miduo_client/Assets/ManagedResources/~Lua/Modules/Battle
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
..
Config [战斗]==================战斗添加神兵 2023-04-06 14:02:32 +08:00
Logic Merge branch 'dev_oneDis' into onepiece_demo 2023-08-29 17:58:24 +08:00
Test 修改战斗编辑器 2023-08-16 14:40:51 +08:00
View Merge branch 'dev_oneDis' into onepiece_demo 2023-08-29 17:58:24 +08:00
BattleAnalysisManager.lua [战斗]=========战斗记录老虎上无敌盾记录修改 2021-12-27 15:42:38 +08:00
BattleAnalysisManager.lua.meta
BattleManager.lua 路飞,萨博 2023-07-17 18:47:07 +08:00
BattleManager.lua.meta
BattlePool.lua 【战斗】====战斗gm报错修改 2021-12-16 10:24:36 +08:00
BattlePool.lua.meta
BattleRecordManager.lua 【战斗】======战斗结果显示主角伤害治疗修改 2021-11-02 18:00:31 +08:00
BattleRecordManager.lua.meta
Config.meta
Logic.meta
Test.meta
View.meta