Commit Graph

76 Commits (bf9efec5c6704238a3048701e749cbb7f1099272)

Author SHA1 Message Date
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 01b3a8c35b 【战斗】=======护盾效果表现修改 2022-03-17 16:50:40 +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 e02f9a7881 [战斗]======角色播放 skill 动作逻辑提交 2021-12-20 10:02:38 +08:00
gaoxin ec916ef6f0 【引导战斗】修复casting层级错误,修复男女角色显示错误 2021-12-13 17:07:31 +08:00
wangzhenxing 150e37ae78 [战斗]======效果144修改 护盾buff修改 2021-12-10 15:22:18 +08:00
gaoxin 836d216309 【战斗】主角出现在战斗中时缺少动画处理 2021-12-10 09:57:08 +08:00
wangzhenxing 3b1ba253b5 [战斗]======表现修改 如果正在释放技能不会播放受击动画 2021-12-07 16:33:04 +08:00
gaoxin ba0680eac6 【战斗】皮肤朝向修改 2021-11-30 23:14:06 +08:00
wangzhenxing 6b742c0788 [立绘朝向]======皮肤立绘朝向修改 2021-11-30 20:43:56 +08:00
wangzhenxing bc39b34a73 [战中表现]=====角色释放技能表现位置修改 2021-11-27 16:34:46 +08:00
gaoxin 0ddf804234 【战斗】战斗结构调整 2021-11-26 17:20:28 +08:00
wangzhenxing bb1402d5e7 [战斗]======立绘方向修改 2021-11-26 11:24:46 +08:00
gaoxin f5f5a2477d 【战斗】怒气层级错误 2021-11-26 10:33:30 +08:00
wangzhenxing b15eaf8b19 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-25 15:05:10 +08:00
wangzhenxing ae8021cd6a [战斗表现]========敌我方立绘镜像显示 2021-11-25 15:04:55 +08:00
gaoxin b316f54e50 【战斗】护盾特效层级问题优化 2021-11-25 14:46:46 +08:00
wangzhenxing b8b1c74f03 [战斗]========被动391修改 我方流血显示修改 2021-11-23 10:46:52 +08:00
wangzhenxing 134b1aff71 【战斗表现】============我方复活后血条不显示修改 2021-11-22 17:21:59 +08:00
wangzhenxing f980485ce2 [战斗表现]========足下阴影显示修改 2021-11-22 15:18:44 +08:00
wangzhenxing 3d4211740c 【战斗表现】=========我方战中立绘缩放读取字段修改 2021-11-19 11:19:18 +08:00
wangzhenxing 45bc2139a6 [战斗表现]=========我方前排血条位置修改 2021-11-18 18:37:14 +08:00
wangzhenxing b74561d70b [战斗表现]===============敌我前后排立绘缩放大小固定 2021-11-18 18:29:13 +08:00
wangzhenxing ad0e844852 [战中表现]========我方单位立绘大小读取字段修改 2021-11-18 15:44:16 +08:00
wangzhenxing 6ee80e7a9f [战斗表现]================战斗表现修改提交 2021-11-17 17:29:17 +08:00
gaoxin 451d8f4460 【战斗】伤害数字延时显示 2021-11-12 11:59:40 +08:00
gaoxin d4582cf244 【神魂】修复战斗中神魂特效不显示的问题 2021-11-05 18:13:32 +08:00
wangzhenxing d004e1d459 【神魂】======战斗中 和伤害记录界面加神魂显示 2021-10-29 15:14:01 +08:00
wangzhenxing 31e8594a70 [战斗]=========御甲添加 图片字提示表现 2021-09-30 09:53:31 +08:00
wangzhenxing cbb22260f3 Merge branch 'china/dev-c-battle' into china/dev 2021-09-23 11:02:19 +08:00
gaoxin 66efc9d4e3 【战斗力】新战斗力计算系统完成 2021-09-16 13:35:33 +08:00
wangzhenxing 4ee0741896 [战斗]==============被动338修改 护甲逻辑修改 2021-09-15 11:23:04 +08:00
wangzhenxing 3e36a537b3 [战斗]======= 目标选择逻辑 生命百分比最低 不选有不灭的 显示层:死亡后怒气显示不清空 被动99 307 目标选择修改 2021-09-01 18:40:32 +08:00
wangzhenxing 690db47d68 【战斗】=========复活,新灼烧特效预设提交 2021-08-25 14:37:10 +08:00
wangzhenxing 94dde31cf9 [战斗]====中毒伤害图片字提交 2021-07-02 19:12:09 +08:00
wangzhenxing 2578107be4 【战斗】============战斗图片字显示修改 2021-06-30 18:06:56 +08:00
wangzhenxing aeed1703bd 【ID1009572】【战斗】===========各种效果提示文字改为图片字 第二期提交 2021-06-30 10:40:52 +08:00
gaoxin 327efb10d0 【战斗】卡牌人物立绘释放技能时位置计算方式调整 2021-06-03 18:40:26 +08:00
gaoxin 1ea3890111 【战斗】报错优化 2021-05-29 15:21:41 +08:00
gaoxin 593a8cb398 【山河社稷图】猪八戒普攻后半身像显示不全 2021-05-28 13:31:06 +08:00
gaoxin a1df6cbcf5 【战斗】尝试修复竞技场战斗报错 2021-05-27 22:11:06 +08:00
gaoxin 30b329a837 【ios】图片回收 2021-04-21 13:12:04 +08:00
JLIOSM1 c31a82ef7f 【ios】lua文件格式修改 2021-04-20 13:58:00 +08:00