1

egret/resource/TextureMerger/bar.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"bar","version":5,"files":["..\\assets\\bar\\bar_bg.png","..\\assets\\bar\\规则.png","..\\assets\\bar\\路径 2.png","..\\assets\\bar\\分享.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"bar","version":5,"files":["../assets/bar/bar_bg.png","../assets/bar/规则.png","../assets/bar/路径 2.png","../assets/bar/分享.png"]}
\ No newline at end of file

egret/resource/TextureMerger/common.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["..\\assets\\common\\closeBtn.png","..\\assets\\common\\light1.png","..\\assets\\common\\light.png","..\\assets\\common\\swap_light.png","..\\assets\\common\\common_-_en.png","..\\assets\\common\\common_+_en.png","..\\assets\\common\\common_+_dis.png","..\\assets\\common\\common_-_dis.png","..\\assets\\common\\prop_water.png","..\\assets\\common\\prop_speed.png","..\\assets\\common\\prop_food.png","..\\assets\\common\\prop_cattle.png","..\\assets\\common\\prop_wheat.png","..\\assets\\common\\prop_chicken.png","..\\assets\\common\\prop_corn.png","..\\assets\\common\\prop_potato.png","..\\assets\\common\\prop_walnut.png","..\\assets\\common\\medal_achv_advanced_farmer_0.png","..\\assets\\common\\medal_achv_advanced_farmer.png","..\\assets\\common\\medal_achv_excellent_farmer_0.png","..\\assets\\common\\medal_achv_internship_farmer_0.png","..\\assets\\common\\medal_achv_excellent_farmer.png","..\\assets\\common\\medal_achv_internship_farmer.png","..\\assets\\common\\medal_achv_well_breeder_0.png","..\\assets\\common\\medal_achv_well_breeder.png","..\\assets\\common\\itemTip.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/closeBtn.png","../assets/common/light1.png","../assets/common/light.png","../assets/common/swap_light.png","../assets/common/common_-_en.png","../assets/common/common_+_en.png","../assets/common/common_+_dis.png","../assets/common/common_-_dis.png","../assets/common/prop_water.png","../assets/common/prop_speed.png","../assets/common/prop_food.png","../assets/common/prop_cattle.png","../assets/common/prop_wheat.png","../assets/common/prop_chicken.png","../assets/common/prop_corn.png","../assets/common/prop_potato.png","../assets/common/prop_walnut.png","../assets/common/medal_achv_advanced_farmer_0.png","../assets/common/medal_achv_advanced_farmer.png","../assets/common/medal_achv_excellent_farmer_0.png","../assets/common/medal_achv_internship_farmer_0.png","../assets/common/medal_achv_excellent_farmer.png","../assets/common/medal_achv_internship_farmer.png","../assets/common/medal_achv_well_breeder_0.png","../assets/common/medal_achv_well_breeder.png","../assets/common/itemTip.png"]}
\ No newline at end of file

