miduo_client/Assets/ManagedResources/~Lua/Modules/Main
ZhangBiao 24ea537bba Merge branch 'master_xma_local' into 0活动开发聚集地/限时神装
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua
2021-03-11 15:15:09 +08:00
..
View 【优化】主城假人改为NPC或者排行榜角色 2 2021-01-27 17:36:33 +08:00
BattleData1.lua 【本地化】还原文本到代码中合并用 2021-01-09 14:20:06 +08:00
BattleData1.lua.meta 【战斗】灵兽战斗逻辑同步 2020-11-01 16:17:26 +08:00
GMPanel.lua 还原lua 2021-03-02 16:53:12 +08:00
GMPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
MainPanel.lua Merge branch 'master_xma_local' into 0活动开发聚集地/限时神装 2021-03-11 15:15:09 +08:00
MainPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
View.meta 提交 2020-05-09 13:31:21 +08:00