miduo_client/Assets/ManagedResources/~Lua/Modules/Shop
zhangqiang b395410ac1 Merge branch 'china/dev' into china/dev_c_跨服天梯
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2021-07-20 18:09:07 +08:00
..
MainShopPanel.lua Merge branch 'china/dev' into china/dev_c_跨服天梯 2021-07-20 18:09:07 +08:00
MainShopPanel.lua.meta
MapShopPanel.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
MapShopPanel.lua.meta
ShopBuyPopup.lua 【跨服天梯】国内首提 2021-06-15 20:08:14 +08:00
ShopBuyPopup.lua.meta
ShopConfig.lua 【ios】lua文件格式修改 2021-04-20 13:58:00 +08:00
ShopConfig.lua.meta
ShopExchangePopup.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
ShopExchangePopup.lua.meta
ShopManager.lua 商店物品添加特效 2021-06-30 18:12:24 +08:00
ShopManager.lua.meta
ShopPanel.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
ShopPanel.lua.meta