miduo_client/Assets/ManagedResources/~Lua/Modules/Battle/View
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
..
Unit Merge branch 'dev_oneDis' into onepiece_demo 2023-08-29 17:58:24 +08:00
BattleBestPopup.lua 增加凯多角色 2023-07-02 21:52:32 +08:00
BattleBestPopup.lua.meta
BattleBossInfoPanel.lua
BattleBossInfoPanel.lua.meta
BattleEndPanel.lua 【装备界面】提交 2021-11-09 10:22:16 +08:00
BattleEndPanel.lua.meta
BattlePanel.lua 七界试炼输了也消耗挑战次数bug修复 2023-05-10 14:31:18 +08:00
BattlePanel.lua.meta
BattleRoleShowView.lua
BattleRoleShowView.lua.meta
BattleStageTipPopup.lua
BattleStageTipPopup.lua.meta
BattleView.lua 增加凯多角色 2023-07-02 21:52:32 +08:00
BattleView.lua.meta
DamageResultPanel.lua 云梦好礼红点修改,伤害结算界面星级修改 2023-01-27 10:49:10 +08:00
DamageResultPanel.lua.meta
GuideBattleLogic.lua 【引导战斗】添加根据主角释放技能次数显示对话的功能 2021-12-09 18:05:47 +08:00
GuideBattleLogic.lua.meta
GuideBattlePanel.lua 【引导战斗】修复casting层级错误,修复男女角色显示错误 2021-12-13 17:07:31 +08:00
GuideBattlePanel.lua.meta
Unit.meta