Commit Graph

602 Commits (83f7449bc0d8732469fefb175c077aa745649215)

Author SHA1 Message Date
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