miduo_client/Assets/ManagedResources/~Lua/Data
jiaoyangna ed1d9a2b1f Merge branch '0功能/天书秘卷' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-03-30 13:46:49 +08:00
..
ConfigData.lua Merge branch 'china/dev' into 0功能/称号坐骑皮肤 2021-03-29 17:56:19 +08:00
ConfigData.lua.meta
SoundData.lua
SoundData.lua.meta
UIData.lua Merge branch '0功能/天书秘卷' into china/dev 2021-03-30 13:46:49 +08:00
UIData.lua.meta