miduo_client/Assets/ManagedResources/Prefabs/UI/Bag
ZhangBiao a197f16837 Merge branch 'china/dev' into 0功能/命格
# 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
2021-12-17 15:46:53 +08:00
..
BagPanel.prefab Merge branch 'china/dev' into 0功能/命格 2021-12-17 15:46:53 +08:00
BagPanel.prefab.meta
BagResolveAnCompoundPanel.prefab 【本地化】预设提交 2021-01-26 17:48:24 +08:00
BagResolveAnCompoundPanel.prefab.meta