miduo_client/Assets/ManagedResources/~Lua/Logic
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
..
Game.lua 【本地化】代码本地化提交 2021-01-26 17:08:39 +08:00
Game.lua.meta 提交 2020-05-09 13:31:21 +08:00
GameEvent.lua Merge branch 'master_xma_local' into 0功能/silingshilian 2021-03-08 10:27:14 +08:00
GameEvent.lua.meta 提交 2020-05-09 13:31:21 +08:00
Network.lua 【本地化】后端写死文本改为表配置 2021-03-04 19:48:38 +08:00
Network.lua.meta 提交 2020-05-09 13:31:21 +08:00
SocketManager.lua 【本周优化修改】 2021-01-15 22:11:38 +08:00
SocketManager.lua.meta 提交 2020-05-09 13:31:21 +08:00