miduo_client/Assets/ManagedResources/~Lua/Modules/WorldArena
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
..
GodsWayBattleInfoPanel.lua Merge branch 'dev_oneDis' into onepiece_demo 2023-08-29 17:58:24 +08:00
GodsWayBattleInfoPanel.lua.meta 遴选多队塔代码 2023-03-21 10:58:00 +08:00
GodsWayMyTeamPanel.lua 多队塔编对修改提交 2023-04-20 13:13:22 +08:00
GodsWayMyTeamPanel.lua.meta 遴选多队塔代码 2023-03-21 10:58:00 +08:00
GodsWayOtherTeamPanel.lua 多队塔详情界面挑战添加限制 2023-03-22 18:26:47 +08:00
GodsWayOtherTeamPanel.lua.meta 遴选多队塔代码 2023-03-21 10:58:00 +08:00
GodsWayTowerManager.lua 多队塔红点提交 2023-03-22 14:58:19 +08:00
GodsWayTowerManager.lua.meta 遴选多队塔代码 2023-03-21 10:58:00 +08:00
WorldArenaBattleInfoPanel.lua 玉虚论道星级修改 2023-01-13 13:44:12 +08:00
WorldArenaBattleInfoPanel.lua.meta
WorldArenaMainPanel.lua
WorldArenaMainPanel.lua.meta
WorldArenaManager.lua 【灵兽特惠】倒计时修改 2021-11-29 13:40:53 +08:00
WorldArenaManager.lua.meta
WorldArenaMyTeamPanel.lua 玉虚论道星级修改 2023-01-13 13:44:12 +08:00
WorldArenaMyTeamPanel.lua.meta
WorldArenaOtherTeamPanel.lua 玉虚论道修改 2023-01-13 14:00:37 +08:00
WorldArenaOtherTeamPanel.lua.meta
WorldArenaRankRewardPanel.lua
WorldArenaRankRewardPanel.lua.meta
WorldArenaRecordPopup.lua 玉虚论道记录神魂修改提交,神将界面修改提交 2021-11-08 10:30:12 +08:00
WorldArenaRecordPopup.lua.meta
WorldArenaUpRewardPanel.lua
WorldArenaUpRewardPanel.lua.meta