Commit Graph

166 Commits (1b0fc73ae14ff34a9238435dda0e1f56b8a90adc)

Author SHA1 Message Date
wangzhenxing ce0df44e22 [战斗]=======战斗我方不显示立绘 2022-11-03 14:39:58 +08:00
wangzhenxing 37c8d8f6a8 [战斗]======逻辑修改 2022-08-03 14:20:57 +08:00
wangzhenxing bf9efec5c6 [战斗]========战斗名称显示修改 2022-06-29 14:54:23 +08:00
wangzhenxing f4545f127c 战斗表现修改 2022-05-24 14:09:01 +08:00
wangzhenxing bbd485f56f [假战斗]=====修改 2022-05-24 13:35:24 +08:00
wangzhenxing 3e75dc9f6f [假战斗]======修改提交 2022-05-24 11:57:47 +08:00
wangzhenxing 53e7c44e2a [战斗]=======战斗提交 2022-04-19 17:23:37 +08:00
wangzhenxing 01b3a8c35b 【战斗】=======护盾效果表现修改 2022-03-17 16:50:40 +08:00
wangzhenxing 008b3671c4 [战斗]======buff提示文字修改 2022-03-14 17:10:15 +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
gaoxin 8351aba49c 【战斗】我方buff显示位置修改 2022-01-13 13:56:08 +08:00
wangzhenxing f89526d96a [战斗]===========被动新增 414 -417 2022-01-06 15:30:40 +08:00
wangzhenxing 5b670023ed [飞升]=======飞升代码逻辑提交 2022-01-05 18:17:44 +08:00
wangzhenxing 33f1934d02 【战斗】========角色皮肤释放技能表现修改 2021-12-29 13:08:32 +08:00
wangzhenxing d3253c5edb 【战斗】========技能释放逻辑修改,技能播放技能攻击动作 2021-12-24 16:11:53 +08:00
wangzhenxing e02f9a7881 [战斗]======角色播放 skill 动作逻辑提交 2021-12-20 10:02:38 +08:00
gaoxin 1691fd03da 【战斗】优化身外化身casting显示时间 2021-12-14 13:51:41 +08:00
gaoxin ec916ef6f0 【引导战斗】修复casting层级错误,修复男女角色显示错误 2021-12-13 17:07:31 +08:00
gaoxin eeda6a80c5 【战斗】修复主角技能卡死 2021-12-10 18:27:51 +08:00
wangzhenxing 150e37ae78 [战斗]======效果144修改 护盾buff修改 2021-12-10 15:22:18 +08:00
gaoxin 9ec7d07fbb 【身外化身剧情】孙悟空可配置为主角 2021-12-10 11:58:42 +08:00
gaoxin 836d216309 【战斗】主角出现在战斗中时缺少动画处理 2021-12-10 09:57:08 +08:00
wangzhenxing 889a49576c 【战斗】=======第五期神魂提交 2021-12-09 14:25:02 +08:00
wangzhenxing 3b1ba253b5 [战斗]======表现修改 如果正在释放技能不会播放受击动画 2021-12-07 16:33:04 +08:00
wangzhenxing acc1be3885 【战斗】=====buff图标显示销毁修改 2021-12-06 13:18:50 +08:00
wangzhenxing e9f9010c12 【战斗】======被动401修改 2021-12-06 09:40:51 +08:00
wangzhenxing 010d68819f [战斗]=====buff显示id修改 2021-12-03 18:53:48 +08:00
wangzhenxing b9763ad25e 【战斗】=====变身卡提交 2021-12-03 17:17:47 +08:00
wangzhenxing d424af4e4e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-02 17:43:00 +08:00
wangzhenxing bbef7796ca [战斗]=======第四期神魂 2021-12-02 17:42:31 +08:00
gaoxin ba0680eac6 【战斗】皮肤朝向修改 2021-11-30 23:14:06 +08:00
wangzhenxing 6b742c0788 [立绘朝向]======皮肤立绘朝向修改 2021-11-30 20:43:56 +08:00
wangzhenxing e1d75c6274 [战斗]=====增加目标筛选条件 2021-11-30 09:58:27 +08:00
wangzhenxing 0cef7683ba [战斗]======效果137修改 立绘朝向修改 2021-11-29 17:53:17 +08:00
wangzhenxing ea7e7d31be 【战中表现】======身外化身表现优化 2021-11-29 16:19:43 +08:00
wangzhenxing bc39b34a73 [战中表现]=====角色释放技能表现位置修改 2021-11-27 16:34:46 +08:00
wangzhenxing cbcead2f50 【身外化身】=======化身位置修改 2021-11-27 15:45:21 +08:00
wangzhenxing 85a12ae9d8 [身外化身]========身外化身立绘朝向修改 2021-11-27 15:14:22 +08:00
wangzhenxing fd81a89c96 【战斗表现】========变身卡展示位置修改 2021-11-27 13:56:37 +08:00
wangzhenxing 587a5cfc2e [战斗]=======133 136 137效果修改 2021-11-26 18:05:16 +08:00
gaoxin 0ddf804234 【战斗】战斗结构调整 2021-11-26 17:20:28 +08:00
gaoxin a9a402bd42 【战斗】再次优化护盾类特效的显示层级 2021-11-26 14:27:58 +08:00
gaoxin 6b199a8b5a 【战斗】敌方怒气穿透 2021-11-26 14:06:19 +08:00
gaoxin 21e7638a75 【特效】优化点对点特效的显示时间,优化特效层级错误的问题 2021-11-26 13:58:59 +08:00
gaoxin 71aa002b13 【战斗】前置特效添加延时 2021-11-26 13:58:24 +08:00
wangzhenxing bb1402d5e7 [战斗]======立绘方向修改 2021-11-26 11:24:46 +08:00
gaoxin f5f5a2477d 【战斗】怒气层级错误 2021-11-26 10:33:30 +08:00
wangzhenxing 7949e8c21c 【战斗】========灵兽卡面翻转提交 2021-11-25 18:47:53 +08:00
gaoxin 879cf506f5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-25 15:43:15 +08:00
gaoxin 4923314bbb 【战斗】屏幕震动加入伤害延时时间 2021-11-25 15:43:10 +08:00