miduo_client/Assets/ManagedResources/~Lua/Modules/Compound
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
..
view Merge branch 'master_xma_local' into 0功能/silingshilian 2021-03-08 11:14:15 +08:00
CompoundPanel.lua 还原lua 2021-03-02 16:53:12 +08:00
CompoundPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
CompoundSelectListPopup.lua 【本地化】修复魂印选择名字重叠 2021-03-05 17:07:59 +08:00
CompoundSelectListPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
view.meta 提交 2020-05-09 13:31:21 +08:00