miduo_client/Assets/ManagedResources/~Lua/Data
jiaoyangna cf3c571182 Merge branch 'master_xma_local' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipChangePopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
2021-03-08 11:14:15 +08:00
..
ConfigData.lua Merge branch 'master_xma_local' into 0功能/silingshilian 2021-03-08 11:14:15 +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 Merge branch 'master_xma_local' into 0功能/silingshilian 2021-03-08 10:27:14 +08:00
UIData.lua.meta 提交 2020-05-09 13:31:21 +08:00