miduo_client/Assets/ManagedResources/~Lua/Data
JieLing 55ab6b992e Merge branch 'china/dev' into china/test
# Conflicts:
#	Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/CarbonImg_monster 4.png.meta
#	Assets/ManagedResources/EffectResUI/ChengHao_new/Textures/Fx_tex_os4_ani_017.png.meta
#	Assets/ManagedResources/EffectResUI/linglongbaojing/Textures/fx_tex_xinguang.png.meta
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
2021-07-26 10:20:29 +08:00
..
ConfigData.lua Merge branch 'china/dev' into china/dev_c_跨服天梯 2021-07-20 18:09:07 +08:00
ConfigData.lua.meta 提交 2020-05-09 13:31:21 +08:00
SoundData.lua 音效添加 2021-07-22 17:04:03 +08:00
SoundData.lua.meta 提交 2020-05-09 13:31:21 +08:00
UIData.lua Merge branch 'china/dev' into china/test 2021-07-26 10:20:29 +08:00
UIData.lua.meta 提交 2020-05-09 13:31:21 +08:00