# Conflicts: # Assets/ManagedResources/EffectResUI/XunBaoMiZong.meta # Assets/ManagedResources/Icon/Item/r_yjsp.png.meta # Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab # Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset # Assets/ManagedResources/~Lua/Common/GlobalDefine.lua # Assets/ManagedResources/~Lua/Data/ConfigData.lua # Assets/ManagedResources/~Lua/Data/UIData.lua # Assets/ManagedResources/~Lua/Logic/GameEvent.lua # Assets/ManagedResources/~Lua/Message/ActivityProto.proto # Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto # Assets/ManagedResources/~Lua/Message/ChatProto.proto # Assets/ManagedResources/~Lua/Message/CommonProto.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/GeneralPanel/GeneralInfoPopup.lua # Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua  | 
			||
|---|---|---|
| .. | ||
| Game.lua | ||
| Game.lua.meta | ||
| GameEvent.lua | ||
| GameEvent.lua.meta | ||
| Network.lua | ||
| Network.lua.meta | ||
| SocketManager.lua | ||
| SocketManager.lua.meta | ||