miduo_client/Assets/ManagedResources/~Lua/Modules/Main
guowei 6c191263bd Merge branch 'master_xma_local' into 0功能/鸿蒙门阵
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/CommonProto.proto
#	Assets/ManagedResources/~Lua/Message/Expedition.proto
#	Assets/ManagedResources/~Lua/Message/Family.proto
#	Assets/ManagedResources/~Lua/Message/FightInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MapInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto.proto
#	Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua
2021-01-06 20:05:35 +08:00
..
View 中文表导出提交 2020-08-25 15:46:38 +08:00
BattleData1.lua 【战斗】灵兽战斗逻辑同步 2020-11-01 16:17:26 +08:00
BattleData1.lua.meta 【战斗】灵兽战斗逻辑同步 2020-11-01 16:17:26 +08:00
GMPanel.lua Merge branch '0活动开发聚集地/新将来袭' into 0活动开发聚集地/新将活动3个 2020-12-23 11:13:48 +08:00
GMPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
MainPanel.lua Merge branch 'master_xma_local' into 0功能/鸿蒙门阵 2021-01-06 20:05:35 +08:00
MainPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
View.meta 提交 2020-05-09 13:31:21 +08:00