miduo_client/Assets/ManagedResources/~Lua/Modules/Arena
jiaoyangna 4121f24a27 Merge branch 'master_xma_local' into 0功能/本周版本优化内容
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
2021-03-10 13:50:38 +08:00
..
View Merge branch 'master_xma_local' into 0功能/本周版本优化内容 2021-03-10 13:50:38 +08:00
ArenaMainPanel.lua 还原lua 2021-03-02 16:53:12 +08:00
ArenaMainPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
ArenaManager.lua 竞技守卫修改 2021-03-02 18:05:06 +08:00
ArenaManager.lua.meta 提交 2020-05-09 13:31:21 +08:00
ArenaRecordPopup.lua 还原lua 2021-03-02 16:53:12 +08:00
ArenaRecordPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
ArenaResultPopup.lua 还原lua 2021-03-02 16:53:12 +08:00
ArenaResultPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
ArenaTypePanel.lua 竞技守卫修改 2021-03-02 18:05:06 +08:00
ArenaTypePanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
View.meta 提交 2020-05-09 13:31:21 +08:00