# Conflicts: # Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab # Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset # Assets/ManagedResources/~Lua/Common/GlobalDefine.lua # Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua # Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua # Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua # Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua # Assets/ManagedResources/~Lua/View/ItemView.lua |
||
|---|---|---|
| .. | ||
| BagManager.lua | ||
| BagManager.lua.meta | ||
| BagPanel.lua | ||
| BagPanel.lua.meta | ||
| BagResolveAnCompoundPanel.lua | ||
| BagResolveAnCompoundPanel.lua.meta | ||