miduo_client/Assets/ManagedResources/~Lua/Data
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
..
ConfigData.lua Merge branch 'master_xma_local' into 0功能/本周版本优化内容 2021-03-10 13:50:38 +08:00
ConfigData.lua.meta 提交 2020-05-09 13:31:21 +08:00
SoundData.lua 【逍遥游】筛子摇动和事件触发音效添加 2020-10-20 17:43:18 +08:00
SoundData.lua.meta 提交 2020-05-09 13:31:21 +08:00
UIData.lua 【系统弹窗】提交 2021-03-05 17:27:57 +08:00
UIData.lua.meta 提交 2020-05-09 13:31:21 +08:00