Commit Graph

109 Commits (4ef95da75d4393f910779bfde67f06e0e81de4e9)

Author SHA1 Message Date
DESKTOP-MMO982B\User 204aa8d607 优化页面和部分战斗报错修改 2025-07-16 11:11:04 +08:00
DESKTOP-MMO982B\User eed480f711 1 2025-08-06 23:39:30 +07:00
DESKTOP-RH64908\Administrator 03898aae5f 1 2025-06-11 18:55:58 +08:00
zhangjiannan c318a3f870 修改战斗场景,替换挂机表现 2024-10-10 16:52:39 +08:00
PC-202302260912\Administrator 4191eee0b0 敌我双方技能显示修改 2024-08-21 20:59:37 +08:00
wangzhenxing 707908f7c2 敌方英雄显示修改 2024-08-21 19:31:26 +08:00
wangzhenxing 35535cdb03 战斗敌人表现添加空判断 2024-06-03 10:57:01 +08:00
xiejun 4e9f83e014 奥义卡星级和灵兽星级 2024-02-01 18:53:03 +08:00
wangzhenxing dc93a8c744 [战斗]====================================战中casting立绘太小显示修改 2024-01-22 19:46:00 +08:00
wangzhenxing d0bab25a02 【战斗】==================战斗显示修改 2024-01-22 16:43:22 +08:00
xiejun 4e5aa2011a 治疗分段 2024-01-13 18:54:16 +08:00
xiejun 9d5cc8371e 灵兽战斗修改 2024-01-09 18:30:51 +08:00
xiejun 76031f9059 关闭死亡特效 2024-01-02 13:32:17 +08:00
xiejun bf04c23bad 文字飘字 2023-12-29 23:53:05 +08:00
wangzhenxing 6bce92fa4c [战斗表现]======================= 技能名称显示修改,主角放技能不显示立绘 2023-12-29 17:34:32 +08:00
xiejun 1b8a1a2480 bug修改 2023-12-27 19:05:37 +08:00
xiejun 787aeaca12 战斗修改 2023-12-13 11:19:32 +08:00
xiejun 4906264a04 战斗多段 2023-12-02 16:57:39 +08:00
xiejun 941c15890c 战斗表现修改 2023-11-30 13:38:19 +08:00
xiejun 16859c0aa7 修改spine缩放不正常的bug 2023-11-08 17:43:15 +08:00
xiejun ba00dc1132 战斗新增修改spine动画缩放 2023-11-08 16:35:53 +08:00
wangzhenxing 0d08ea1a84 法灵提交 2023-10-26 17:16:10 +08:00
xiejun 731ca32f5b 修改BUG 2023-09-04 15:40:11 +08:00
xiejun 5b8ef487f7 御灵 2023-09-02 17:16:34 +08:00
xiejun 6ced2b0507 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
2023-08-29 17:58:24 +08:00
xiejun 49df3050d1 代码 2023-08-15 13:31:06 +08:00
xiejun 43d80275b9 神将部分UI替换 2023-08-04 18:58:14 +08:00
xiejun 937ec44bf5 立绘和代码修改 2023-07-13 14:38:34 +08:00
xiejun ab2e8eb833 增加技能特效spine 2023-07-06 14:08:10 +08:00
xiejun ab6a726b3a 增加凯多角色 2023-07-02 21:52:32 +08:00
xiejun f52a94841e 修改战斗的代码,已经调整live2D 2023-06-28 15:58:29 +08:00
xiejun b47c16dcb7 test 2023-06-20 18:01:51 +08:00
wangzhenxing 7c2598c7e7 英雄属性添加时空英雄属性 2023-04-19 17:49:29 +08:00
wangzhenxing be9f720590 [战斗]======神兵服务器发过来的数据处理 2023-04-07 16:11:39 +08:00
wangzhenxing cbd60b5e14 [战斗]==================战斗添加神兵 2023-04-06 14:02:32 +08:00
wangzhenxing 51c7375d65 【战斗】==========人物受击后立绘变红 2022-11-16 13:31:13 +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 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
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
wangzhenxing 150e37ae78 [战斗]======效果144修改 护盾buff修改 2021-12-10 15:22:18 +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