wangzhenxing
|
7fc634bcf8
|
英雄升级材料不足提示修改
|
2022-11-07 17:40:10 +08:00 |
wangzhenxing
|
9fc80d7006
|
gm修改器显示修改提交
|
2022-11-04 17:49:27 +08:00 |
wangzhenxing
|
d11e4a90cc
|
英雄升级突破材料不足提示
|
2022-11-04 16:28:16 +08:00 |
wangzhenxing
|
19ce8e51d5
|
英雄升星扩展
|
2022-11-03 14:33:09 +08:00 |
wangzhenxing
|
0543114a36
|
角色星级扩展
|
2022-11-02 16:26:40 +08:00 |
wangzhenxing
|
da4b07d862
|
星级显示修改提交
|
2022-11-02 15:47:17 +08:00 |
yuanshuai
|
d42106b07e
|
神尊特权提交
|
2022-09-09 18:09:45 +08:00 |
yuanshuai
|
489fd12db2
|
锻器阁 bug修改
|
2022-09-07 14:08:01 +08:00 |
yuanshuai
|
d253c29e11
|
上限限制
|
2022-09-07 13:23:51 +08:00 |
yuanshuai
|
05d1eeeb6c
|
神应 上限修改
|
2022-09-07 13:21:27 +08:00 |
yuanshuai
|
f6e27c21d3
|
神应相关属性战斗力修改
|
2022-09-07 11:40:13 +08:00 |
yuanshuai
|
ef7373fe4a
|
宝物分解
|
2022-09-07 10:25:38 +08:00 |
yuanshuai
|
d0d94401d4
|
魂宝灵宝分解
|
2022-09-07 10:14:05 +08:00 |
yuanshuai
|
e91edae1cf
|
建木神树bug修改
|
2022-09-06 15:47:16 +08:00 |
yuanshuai
|
573ea577ce
|
建木神树修改提交
|
2022-09-06 10:16:57 +08:00 |
wangzhenxing
|
7d8cb3e398
|
鸿蒙阵上阵英雄法宝进阶按钮置灰修改
|
2022-08-31 15:53:27 +08:00 |
wangzhenxing
|
3a1d522acd
|
[法宝]======归元,进阶红点修改
|
2022-08-31 14:21:28 +08:00 |
wangzhenxing
|
24d9637fb2
|
[共鸣去掉法宝]
|
2022-08-31 11:18:55 +08:00 |
yuanshuai
|
e41c13e565
|
法宝显示修改
|
2022-08-30 18:12:25 +08:00 |
yuanshuai
|
a10a386b24
|
法宝修改提交
|
2022-08-30 15:55:37 +08:00 |
wangzhenxing
|
4ca74759ba
|
[图鉴,英雄详情]======添加神魂按钮
|
2022-07-22 13:43:25 +08:00 |
wangzhenxing
|
4c82f2d58c
|
【装备】======添加特效
|
2022-06-15 10:31:10 +08:00 |
wangzhenxing
|
c382f44681
|
[英雄技能]======飞升技能显示修改
|
2022-06-13 16:35:30 +08:00 |
wangzhenxing
|
d1970ed6cc
|
他人英雄详情修改
|
2022-05-19 22:12:14 +08:00 |
wangzhenxing
|
d97c84a543
|
[英雄详情修改i]
|
2022-05-19 20:43:41 +08:00 |
wangzhenxing
|
588df24b29
|
角色信息界面技能标签修改
|
2022-05-19 19:04:21 +08:00 |
wangzhenxing
|
3b4e771d16
|
[神将信息展示]======神将信息修改
|
2022-05-19 16:38:52 +08:00 |
wangzhenxing
|
d4a6bfdda2
|
【神将排版优化】========神将信息界面修改
|
2022-05-18 20:00:57 +08:00 |
wangzhenxing
|
9716d0d90e
|
神印红点修改提交
|
2022-04-28 10:51:39 +08:00 |
wangzhenxing
|
b5445b2ed6
|
神印bug修改
|
2022-04-26 15:03:06 +08:00 |
wangzhenxing
|
2ba97e8fe2
|
英雄神印入口修改
|
2022-04-26 14:22:35 +08:00 |
yuanshuai
|
f0cb395539
|
背包页签修改
|
2022-04-26 11:45:13 +08:00 |
wangzhenxing
|
043f174f08
|
神印开始条件显示
|
2022-04-24 17:19:34 +08:00 |
wangzhenxing
|
ca2b699259
|
神印提交
|
2022-04-22 18:23:01 +08:00 |
wangzhenxing
|
abd83b945a
|
【bug】======英雄升星属性显示修改
|
2022-04-07 10:33:55 +08:00 |
wangzhenxing
|
eff2800c35
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-03-31 09:51:26 +08:00 |
jiaoyangna
|
701938ad27
|
【ID1011391】
飞升鸿蒙阵等级限制调整
(cherry picked from commit 0f69eb822293597556fe825a6b9f99d27b8d8f91)
|
2022-03-29 16:25:49 +08:00 |
wangzhenxing
|
a13dd2939a
|
[功能]================神系英雄添加提叫
|
2022-03-28 18:18:19 +08:00 |
gaoxin
|
cbc4f3f410
|
【建木神树】修复神树升级后战斗计算异常
|
2022-02-24 02:22:16 +08:00 |
jiaoyangna
|
1905b3c175
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-21 18:37:18 +08:00 |
jiaoyangna
|
3ccf3c29a3
|
ID1011149】
【优化】升星操作增加鸿蒙阵等级限制
|
2022-02-21 18:36:21 +08:00 |
wangzhenxing
|
51e89fea29
|
英雄觉醒后天赋显示修改
|
2022-02-21 14:25:52 +08:00 |
jiaoyangna
|
a76616df31
|
【ID1011149】
【优化】升星操作增加鸿蒙阵等级限制
|
2022-02-17 15:13:26 +08:00 |
wangzhenxing
|
5b3c82f0b3
|
【bug】=======图鉴觉醒信息显示修改
|
2022-02-15 10:43:13 +08:00 |
wangzhenxing
|
01506ba48c
|
[角色天赋]======角色天赋显示修改
|
2022-02-10 17:52:40 +08:00 |
wangzhenxing
|
7de5fdac9e
|
[飞升]=====特效问题修改
|
2022-01-20 17:58:57 +08:00 |
wangzhenxing
|
46f337312e
|
[飞升]========特效修改
|
2022-01-20 15:06:04 +08:00 |
wangzhenxing
|
6ef00a4498
|
[飞升]=====细节调整
|
2022-01-19 16:57:17 +08:00 |
wangzhenxing
|
109648ae93
|
Merge branch 'china/dev' into china/飞升
|
2022-01-19 16:13:20 +08:00 |
wangzhenxing
|
4034a90a33
|
[飞升]======优化修改提交
|
2022-01-19 15:29:47 +08:00 |
gaoxin
|
35648e8762
|
【升级】长按升到最大级了,会无法触发抬起事件,导致升级失败
|
2022-01-19 15:22:11 +08:00 |
wangzhenxing
|
a6e05ae8e8
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/~Lua/Data/UIData.lua
|
2022-01-18 09:53:04 +08:00 |
wangzhenxing
|
2e0bd1ded7
|
[飞升]=======显示修改
|
2022-01-18 09:47:38 +08:00 |
ZhangBiao
|
bf3ca7ef08
|
【装备加持】鸿蒙阵共鸣出的装备未受到装备加持加成
|
2022-01-17 18:22:45 +08:00 |
jiaoyangna
|
d0023bbcdf
|
神魂显示修改提交
|
2022-01-17 13:56:06 +08:00 |
jiaoyangna
|
5bd09017e0
|
掩藏神魂
|
2022-01-17 13:23:19 +08:00 |
jiaoyangna
|
501d3758fd
|
升级显示消耗
|
2022-01-17 10:59:48 +08:00 |
jiaoyangna
|
28b3fb33f3
|
技能报错修改提交
|
2022-01-17 10:56:38 +08:00 |
wangzhenxing
|
a7ad2ee1f6
|
Merge branch 'china/dev' into china/飞升
|
2022-01-17 10:50:14 +08:00 |
ZhangBiao
|
10070d14ca
|
【跳转】提交
|
2022-01-15 18:29:18 +08:00 |
wangzhenxing
|
0b3007a9c7
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/~Lua/Data/UIData.lua
|
2022-01-15 18:16:56 +08:00 |
ZhangBiao
|
f4c1b9d097
|
【修改】提交
|
2022-01-15 14:34:55 +08:00 |
wangzhenxing
|
ef0a0ff436
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab
Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Data/UIData.lua
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua
Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
|
2022-01-15 12:47:22 +08:00 |
jiaoyangna
|
b0611db595
|
神将技能修改提交
|
2022-01-14 18:48:23 +08:00 |
jiaoyangna
|
81ce84e7be
|
升级修改提交
|
2022-01-14 17:57:12 +08:00 |
jiaoyangna
|
c11db3056f
|
神将修改
|
2022-01-14 17:13:36 +08:00 |
jiaoyangna
|
3f267894a8
|
神将修改提交
|
2022-01-14 16:14:52 +08:00 |
jiaoyangna
|
053de388f2
|
神将修改提交
|
2022-01-14 14:52:56 +08:00 |
jiaoyangna
|
981aba2417
|
神将情报修改提交
|
2022-01-14 11:26:13 +08:00 |
jiaoyangna
|
8377e33b31
|
神将情报修改提交
|
2022-01-14 10:50:51 +08:00 |
jiaoyangna
|
17db5f29c4
|
框修改提交
|
2022-01-14 10:25:27 +08:00 |
jiaoyangna
|
e4ea506ed1
|
神将情报修改提交
|
2022-01-14 10:17:19 +08:00 |
wangzhenxing
|
a16b592892
|
[飞升]=========飞升优化修改
|
2022-01-13 10:01:22 +08:00 |
wangzhenxing
|
ff7b7ba5ed
|
[飞升]=====bug修改提交
|
2022-01-12 16:41:51 +08:00 |
jiaoyangna
|
0b4cfe3a74
|
点击技能切换修改
|
2022-01-12 14:35:27 +08:00 |
jiaoyangna
|
93fda69ff5
|
升级突破状态显示错误修改
|
2022-01-12 13:37:39 +08:00 |
jiaoyangna
|
f943824ae9
|
共鸣中修改提交
|
2022-01-11 15:40:22 +08:00 |
jiaoyangna
|
a01485ebab
|
资源提交
|
2022-01-11 15:36:17 +08:00 |
jiaoyangna
|
e12e783590
|
共鸣中修改提交
|
2022-01-11 15:31:19 +08:00 |
jiaoyangna
|
36c6228096
|
图片修改提交
|
2022-01-11 14:56:37 +08:00 |
jiaoyangna
|
4d58e36be4
|
神将界面技能报错修改
|
2022-01-11 14:44:16 +08:00 |
jiaoyangna
|
af9306d8cf
|
未解锁添加未解锁提示
|
2022-01-11 14:23:24 +08:00 |
jiaoyangna
|
b0e7ce6238
|
代码漏提
|
2022-01-11 13:49:18 +08:00 |
jiaoyangna
|
40e37473dc
|
【ID1011029】
【优化】 神将界面优化
|
2022-01-11 11:09:44 +08:00 |
wangzhenxing
|
1b39fbdbe9
|
【飞升】===========神魂后星级显示修改
|
2022-01-10 15:11:30 +08:00 |
wangzhenxing
|
a68fa4e0f6
|
【飞升】============飞升添加特效
|
2022-01-07 13:41:57 +08:00 |
wangzhenxing
|
e5c176cd9f
|
[飞升]============特效显示修改提交
|
2022-01-07 10:08:55 +08:00 |
ZhangBiao
|
9c874f1789
|
Merge branch 'china/dev' into 0功能/家园
# Conflicts:
# Assets/ManagedResources/Icon/Item/icon_laohu.png.meta
# Assets/ManagedResources/Icon/Item/r_Resource_laohu.png.meta
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
|
2022-01-06 15:38:48 +08:00 |
jiaoyangna
|
c8b604bde4
|
【ID1011007】
【优化】功能开启增加新条件类型
|
2022-01-06 11:30:35 +08:00 |
wangzhenxing
|
5b670023ed
|
[飞升]=======飞升代码逻辑提交
|
2022-01-05 18:17:44 +08:00 |
ZhangBiao
|
c0d27feac2
|
Merge branch 'china/dev' into 0功能/家园
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2022-01-05 10:16:25 +08:00 |
gaoxin
|
0c9b3b4f96
|
【角色信息】修复回收立绘错误
|
2021-12-31 17:55:01 +08:00 |
wangzhenxing
|
2f2634eb39
|
【飞升】=====代码预设提交
|
2021-12-31 13:50:49 +08:00 |
ZhangBiao
|
cf9cbc5ac9
|
【家园】摘星阁装备属性加持+战斗力
|
2021-12-31 13:44:11 +08:00 |
gaoxin
|
17394f79a0
|
【动画】神将切换动画优化
|
2021-12-31 01:45:13 +08:00 |
wangzhenxing
|
73d92664de
|
[飞升]=======飞升逻辑提交
|
2021-12-28 16:20:07 +08:00 |
wangzhenxing
|
380b0bdb78
|
[飞升]=============飞升代码提交
|
2021-12-27 16:39:38 +08:00 |
jiaoyangna
|
c5448299c0
|
报错修改提交
|
2021-12-15 13:35:44 +08:00 |
jiaoyangna
|
0c83c3412e
|
【ID1010843】
增加英雄回退功能
|
2021-12-14 17:25:44 +08:00 |
ZhangBiao
|
3bc06e9b8e
|
【白金装备】装备穿戴界面,四星白金装备比五星白金装备排序靠前,其他部位没问题
|
2021-12-13 10:14:54 +08:00 |
wangzhenxing
|
35e42ed5f0
|
【战斗】===buff图标资源 回合变化延时修改
|
2021-12-07 13:18:52 +08:00 |
wangzhenxing
|
898f3a9b99
|
[立绘朝向]=======英雄列表初始化立绘朝向修改
|
2021-11-30 22:53:49 +08:00 |
wangzhenxing
|
6b742c0788
|
[立绘朝向]======皮肤立绘朝向修改
|
2021-11-30 20:43:56 +08:00 |
wangzhenxing
|
bdb02e9fa4
|
[战斗]=====皮肤立绘朝向修改
|
2021-11-30 11:04:25 +08:00 |
wangzhenxing
|
1eb6115bc9
|
[角色朝向]=======立绘朝向修改
|
2021-11-29 13:21:23 +08:00 |
wangzhenxing
|
dd248f37f6
|
[角色朝向]======进阶展示,皮肤显示,好感度
|
2021-11-27 17:18:04 +08:00 |
wangzhenxing
|
3c22a1ef6c
|
[立绘朝向]======静态立绘朝向改回原样
|
2021-11-27 13:17:36 +08:00 |
wangzhenxing
|
c80968098c
|
【立绘朝向】=============装备界面立绘朝向
|
2021-11-27 13:01:27 +08:00 |
wangzhenxing
|
69e30d908c
|
[立绘朝向]===============我方立绘展示朝向修改
|
2021-11-26 16:55:13 +08:00 |
gaoxin
|
ecedea90f8
|
Merge branch '0功能/新增克制属性' into china/dev
|
2021-11-18 10:49:34 +08:00 |
gaoxin
|
12fe3eb3e4
|
【战斗力】公式参数走表,装备,法宝战斗力计算公式修改
|
2021-11-17 15:55:37 +08:00 |
ZhangBiao
|
b6ce191bff
|
【装备界面】无法卸下调整
|
2021-11-17 12:34:39 +08:00 |
jiaoyangna
|
cd5c2f585a
|
【ID1019160】
【神将】初始4星情报界面有魂印图标,点击提示6星解锁
(cherry picked from commit ee46920fe5 )
|
2021-11-16 17:17:35 +08:00 |
ZhangBiao
|
2c0032b829
|
【神魂】头像框错误修改
|
2021-11-15 16:58:49 +08:00 |
ZhangBiao
|
b7c354befe
|
【神魂】神魂头像框修改
|
2021-11-15 16:44:46 +08:00 |
jiaoyangna
|
6ed696b426
|
法宝界面文字大小修改
|
2021-11-12 09:40:13 +08:00 |
gaoxin
|
3addb9905b
|
【神将觉醒】觉醒成功界面中,不需要显示非核心天赋的变化(非特性天赋),且【特性】文字需要放大
|
2021-11-11 14:10:48 +08:00 |
jiaoyangna
|
4455242293
|
【ID1019110】
【神魂图鉴】图鉴中的神魂弹窗,神将头像不是边框边框
|
2021-11-11 13:41:42 +08:00 |
ZhangBiao
|
7efdfd5029
|
【新·装备】增加战力对比图标
|
2021-11-09 18:24:38 +08:00 |
ZhangBiao
|
f18880622e
|
【新·魂灵宝】提交
|
2021-11-09 17:06:47 +08:00 |
ZhangBiao
|
12e46be512
|
【装备界面】提交
|
2021-11-09 10:22:16 +08:00 |
jiaoyangna
|
265aaca235
|
神将界面特效修改提交
|
2021-11-08 15:18:28 +08:00 |
gaoxin
|
bbb89af48e
|
【英雄突破】白骨精升级到100级点击突破按钮,弹出跳转提示,点击前往进阶界面报错
|
2021-11-08 14:10:26 +08:00 |
gaoxin
|
67f3ca9f52
|
【适配】1080*2550,进阶白骨精法宝,文字描述遮挡
|
2021-11-08 13:39:29 +08:00 |
ZhangBiao
|
a577d80d76
|
【神魂】增加特效
|
2021-11-08 13:02:00 +08:00 |
jiaoyangna
|
1329112387
|
神魂未激活图片修改提交
|
2021-11-08 11:24:10 +08:00 |
jiaoyangna
|
e8433d1026
|
玉虚论道记录神魂修改提交,神将界面修改提交
|
2021-11-08 10:30:12 +08:00 |
ZhangBiao
|
a953a78018
|
【升星有礼】觉醒后没有红点修改
|
2021-11-05 18:14:44 +08:00 |
wangzhenxing
|
99452354bc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 17:21:30 +08:00 |
wangzhenxing
|
a92a76e3ab
|
【神魂】=====技能描述修改
|
2021-11-05 17:21:18 +08:00 |
jiaoyangna
|
2aea503619
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 17:14:08 +08:00 |
jiaoyangna
|
bd8cd97bf3
|
神魂星星修改提交
|
2021-11-05 17:13:49 +08:00 |
ZhangBiao
|
142956ca6a
|
【活动】活动修改提交
|
2021-11-05 16:43:09 +08:00 |
jiaoyangna
|
d0d93e02ea
|
代码星星层级设置修改
|
2021-11-05 13:18:55 +08:00 |
jiaoyangna
|
0d68d9229b
|
神魂提交
|
2021-11-05 10:18:10 +08:00 |
jiaoyangna
|
154aa77cd3
|
神魂特效修改提交
|
2021-11-04 10:46:25 +08:00 |
jiaoyangna
|
596c8477d3
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-11-04 09:29:56 +08:00 |
jiaoyangna
|
34d8cf4440
|
神魂位置提交
|
2021-11-04 09:27:56 +08:00 |
jiaoyangna
|
6f0d51ddb2
|
神魂提交
|
2021-11-03 18:11:08 +08:00 |
gaoxin
|
820b45cfa0
|
【宝物】修复神树和四灵变化后,没有重新计算宝物评分的问题
|
2021-11-03 15:16:48 +08:00 |
jiaoyangna
|
604b1d6819
|
神魂提交
|
2021-11-03 11:18:37 +08:00 |
jiaoyangna
|
0468c865db
|
神魂提交
|
2021-11-03 10:32:55 +08:00 |
jiaoyangna
|
125e37fe6d
|
神魂提交
|
2021-11-03 10:13:44 +08:00 |
jiaoyangna
|
a41765d10b
|
神魂提交
|
2021-11-02 10:20:17 +08:00 |
jiaoyangna
|
681f8d5a57
|
神魂提交
|
2021-11-01 19:11:59 +08:00 |
gaoxin
|
5044a79789
|
Revert "Revert "【界面优化】心魔试炼、战斗统计、法宝进阶""
This reverts commit 2901a60489 .
|
2021-11-01 18:59:11 +08:00 |
zhangshanxue
|
2901a60489
|
Revert "【界面优化】心魔试炼、战斗统计、法宝进阶"
This reverts commit 75827dc392 .
|
2021-11-01 18:53:54 +08:00 |
ZhangBiao
|
75827dc392
|
【界面优化】心魔试炼、战斗统计、法宝进阶
|
2021-11-01 15:36:40 +08:00 |
jiaoyangna
|
9249ed85cb
|
神魂预设修改
|
2021-10-28 16:19:59 +08:00 |
ZhangBiao
|
87a95f0612
|
【界面优化】还原”特性“、大闹天宫
|
2021-10-28 14:14:30 +08:00 |