# Conflicts:
#	egret/resource/default.res.json
#	egret/src/Panels/ShopPanel.ts
#	egret/src/Panels/WareHousePanel.ts
#	egret/src/Scenes/Home.ts
#	mock/joyousManor/priceInfo.json
#	mock/joyousManor/propInfo.json
合并