egret/resource/TextureMerger/exchange.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"exchange","version":5,"files":["..\\assets\\exchange\\shop_bg.png","..\\assets\\exchange\\前景.png","..\\assets\\exchange\\商品b.png","..\\assets\\exchange\\商品w.png","..\\assets\\exchange\\灯.png","..\\assets\\exchange\\货柜.png","..\\assets\\exchange\\返回农场.png","..\\assets\\exchange\\道具b.png","..\\assets\\exchange\\道具w.png","..\\assets\\exchange\\shop_water.png","..\\assets\\exchange\\shop_speed.png","..\\assets\\exchange\\shop_goods_wheat.png","..\\assets\\exchange\\shop_goods_walnut.png","..\\assets\\exchange\\shop_goods_potato.png","..\\assets\\exchange\\shop_goods_milk.png","..\\assets\\exchange\\shop_goods_egg.png","..\\assets\\exchange\\shop_goods_corn.png","..\\assets\\exchange\\shop_goods_bg.png","..\\assets\\exchange\\shop_food.png","..\\assets\\exchange\\shop_buy\\shop_buy_water.png","..\\assets\\exchange\\shop_buy\\shop_buy_speed.png","..\\assets\\exchange\\shop_buy\\shop_buy_food.png","..\\assets\\exchange\\shop_buy\\shop_buy_btn.png","..\\assets\\exchange\\shop_buy\\shop_bug_bg.png","..\\assets\\shop\\shop_item_bg.png","..\\assets\\shop\\shop_item_btn_dis.png","..\\assets\\shop\\shop_item_btn.png","..\\assets\\shop\\shopPanel_bg.png","..\\assets\\shop\\shopPanel_table_prop.png","..\\assets\\shop\\shopPanel_table_prop_dis.png","..\\assets\\shop\\shopPanel_table_seed.png","..\\assets\\shop\\shopPanel_table_seed_dis.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"exchange","version":5,"files":["../assets/exchange/shop_bg.png","../assets/exchange/前景.png","../assets/exchange/商品b.png","../assets/exchange/商品w.png","../assets/exchange/灯.png","../assets/exchange/货柜.png","../assets/exchange/返回农场.png","../assets/exchange/道具b.png","../assets/exchange/道具w.png","../assets/exchange/shop_water.png","../assets/exchange/shop_speed.png","../assets/exchange/shop_goods_wheat.png","../assets/exchange/shop_goods_walnut.png","../assets/exchange/shop_goods_potato.png","../assets/exchange/shop_goods_milk.png","../assets/exchange/shop_goods_egg.png","../assets/exchange/shop_goods_corn.png","../assets/exchange/shop_goods_bg.png","../assets/exchange/shop_food.png","../assets/exchange/shop_buy/shop_buy_water.png","../assets/exchange/shop_buy/shop_buy_speed.png","../assets/exchange/shop_buy/shop_buy_food.png","../assets/exchange/shop_buy/shop_buy_btn.png","../assets/exchange/shop_buy/shop_bug_bg.png","../assets/shop/shop_item_bg.png","../assets/shop/shop_item_btn_dis.png","../assets/shop/shop_item_btn.png","../assets/shop/shopPanel_bg.png","../assets/shop/shopPanel_table_prop.png","../assets/shop/shopPanel_table_prop_dis.png","../assets/shop/shopPanel_table_seed.png","../assets/shop/shopPanel_table_seed_dis.png"]}
\ No newline at end of file

egret/resource/TextureMerger/exchange_panel.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"exchange_panel","version":5,"files":["..\\assets\\exchange_panel\\ex_bg.png","..\\assets\\exchange_panel\\ex_btn_dis.png","..\\assets\\exchange_panel\\ex_btn.png","..\\assets\\exchange_panel\\ex_sp1.png","..\\assets\\exchange_panel\\ex_sp2.png","..\\assets\\exchange_panel\\ex_sp3.png","..\\assets\\exchange_panel\\ex_sp4.png","..\\assets\\exchange_panel\\ex_btn_done.png","..\\assets\\exchange_panel\\ex_titleImg.png","..\\assets\\exchange_panel\\ex_sp6.png","..\\assets\\exchange_panel\\ex_sp5.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"exchange_panel","version":5,"files":["../assets/exchange_panel/ex_bg.png","../assets/exchange_panel/ex_btn_dis.png","../assets/exchange_panel/ex_btn.png","../assets/exchange_panel/ex_sp1.png","../assets/exchange_panel/ex_sp2.png","../assets/exchange_panel/ex_sp3.png","../assets/exchange_panel/ex_sp4.png","../assets/exchange_panel/ex_btn_done.png","../assets/exchange_panel/ex_titleImg.png","../assets/exchange_panel/ex_sp6.png","../assets/exchange_panel/ex_sp5.png"]}
\ No newline at end of file

egret/resource/TextureMerger/exchanged_panel.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"exchanged_panel","version":5,"files":["..\\assets\\exchanged_panel\\exd_bg.png","..\\assets\\exchanged_panel\\exd_btn.png","..\\assets\\exchanged_panel\\exd_record.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"exchanged_panel","version":5,"files":["../assets/exchanged_panel/exd_bg.png","../assets/exchanged_panel/exd_btn.png","../assets/exchanged_panel/exd_record.png"]}
\ No newline at end of file

egret/resource/TextureMerger/gameGroup_panel.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"gameGroup_panel","version":5,"files":["..\\assets\\gameGroup_panel\\gameGroup_bg.png","..\\assets\\gameGroup_panel\\gameGroup_clear.png","..\\assets\\gameGroup_panel\\gameGroup_plane.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"gameGroup_panel","version":5,"files":["../assets/gameGroup_panel/gameGroup_bg.png","../assets/gameGroup_panel/gameGroup_clear.png","../assets/gameGroup_panel/gameGroup_plane.png"]}
\ No newline at end of file

egret/resource/TextureMerger/guide.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"guide","version":5,"files":["..\\assets\\guide\\guide3_tip.png","..\\assets\\guide\\guide3_btn.png","..\\assets\\guide\\guide2_tip.png","..\\assets\\guide\\guide2_land.png","..\\assets\\guide\\guide1_tip.png","..\\assets\\guide\\guide1_btn.png","..\\assets\\guide\\guide_point.png","..\\assets\\guide\\guide_hand.png","..\\assets\\guide\\guide_cancel.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"guide","version":5,"files":["../assets/guide/guide3_tip.png","../assets/guide/guide3_btn.png","../assets/guide/guide2_tip.png","../assets/guide/guide2_land.png","../assets/guide/guide1_tip.png","../assets/guide/guide1_btn.png","../assets/guide/guide_point.png","../assets/guide/guide_hand.png","../assets/guide/guide_cancel.png"]}
\ No newline at end of file

egret/resource/TextureMerger/index_plant.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"index_plant","version":5,"files":["..\\assets\\index_scene\\planting\\篱笆.png","..\\assets\\index_scene\\planting\\plant_land_active.png","..\\assets\\index_scene\\planting\\plant_land_animal.png","..\\assets\\index_scene\\planting\\plant_land_none.png","..\\assets\\index_scene\\planting\\plant_land_plant.png","..\\assets\\index_scene\\planting\\食槽.png","..\\assets\\index_scene\\planting\\option\\feed.png","..\\assets\\index_scene\\planting\\option\\hand.png","..\\assets\\index_scene\\planting\\option\\option_chicken.png","..\\assets\\index_scene\\planting\\option\\option_panel.png","..\\assets\\index_scene\\planting\\option\\option_wheat.png","..\\assets\\index_scene\\planting\\option\\water.png","..\\assets\\index_scene\\planting\\麦粉.png","..\\assets\\index_scene\\planting\\鸡蛋.png","..\\assets\\index_scene\\planting\\option\\option_cattle.png","..\\assets\\common\\light.png","..\\assets\\index_scene\\planting\\玉米.png","..\\assets\\index_scene\\planting\\牛奶.png","..\\assets\\index_scene\\planting\\option\\option_corn.png","..\\assets\\index_scene\\planting\\土豆.png","..\\assets\\index_scene\\planting\\核桃.png","..\\assets\\index_scene\\planting\\option\\免费邮寄到家.png","..\\assets\\index_scene\\planting\\option\\option_walnut.png","..\\assets\\index_scene\\planting\\option\\option_potato.png","..\\assets\\index_scene\\planting\\plant_land_lock.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"index_plant","version":5,"files":["../assets/index_scene/planting/篱笆.png","../assets/index_scene/planting/plant_land_active.png","../assets/index_scene/planting/plant_land_animal.png","../assets/index_scene/planting/plant_land_none.png","../assets/index_scene/planting/plant_land_plant.png","../assets/index_scene/planting/食槽.png","../assets/index_scene/planting/option/feed.png","../assets/index_scene/planting/option/hand.png","../assets/index_scene/planting/option/option_chicken.png","../assets/index_scene/planting/option/option_panel.png","../assets/index_scene/planting/option/option_wheat.png","../assets/index_scene/planting/option/water.png","../assets/index_scene/planting/麦粉.png","../assets/index_scene/planting/鸡蛋.png","../assets/index_scene/planting/option/option_cattle.png","../assets/common/light.png","../assets/index_scene/planting/玉米.png","../assets/index_scene/planting/牛奶.png","../assets/index_scene/planting/option/option_corn.png","../assets/index_scene/planting/土豆.png","../assets/index_scene/planting/核桃.png","../assets/index_scene/planting/option/免费邮寄到家.png","../assets/index_scene/planting/option/option_walnut.png","../assets/index_scene/planting/option/option_potato.png","../assets/index_scene/planting/plant_land_lock.png"]}
\ No newline at end of file

egret/resource/TextureMerger/introduce_panel.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"introduce_panel","version":5,"files":["..\\assets\\introduce_panel\\introduce_wheat.png","..\\assets\\introduce_panel\\introduce_walnut.png","..\\assets\\introduce_panel\\introduce_potato.png","..\\assets\\introduce_panel\\introduce_corn.png","..\\assets\\introduce_panel\\introduce_chicken.png","..\\assets\\introduce_panel\\introduce_cattle.png","..\\assets\\introduce_panel\\introduce_bg.png","..\\assets\\introduce_panel\\introduce_btn.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"introduce_panel","version":5,"files":["../assets/introduce_panel/introduce_wheat.png","../assets/introduce_panel/introduce_walnut.png","../assets/introduce_panel/introduce_potato.png","../assets/introduce_panel/introduce_corn.png","../assets/introduce_panel/introduce_chicken.png","../assets/introduce_panel/introduce_cattle.png","../assets/introduce_panel/introduce_bg.png","../assets/introduce_panel/introduce_btn.png"]}
\ No newline at end of file

egret/resource/TextureMerger/loading.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"loading","version":5,"files":["..\\assets\\loading\\progress.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"loading","version":5,"files":["../assets/loading/progress.png"]}
\ No newline at end of file

egret/resource/TextureMerger/loading_scene.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"loading_scene","version":5,"files":["..\\assets\\loading\\progress.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"loading_scene","version":5,"files":["../assets/loading/progress.png"]}
\ No newline at end of file

egret/resource/TextureMerger/main_scene.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"main_scene","version":5,"files":["..\\assets\\index_scene\\index_bg.png","..\\assets\\index_scene\\小E.png","..\\assets\\index_scene\\xiaoE\\xiaoETip_bg.png","..\\assets\\index_scene\\xiaoE\\xiaoETip_item_btn.png","..\\assets\\index_scene\\xiaoE\\xiaoETip_miss.png","..\\assets\\index_scene\\xiaoE\\xiaoETip_get.png","..\\assets\\index_scene\\xiaoE\\xiaoETip_plant.png","..\\assets\\index_scene\\xiaoE\\xiaoETip_whooo.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"main_scene","version":5,"files":["../assets/index_scene/index_bg.png","../assets/index_scene/小E.png","../assets/index_scene/xiaoE/xiaoETip_bg.png","../assets/index_scene/xiaoE/xiaoETip_item_btn.png","../assets/index_scene/xiaoE/xiaoETip_miss.png","../assets/index_scene/xiaoE/xiaoETip_get.png","../assets/index_scene/xiaoE/xiaoETip_plant.png","../assets/index_scene/xiaoE/xiaoETip_whooo.png"]}
\ No newline at end of file

egret/resource/TextureMerger/main_ui.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"main_ui","version":5,"files":["..\\assets\\index_scene\\ui\\兑换记录.png","..\\assets\\index_scene\\ui\\浇水.png","..\\assets\\index_scene\\ui\\流水装饰.png","..\\assets\\index_scene\\ui\\默认头像.png","..\\assets\\index_scene\\ui\\任务.png","..\\assets\\index_scene\\ui\\商店.png","..\\assets\\index_scene\\ui\\饲料.png","..\\assets\\index_scene\\ui\\头像背景.png","..\\assets\\index_scene\\ui\\勋章.png","..\\assets\\index_scene\\ui\\头像面板.png","..\\assets\\index_scene\\ui\\加速卡.png","..\\assets\\index_scene\\ui\\仓库_btn.png","..\\assets\\index_scene\\ui\\main_rule.png","..\\assets\\index_scene\\ui\\广播__m.png","..\\assets\\index_scene\\ui\\ui_兑换.png","..\\assets\\index_scene\\ui\\ui_农耕舍.png","..\\assets\\index_scene\\ui\\ui_规则.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"main_ui","version":5,"files":["../assets/index_scene/ui/兑换记录.png","../assets/index_scene/ui/浇水.png","../assets/index_scene/ui/流水装饰.png","../assets/index_scene/ui/默认头像.png","../assets/index_scene/ui/任务.png","../assets/index_scene/ui/商店.png","../assets/index_scene/ui/饲料.png","../assets/index_scene/ui/头像背景.png","../assets/index_scene/ui/勋章.png","../assets/index_scene/ui/头像面板.png","../assets/index_scene/ui/加速卡.png","../assets/index_scene/ui/仓库_btn.png","../assets/index_scene/ui/main_rule.png","../assets/index_scene/ui/广播__m.png","../assets/index_scene/ui/ui_兑换.png","../assets/index_scene/ui/ui_农耕舍.png","../assets/index_scene/ui/ui_规则.png"]}
\ No newline at end of file

egret/resource/TextureMerger/medal_panel.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"medal_panel","version":5,"files":["..\\assets\\medal_panel\\medal_light.png","..\\assets\\medal_panel\\light_point.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"medal_panel","version":5,"files":["../assets/medal_panel/medal_light.png","../assets/medal_panel/light_point.png"]}
\ No newline at end of file

egret/resource/TextureMerger/medals.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"medals","version":5,"files":["..\\assets\\medals_panel\\medals_bg.png","..\\assets\\room\\room_sp_achv_1.png","..\\assets\\room\\room_sp_achv_2.png","..\\assets\\medals_panel\\medals_swap_light.png","..\\assets\\medals_panel\\下拉查看更多.png","..\\assets\\medals_panel\\medal_wait_0.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"medals","version":5,"files":["../assets/medals_panel/medals_bg.png","../assets/room/room_sp_achv_1.png","../assets/room/room_sp_achv_2.png","../assets/medals_panel/medals_swap_light.png","../assets/medals_panel/下拉查看更多.png","../assets/medals_panel/medal_wait_0.png"]}
\ No newline at end of file

egret/resource/TextureMerger/newUser_panel.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"newUser_panel","version":5,"files":["..\\assets\\newUser_panel\\newUserBtn.png","..\\assets\\newUser_panel\\newUserBg.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"newUser_panel","version":5,"files":["../assets/newUser_panel/newUserBtn.png","../assets/newUser_panel/newUserBg.png"]}
\ No newline at end of file

egret/resource/TextureMerger/oldUser_panel.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"oldUser_panel","version":5,"files":["..\\assets\\oldUser_panel\\oldUserBg.png","..\\assets\\oldUser_panel\\oldUserBtn.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"oldUser_panel","version":5,"files":["../assets/oldUser_panel/oldUserBg.png","../assets/oldUser_panel/oldUserBtn.png"]}
\ No newline at end of file

egret/resource/TextureMerger/room.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"room","version":5,"files":["..\\assets\\room\\room_back.png","..\\assets\\room\\room_market.png","..\\assets\\room\\room_farm.png","..\\assets\\room\\room_medals.png","..\\assets\\room\\room_ad.png","..\\assets\\room\\room_bg.png","..\\assets\\room\\room_sp_achv_4_dis.png","..\\assets\\room\\room_sp_achv_2_dis.png","..\\assets\\room\\room_sp_achv_3_dis.png","..\\assets\\room\\room_sp_achv_1_dis.png","..\\assets\\room\\room_table.png","..\\assets\\room\\room_panda.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"room","version":5,"files":["../assets/room/room_back.png","../assets/room/room_market.png","../assets/room/room_farm.png","../assets/room/room_medals.png","../assets/room/room_ad.png","../assets/room/room_bg.png","../assets/room/room_sp_achv_4_dis.png","../assets/room/room_sp_achv_2_dis.png","../assets/room/room_sp_achv_3_dis.png","../assets/room/room_sp_achv_1_dis.png","../assets/room/room_table.png","../assets/room/room_panda.png"]}
\ No newline at end of file

egret/resource/TextureMerger/sellRecord.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sellRecord","version":5,"files":["..\\assets\\warehouse_panel\\sellRecord\\sellRecord_outline.png","..\\assets\\warehouse_panel\\sellRecord\\sellRecord_bg.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sellRecord","version":5,"files":["../assets/warehouse_panel/sellRecord/sellRecord_outline.png","../assets/warehouse_panel/sellRecord/sellRecord_bg.png"]}
\ No newline at end of file

egret/resource/TextureMerger/sell_panel.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sell_panel","version":5,"files":["..\\assets\\warehouse_panel\\sell_panel\\sellTitle_wheat.png","..\\assets\\warehouse_panel\\sell_panel\\sellTitle_egg.png","..\\assets\\warehouse_panel\\sell_panel\\sell_btn_en.png","..\\assets\\warehouse_panel\\sell_panel\\sell_btn_dis.png","..\\assets\\warehouse_panel\\sell_panel\\sell_bg.png","..\\assets\\warehouse_panel\\sell_panel\\out_line.png","..\\assets\\warehouse_panel\\sell_panel\\+_en.png","..\\assets\\warehouse_panel\\sell_panel\\+_dis.png","..\\assets\\warehouse_panel\\sell_panel\\-_en.png","..\\assets\\warehouse_panel\\sell_panel\\-_dis.png","..\\assets\\warehouse_panel\\sell_panel\\sell_hand.png","..\\assets\\warehouse_panel\\sell_panel\\sellTitle_milk.png","..\\assets\\warehouse_panel\\sell_panel\\sellTitle_corn.png","..\\assets\\warehouse_panel\\sell_panel\\sellTitle_potato.png","..\\assets\\warehouse_panel\\sell_panel\\sellTitle_walnut.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sell_panel","version":5,"files":["../assets/warehouse_panel/sell_panel/sellTitle_wheat.png","../assets/warehouse_panel/sell_panel/sellTitle_egg.png","../assets/warehouse_panel/sell_panel/sell_btn_en.png","../assets/warehouse_panel/sell_panel/sell_btn_dis.png","../assets/warehouse_panel/sell_panel/sell_bg.png","../assets/warehouse_panel/sell_panel/out_line.png","../assets/warehouse_panel/sell_panel/+_en.png","../assets/warehouse_panel/sell_panel/+_dis.png","../assets/warehouse_panel/sell_panel/-_en.png","../assets/warehouse_panel/sell_panel/-_dis.png","../assets/warehouse_panel/sell_panel/sell_hand.png","../assets/warehouse_panel/sell_panel/sellTitle_milk.png","../assets/warehouse_panel/sell_panel/sellTitle_corn.png","../assets/warehouse_panel/sell_panel/sellTitle_potato.png","../assets/warehouse_panel/sell_panel/sellTitle_walnut.png"]}
\ No newline at end of file

egret/resource/TextureMerger/selled_panel.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"selled_panel","version":5,"files":["..\\assets\\warehouse_panel\\selled\\selled_btn.png","..\\assets\\warehouse_panel\\selled\\selled_bg.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"selled_panel","version":5,"files":["../assets/warehouse_panel/selled/selled_btn.png","../assets/warehouse_panel/selled/selled_bg.png"]}
\ No newline at end of file

egret/resource/TextureMerger/shop.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"shop","version":5,"files":["..\\assets\\shop\\shopPanel_table_prop.png","..\\assets\\shop\\shopPanel_bg.png","..\\assets\\shop\\shopPanel_table_seed.png","..\\assets\\shop\\shopPanel_table_prop_dis.png","..\\assets\\shop\\shopPanel_table_seed_dis.png","..\\assets\\shop\\shop_item_bg.png","..\\assets\\shop\\shop_item_btn.png","..\\assets\\shop\\shop_item_btn_dis.png","..\\assets\\shop\\shopBuy_bg.png","..\\assets\\shop\\shopBuy_btn.png","..\\assets\\shop\\shop_prop_none.png","..\\assets\\shop\\shop_prop_done.png","..\\assets\\shop\\shop_prop_buy.png","..\\assets\\shop\\shopBuy_btn1.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"shop","version":5,"files":["../assets/shop/shopPanel_table_prop.png","../assets/shop/shopPanel_bg.png","../assets/shop/shopPanel_table_seed.png","../assets/shop/shopPanel_table_prop_dis.png","../assets/shop/shopPanel_table_seed_dis.png","../assets/shop/shop_item_bg.png","../assets/shop/shop_item_btn.png","../assets/shop/shop_item_btn_dis.png","../assets/shop/shopBuy_bg.png","../assets/shop/shopBuy_btn.png","../assets/shop/shop_prop_none.png","../assets/shop/shop_prop_done.png","../assets/shop/shop_prop_buy.png","../assets/shop/shopBuy_btn1.png"]}
\ No newline at end of file

egret/resource/TextureMerger/task_panel.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"task_panel","version":5,"files":["..\\assets\\task_panel\\task_bg.png","..\\assets\\task_panel\\task_item_bg.png","..\\assets\\task_panel\\饲料 拷贝.png","..\\assets\\task_panel\\task_brn_bg.png","..\\assets\\task_panel\\task_toast.png","..\\assets\\task_panel\\签到 icon.png","..\\assets\\task_panel\\消费 icon.png","..\\assets\\task_panel\\生活日 icon.png","..\\assets\\task_panel\\分享 icon.png","..\\assets\\task_panel\\浇水2.png","..\\assets\\task_panel\\浏览积分商城任务.png","..\\assets\\task_panel\\消费任务.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"task_panel","version":5,"files":["../assets/task_panel/task_bg.png","../assets/task_panel/task_item_bg.png","../assets/task_panel/饲料 拷贝.png","../assets/task_panel/task_brn_bg.png","../assets/task_panel/task_toast.png","../assets/task_panel/签到 icon.png","../assets/task_panel/消费 icon.png","../assets/task_panel/生活日 icon.png","../assets/task_panel/分享 icon.png","../assets/task_panel/浇水2.png","../assets/task_panel/浏览积分商城任务.png","../assets/task_panel/消费任务.png"]}
\ No newline at end of file

egret/resource/TextureMerger/unlock_panel.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"unlock_panel","version":5,"files":["..\\assets\\unlock_panel\\unlock_bg.png","..\\assets\\unlock_panel\\unlock_btn.png","..\\assets\\unlock_panel\\unlock_cancel.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"unlock_panel","version":5,"files":["../assets/unlock_panel/unlock_bg.png","../assets/unlock_panel/unlock_btn.png","../assets/unlock_panel/unlock_cancel.png"]}
\ No newline at end of file

egret/resource/TextureMerger/warehouse.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"warehouse","version":5,"files":["..\\assets\\warehouse_panel\\corn_bg.png","..\\assets\\warehouse_panel\\egg_bg.png","..\\assets\\warehouse_panel\\milk_bg.png","..\\assets\\warehouse_panel\\仓库.png","..\\assets\\warehouse_panel\\兑换.png","..\\assets\\warehouse_panel\\出售.png","..\\assets\\warehouse_panel\\出售记录.png","..\\assets\\warehouse_panel\\warehouse_none.png","..\\assets\\warehouse_panel\\wheat_bg.png","..\\assets\\warehouse_panel\\potato_bg.png","..\\assets\\warehouse_panel\\walnut_bg.png","..\\assets\\warehouse_panel\\warehouse_item_bg.png","..\\assets\\warehouse_panel\\warehouse_crop.png","..\\assets\\warehouse_panel\\warehouse_crop_dis.png","..\\assets\\warehouse_panel\\warehouse_bg.png","..\\assets\\warehouse_panel\\warehouse_seed.png","..\\assets\\warehouse_panel\\warehouse_seed_dis.png","..\\assets\\warehouse_panel\\warehouse_none_seed.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"warehouse","version":5,"files":["../assets/warehouse_panel/corn_bg.png","../assets/warehouse_panel/egg_bg.png","../assets/warehouse_panel/milk_bg.png","../assets/warehouse_panel/仓库.png","../assets/warehouse_panel/兑换.png","../assets/warehouse_panel/出售.png","../assets/warehouse_panel/出售记录.png","../assets/warehouse_panel/warehouse_none.png","../assets/warehouse_panel/wheat_bg.png","../assets/warehouse_panel/potato_bg.png","../assets/warehouse_panel/walnut_bg.png","../assets/warehouse_panel/warehouse_item_bg.png","../assets/warehouse_panel/warehouse_crop.png","../assets/warehouse_panel/warehouse_crop_dis.png","../assets/warehouse_panel/warehouse_bg.png","../assets/warehouse_panel/warehouse_seed.png","../assets/warehouse_panel/warehouse_seed_dis.png","../assets/warehouse_panel/warehouse_none_seed.png"]}
\ No newline at end of file

egret/src/Scenes/ExchangeScene/ExchangeScene.ts

@@ -116,7 +116,7 @@ export default class ExchangeScene extends Scene {
             }
         }
 
-        return new Promise((resolve, reject) => {
+        return new Promise<void>((resolve, reject) => {
             ///////////////////////// 查询商店列表 /////////////////////////
             NetManager.ins.mergeQuery((success, res) => {
                 if (!success) {
@@ -159,20 +159,20 @@ export default class ExchangeScene extends Scene {
                     }
                     ///////////////////////// 查询是否合成过 /////////////////////////
                     /// TODO 2020.11.18, 运营要求所有奖品可以无限制兑换，去掉兑换一次的限制
-                    // NetManager.ins.queryRecords((success, res) => {
-                    //     if (!success) {
-                    //         reject();
-                    //         return;
-                    //     }
-                    //     const __data = res.data;
-                    //     for (let v of __data) {
-                    //         let prizeId = v.prizeId;
-                    //         if (this.prizeData.hasOwnProperty(prizeId)) {
-                    //             this.prizeData[prizeId].canGet = false;
-                    //         }
-                    //     }
-                    //     resolve();   /// TODO 移到下面去
-                    // });
+                    NetManager.ins.queryRecords((success, res) => {
+                        if (!success) {
+                            reject();
+                            return;
+                        }
+                        const __data = res.data;
+                        for (let v of __data) {
+                            let prizeId = v.prizeId;
+                            if (this.prizeData.hasOwnProperty(prizeId)) {
+                                this.prizeData[prizeId].canGet = false;
+                            }
+                        }
+                        resolve();   /// TODO 移到下面去
+                    });
                     resolve(); /// TODO 上面移下来的
 
                     ///////////////////////// 查询是否合成过 /////////////////////////

mock/projectX/queryRecords.json

@@ -10,7 +10,7 @@
             },
             "gmtCreate": 1577687173000,
             "id": 2777,
-            "prizeId": "sss_item_4",
+            "prizeId": "sss_10",
             "strategyId": "ru_item_4"
         },
         {
@@ -93,4 +93,4 @@
         }
     ],
     "success": true
-}
+}
\ No newline at end of file