l

egret/resource/TextureMerger/ad.tmproject

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

egret/resource/TextureMerger/back.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"back","version":5,"files":["..\\assets\\back\\back按钮 副本 91.png","..\\assets\\back\\backbg.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"back","version":5,"files":["../assets/back/back按钮 副本 91.png","../assets/back/backbg.png"]}
\ No newline at end of file

egret/resource/TextureMerger/backindex.tmproject

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

egret/resource/TextureMerger/bag.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"bag","version":5,"files":["..\\assets\\bag\\bagbtn我的奖券.png","..\\assets\\bag\\bagbtn我的道具.png","..\\assets\\bag\\bag我的奖券.png","..\\assets\\bag\\bag我的道具.png","..\\assets\\bag\\bag_item_bg2.png","..\\assets\\bag\\bag_item_bg.png","..\\assets\\bag\\bag_icon3.png","..\\assets\\bag\\bag_icon2.png","..\\assets\\bag\\bag_icon1.png","..\\assets\\bag\\bag按钮 副本 9.png","..\\assets\\bag\\bag按钮 副本 10.png","..\\assets\\bag\\bagbg.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"bag","version":5,"files":["../assets/bag/bagbtn我的奖券.png","../assets/bag/bagbtn我的道具.png","../assets/bag/bag我的奖券.png","../assets/bag/bag我的道具.png","../assets/bag/bag_item_bg2.png","../assets/bag/bag_item_bg.png","../assets/bag/bag_icon3.png","../assets/bag/bag_icon2.png","../assets/bag/bag_icon1.png","../assets/bag/bag按钮 副本 9.png","../assets/bag/bag按钮 副本 10.png","../assets/bag/bagbg.png"]}
\ No newline at end of file

egret/resource/TextureMerger/bagquit.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"bagquit","version":5,"files":["..\\assets\\bagquit\\bag退出弹窗.png","..\\assets\\bagquit\\bag退出按钮.png","..\\assets\\bagquit\\bag继续按钮.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"bagquit","version":5,"files":["../assets/bagquit/bag退出弹窗.png","../assets/bagquit/bag退出按钮.png","../assets/bagquit/bag继续按钮.png"]}
\ No newline at end of file

egret/resource/TextureMerger/blood.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"blood","version":5,"files":["..\\assets\\blood\\blood体力补济站.png","..\\assets\\blood\\blood按钮.png","..\\assets\\blood\\blood按钮 副本1.png","..\\assets\\blood\\blood按钮 副本.png","..\\assets\\blood\\blood去分享.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"blood","version":5,"files":["../assets/blood/blood体力补济站.png","../assets/blood/blood按钮.png","../assets/blood/blood按钮 副本1.png","../assets/blood/blood按钮 副本.png","../assets/blood/blood去分享.png"]}
\ No newline at end of file

egret/resource/TextureMerger/blood2.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"blood2","version":5,"files":["..\\assets\\blood2\\blood2按钮 副本1.png","..\\assets\\blood2\\blood2按钮 副本.png","..\\assets\\blood2\\blood2.png","..\\assets\\blood2\\blood2去分享按钮.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"blood2","version":5,"files":["../assets/blood2/blood2按钮 副本1.png","../assets/blood2/blood2按钮 副本.png","../assets/blood2/blood2.png","../assets/blood2/blood2去分享按钮.png"]}
\ No newline at end of file

egret/resource/TextureMerger/box.tmproject

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

egret/resource/TextureMerger/box2.tmproject

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

egret/resource/TextureMerger/buy1.tmproject

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

egret/resource/TextureMerger/buy2.tmproject

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

egret/resource/TextureMerger/buy3.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"buy3","version":5,"files":["..\\assets\\buy3\\购买步数增加.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"buy3","version":5,"files":["../assets/buy3/购买步数增加.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\\turnnoprize再来一次.png","..\\assets\\common\\toast.png","..\\assets\\common\\share_btn2.png","..\\assets\\common\\share_btn1.png","..\\assets\\common\\prizePanelbg.png","..\\assets\\common\\lightani.png","..\\assets\\common\\exchangebtn.png","..\\assets\\common\\common_yuanbao.png","..\\assets\\common\\common_prop3.png","..\\assets\\common\\common_prop2.png","..\\assets\\common\\common_prop1.png","..\\assets\\common\\common_prizelight.png","..\\assets\\common\\common_money.png","..\\assets\\common\\common_blood.png","..\\assets\\common\\common_adbg.png","..\\assets\\common\\commmon_okbtn1.png","..\\assets\\common\\closeCommonBtn.png","..\\assets\\common\\btn.png","..\\assets\\common\\alertbg.png","..\\assets\\common\\按钮 副本 4.png","..\\assets\\common\\按钮 副本 3.png","..\\assets\\common\\common_block.png","..\\assets\\common\\common_block_front.png","..\\assets\\common\\common_block_bg_yellow.png","..\\assets\\common\\common_block_bg_red.png","..\\assets\\common\\common_block_bg_blue.png","..\\assets\\common\\chocolate3.png","..\\assets\\common\\chocolate1.png","..\\assets\\common\\chocolate0.png","..\\assets\\common\\chocolate2.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/turnnoprize再来一次.png","../assets/common/toast.png","../assets/common/share_btn2.png","../assets/common/share_btn1.png","../assets/common/prizePanelbg.png","../assets/common/lightani.png","../assets/common/exchangebtn.png","../assets/common/common_yuanbao.png","../assets/common/common_prop3.png","../assets/common/common_prop2.png","../assets/common/common_prop1.png","../assets/common/common_prizelight.png","../assets/common/common_money.png","../assets/common/common_blood.png","../assets/common/common_adbg.png","../assets/common/commmon_okbtn1.png","../assets/common/closeCommonBtn.png","../assets/common/btn.png","../assets/common/alertbg.png","../assets/common/按钮 副本 4.png","../assets/common/按钮 副本 3.png","../assets/common/common_block.png","../assets/common/common_block_front.png","../assets/common/common_block_bg_yellow.png","../assets/common/common_block_bg_red.png","../assets/common/common_block_bg_blue.png","../assets/common/chocolate3.png","../assets/common/chocolate1.png","../assets/common/chocolate0.png","../assets/common/chocolate2.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\\exchange.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"exchange","version":5,"files":["../assets/exchange/exchange.png"]}
\ No newline at end of file

egret/resource/TextureMerger/fail.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"fail","version":5,"files":["..\\assets\\faild\\闯关失败.png","..\\assets\\faild\\按钮 副本 9.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"fail","version":5,"files":["../assets/faild/闯关失败.png","../assets/faild/按钮 副本 9.png"]}
\ No newline at end of file

egret/resource/TextureMerger/friend.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"friend","version":5,"files":["..\\assets\\friend\\friendbg.png","..\\assets\\friend\\friend按钮-炫耀.png","..\\assets\\friend\\friend_itembg.png","..\\assets\\friend\\friend_icon3.png","..\\assets\\friend\\friend_icon2.png","..\\assets\\friend\\friend_icon1.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"friend","version":5,"files":["../assets/friend/friendbg.png","../assets/friend/friend按钮-炫耀.png","../assets/friend/friend_itembg.png","../assets/friend/friend_icon3.png","../assets/friend/friend_icon2.png","../assets/friend/friend_icon1.png"]}
\ No newline at end of file

egret/resource/TextureMerger/friendshare.tmproject

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

egret/resource/TextureMerger/h5.tmproject

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

egret/resource/TextureMerger/h52.tmproject

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

egret/resource/TextureMerger/hbcuttime.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"hbcuttime","version":5,"files":["..\\assets\\hbCutTime\\hbCutTime_bg.png","..\\assets\\hbCutTime\\hbCutTime_btn_disable.png","..\\assets\\hbCutTime\\hbCutTime_btn_enable.png","..\\assets\\hbCutTime\\hbCutTime_cutLine_disable.png","..\\assets\\hbCutTime\\hbCutTime_cutLine_enable.png","..\\assets\\hbCutTime\\hbCutTime_rule_btn.png","..\\assets\\hbCutTime\\hbCutTime_btn_null.png","..\\assets\\hbCutTime\\hbCutTime_btn_soon.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"hbcuttime","version":5,"files":["../assets/hbCutTime/hbCutTime_bg.png","../assets/hbCutTime/hbCutTime_btn_disable.png","../assets/hbCutTime/hbCutTime_btn_enable.png","../assets/hbCutTime/hbCutTime_cutLine_disable.png","../assets/hbCutTime/hbCutTime_cutLine_enable.png","../assets/hbCutTime/hbCutTime_rule_btn.png","../assets/hbCutTime/hbCutTime_btn_null.png","../assets/hbCutTime/hbCutTime_btn_soon.png"]}
\ No newline at end of file

egret/resource/TextureMerger/hbgame.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"hbgame","version":5,"files":["..\\assets\\hbGame\\hbGame_CutTime_bg.png","..\\assets\\hbGame\\hbGame_CutTime_progress.png","..\\assets\\hbGame\\hbGame_num_bg.png","..\\assets\\hbGame\\hbGame_tips.png","..\\assets\\hbGame\\hbGame_1.png","..\\assets\\hbGame\\hbGame_2.png","..\\assets\\hbGame\\hbGame_3.png","..\\assets\\hbGame\\hbGame_+1.png","..\\assets\\hbGame\\hbGame_bird_touch.png","..\\assets\\hbGame\\hbGame_bird.png","..\\assets\\hbGame\\hbGame_cattle.png","..\\assets\\hbGame\\hbGame_cattle_touch.png","..\\assets\\hbGame\\hbGame_hongbao_touch.png","..\\assets\\hbGame\\hbGame_+2.png","..\\assets\\hbGame\\hbGame_hongbao.png","..\\assets\\hbGame\\hbGame_lion.png","..\\assets\\hbGame\\hbGame_lion_touch.png","..\\assets\\hbGame\\hbGame_pig_touch.png","..\\assets\\hbGame\\hbGame_pig.png","..\\assets\\hbGame\\hbGame_rabbit_touch.png","..\\assets\\hbGame\\hbGame_rabbit.png","..\\assets\\hbGame\\hbGame_CutTime_btn.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"hbgame","version":5,"files":["../assets/hbGame/hbGame_CutTime_bg.png","../assets/hbGame/hbGame_CutTime_progress.png","../assets/hbGame/hbGame_num_bg.png","../assets/hbGame/hbGame_tips.png","../assets/hbGame/hbGame_1.png","../assets/hbGame/hbGame_2.png","../assets/hbGame/hbGame_3.png","../assets/hbGame/hbGame_+1.png","../assets/hbGame/hbGame_bird_touch.png","../assets/hbGame/hbGame_bird.png","../assets/hbGame/hbGame_cattle.png","../assets/hbGame/hbGame_cattle_touch.png","../assets/hbGame/hbGame_hongbao_touch.png","../assets/hbGame/hbGame_+2.png","../assets/hbGame/hbGame_hongbao.png","../assets/hbGame/hbGame_lion.png","../assets/hbGame/hbGame_lion_touch.png","../assets/hbGame/hbGame_pig_touch.png","../assets/hbGame/hbGame_pig.png","../assets/hbGame/hbGame_rabbit_touch.png","../assets/hbGame/hbGame_rabbit.png","../assets/hbGame/hbGame_CutTime_btn.png"]}
\ No newline at end of file

egret/resource/TextureMerger/hbnoprize.tmproject

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

egret/resource/TextureMerger/hbprize.tmproject

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

egret/resource/TextureMerger/hbrule.tmproject

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

egret/resource/TextureMerger/invite.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"invite","version":5,"files":["..\\assets\\invite\\invite_invite.png","..\\assets\\invite\\invite_help.png","..\\assets\\invite\\invite_btn.png","..\\assets\\invite\\invite_bg.png","..\\assets\\invite\\prize\\invitePrize_btn.png","..\\assets\\invite\\prize\\invitePrize_bg.png","..\\assets\\invite\\prize\\invitePrize_game_btn.png","..\\assets\\invite\\cutTime\\invateCut_bg.png","..\\assets\\invite\\cutTime\\invateCut_btn.png","..\\assets\\invite\\invite_wx_tip.png","..\\assets\\invite\\rule\\invite_rule_bg.png","..\\assets\\invite\\invitebg2.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"invite","version":5,"files":["../assets/invite/invite_invite.png","../assets/invite/invite_help.png","../assets/invite/invite_btn.png","../assets/invite/invite_bg.png","../assets/invite/prize/invitePrize_btn.png","../assets/invite/prize/invitePrize_bg.png","../assets/invite/prize/invitePrize_game_btn.png","../assets/invite/cutTime/invateCut_bg.png","../assets/invite/cutTime/invateCut_btn.png","../assets/invite/invite_wx_tip.png","../assets/invite/rule/invite_rule_bg.png","../assets/invite/invitebg2.png"]}
\ No newline at end of file

egret/resource/TextureMerger/invitecuttimepanel.tmproject

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

egret/resource/TextureMerger/inviteprizepanel.tmproject

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

egret/resource/TextureMerger/inviterule.tmproject

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

egret/resource/TextureMerger/inviterulepanel.tmproject

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

egret/resource/TextureMerger/main2.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"main2","version":5,"files":["..\\assets\\mainScene\\bonusFra1.png","..\\assets\\mainScene\\bonusFra10.png","..\\assets\\mainScene\\bonusFra11.png","..\\assets\\mainScene\\bonusFra12.png","..\\assets\\mainScene\\bonusFra13.png","..\\assets\\mainScene\\bonusFra14.png","..\\assets\\mainScene\\bonusFra15.png","..\\assets\\mainScene\\bonusFra16.png","..\\assets\\mainScene\\bonusFra17.png","..\\assets\\mainScene\\bonusFra18.png","..\\assets\\mainScene\\bonusFra19.png","..\\assets\\mainScene\\bonusFra2.png","..\\assets\\mainScene\\bonusFra20.png","..\\assets\\mainScene\\bonusFra21.png","..\\assets\\mainScene\\bonusFra22.png","..\\assets\\mainScene\\bonusFra23.png","..\\assets\\mainScene\\bonusFra24.png","..\\assets\\mainScene\\bonusFra25.png","..\\assets\\mainScene\\bonusFra26.png","..\\assets\\mainScene\\bonusFra27.png","..\\assets\\mainScene\\bonusFra3.png","..\\assets\\mainScene\\bonusFra4.png","..\\assets\\mainScene\\bonusFra5.png","..\\assets\\mainScene\\bonusFra6.png","..\\assets\\mainScene\\bonusFra7.png","..\\assets\\mainScene\\bonusFra8.png","..\\assets\\mainScene\\bonusFra9.png","..\\assets\\mainScene\\bonusShoot.png","..\\assets\\mainScene\\bonusTime.png","..\\assets\\mainScene\\boom1.png","..\\assets\\mainScene\\boom10.png","..\\assets\\mainScene\\boom11.png","..\\assets\\mainScene\\boom12.png","..\\assets\\mainScene\\boom13.png","..\\assets\\mainScene\\boom14.png","..\\assets\\mainScene\\boom15.png","..\\assets\\mainScene\\boom16.png","..\\assets\\mainScene\\boom17.png","..\\assets\\mainScene\\boom18.png","..\\assets\\mainScene\\boom2.png","..\\assets\\mainScene\\boom3.png","..\\assets\\mainScene\\boom4.png","..\\assets\\mainScene\\boom5.png","..\\assets\\mainScene\\boom6.png","..\\assets\\mainScene\\boom7.png","..\\assets\\mainScene\\boom8.png","..\\assets\\mainScene\\boom9.png","..\\assets\\mainScene\\boomBtn.png","..\\assets\\mainScene\\chooseRect.png","..\\assets\\mainScene\\dangqianfenshu.png","..\\assets\\mainScene\\eggPiece1.png","..\\assets\\mainScene\\eggPiece2.png","..\\assets\\mainScene\\eggPiece3.png","..\\assets\\mainScene\\eggPiece4.png","..\\assets\\mainScene\\eggPiece5.png","..\\assets\\mainScene\\eggStatus0.png","..\\assets\\mainScene\\eggStatus1.png","..\\assets\\mainScene\\eggStatus2.png","..\\assets\\mainScene\\ele0.png","..\\assets\\mainScene\\ele0Exp.png","..\\assets\\mainScene\\ele0Line.png","..\\assets\\mainScene\\ele1.png","..\\assets\\mainScene\\ele1Exp.png","..\\assets\\mainScene\\ele1Line.png","..\\assets\\mainScene\\ele2.png","..\\assets\\mainScene\\ele2Exp.png","..\\assets\\mainScene\\ele2Line.png","..\\assets\\mainScene\\ele3.png","..\\assets\\mainScene\\ele3Exp.png","..\\assets\\mainScene\\ele3Line.png","..\\assets\\mainScene\\ele4.png","..\\assets\\mainScene\\ele4Exp.png","..\\assets\\mainScene\\ele4Line.png","..\\assets\\mainScene\\ele5.png","..\\assets\\mainScene\\ele6.png","..\\assets\\mainScene\\ele7.png","..\\assets\\mainScene\\ele8.png","..\\assets\\mainScene\\ele9.png","..\\assets\\mainScene\\eleDis1.png","..\\assets\\mainScene\\eleDis10.png","..\\assets\\mainScene\\eleDis11.png","..\\assets\\mainScene\\eleDis12.png","..\\assets\\mainScene\\eleDis13.png","..\\assets\\mainScene\\eleDis14.png","..\\assets\\mainScene\\eleDis15.png","..\\assets\\mainScene\\eleDis16.png","..\\assets\\mainScene\\eleDis17.png","..\\assets\\mainScene\\eleDis18.png","..\\assets\\mainScene\\eleDis19.png","..\\assets\\mainScene\\eleDis2.png","..\\assets\\mainScene\\eleDis3.png","..\\assets\\mainScene\\eleDis4.png","..\\assets\\mainScene\\eleDis5.png","..\\assets\\mainScene\\eleDis6.png","..\\assets\\mainScene\\eleDis7.png","..\\assets\\mainScene\\eleDis8.png","..\\assets\\mainScene\\eleDis9.png","..\\assets\\mainScene\\exLighting1.png","..\\assets\\mainScene\\exLighting11.png","..\\assets\\mainScene\\exLighting14.png","..\\assets\\mainScene\\exLighting16.png","..\\assets\\mainScene\\exLighting18.png","..\\assets\\mainScene\\exLighting19.png","..\\assets\\mainScene\\exLighting21.png","..\\assets\\mainScene\\exLighting23.png","..\\assets\\mainScene\\exLighting25.png","..\\assets\\mainScene\\exLighting27.png","..\\assets\\mainScene\\exLighting29.png","..\\assets\\mainScene\\exLighting3.png","..\\assets\\mainScene\\exLighting32.png","..\\assets\\mainScene\\exLighting34.png","..\\assets\\mainScene\\exLighting5.png","..\\assets\\mainScene\\exLighting7.png","..\\assets\\mainScene\\exLighting9.png","..\\assets\\mainScene\\greenCircleDown.png","..\\assets\\mainScene\\greenCircleUp.png","..\\assets\\mainScene\\guidePropBoom.png","..\\assets\\mainScene\\guidePropCow.png","..\\assets\\mainScene\\guidePropHammer.png","..\\assets\\mainScene\\guidePropHand.png","..\\assets\\mainScene\\guidePropMsgPanel.png","..\\assets\\mainScene\\guidePropShoe.png","..\\assets\\mainScene\\hammerBtn.png","..\\assets\\mainScene\\ice2.png","..\\assets\\mainScene\\ice3.png","..\\assets\\mainScene\\ice4.png","..\\assets\\mainScene\\ice5.png","..\\assets\\mainScene\\ice6.png","..\\assets\\mainScene\\jellyArrow.png","..\\assets\\mainScene\\leftArrow.png","..\\assets\\mainScene\\lightedStar.png","..\\assets\\mainScene\\lineLight.png","..\\assets\\mainScene\\lockVine.png","..\\assets\\mainScene\\magicLion.png","..\\assets\\mainScene\\magicLionBg.png","..\\assets\\mainScene\\mainMusicBtnOff.png","..\\assets\\mainScene\\mainMusicBtnOn.png","..\\assets\\mainScene\\mainQuestionBtn.png","..\\assets\\mainScene\\mainQuitBtn.png","..\\assets\\mainScene\\mainSettingBg.png","..\\assets\\mainScene\\mainSoundBtnOff.png","..\\assets\\mainScene\\mainSoundBtnOn.png","..\\assets\\mainScene\\main_mapbottom.png","..\\assets\\mainScene\\progressDown.png","..\\assets\\mainScene\\propNum0.png","..\\assets\\mainScene\\propNum1.png","..\\assets\\mainScene\\propNum2.png","..\\assets\\mainScene\\propNum3.png","..\\assets\\mainScene\\propNum4.png","..\\assets\\mainScene\\propNum5.png","..\\assets\\mainScene\\propNum6.png","..\\assets\\mainScene\\propNum7.png","..\\assets\\mainScene\\propNum8.png","..\\assets\\mainScene\\propNum9.png","..\\assets\\mainScene\\propNumBg.png","..\\assets\\mainScene\\rectLat.png","..\\assets\\mainScene\\rightArrow.png","..\\assets\\mainScene\\rightMark.png","..\\assets\\mainScene\\rock2.png","..\\assets\\mainScene\\rock3.png","..\\assets\\mainScene\\rock4.png","..\\assets\\mainScene\\rock5.png","..\\assets\\mainScene\\rock6.png","..\\assets\\mainScene\\scoreNumber0.png","..\\assets\\mainScene\\scoreNumber1.png","..\\assets\\mainScene\\scoreNumber2.png","..\\assets\\mainScene\\scoreNumber3.png","..\\assets\\mainScene\\scoreNumber4.png","..\\assets\\mainScene\\scoreNumber5.png","..\\assets\\mainScene\\scoreNumber6.png","..\\assets\\mainScene\\scoreNumber7.png","..\\assets\\mainScene\\scoreNumber8.png","..\\assets\\mainScene\\scoreNumber9.png","..\\assets\\mainScene\\setting.png","..\\assets\\mainScene\\starProgress.png","..\\assets\\mainScene\\stepAni1.png","..\\assets\\mainScene\\stepAni10.png","..\\assets\\mainScene\\stepAni11.png","..\\assets\\mainScene\\stepAni2.png","..\\assets\\mainScene\\stepAni3.png","..\\assets\\mainScene\\stepAni4.png","..\\assets\\mainScene\\stepAni5.png","..\\assets\\mainScene\\stepAni6.png","..\\assets\\mainScene\\stepAni7.png","..\\assets\\mainScene\\stepAni8.png","..\\assets\\mainScene\\stepAni9.png","..\\assets\\mainScene\\stepBtn.png","..\\assets\\mainScene\\stepNumber0.png","..\\assets\\mainScene\\stepNumber1.png","..\\assets\\mainScene\\stepNumber2.png","..\\assets\\mainScene\\stepNumber3.png","..\\assets\\mainScene\\stepNumber4.png","..\\assets\\mainScene\\stepNumber5.png","..\\assets\\mainScene\\stepNumber6.png","..\\assets\\mainScene\\stepNumber7.png","..\\assets\\mainScene\\stepNumber8.png","..\\assets\\mainScene\\stepNumber9.png","..\\assets\\mainScene\\stepsBoard.png","..\\assets\\mainScene\\targetBoard.png","..\\assets\\mainScene\\targetNumber0.png","..\\assets\\mainScene\\targetNumber1.png","..\\assets\\mainScene\\targetNumber2.png","..\\assets\\mainScene\\targetNumber3.png","..\\assets\\mainScene\\targetNumber4.png","..\\assets\\mainScene\\targetNumber5.png","..\\assets\\mainScene\\targetNumber6.png","..\\assets\\mainScene\\targetNumber7.png","..\\assets\\mainScene\\targetNumber8.png","..\\assets\\mainScene\\targetNumber9.png","..\\assets\\mainScene\\unlightedStar.png","..\\assets\\mainScene\\yellowCircleDown.png","..\\assets\\mainScene\\yellowCircleUp.png","..\\assets\\mainScene\\yezi1.png","..\\assets\\mainScene\\bubbleStar19.png","..\\assets\\mainScene\\bubleEle0.png","..\\assets\\mainScene\\bubleEle1.png","..\\assets\\mainScene\\bubleEle2.png","..\\assets\\mainScene\\bubleEle3.png","..\\assets\\mainScene\\bubleEle4.png","..\\assets\\mainScene\\bubbleStar1.png","..\\assets\\mainScene\\bubbleStar2.png","..\\assets\\mainScene\\bubbleStar3.png","..\\assets\\mainScene\\bubbleStar4.png","..\\assets\\mainScene\\bubbleStar5.png","..\\assets\\mainScene\\bubbleStar6.png","..\\assets\\mainScene\\bubbleStar7.png","..\\assets\\mainScene\\bubbleStar8.png","..\\assets\\mainScene\\bubbleStar9.png","..\\assets\\mainScene\\bubbleStar10.png","..\\assets\\mainScene\\bubbleStar11.png","..\\assets\\mainScene\\bubbleStar12.png","..\\assets\\mainScene\\bubbleStar13.png","..\\assets\\mainScene\\bubbleStar14.png","..\\assets\\mainScene\\bubbleStar15.png","..\\assets\\mainScene\\bubbleStar16.png","..\\assets\\mainScene\\bubbleStar17.png","..\\assets\\mainScene\\bubbleStar18.png","..\\assets\\mainScene\\ele11.png","..\\assets\\mainScene\\ele10.png","..\\assets\\mainScene\\brownBallFace.png","..\\assets\\mainScene\\eyeDownLeft.png","..\\assets\\mainScene\\eyeSingle.png","..\\assets\\mainScene\\greyBallFace.png","..\\assets\\mainScene\\eyeDownRight.png","..\\assets\\mainScene\\hairballPiece9.png","..\\assets\\mainScene\\hairballPiece8.png","..\\assets\\mainScene\\hairballPiece7.png","..\\assets\\mainScene\\hairballPiece6.png","..\\assets\\mainScene\\hairballPiece5.png","..\\assets\\mainScene\\hairballPiece4.png","..\\assets\\mainScene\\hairballPiece3.png","..\\assets\\mainScene\\hairballPiece2.png","..\\assets\\mainScene\\hairballPiece11.png","..\\assets\\mainScene\\hairballPiece10.png","..\\assets\\mainScene\\hairballPiece1.png","..\\assets\\mainScene\\hairballDisBg.png","..\\assets\\mainScene\\curScoreNum9.png","..\\assets\\mainScene\\curScoreNum8.png","..\\assets\\mainScene\\curScoreNum7.png","..\\assets\\mainScene\\curScoreNum6.png","..\\assets\\mainScene\\curScoreNum5.png","..\\assets\\mainScene\\curScoreNum4.png","..\\assets\\mainScene\\curScoreNum3.png","..\\assets\\mainScene\\curScoreNum2.png","..\\assets\\mainScene\\curScoreNum1.png","..\\assets\\mainScene\\curScoreNum0.png","..\\assets\\mainScene\\festivalTargetBg.png","..\\assets\\mainScene\\lineLight9.png","..\\assets\\mainScene\\lineLight8.png","..\\assets\\mainScene\\lineLight7.png","..\\assets\\mainScene\\lineLight6.png","..\\assets\\mainScene\\lineLight5.png","..\\assets\\mainScene\\lineLight4.png","..\\assets\\mainScene\\lineLight3.png","..\\assets\\mainScene\\lineLight2.png","..\\assets\\mainScene\\lineLight13.png","..\\assets\\mainScene\\lineLight12.png","..\\assets\\mainScene\\lineLight11.png","..\\assets\\mainScene\\lineLight10.png","..\\assets\\mainScene\\lineLight1.png","..\\assets\\mainScene\\fesRedUp.png","..\\assets\\mainScene\\fesRedSmallLight.png","..\\assets\\mainScene\\fesRedDown.png","..\\assets\\mainScene\\fesRedCap.png","..\\assets\\mainScene\\fesRedBombSta1.png","..\\assets\\mainScene\\fesRedBigLight.png","..\\assets\\mainScene\\fesEleSmallDis9.png","..\\assets\\mainScene\\fesEleSmallDis8.png","..\\assets\\mainScene\\fesEleSmallDis7.png","..\\assets\\mainScene\\fesEleSmallDis6.png","..\\assets\\mainScene\\fesEleSmallDis5.png","..\\assets\\mainScene\\fesEleSmallDis4.png","..\\assets\\mainScene\\fesEleSmallDis3.png","..\\assets\\mainScene\\fesEleSmallDis2.png","..\\assets\\mainScene\\fesEleSmallDis10.png","..\\assets\\mainScene\\fesEleSmallDis1.png","..\\assets\\mainScene\\ele12.png","..\\assets\\mainScene\\ele13.png","..\\assets\\mainScene\\xingxingbi.png","..\\assets\\mainScene\\tinyRedMid.png","..\\assets\\mainScene\\tinyRedLeft.png","..\\assets\\mainScene\\tinyRedRight.png","..\\assets\\mainScene\\rectLatWhite.png","..\\assets\\mainScene\\fesRedBombSta2.png","..\\assets\\mainScene\\ele14.png","..\\assets\\mainScene\\redBombYStar.png","..\\assets\\mainScene\\redBombBStar.png","..\\assets\\mainScene\\redBombBSnow.png","..\\assets\\mainScene\\线条尾部炸开_00000.png","..\\assets\\mainScene\\线条尾部炸开_00001.png","..\\assets\\mainScene\\线条尾部炸开_00002.png","..\\assets\\mainScene\\线条尾部炸开_00003.png","..\\assets\\mainScene\\线条尾部炸开_00004.png","..\\assets\\mainScene\\线条尾部炸开_00005.png","..\\assets\\mainScene\\线条尾部炸开_00006.png","..\\assets\\mainScene\\线条尾部炸开_00007.png","..\\assets\\mainScene\\线条尾部炸开_00008.png","..\\assets\\mainScene\\ele15.png","..\\assets\\mainScene\\ele16.png","..\\assets\\mainScene\\ele17.png","..\\assets\\mainScene\\ele18.png","..\\assets\\mainScene\\ele19.png","..\\assets\\mainScene\\ele20.png","..\\assets\\mainScene\\empty.png","..\\assets\\mainScene\\ele23.png","..\\assets\\mainScene\\ele25.png","..\\assets\\mainScene\\ele27.png","..\\assets\\mainScene\\ele26.png","..\\assets\\mainScene\\ele24.png","..\\assets\\mainScene\\ele22.png","..\\assets\\mainScene\\chocolateMark3.png","..\\assets\\mainScene\\chocolateMark1.png","..\\assets\\mainScene\\chocolateFour.png","..\\assets\\mainScene\\chocolateMark0.png","..\\assets\\mainScene\\chocolateMark2.png","..\\assets\\mainScene\\redbombParticle.png","..\\assets\\mainScene\\monster_shoot.png","..\\assets\\mainScene\\ele33_1.png","..\\assets\\mainScene\\ele33_0.png","..\\assets\\mainScene\\ele34.png","..\\assets\\mainScene\\honey.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"main2","version":5,"files":["../assets/mainScene/bonusFra1.png","../assets/mainScene/bonusFra10.png","../assets/mainScene/bonusFra11.png","../assets/mainScene/bonusFra12.png","../assets/mainScene/bonusFra13.png","../assets/mainScene/bonusFra14.png","../assets/mainScene/bonusFra15.png","../assets/mainScene/bonusFra16.png","../assets/mainScene/bonusFra17.png","../assets/mainScene/bonusFra18.png","../assets/mainScene/bonusFra19.png","../assets/mainScene/bonusFra2.png","../assets/mainScene/bonusFra20.png","../assets/mainScene/bonusFra21.png","../assets/mainScene/bonusFra22.png","../assets/mainScene/bonusFra23.png","../assets/mainScene/bonusFra24.png","../assets/mainScene/bonusFra25.png","../assets/mainScene/bonusFra26.png","../assets/mainScene/bonusFra27.png","../assets/mainScene/bonusFra3.png","../assets/mainScene/bonusFra4.png","../assets/mainScene/bonusFra5.png","../assets/mainScene/bonusFra6.png","../assets/mainScene/bonusFra7.png","../assets/mainScene/bonusFra8.png","../assets/mainScene/bonusFra9.png","../assets/mainScene/bonusShoot.png","../assets/mainScene/bonusTime.png","../assets/mainScene/boom1.png","../assets/mainScene/boom10.png","../assets/mainScene/boom11.png","../assets/mainScene/boom12.png","../assets/mainScene/boom13.png","../assets/mainScene/boom14.png","../assets/mainScene/boom15.png","../assets/mainScene/boom16.png","../assets/mainScene/boom17.png","../assets/mainScene/boom18.png","../assets/mainScene/boom2.png","../assets/mainScene/boom3.png","../assets/mainScene/boom4.png","../assets/mainScene/boom5.png","../assets/mainScene/boom6.png","../assets/mainScene/boom7.png","../assets/mainScene/boom8.png","../assets/mainScene/boom9.png","../assets/mainScene/boomBtn.png","../assets/mainScene/chooseRect.png","../assets/mainScene/dangqianfenshu.png","../assets/mainScene/eggPiece1.png","../assets/mainScene/eggPiece2.png","../assets/mainScene/eggPiece3.png","../assets/mainScene/eggPiece4.png","../assets/mainScene/eggPiece5.png","../assets/mainScene/eggStatus0.png","../assets/mainScene/eggStatus1.png","../assets/mainScene/eggStatus2.png","../assets/mainScene/ele0.png","../assets/mainScene/ele0Exp.png","../assets/mainScene/ele0Line.png","../assets/mainScene/ele1.png","../assets/mainScene/ele1Exp.png","../assets/mainScene/ele1Line.png","../assets/mainScene/ele2.png","../assets/mainScene/ele2Exp.png","../assets/mainScene/ele2Line.png","../assets/mainScene/ele3.png","../assets/mainScene/ele3Exp.png","../assets/mainScene/ele3Line.png","../assets/mainScene/ele4.png","../assets/mainScene/ele4Exp.png","../assets/mainScene/ele4Line.png","../assets/mainScene/ele5.png","../assets/mainScene/ele6.png","../assets/mainScene/ele7.png","../assets/mainScene/ele8.png","../assets/mainScene/ele9.png","../assets/mainScene/eleDis1.png","../assets/mainScene/eleDis10.png","../assets/mainScene/eleDis11.png","../assets/mainScene/eleDis12.png","../assets/mainScene/eleDis13.png","../assets/mainScene/eleDis14.png","../assets/mainScene/eleDis15.png","../assets/mainScene/eleDis16.png","../assets/mainScene/eleDis17.png","../assets/mainScene/eleDis18.png","../assets/mainScene/eleDis19.png","../assets/mainScene/eleDis2.png","../assets/mainScene/eleDis3.png","../assets/mainScene/eleDis4.png","../assets/mainScene/eleDis5.png","../assets/mainScene/eleDis6.png","../assets/mainScene/eleDis7.png","../assets/mainScene/eleDis8.png","../assets/mainScene/eleDis9.png","../assets/mainScene/exLighting1.png","../assets/mainScene/exLighting11.png","../assets/mainScene/exLighting14.png","../assets/mainScene/exLighting16.png","../assets/mainScene/exLighting18.png","../assets/mainScene/exLighting19.png","../assets/mainScene/exLighting21.png","../assets/mainScene/exLighting23.png","../assets/mainScene/exLighting25.png","../assets/mainScene/exLighting27.png","../assets/mainScene/exLighting29.png","../assets/mainScene/exLighting3.png","../assets/mainScene/exLighting32.png","../assets/mainScene/exLighting34.png","../assets/mainScene/exLighting5.png","../assets/mainScene/exLighting7.png","../assets/mainScene/exLighting9.png","../assets/mainScene/greenCircleDown.png","../assets/mainScene/greenCircleUp.png","../assets/mainScene/guidePropBoom.png","../assets/mainScene/guidePropCow.png","../assets/mainScene/guidePropHammer.png","../assets/mainScene/guidePropHand.png","../assets/mainScene/guidePropMsgPanel.png","../assets/mainScene/guidePropShoe.png","../assets/mainScene/hammerBtn.png","../assets/mainScene/ice2.png","../assets/mainScene/ice3.png","../assets/mainScene/ice4.png","../assets/mainScene/ice5.png","../assets/mainScene/ice6.png","../assets/mainScene/jellyArrow.png","../assets/mainScene/leftArrow.png","../assets/mainScene/lightedStar.png","../assets/mainScene/lineLight.png","../assets/mainScene/lockVine.png","../assets/mainScene/magicLion.png","../assets/mainScene/magicLionBg.png","../assets/mainScene/mainMusicBtnOff.png","../assets/mainScene/mainMusicBtnOn.png","../assets/mainScene/mainQuestionBtn.png","../assets/mainScene/mainQuitBtn.png","../assets/mainScene/mainSettingBg.png","../assets/mainScene/mainSoundBtnOff.png","../assets/mainScene/mainSoundBtnOn.png","../assets/mainScene/main_mapbottom.png","../assets/mainScene/progressDown.png","../assets/mainScene/propNum0.png","../assets/mainScene/propNum1.png","../assets/mainScene/propNum2.png","../assets/mainScene/propNum3.png","../assets/mainScene/propNum4.png","../assets/mainScene/propNum5.png","../assets/mainScene/propNum6.png","../assets/mainScene/propNum7.png","../assets/mainScene/propNum8.png","../assets/mainScene/propNum9.png","../assets/mainScene/propNumBg.png","../assets/mainScene/rectLat.png","../assets/mainScene/rightArrow.png","../assets/mainScene/rightMark.png","../assets/mainScene/rock2.png","../assets/mainScene/rock3.png","../assets/mainScene/rock4.png","../assets/mainScene/rock5.png","../assets/mainScene/rock6.png","../assets/mainScene/scoreNumber0.png","../assets/mainScene/scoreNumber1.png","../assets/mainScene/scoreNumber2.png","../assets/mainScene/scoreNumber3.png","../assets/mainScene/scoreNumber4.png","../assets/mainScene/scoreNumber5.png","../assets/mainScene/scoreNumber6.png","../assets/mainScene/scoreNumber7.png","../assets/mainScene/scoreNumber8.png","../assets/mainScene/scoreNumber9.png","../assets/mainScene/setting.png","../assets/mainScene/starProgress.png","../assets/mainScene/stepAni1.png","../assets/mainScene/stepAni10.png","../assets/mainScene/stepAni11.png","../assets/mainScene/stepAni2.png","../assets/mainScene/stepAni3.png","../assets/mainScene/stepAni4.png","../assets/mainScene/stepAni5.png","../assets/mainScene/stepAni6.png","../assets/mainScene/stepAni7.png","../assets/mainScene/stepAni8.png","../assets/mainScene/stepAni9.png","../assets/mainScene/stepBtn.png","../assets/mainScene/stepNumber0.png","../assets/mainScene/stepNumber1.png","../assets/mainScene/stepNumber2.png","../assets/mainScene/stepNumber3.png","../assets/mainScene/stepNumber4.png","../assets/mainScene/stepNumber5.png","../assets/mainScene/stepNumber6.png","../assets/mainScene/stepNumber7.png","../assets/mainScene/stepNumber8.png","../assets/mainScene/stepNumber9.png","../assets/mainScene/stepsBoard.png","../assets/mainScene/targetBoard.png","../assets/mainScene/targetNumber0.png","../assets/mainScene/targetNumber1.png","../assets/mainScene/targetNumber2.png","../assets/mainScene/targetNumber3.png","../assets/mainScene/targetNumber4.png","../assets/mainScene/targetNumber5.png","../assets/mainScene/targetNumber6.png","../assets/mainScene/targetNumber7.png","../assets/mainScene/targetNumber8.png","../assets/mainScene/targetNumber9.png","../assets/mainScene/unlightedStar.png","../assets/mainScene/yellowCircleDown.png","../assets/mainScene/yellowCircleUp.png","../assets/mainScene/yezi1.png","../assets/mainScene/bubbleStar19.png","../assets/mainScene/bubleEle0.png","../assets/mainScene/bubleEle1.png","../assets/mainScene/bubleEle2.png","../assets/mainScene/bubleEle3.png","../assets/mainScene/bubleEle4.png","../assets/mainScene/bubbleStar1.png","../assets/mainScene/bubbleStar2.png","../assets/mainScene/bubbleStar3.png","../assets/mainScene/bubbleStar4.png","../assets/mainScene/bubbleStar5.png","../assets/mainScene/bubbleStar6.png","../assets/mainScene/bubbleStar7.png","../assets/mainScene/bubbleStar8.png","../assets/mainScene/bubbleStar9.png","../assets/mainScene/bubbleStar10.png","../assets/mainScene/bubbleStar11.png","../assets/mainScene/bubbleStar12.png","../assets/mainScene/bubbleStar13.png","../assets/mainScene/bubbleStar14.png","../assets/mainScene/bubbleStar15.png","../assets/mainScene/bubbleStar16.png","../assets/mainScene/bubbleStar17.png","../assets/mainScene/bubbleStar18.png","../assets/mainScene/ele11.png","../assets/mainScene/ele10.png","../assets/mainScene/brownBallFace.png","../assets/mainScene/eyeDownLeft.png","../assets/mainScene/eyeSingle.png","../assets/mainScene/greyBallFace.png","../assets/mainScene/eyeDownRight.png","../assets/mainScene/hairballPiece9.png","../assets/mainScene/hairballPiece8.png","../assets/mainScene/hairballPiece7.png","../assets/mainScene/hairballPiece6.png","../assets/mainScene/hairballPiece5.png","../assets/mainScene/hairballPiece4.png","../assets/mainScene/hairballPiece3.png","../assets/mainScene/hairballPiece2.png","../assets/mainScene/hairballPiece11.png","../assets/mainScene/hairballPiece10.png","../assets/mainScene/hairballPiece1.png","../assets/mainScene/hairballDisBg.png","../assets/mainScene/curScoreNum9.png","../assets/mainScene/curScoreNum8.png","../assets/mainScene/curScoreNum7.png","../assets/mainScene/curScoreNum6.png","../assets/mainScene/curScoreNum5.png","../assets/mainScene/curScoreNum4.png","../assets/mainScene/curScoreNum3.png","../assets/mainScene/curScoreNum2.png","../assets/mainScene/curScoreNum1.png","../assets/mainScene/curScoreNum0.png","../assets/mainScene/festivalTargetBg.png","../assets/mainScene/lineLight9.png","../assets/mainScene/lineLight8.png","../assets/mainScene/lineLight7.png","../assets/mainScene/lineLight6.png","../assets/mainScene/lineLight5.png","../assets/mainScene/lineLight4.png","../assets/mainScene/lineLight3.png","../assets/mainScene/lineLight2.png","../assets/mainScene/lineLight13.png","../assets/mainScene/lineLight12.png","../assets/mainScene/lineLight11.png","../assets/mainScene/lineLight10.png","../assets/mainScene/lineLight1.png","../assets/mainScene/fesRedUp.png","../assets/mainScene/fesRedSmallLight.png","../assets/mainScene/fesRedDown.png","../assets/mainScene/fesRedCap.png","../assets/mainScene/fesRedBombSta1.png","../assets/mainScene/fesRedBigLight.png","../assets/mainScene/fesEleSmallDis9.png","../assets/mainScene/fesEleSmallDis8.png","../assets/mainScene/fesEleSmallDis7.png","../assets/mainScene/fesEleSmallDis6.png","../assets/mainScene/fesEleSmallDis5.png","../assets/mainScene/fesEleSmallDis4.png","../assets/mainScene/fesEleSmallDis3.png","../assets/mainScene/fesEleSmallDis2.png","../assets/mainScene/fesEleSmallDis10.png","../assets/mainScene/fesEleSmallDis1.png","../assets/mainScene/ele12.png","../assets/mainScene/ele13.png","../assets/mainScene/xingxingbi.png","../assets/mainScene/tinyRedMid.png","../assets/mainScene/tinyRedLeft.png","../assets/mainScene/tinyRedRight.png","../assets/mainScene/rectLatWhite.png","../assets/mainScene/fesRedBombSta2.png","../assets/mainScene/ele14.png","../assets/mainScene/redBombYStar.png","../assets/mainScene/redBombBStar.png","../assets/mainScene/redBombBSnow.png","../assets/mainScene/线条尾部炸开_00000.png","../assets/mainScene/线条尾部炸开_00001.png","../assets/mainScene/线条尾部炸开_00002.png","../assets/mainScene/线条尾部炸开_00003.png","../assets/mainScene/线条尾部炸开_00004.png","../assets/mainScene/线条尾部炸开_00005.png","../assets/mainScene/线条尾部炸开_00006.png","../assets/mainScene/线条尾部炸开_00007.png","../assets/mainScene/线条尾部炸开_00008.png","../assets/mainScene/ele15.png","../assets/mainScene/ele16.png","../assets/mainScene/ele17.png","../assets/mainScene/ele18.png","../assets/mainScene/ele19.png","../assets/mainScene/ele20.png","../assets/mainScene/empty.png","../assets/mainScene/ele23.png","../assets/mainScene/ele25.png","../assets/mainScene/ele27.png","../assets/mainScene/ele26.png","../assets/mainScene/ele24.png","../assets/mainScene/ele22.png","../assets/mainScene/chocolateMark3.png","../assets/mainScene/chocolateMark1.png","../assets/mainScene/chocolateFour.png","../assets/mainScene/chocolateMark0.png","../assets/mainScene/chocolateMark2.png","../assets/mainScene/redbombParticle.png","../assets/mainScene/monster_shoot.png","../assets/mainScene/ele33_1.png","../assets/mainScene/ele33_0.png","../assets/mainScene/ele34.png","../assets/mainScene/honey.png"]}
\ No newline at end of file

egret/resource/TextureMerger/map.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["..\\assets\\map\\宝箱.png","..\\assets\\map\\宝箱1.png","..\\assets\\map\\宝箱2.png","..\\assets\\map\\宝箱3.png","..\\assets\\map\\宝箱bg.png","..\\assets\\map\\宝箱btn.png","..\\assets\\map\\道具.png","..\\assets\\map\\关闭 拷贝.png","..\\assets\\map\\光 副本 4.png","..\\assets\\map\\设置.png","..\\assets\\map\\设置bg.png","..\\assets\\map\\声音.png","..\\assets\\map\\声音关闭.png","..\\assets\\map\\狮子.png","..\\assets\\map\\退出.png","..\\assets\\map\\问题.png","..\\assets\\map\\无星星.png","..\\assets\\map\\星星.png","..\\assets\\map\\星星bg.png","..\\assets\\map\\音乐.png","..\\assets\\map\\音乐关闭.png","..\\assets\\map\\有星星.png","..\\assets\\map\\有星星2.png","..\\assets\\map\\有星星3.png","..\\assets\\map\\元宝bg.png","..\\assets\\map\\ad_icon.png","..\\assets\\map\\animal1.png","..\\assets\\map\\avatar.png","..\\assets\\map\\friend_avatar.png","..\\assets\\map\\guideBox.png","..\\assets\\map\\guideLevel.png","..\\assets\\map\\guideLove.png","..\\assets\\map\\guideMoney.png","..\\assets\\map\\guideOver.png","..\\assets\\map\\icon.png","..\\assets\\map\\iconbg.png","..\\assets\\map\\icongray.png","..\\assets\\map\\invite_icon.png","..\\assets\\map\\invite_txtbg.png","..\\assets\\map\\lionMsgBg.png","..\\assets\\map\\map_signicon.png","..\\assets\\map\\map2+.png","..\\assets\\map\\map2+bg.png","..\\assets\\map\\map2红包大作战.png","..\\assets\\map\\map2热门引导.png","..\\assets\\map\\map2周一红包雨.png","..\\assets\\map\\map大转盘.png","..\\assets\\map\\map刮现金红包.png","..\\assets\\map\\map今日可领.png","..\\assets\\map\\map明日可领.png","..\\assets\\map\\maphot.png","..\\assets\\map\\msgTri.png","..\\assets\\map\\namebg.png","..\\assets\\map\\progress1.png","..\\assets\\map\\progress2.png","..\\assets\\map\\recordbtn.png","..\\assets\\map\\taskicon.png","..\\assets\\map\\map2+bg2.png","..\\assets\\map\\mapredbagicom.png","..\\assets\\map\\maplight2.png","..\\assets\\map\\taskBtn.png","..\\assets\\map\\txtbg_blue.png","..\\assets\\map\\txtbg_orange.png","..\\assets\\map\\txtbg_purple.png","..\\assets\\map\\mapredbagicom2.png","..\\assets\\map\\iconnow.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/宝箱.png","../assets/map/宝箱1.png","../assets/map/宝箱2.png","../assets/map/宝箱3.png","../assets/map/宝箱bg.png","../assets/map/宝箱btn.png","../assets/map/道具.png","../assets/map/关闭 拷贝.png","../assets/map/光 副本 4.png","../assets/map/设置.png","../assets/map/设置bg.png","../assets/map/声音.png","../assets/map/声音关闭.png","../assets/map/狮子.png","../assets/map/退出.png","../assets/map/问题.png","../assets/map/无星星.png","../assets/map/星星.png","../assets/map/星星bg.png","../assets/map/音乐.png","../assets/map/音乐关闭.png","../assets/map/有星星.png","../assets/map/有星星2.png","../assets/map/有星星3.png","../assets/map/元宝bg.png","../assets/map/ad_icon.png","../assets/map/animal1.png","../assets/map/avatar.png","../assets/map/friend_avatar.png","../assets/map/guideBox.png","../assets/map/guideLevel.png","../assets/map/guideLove.png","../assets/map/guideMoney.png","../assets/map/guideOver.png","../assets/map/icon.png","../assets/map/iconbg.png","../assets/map/icongray.png","../assets/map/invite_icon.png","../assets/map/invite_txtbg.png","../assets/map/lionMsgBg.png","../assets/map/map_signicon.png","../assets/map/map2+.png","../assets/map/map2+bg.png","../assets/map/map2红包大作战.png","../assets/map/map2热门引导.png","../assets/map/map2周一红包雨.png","../assets/map/map大转盘.png","../assets/map/map刮现金红包.png","../assets/map/map今日可领.png","../assets/map/map明日可领.png","../assets/map/maphot.png","../assets/map/msgTri.png","../assets/map/namebg.png","../assets/map/progress1.png","../assets/map/progress2.png","../assets/map/recordbtn.png","../assets/map/taskicon.png","../assets/map/map2+bg2.png","../assets/map/mapredbagicom.png","../assets/map/maplight2.png","../assets/map/taskBtn.png","../assets/map/txtbg_blue.png","../assets/map/txtbg_orange.png","../assets/map/txtbg_purple.png","../assets/map/mapredbagicom2.png","../assets/map/iconnow.png"]}
\ No newline at end of file

egret/resource/TextureMerger/noprize.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"noprize","version":5,"files":["..\\assets\\nprize\\擦肩而过弹窗 .png","..\\assets\\nprize\\得分- 无发券.png","..\\assets\\nprize\\再来一次.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"noprize","version":5,"files":["../assets/nprize/擦肩而过弹窗 .png","../assets/nprize/得分- 无发券.png","../assets/nprize/再来一次.png"]}
\ No newline at end of file

egret/resource/TextureMerger/preload.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"preload","version":5,"files":["..\\assets\\mainScene\\ele34.png","..\\assets\\mainScene\\honey.png","..\\assets\\startpanel2\\startpanel_ele34.png"]}
\ No newline at end of file

egret/resource/TextureMerger/prize.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"prize","version":5,"files":["..\\assets\\prize\\PrizePanelX.png","..\\assets\\prize\\prizePanelUseBtn.png","..\\assets\\prize\\点亮gray.png","..\\assets\\prize\\点亮.png","..\\assets\\prize\\点亮 副本 2gray.png","..\\assets\\prize\\点亮 副本 2.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"prize","version":5,"files":["../assets/prize/PrizePanelX.png","../assets/prize/prizePanelUseBtn.png","../assets/prize/点亮gray.png","../assets/prize/点亮.png","../assets/prize/点亮 副本 2gray.png","../assets/prize/点亮 副本 2.png"]}
\ No newline at end of file

egret/resource/TextureMerger/prize2.tmproject

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

egret/resource/TextureMerger/quit.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"quit","version":5,"files":["..\\assets\\quit\\quit_bg.png","..\\assets\\quit\\关闭按钮.png","..\\assets\\quit\\按钮 副本 8.png","..\\assets\\quit\\按钮 副本 7.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"quit","version":5,"files":["../assets/quit/quit_bg.png","../assets/quit/关闭按钮.png","../assets/quit/按钮 副本 8.png","../assets/quit/按钮 副本 7.png"]}
\ No newline at end of file

egret/resource/TextureMerger/recharge.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"recharge","version":5,"files":["..\\assets\\recharge\\recharge_bg.png","..\\assets\\recharge\\recharge_btn_bg.png","..\\assets\\recharge\\recharge_num_bg.png","..\\assets\\recharge\\recharge_10_ds.png","..\\assets\\recharge\\recharge_10_en.png","..\\assets\\recharge\\recharge_1000_ds.png","..\\assets\\recharge\\recharge_1000_en.png","..\\assets\\recharge\\recharge_500_ds.png","..\\assets\\recharge\\recharge_500_en.png","..\\assets\\recharge\\recharge_add_ds.png","..\\assets\\recharge\\recharge_add_en.png","..\\assets\\recharge\\recharge_sub_ds.png","..\\assets\\recharge\\recharge_sub_en.png","..\\assets\\recharge\\recharge_1_ds.png","..\\assets\\recharge\\recharge_1_en.png","..\\assets\\recharge\\recharge_100_ds.png","..\\assets\\recharge\\recharge_100_en.png","..\\assets\\recharge\\recharge_50_ds.png","..\\assets\\recharge\\recharge_50_en.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"recharge","version":5,"files":["../assets/recharge/recharge_bg.png","../assets/recharge/recharge_btn_bg.png","../assets/recharge/recharge_num_bg.png","../assets/recharge/recharge_10_ds.png","../assets/recharge/recharge_10_en.png","../assets/recharge/recharge_1000_ds.png","../assets/recharge/recharge_1000_en.png","../assets/recharge/recharge_500_ds.png","../assets/recharge/recharge_500_en.png","../assets/recharge/recharge_add_ds.png","../assets/recharge/recharge_add_en.png","../assets/recharge/recharge_sub_ds.png","../assets/recharge/recharge_sub_en.png","../assets/recharge/recharge_1_ds.png","../assets/recharge/recharge_1_en.png","../assets/recharge/recharge_100_ds.png","../assets/recharge/recharge_100_en.png","../assets/recharge/recharge_50_ds.png","../assets/recharge/recharge_50_en.png"]}
\ No newline at end of file

egret/resource/TextureMerger/redbombalert.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"redbombalert","version":5,"files":["..\\assets\\redbombalert\\redbombalert文案.png","..\\assets\\redbombalert\\redAlert_btn.png","..\\assets\\redbombalert\\alert_yb.png","..\\assets\\redbombalert\\alert_prop3.png","..\\assets\\redbombalert\\alert_prop2.png","..\\assets\\redbombalert\\alert_prop1.png","..\\assets\\redbombalert\\alert_blood.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"redbombalert","version":5,"files":["../assets/redbombalert/redbombalert文案.png","../assets/redbombalert/redAlert_btn.png","../assets/redbombalert/alert_yb.png","../assets/redbombalert/alert_prop3.png","../assets/redbombalert/alert_prop2.png","../assets/redbombalert/alert_prop1.png","../assets/redbombalert/alert_blood.png"]}
\ No newline at end of file

egret/resource/TextureMerger/redbombtips.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"redbombtips","version":5,"files":["..\\assets\\redbombtips\\redbagtips_ele.png","..\\assets\\redbombtips\\redbagtips_ele1.png","..\\assets\\redbombtips\\redbagtips_ele2.png","..\\assets\\redbombtips\\redbagtips_ele3.png","..\\assets\\redbombtips\\redbagtips_light.png","..\\assets\\redbombtips\\redbagtips按钮.png","..\\assets\\redbombtips\\redbagtips活动规则.png","..\\assets\\redbombtips\\redbagtipsbg.png","..\\assets\\redbombtips\\redbagtips_ele7.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"redbombtips","version":5,"files":["../assets/redbombtips/redbagtips_ele.png","../assets/redbombtips/redbagtips_ele1.png","../assets/redbombtips/redbagtips_ele2.png","../assets/redbombtips/redbagtips_ele3.png","../assets/redbombtips/redbagtips_light.png","../assets/redbombtips/redbagtips按钮.png","../assets/redbombtips/redbagtips活动规则.png","../assets/redbombtips/redbagtipsbg.png","../assets/redbombtips/redbagtips_ele7.png"]}
\ No newline at end of file

egret/resource/TextureMerger/redbombtips2.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"redbombtips2","version":5,"files":["..\\assets\\redbombtips\\redbagtips_ele.png","..\\assets\\redbombtips\\redbagtips_ele1.png","..\\assets\\redbombtips\\redbagtips_ele2.png","..\\assets\\redbombtips\\redbagtips_ele3.png","..\\assets\\redbombtips\\redbagtips_light.png","..\\assets\\redbombtips\\redbagtips按钮.png","..\\assets\\redbombtips\\redbagtips活动规则.png","..\\assets\\redbombtips\\redbagtipsbg.png","..\\assets\\redbombtips\\redbagtips_ele7.png","..\\assets\\redbombtips\\redbagtips_elexx.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"redbombtips2","version":5,"files":["../assets/redbombtips/redbagtips_ele.png","../assets/redbombtips/redbagtips_ele1.png","../assets/redbombtips/redbagtips_ele2.png","../assets/redbombtips/redbagtips_ele3.png","../assets/redbombtips/redbagtips_light.png","../assets/redbombtips/redbagtips按钮.png","../assets/redbombtips/redbagtips活动规则.png","../assets/redbombtips/redbagtipsbg.png","../assets/redbombtips/redbagtips_ele7.png","../assets/redbombtips/redbagtips_elexx.png"]}
\ No newline at end of file

egret/resource/TextureMerger/rule.tmproject

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

egret/resource/TextureMerger/scratch.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"scratch","version":5,"files":["..\\assets\\scratch\\scratch_bg.png","..\\assets\\scratch\\scratch_hongbao.png","..\\assets\\scratch\\scratch_help.png","..\\assets\\scratch\\scratch_progress_bg.png","..\\assets\\scratch\\scratch_wx_tip.png","..\\assets\\scratch\\scratchbg2.png","..\\assets\\scratch\\scratch_invite.png","..\\assets\\scratch\\scratch_card_90.png","..\\assets\\scratch\\scratch_card_96.png","..\\assets\\scratch\\scratch_card_94.png","..\\assets\\scratch\\scratch_card_98.png","..\\assets\\scratch\\scratch_user1.png","..\\assets\\scratch\\scratch_card_bg.png","..\\assets\\scratch\\scratch_card_92.png","..\\assets\\scratch\\scratch_user2.png","..\\assets\\scratch\\scratch_mask.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"scratch","version":5,"files":["../assets/scratch/scratch_bg.png","../assets/scratch/scratch_hongbao.png","../assets/scratch/scratch_help.png","../assets/scratch/scratch_progress_bg.png","../assets/scratch/scratch_wx_tip.png","../assets/scratch/scratchbg2.png","../assets/scratch/scratch_invite.png","../assets/scratch/scratch_card_90.png","../assets/scratch/scratch_card_96.png","../assets/scratch/scratch_card_94.png","../assets/scratch/scratch_card_98.png","../assets/scratch/scratch_user1.png","../assets/scratch/scratch_card_bg.png","../assets/scratch/scratch_card_92.png","../assets/scratch/scratch_user2.png","../assets/scratch/scratch_mask.png"]}
\ No newline at end of file

egret/resource/TextureMerger/scratchprize.tmproject

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

egret/resource/TextureMerger/scratchrulepanel.tmproject

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

egret/resource/TextureMerger/share3.tmproject

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

egret/resource/TextureMerger/sharecodepanel.tmproject

+<<<<<<< HEAD
 {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sharecodepanel","version":5,"files":["..\\assets\\shareCodePanel\\lijiqianwang.png","..\\assets\\shareCodePanel\\copyCodeBg.png","..\\assets\\shareCodePanel\\shareWxpyqIcon.png","..\\assets\\shareCodePanel\\shareWxIcon.png","..\\assets\\shareCodePanel\\shareQqIcon.png","..\\assets\\shareCodePanel\\shareWeiboIcon.png","..\\assets\\shareCodePanel\\zhantiegeihaoyou.png"]}
+=======
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sharecodepanel","version":5,"files":["../assets/shareCodePanel/lijiqianwang.png","../assets/shareCodePanel/copyCodeBg.png","../assets/shareCodePanel/shareWxpyqIcon.png","../assets/shareCodePanel/shareWxIcon.png","../assets/shareCodePanel/shareQqIcon.png","../assets/shareCodePanel/shareWeiboIcon.png","../assets/shareCodePanel/zhantiegeihaoyou.png"]}
+>>>>>>> cc335fd429a254bc0a7d0e0a972062841c38abeb

egret/resource/TextureMerger/shop.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"shop","version":5,"files":["..\\assets\\shop\\shopbtn1.png","..\\assets\\shop\\道具商城.png","..\\assets\\shop\\按钮 副本.png","..\\assets\\shop\\shop_quan_bg.png","..\\assets\\shop\\shop_item3_bg.png","..\\assets\\shop\\shop_item1_bg.png","..\\assets\\shop\\shop_bg2.png","..\\assets\\shop\\shop_bg1.png","..\\assets\\shop\\shop_item2_bg.png","..\\assets\\shop\\去充值.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"shop","version":5,"files":["../assets/shop/shopbtn1.png","../assets/shop/道具商城.png","../assets/shop/按钮 副本.png","../assets/shop/shop_quan_bg.png","../assets/shop/shop_item3_bg.png","../assets/shop/shop_item1_bg.png","../assets/shop/shop_bg2.png","../assets/shop/shop_bg1.png","../assets/shop/shop_item2_bg.png","../assets/shop/去充值.png"]}
\ No newline at end of file

egret/resource/TextureMerger/shoptip.tmproject

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

egret/resource/TextureMerger/sign.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sign","version":5,"files":["..\\assets\\sign\\signitem.png","..\\assets\\sign\\signicon6.png","..\\assets\\sign\\signicon5.png","..\\assets\\sign\\signicon4.png","..\\assets\\sign\\signicon3.png","..\\assets\\sign\\signicon2.png","..\\assets\\sign\\signicon_blood.png","..\\assets\\sign\\signbtn4.png","..\\assets\\sign\\signbtn3.png","..\\assets\\sign\\signbtn2.png","..\\assets\\sign\\signbtn1.png","..\\assets\\sign\\signbg.png","..\\assets\\sign\\sign_quan88.png","..\\assets\\sign\\sign_quan8.png","..\\assets\\sign\\sign_quan58.png","..\\assets\\sign\\sign_quan38.png","..\\assets\\sign\\sign_quan28.png","..\\assets\\sign\\sign_quan16.png","..\\assets\\sign\\sign_quan15.png","..\\assets\\sign\\sign_quan12.png","..\\assets\\sign\\sign_line2.png","..\\assets\\sign\\sign_line.png","..\\assets\\sign\\sign_light.png","..\\assets\\sign\\sign_icon1.png","..\\assets\\sign\\sign_quan10.png","..\\assets\\sign\\sign_quan23.png","..\\assets\\sign\\sign_quan36.png","..\\assets\\sign\\sign_quan25.png","..\\assets\\sign\\sign_quan35.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sign","version":5,"files":["../assets/sign/signitem.png","../assets/sign/signicon6.png","../assets/sign/signicon5.png","../assets/sign/signicon4.png","../assets/sign/signicon3.png","../assets/sign/signicon2.png","../assets/sign/signicon_blood.png","../assets/sign/signbtn4.png","../assets/sign/signbtn3.png","../assets/sign/signbtn2.png","../assets/sign/signbtn1.png","../assets/sign/signbg.png","../assets/sign/sign_quan88.png","../assets/sign/sign_quan8.png","../assets/sign/sign_quan58.png","../assets/sign/sign_quan38.png","../assets/sign/sign_quan28.png","../assets/sign/sign_quan16.png","../assets/sign/sign_quan15.png","../assets/sign/sign_quan12.png","../assets/sign/sign_line2.png","../assets/sign/sign_line.png","../assets/sign/sign_light.png","../assets/sign/sign_icon1.png","../assets/sign/sign_quan10.png","../assets/sign/sign_quan23.png","../assets/sign/sign_quan36.png","../assets/sign/sign_quan25.png","../assets/sign/sign_quan35.png"]}
\ No newline at end of file

egret/resource/TextureMerger/signprize.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"signprize","version":5,"files":["..\\assets\\signprize\\singprizebg.png","..\\assets\\signprize\\singprize体力.png","..\\assets\\signprize\\signprize元宝.png","..\\assets\\signprize\\signprize_numsbg.png","..\\assets\\signprize\\signprize_btn.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"signprize","version":5,"files":["../assets/signprize/singprizebg.png","../assets/signprize/singprize体力.png","../assets/signprize/signprize元宝.png","../assets/signprize/signprize_numsbg.png","../assets/signprize/signprize_btn.png"]}
\ No newline at end of file

egret/resource/TextureMerger/start.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"start","version":5,"files":["..\\assets\\startScene\\mask3.png","..\\assets\\startScene\\mask2.png","..\\assets\\startScene\\mask.png","..\\assets\\startScene\\loadingbg.png","..\\assets\\startScene\\头顶树丛.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"start","version":5,"files":["../assets/startScene/mask3.png","../assets/startScene/mask2.png","../assets/startScene/mask.png","../assets/startScene/loadingbg.png","../assets/startScene/头顶树丛.png"]}
\ No newline at end of file

egret/resource/TextureMerger/startpanel.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"startpanel","version":5,"files":["..\\assets\\startpanel2\\startpanel通关条件.png","..\\assets\\startpanel2\\startpanel数量.png","..\\assets\\startpanel2\\startpanel数量 副本 3.png","..\\assets\\startpanel2\\startpanel目标33.png","..\\assets\\startpanel2\\startpanel目标3.png","..\\assets\\startpanel2\\startpanel按钮.png","..\\assets\\startpanel2\\startpanel_icon3.png","..\\assets\\startpanel2\\startpanel_icon2.png","..\\assets\\startpanel2\\startpanel_icon1.png","..\\assets\\startpanel2\\startpanel_icon.png","..\\assets\\startpanel2\\startpanel_ele9.png","..\\assets\\startpanel2\\startpanel_ele8.png","..\\assets\\startpanel2\\startpanel_ele7.png","..\\assets\\startpanel2\\startpanel_ele6.png","..\\assets\\startpanel2\\startpanel_ele5.png","..\\assets\\startpanel2\\startpanel_ele4.png","..\\assets\\startpanel2\\startpanel_ele3.png","..\\assets\\startpanel2\\startpanel_ele2.png","..\\assets\\startpanel2\\startpanel_ele1.png","..\\assets\\startpanel2\\startpanel_ele0.png","..\\assets\\startpanel2\\startpanel_block2.png","..\\assets\\startpanel2\\startpanel_bg2.png","..\\assets\\startpanel2\\startpanel_avatar.png","..\\assets\\startpanel2\\startpanel_ele10.png","..\\assets\\startpanel2\\startpanel_numsbg.png","..\\assets\\startpanel2\\startpanel_ele27.png","..\\assets\\startpanel2\\startpanel_ele26.png","..\\assets\\startpanel2\\startpanel_ele25.png","..\\assets\\startpanel2\\startpanel_ele24.png","..\\assets\\startpanel2\\startpanel_ele23.png","..\\assets\\startpanel2\\startpanel_ele22.png","..\\assets\\startpanel2\\startpanel_ele34.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"startpanel","version":5,"files":["../assets/startpanel2/startpanel通关条件.png","../assets/startpanel2/startpanel数量.png","../assets/startpanel2/startpanel数量 副本 3.png","../assets/startpanel2/startpanel目标33.png","../assets/startpanel2/startpanel目标3.png","../assets/startpanel2/startpanel按钮.png","../assets/startpanel2/startpanel_icon3.png","../assets/startpanel2/startpanel_icon2.png","../assets/startpanel2/startpanel_icon1.png","../assets/startpanel2/startpanel_icon.png","../assets/startpanel2/startpanel_ele9.png","../assets/startpanel2/startpanel_ele8.png","../assets/startpanel2/startpanel_ele7.png","../assets/startpanel2/startpanel_ele6.png","../assets/startpanel2/startpanel_ele5.png","../assets/startpanel2/startpanel_ele4.png","../assets/startpanel2/startpanel_ele3.png","../assets/startpanel2/startpanel_ele2.png","../assets/startpanel2/startpanel_ele1.png","../assets/startpanel2/startpanel_ele0.png","../assets/startpanel2/startpanel_block2.png","../assets/startpanel2/startpanel_bg2.png","../assets/startpanel2/startpanel_avatar.png","../assets/startpanel2/startpanel_ele10.png","../assets/startpanel2/startpanel_numsbg.png","../assets/startpanel2/startpanel_ele27.png","../assets/startpanel2/startpanel_ele26.png","../assets/startpanel2/startpanel_ele25.png","../assets/startpanel2/startpanel_ele24.png","../assets/startpanel2/startpanel_ele23.png","../assets/startpanel2/startpanel_ele22.png","../assets/startpanel2/startpanel_ele34.png"]}
\ No newline at end of file

egret/resource/TextureMerger/taskcenter.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"taskcenter","version":5,"files":["..\\assets\\TaskCenterPanel\\TaskCenter_getPrizeBtn.png","..\\assets\\TaskCenterPanel\\TaskCenter_goTaskBtn.png","..\\assets\\TaskCenterPanel\\TaskCenter_bg.png","..\\assets\\TaskCenterPanel\\TaskCenter_taskBg.png","..\\assets\\TaskCenterPanel\\TaskCenter_doneBtn.png","..\\assets\\TaskCenterPanel\\TaskCenter_btn.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"taskcenter","version":5,"files":["../assets/TaskCenterPanel/TaskCenter_getPrizeBtn.png","../assets/TaskCenterPanel/TaskCenter_goTaskBtn.png","../assets/TaskCenterPanel/TaskCenter_bg.png","../assets/TaskCenterPanel/TaskCenter_taskBg.png","../assets/TaskCenterPanel/TaskCenter_doneBtn.png","../assets/TaskCenterPanel/TaskCenter_btn.png"]}
\ No newline at end of file

egret/resource/TextureMerger/taskcenternoprize.tmproject

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

egret/resource/TextureMerger/taskcenterprize.tmproject

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

egret/resource/TextureMerger/turnrule.tmproject

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

egret/resource/TextureMerger/turntable.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"turntable","version":5,"files":["..\\assets\\turntable\\turnable_icon1.png","..\\assets\\turntable\\turnable_icon2.png","..\\assets\\turntable\\turnable_icon3.png","..\\assets\\turntable\\turntable_bg.png","..\\assets\\turntable\\turntable_panel.png","..\\assets\\turntable\\turntable_rulebtn.png","..\\assets\\turntable\\turntable_startbtn.png","..\\assets\\turntable\\turntable_oupon.png","..\\assets\\turntable\\turntable_prop.png","..\\assets\\turntable\\turntable_scratch.png","..\\assets\\turntable\\turntable_thanks.png","..\\assets\\turntable\\turntable_wealth.png","..\\assets\\turntable\\turntable_gameTime.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"turntable","version":5,"files":["../assets/turntable/turnable_icon1.png","../assets/turntable/turnable_icon2.png","../assets/turntable/turnable_icon3.png","../assets/turntable/turntable_bg.png","../assets/turntable/turntable_panel.png","../assets/turntable/turntable_rulebtn.png","../assets/turntable/turntable_startbtn.png","../assets/turntable/turntable_oupon.png","../assets/turntable/turntable_prop.png","../assets/turntable/turntable_scratch.png","../assets/turntable/turntable_thanks.png","../assets/turntable/turntable_wealth.png","../assets/turntable/turntable_gameTime.png"]}
\ No newline at end of file

egret/resource/TextureMerger/turntablenoprize.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"turntablenoprize","version":5,"files":["..\\assets\\turnnoprize\\turnnoprize再来一次.png","..\\assets\\turnnoprize\\turnnoprize离奖励只差一毫米！ 再来一次吧！.png","..\\assets\\turnnoprize\\turnnoprize奖励溜走了，再试一次吧！.png","..\\assets\\turnnoprize\\turnnoprize继续闯关.png","..\\assets\\turnnoprize\\turnnoprize换个姿势再来一次！.png","..\\assets\\turnnoprize\\turnnoprizebg.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"turntablenoprize","version":5,"files":["../assets/turnnoprize/turnnoprize再来一次.png","../assets/turnnoprize/turnnoprize离奖励只差一毫米！ 再来一次吧！.png","../assets/turnnoprize/turnnoprize奖励溜走了，再试一次吧！.png","../assets/turnnoprize/turnnoprize继续闯关.png","../assets/turnnoprize/turnnoprize换个姿势再来一次！.png","../assets/turnnoprize/turnnoprizebg.png"]}
\ No newline at end of file

egret/resource/TextureMerger/turntableprize.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"turntableprize","version":5,"files":["..\\assets\\turntableprize\\turnprize_icon1.png","..\\assets\\turntableprize\\turnprize_icon2.png","..\\assets\\turntableprize\\turnprize_icon3.png","..\\assets\\turntableprize\\turprizebg.png","..\\assets\\turntableprize\\turprize继续闯关按钮.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"turntableprize","version":5,"files":["../assets/turntableprize/turnprize_icon1.png","../assets/turntableprize/turnprize_icon2.png","../assets/turntableprize/turnprize_icon3.png","../assets/turntableprize/turprizebg.png","../assets/turntableprize/turprize继续闯关按钮.png"]}
\ No newline at end of file

egret/resource/TextureMerger/turntableprize2.tmproject

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

egret/resource/assets/mc/honeymc.json

+{"file":"honeymc.png","frames":{
+"合成 4_00013":{"x":1328,"y":1004,"w":341,"h":322,"offX":88,"offY":99,"sourceW":500,"sourceH":500},
+"合成 4_00012":{"x":502,"y":1004,"w":500,"h":500,"offX":0,"offY":0,"sourceW":500,"sourceH":500},
+"合成 4_00011":{"x":0,"y":1004,"w":500,"h":500,"offX":0,"offY":0,"sourceW":500,"sourceH":500},
+"合成 4_00010":{"x":1506,"y":502,"w":500,"h":500,"offX":0,"offY":0,"sourceW":500,"sourceH":500},
+"合成 4_00009":{"x":1004,"y":502,"w":500,"h":500,"offX":0,"offY":0,"sourceW":500,"sourceH":500},
+"合成 4_00008":{"x":502,"y":502,"w":500,"h":500,"offX":0,"offY":0,"sourceW":500,"sourceH":500},
+"合成 4_00007":{"x":0,"y":502,"w":500,"h":500,"offX":0,"offY":0,"sourceW":500,"sourceH":500},
+"合成 4_00006":{"x":1506,"y":0,"w":500,"h":500,"offX":0,"offY":0,"sourceW":500,"sourceH":500},
+"合成 4_00005":{"x":1004,"y":0,"w":500,"h":500,"offX":0,"offY":0,"sourceW":500,"sourceH":500},
+"合成 4_00004":{"x":502,"y":0,"w":500,"h":500,"offX":0,"offY":0,"sourceW":500,"sourceH":500},
+"合成 4_00003":{"x":0,"y":0,"w":500,"h":500,"offX":0,"offY":0,"sourceW":500,"sourceH":500},
+"合成 4_00002":{"x":1004,"y":1004,"w":322,"h":500,"offX":91,"offY":0,"sourceW":500,"sourceH":500},
+"合成 4_00001":{"x":1671,"y":1004,"w":47,"h":95,"offX":227,"offY":215,"sourceW":500,"sourceH":500}}}
\ No newline at end of file

egret/resource/default.res.json

@@ -235,6 +235,10 @@
 		{
 			"keys": "lijiqianwang_png,copyCodeBg_png,shareWxpyqIcon_png,shareWxIcon_png,shareQqIcon_png,shareWeiboIcon_png,zhantiegeihaoyou_png",
 			"name": "sharecodepanel"
+		},
+		{
+			"name": "preload",
+			"keys": "honeymc_json"
 		}
 	],
 	"resources": [
@@ -4542,6 +4546,12 @@
 			"url": "assets/shareCodePanel/zhantiegeihaoyou.png",
 			"type": "image",
 			"name": "zhantiegeihaoyou_png"
+		},
+		{
+			"name": "honeymc_json",
+			"type": "sheet",
+			"url": "assets/mc/honeymc.json",
+			"subkeys": "合成 4_00013,合成 4_00012,合成 4_00011,合成 4_00010,合成 4_00009,合成 4_00008,合成 4_00007,合成 4_00006,合成 4_00005,合成 4_00004,合成 4_00003,合成 4_00002,合成 4_00001"
 		}
 	]
 }
\ No newline at end of file

egret/scripts/MyExmlPlugin.ts

@@ -8,6 +8,7 @@ import { ExmlPlugin2 } from "./ExmlPlugin2";
 export class MyExmlPlugin extends ExmlPlugin2 implements plugins.Command {
     async onFile(file: plugins.File) {
         const excludes = [
+            'honeymc.png',
             'candydiebg.png',
             'monsterState.png',
             'candysub.png',

egret/src/SAMap.ts

@@ -9,11 +9,13 @@ export default {
     '33': ['bingoMapIndex', 'bingoInvite'],
     '67': ['bingoMapIndex', 'bingoCoin'],
     '62': ['bingoMapIndex', 'bingoGetCoin'],
-    '77': ['bingoMapIndex', 'bingoRedBattle'],
+    '77': ['bingoMapIndex', 'bingoRedBoom'],
     '57': ['bingoMapIndex', 'bingoRedPacket'],
-    '74': ['bingoMapIndex', 'bingoRedBoom'],
+    '74': ['bingoMapIndex', 'bingoFindRed'],
     '43': ['bingoMapIndex', 'bingoLottery'],
     '49': ['bingoMapIndex', 'bingoGetRed'],
+    '75': ['bingoMapIndex', 'bingoRedBoomCfm'],
+    '76': ['bingoMapIndex', 'xxxx'],
 
     '3': ['bingoDialog', 'bingoLifeBuy'],
     '4': ['bingoDialog', 'bingoLifeAsk'],

egret/src/effect/createHoneyBombAni.ts

+import MovieClip from "../movieclip/MovieClip";
+import { getEffectFramesStr } from "./createEffect1";
+
+export const createHoneyBombAni = async (x, y, p) => {
+    const spritesheet = await RES.getResAsync('honeymc_json');
+    const list = getEffectFramesStr('合成 4_000', 1, 13);
+
+    const movieclip = new MovieClip({
+        spritesheet: spritesheet,
+        frameInterval: 2,
+        frames: list,
+        position: [x, y],
+        scale: 1,
+        anchor: [.5, .5],
+        loop: false
+    });
+    p.addChild(movieclip);
+    movieclip.once(egret.Event.COMPLETE, () => {
+        if (movieclip.parent)
+            movieclip.parent.removeChild(movieclip);
+
+    }, this)
+}
\ No newline at end of file

egret/src/effect/createHoneyBubbleAni.ts

+import getResPath from "../../libs/new_tc/getResPath";
+import { loadSvga } from "../loadSvga";
+
+export const createHoneyBubbleAni = async (x, y, p) => {
+    const movieclip: any = await loadSvga(getResPath() + 'resource/assets/svgas/honeypot_bubble.svga');
+    p.addChild(movieclip);
+    movieclip.anchorOffsetX= 60;
+    movieclip.anchorOffsetY= 60;
+    movieclip.x = x;
+    movieclip.y = y;
+    movieclip.once(egret.Event.COMPLETE, () => {
+        if (movieclip.parent)
+            movieclip.parent.removeChild(movieclip);
+    }, this);
+}
\ No newline at end of file

egret/src/effect/createHoneyDisAni.ts

+import getResPath from "../../libs/new_tc/getResPath";
+import { loadSvga } from "../loadSvga";
+
+export const createHoneyDisAni = async (x, y, p) => {
+    const movieclip: any = await loadSvga(getResPath() + 'resource/assets/svgas/honeypot_dispear.svga');
+    p.addChild(movieclip);
+    movieclip.anchorOffsetX= 150;
+    movieclip.anchorOffsetY= 150;
+    movieclip.x = x;
+    movieclip.y = y;
+    movieclip.scaleX=movieclip.scaleY=0.5;
+    movieclip.once(egret.Event.COMPLETE, () => {
+        if (movieclip.parent)
+            movieclip.parent.removeChild(movieclip);
+    }, this);
+}
\ No newline at end of file

egret/src/effect/createHoneyPotStatusAni.ts

+import getResPath from "../../libs/new_tc/getResPath";
+import { loadSvga } from "../loadSvga";
+
+export const createHoneyPotStatusAni = async (x, y, p) => {
+    const movieclip: any = await loadSvga(getResPath() + 'resource/assets/svgas/honeypot_change.svga');
+    p.addChild(movieclip);
+    movieclip.anchorOffsetX= 150;
+    movieclip.anchorOffsetY= 150;
+    movieclip.x = x;
+    movieclip.y = y;
+    movieclip.once(egret.Event.COMPLETE, () => {
+        if (movieclip.parent)
+            movieclip.parent.removeChild(movieclip);
+    }, this);
+}
\ No newline at end of file

egret/src/mainScene/MainScene.ts

@@ -97,6 +97,7 @@ import doFishAI from './doFishAI';
 import doHoneyPotAI from './doHoneyPotAI';
 import doMonsterAI from './doMonsterAI';
 import jellyMonsterAI from './jellyMonsterAI';
+import { createHoneyDisAni } from '../effect/createHoneyDisAni';
 
 const aniClass = {
     "BoomAni": BoomAni,
@@ -158,6 +159,20 @@ export default class MainScene extends Scene {
         return 'Main2'
     }
 
+    gm=()=>{
+        var json = {};
+        //分数
+        json[1] = 9999999;
+        if (this.passElements) {
+            for (var m = 0; m < this.chapterData.passTarget.elements.length; m++) {
+                var element: ElementTargetData = this.chapterData.passTarget.elements[m];
+                json[submitTran[element.type]] = element.count;
+            }
+        }
+        var strJson = JSON.stringify(json)
+        this.submit(strJson)
+    }
+
     //关卡数据
     chapterData: ChapterData;
     //关数
@@ -284,6 +299,7 @@ export default class MainScene extends Scene {
 
     async start(data) {
         super.start();
+        window['gm'] =this.gm;
         //第几关
         this.chapter = (data && data.chapter) ? data.chapter : 1;
         // this.chapter = 24;
@@ -2415,6 +2431,7 @@ export default class MainScene extends Scene {
             }
             else if (ele.hasState(StateType.HONEY)) {
                 ele.setState(StateType.HONEY, false);
+                createHoneyDisAni(ele.x,ele.y,this)
                 this.goElementTarget(ElementType.HONEY, [ele.x, ele.y]);
             }
             else if (ele.monster) {//如果是独眼怪,

egret/src/mainScene/doHoneyPotAI.ts

@@ -9,6 +9,10 @@ import wait from "../../libs/new_tc/wait";
 import { EffectType } from "../something/enum/EffectType";
 import { EggBrokenAni } from "../something/anis/EggBrokenAni";
 import { StateType } from "../something/enum/StateType";
+import { createHoneyBombAni } from "../effect/createHoneyBombAni";
+import HoneyPotElement from "../something/class/HoneyPotElement";
+import { HoneyPotShootAni } from "../something/anis/HoneyPotShootAni";
+import { createHoneyBubbleAni } from "../effect/createHoneyBubbleAni";
 /**
  * 罐子爆炸
  */
@@ -52,15 +56,32 @@ export default async (thisObj: MainScene) => {
         foundsResult[index] = founds;
     }
 
+    if (activeElements.length > 0) {
+        activeElements.forEach((ele:HoneyPotElement) => {
+            ele.fixStatus();
+            createHoneyBombAni(ele.x, ele.y, thisObj)
+        });
+        await wait(400);
+
+        activeElements.forEach((ele: HoneyPotElement) => {
+            ele.honeyPot.playAni();
+        });
+
+        await wait(1200);
+    }
+
     const playEffect = async (index) => {
         const activeEle = activeElements[index];
         let founds = foundsResult[index];
         founds.forEach((ele) => {
-            let bonusShootAni: MonsterShootAni = Pool.takeOut(RecoverName.MONSTER_SHOOT_ANI);
+            let bonusShootAni: HoneyPotShootAni = Pool.takeOut(RecoverName.MONSTER_SHOOT_ANI);
             if (!bonusShootAni)
-                bonusShootAni = new MonsterShootAni();
+                bonusShootAni = new HoneyPotShootAni();
             var r = Tool.getForwardRotation([activeEle.x, activeEle.y], [ele.x, ele.y])
             bonusShootAni.play(r * 180 / Math.PI, [activeEle.x, activeEle.y], [ele.x, ele.y], () => { });
+            wait(1000).then(()=>{
+                createHoneyBubbleAni(ele.x,ele.y,thisObj);
+            });
             thisObj.addChild(bonusShootAni);
         });
     };
@@ -68,8 +89,10 @@ export default async (thisObj: MainScene) => {
         playEffect(index);
     }
 
-    if (genarates.length > 0)
-        await wait(500);
+    if (genarates.length > 0) {
+        await wait(1300);
+    }
+
     for (let index = 0; index < foundsResult.length; index++) {
         const founds = foundsResult[index];
         founds.forEach(ele => {

egret/src/mapScene/MapScene.ts

@@ -399,6 +399,7 @@ export default class MapScene extends Scene {
             RES.getResAsync('candydie4_json');
             RES.getResAsync('candysub_json');
             RES.getResAsync('monsterState_json');
+            RES.getResAsync('honeymc_json');
             RES.getResAsync('candydiebg_json');
             RES.getResAsync('redrainbg_jpg');
 
@@ -416,6 +417,13 @@ export default class MapScene extends Scene {
             loadSvga(getResPath() + 'resource/assets/svgas/turnprize.svga');
             loadSvga(getResPath() + 'resource/assets/svgas/sprize.svga');
             loadSvga(getResPath() + 'resource/assets/svgas/monster.svga');
+            loadSvga(getResPath() + 'resource/assets/svgas/honeypot1.svga');
+            loadSvga(getResPath() + 'resource/assets/svgas/honeypot2.svga');
+            loadSvga(getResPath() + 'resource/assets/svgas/honeypot3.svga');
+
+            loadSvga(getResPath() + 'resource/assets/svgas/honeypot_dispear.svga');
+            loadSvga(getResPath() + 'resource/assets/svgas/honeypot_change.svga');
+            loadSvga(getResPath() + 'resource/assets/svgas/honeypot_bubble.svga');
             // loadSvga(getResPath() + 'resource/assets/svgas/fireworks.svga');
 
             if (!window['development']) {

egret/src/panels/BloodPanel.ts

@@ -92,49 +92,22 @@ export default class BloodPanel extends Panel {
         }, 1);
     }
 
-    // onTapInvite() {
-
-    //     if(iswx()) {
-    //         getShareUrl(this.stage);
-    //     } else
-    //         showShare(1);
-    //     NetManager.ins.clickLog(getlogItem(4));
-    //     const data = getHomeData();
-    //     if(data.askForEnergy >= BloodPanel.MAX) {
-    //         showToast('对不起，索要体力的机会已经用完了~');
-    //         return;
-    //     }
-    //     this['inviteBtn'].enabled = false;
-    //     NetManager.ins.hc_askForEnergy((success) => {
-    //         this['inviteBtn'].enabled = true;
-    //         if(success) {
-    //         }
-    //         NetManager.ins.hc_home(() => {
-    //             this.updateData();
-    //             updateMainTimer();
-    //             SceneCtrl.instance.updateScene();
-    //         }, window['collectRuleId']);
-    //         wait(2000).then(() => {
-    //             showToast('分享成功~');
-    //         });
-    //     })
-    // }
-
-    //0224修改
     onTapInvite() {
+
+        if(iswx()) {
+            getShareUrl(this.stage);
+        } else
+            showShare(1);
         NetManager.ins.clickLog(getlogItem(4));
         const data = getHomeData();
-        if (iswx()) {
-            //微信流程不变
-            getShareUrl(this.stage);
-            if (data.askForEnergy >= BloodPanel.MAX) {
+        if(data.askForEnergy >= BloodPanel.MAX) {
             showToast('对不起，索要体力的机会已经用完了~');
             return;
         }
         this['inviteBtn'].enabled = false;
         NetManager.ins.hc_askForEnergy((success) => {
             this['inviteBtn'].enabled = true;
-                if (success) {
+            if(success) {
             }
             NetManager.ins.hc_home(() => {
                 this.updateData();
@@ -145,55 +118,82 @@ export default class BloodPanel extends Panel {
                 showToast('分享成功~');
             });
         })
-        } else {
-            if (window["test0228"]) {
-                //如果之前没获取到，就再发接口，几率很低
-                if (!DataManager.ins.getData("getUserShareCode")) {
-                    this.touchEnabled = false
-                    this.touchChildren = false
-                    NetManager.ins.getUserShareCode((s, res) => {
-                        this.touchEnabled = true
-                        this.touchChildren = true
-                        if (!s) {
-                            showToast("获取分享信息失败，请重试")
-                        } else {
-                            showShareCodePanel(
-                                CodeChannels.AddBlood,
-                                res.data,
-                                () => { wait(2000).then(() => { showToast('分享成功'); }); }
-                            )
-                        }
-                    })
-                } else {
-                    showShareCodePanel(
-                        CodeChannels.AddBlood,
-                        DataManager.ins.getData("getUserShareCode").data,
-                        () => { wait(2000).then(() => { showToast('分享成功'); }); }
-                    );
-                }
-            } else {
-                showShareCodePanel(CodeChannels.AddBlood, null, () => {
-                    if (data.askForEnergy >= BloodPanel.MAX) {
-                        wait(2000).then(() => {
-                            showToast('对不起，索要体力的机会已经用完了~');
-                        });
-                    } else {
-                        NetManager.ins.hc_askForEnergy((success) => {
-                            NetManager.ins.hc_home(() => {
-                                this.updateData();
-                                updateMainTimer();
-                                SceneCtrl.instance.updateScene();
-                            }, window['collectRuleId']);
-                            wait(2000).then(() => {
-                                showToast('分享成功');
-                            });
-                        })
-                    }
-                })
-            }
-        }
     }
 
+    //0224修改
+    // onTapInvite() {
+    //     NetManager.ins.clickLog(getlogItem(4));
+    //     const data = getHomeData();
+    //     if (iswx()) {
+    //         //微信流程不变
+    //         getShareUrl(this.stage);
+    //         if (data.askForEnergy >= BloodPanel.MAX) {
+    //             showToast('对不起，索要体力的机会已经用完了~');
+    //             return;
+    //         }
+    //         this['inviteBtn'].enabled = false;
+    //         NetManager.ins.hc_askForEnergy((success) => {
+    //             this['inviteBtn'].enabled = true;
+    //             if (success) {
+    //             }
+    //             NetManager.ins.hc_home(() => {
+    //                 this.updateData();
+    //                 updateMainTimer();
+    //                 SceneCtrl.instance.updateScene();
+    //             }, window['collectRuleId']);
+    //             wait(2000).then(() => {
+    //                 showToast('分享成功~');
+    //             });
+    //         })
+    //     } else {
+    //         if (window["test0228"]) {
+    //             //如果之前没获取到，就再发接口，几率很低
+    //             if (!DataManager.ins.getData("getUserShareCode")) {
+    //                 this.touchEnabled = false
+    //                 this.touchChildren = false
+    //                 NetManager.ins.getUserShareCode((s, res) => {
+    //                     this.touchEnabled = true
+    //                     this.touchChildren = true
+    //                     if (!s) {
+    //                         showToast("获取分享信息失败，请重试")
+    //                     } else {
+    //                         showShareCodePanel(
+    //                             CodeChannels.AddBlood,
+    //                             res.data,
+    //                             () => { wait(2000).then(() => { showToast('分享成功'); }); }
+    //                         )
+    //                     }
+    //                 })
+    //             } else {
+    //                 showShareCodePanel(
+    //                     CodeChannels.AddBlood,
+    //                     DataManager.ins.getData("getUserShareCode").data,
+    //                     () => { wait(2000).then(() => { showToast('分享成功'); }); }
+    //                 );
+    //             }
+    //         } else {
+    //             showShareCodePanel(CodeChannels.AddBlood, null, () => {
+    //                 if (data.askForEnergy >= BloodPanel.MAX) {
+    //                     wait(2000).then(() => {
+    //                         showToast('对不起，索要体力的机会已经用完了~');
+    //                     });
+    //                 } else {
+    //                     NetManager.ins.hc_askForEnergy((success) => {
+    //                         NetManager.ins.hc_home(() => {
+    //                             this.updateData();
+    //                             updateMainTimer();
+    //                             SceneCtrl.instance.updateScene();
+    //                         }, window['collectRuleId']);
+    //                         wait(2000).then(() => {
+    //                             showToast('分享成功');
+    //                         });
+    //                     })
+    //                 }
+    //             })
+    //         }
+    //     }
+    // }
+
 
 
     protected get closeBtns(): eui.Button[] {

egret/src/panels/BloodPanel2.ts

@@ -88,50 +88,22 @@ export default class BloodPanel2 extends Panel {
         }, 1);
     }
 
-    // onTapInvite() {
-
-    //     if(iswx()) {
-    //         getShareUrl(this.stage);
-    //     } else
-    //         showShare(1);
-    //     NetManager.ins.clickLog(getlogItem(4));
-    //     const data = getHomeData();
-    //     if(data.askForEnergy >= BloodPanel.MAX) {
-    //         showToast('对不起，索要体力的机会已经用完了~');
-    //         return;
-    //     }
-    //     this['inviteBtn'].enabled = false;
-    //     NetManager.ins.hc_askForEnergy((success) => {
-    //         this['inviteBtn'].enabled = true;
-    //         if(success) {
-
-    //         }
-    //         NetManager.ins.hc_home(() => {
-    //             this.updateData();
-    //             updateMainTimer();
-    //             SceneCtrl.instance.updateScene();
-    //         }, window['collectRuleId']);
-    //         wait(2000).then(() => {
-    //             showToast('分享成功~');
-    //         });
-    //     })
-    // }
-
-    //0224修改
     onTapInvite() {
+
+        if(iswx()) {
+            getShareUrl(this.stage);
+        } else
+            showShare(1);
         NetManager.ins.clickLog(getlogItem(4));
         const data = getHomeData();
-        if (iswx()) {
-            getShareUrl(this.stage);
-            //原先微信流程不变
-            if (data.askForEnergy >= BloodPanel.MAX) {
+        if(data.askForEnergy >= BloodPanel.MAX) {
             showToast('对不起，索要体力的机会已经用完了~');
             return;
         }
         this['inviteBtn'].enabled = false;
         NetManager.ins.hc_askForEnergy((success) => {
             this['inviteBtn'].enabled = true;
-                if (success) {
+            if(success) {
 
             }
             NetManager.ins.hc_home(() => {
@@ -143,55 +115,83 @@ export default class BloodPanel2 extends Panel {
                 showToast('分享成功~');
             });
         })
-        } else {
-            if (window["test0228"]) {
-                //如果之前没获取到，就再发接口，几率很低
-                if (!DataManager.ins.getData("getUserShareCode")) {
-                    this.touchEnabled = false
-                    this.touchChildren = false
-                    NetManager.ins.getUserShareCode((s, res) => {
-                        this.touchEnabled = true
-                        this.touchChildren = true
-                        if (!s) {
-                            showToast("获取分享信息失败，请重试")
-                        } else {
-                            showShareCodePanel(
-                                CodeChannels.AddBlood,
-                                res.data,
-                                () => { wait(2000).then(() => { showToast('分享成功'); }); }
-                            )
-                        }
-                    })
-                } else {
-                    showShareCodePanel(
-                        CodeChannels.AddBlood,
-                        DataManager.ins.getData("getUserShareCode").data,
-                        () => { wait(2000).then(() => { showToast('分享成功'); }); }
-                    );
-                }
-            } else {
-                showShareCodePanel(CodeChannels.AddBlood, null, () => {
-                    if (data.askForEnergy >= BloodPanel.MAX) {
-                        wait(2000).then(() => {
-                            showToast('对不起，索要体力的机会已经用完了~');
-                        });
-                    } else {
-                        NetManager.ins.hc_askForEnergy((success) => {
-                            NetManager.ins.hc_home(() => {
-                                this.updateData();
-                                updateMainTimer();
-                                SceneCtrl.instance.updateScene();
-                            }, window['collectRuleId']);
-                            wait(2000).then(() => {
-                                showToast('分享成功');
-                            });
-                        })
-                    }
-                })
-            }
-        }
     }
 
+    //0224修改
+    // onTapInvite() {
+    //     NetManager.ins.clickLog(getlogItem(4));
+    //     const data = getHomeData();
+    //     if (iswx()) {
+    //         getShareUrl(this.stage);
+    //         //原先微信流程不变
+    //         if (data.askForEnergy >= BloodPanel.MAX) {
+    //             showToast('对不起，索要体力的机会已经用完了~');
+    //             return;
+    //         }
+    //         this['inviteBtn'].enabled = false;
+    //         NetManager.ins.hc_askForEnergy((success) => {
+    //             this['inviteBtn'].enabled = true;
+    //             if (success) {
+
+    //             }
+    //             NetManager.ins.hc_home(() => {
+    //                 this.updateData();
+    //                 updateMainTimer();
+    //                 SceneCtrl.instance.updateScene();
+    //             }, window['collectRuleId']);
+    //             wait(2000).then(() => {
+    //                 showToast('分享成功~');
+    //             });
+    //         })
+    //     } else {
+    //         if (window["test0228"]) {
+    //             //如果之前没获取到，就再发接口，几率很低
+    //             if (!DataManager.ins.getData("getUserShareCode")) {
+    //                 this.touchEnabled = false
+    //                 this.touchChildren = false
+    //                 NetManager.ins.getUserShareCode((s, res) => {
+    //                     this.touchEnabled = true
+    //                     this.touchChildren = true
+    //                     if (!s) {
+    //                         showToast("获取分享信息失败，请重试")
+    //                     } else {
+    //                         showShareCodePanel(
+    //                             CodeChannels.AddBlood,
+    //                             res.data,
+    //                             () => { wait(2000).then(() => { showToast('分享成功'); }); }
+    //                         )
+    //                     }
+    //                 })
+    //             } else {
+    //                 showShareCodePanel(
+    //                     CodeChannels.AddBlood,
+    //                     DataManager.ins.getData("getUserShareCode").data,
+    //                     () => { wait(2000).then(() => { showToast('分享成功'); }); }
+    //                 );
+    //             }
+    //         } else {
+    //             showShareCodePanel(CodeChannels.AddBlood, null, () => {
+    //                 if (data.askForEnergy >= BloodPanel.MAX) {
+    //                     wait(2000).then(() => {
+    //                         showToast('对不起，索要体力的机会已经用完了~');
+    //                     });
+    //                 } else {
+    //                     NetManager.ins.hc_askForEnergy((success) => {
+    //                         NetManager.ins.hc_home(() => {
+    //                             this.updateData();
+    //                             updateMainTimer();
+    //                             SceneCtrl.instance.updateScene();
+    //                         }, window['collectRuleId']);
+    //                         wait(2000).then(() => {
+    //                             showToast('分享成功');
+    //                         });
+    //                     })
+    //                 }
+    //             })
+    //         }
+    //     }
+    // }
+
     protected get closeBtns(): eui.Button[] {
         return [this['closeBtn']]
     }

egret/src/panels/InvitePanel.ts

@@ -130,9 +130,9 @@ export default class InvitePanel extends Panel {
                         window["invokeWX"]();
                     } else {//端内
                         this.wxShareTip.visible = false;
-                        // window["inviteShare"](shareCode);
+                        window["inviteShare"](shareCode);
                         //0224修改，去掉原先邀请逻辑，新增口令逻辑
-                        showShareCodePanel(CodeChannels.InvitePrize, shareCode)
+                        // showShareCodePanel(CodeChannels.InvitePrize, shareCode)
                     }
                 });
             }

egret/src/panels/ScratchPanel.ts

@@ -264,9 +264,9 @@ class ScratchItem extends eui.ItemRenderer {
                     window["invokeWX"]();
                 } else {//端内
                     this.data.wxShareTip.visible = false;
-                    // window["scratchShare"](code);
+                    window["scratchShare"](code);
                     //0224修改，去掉原先邀请逻辑，新增口令逻辑
-                    showShareCodePanel(CodeChannels.Scratch, code)
+                    // showShareCodePanel(CodeChannels.Scratch, code)
                 }
             }, this.data.scratchTaskId);
         }, this);

egret/src/panels/StartPanel.ts

@@ -91,70 +91,70 @@ export default class StartPanel extends Panel {
             if (homeData.askForEnergy) {
                 PanelCtrl.instance.show('blood2Panel');
             } else {
-                // if(iswx()) {
-                //     getShareUrl(this.stage);
-                // } else
-                //     showShare(1);
-                // NetManager.ins.hc_askForEnergy((success) => {
-                //     NetManager.ins.hc_home(() => {
-                //         SceneCtrl.instance.updateScene();
-                //     }, window['collectRuleId']);
-                //     wait(2000).then(() => {
-                //         showToast('分享成功~');
-                //     });
-                // })
-                //0224修改，微信环境不变
-                if (iswx()) {
+                if(iswx()) {
                     getShareUrl(this.stage);
-                    NetManager.ins.hc_askForEnergy((success) => {
-                        NetManager.ins.hc_home(() => {
-                            SceneCtrl.instance.updateScene();
-                        }, window['collectRuleId']);
-                        wait(2000).then(() => {
-                            showToast('分享成功~');
-                        });
-                    })
                 } else
-                // showShare(1);
-                {
-                    if (window["test0228"]) {
-                        //如果之前没获取到，就再发接口，几率很低
-                        if (!DataManager.ins.getData("getUserShareCode")) {
-                            this.touchEnabled = false
-                            this.touchChildren = false
-                            NetManager.ins.getUserShareCode((s, res) => {
-                                this.touchEnabled = true
-                                this.touchChildren = true
-                                if (!s) {
-                                    showToast("获取分享信息失败，请重试")
-                                } else {
-                                    showShareCodePanel(
-                                        CodeChannels.AddBlood,
-                                        res.data,
-                                        () => { wait(2000).then(() => { showToast('分享成功'); }); }
-                                    )
-                                }
-                            })
-                        } else {
-                            showShareCodePanel(
-                                CodeChannels.AddBlood,
-                                DataManager.ins.getData("getUserShareCode").data,
-                                () => { wait(2000).then(() => { showToast('分享成功'); }); }
-                            );
-                        }
-                    } else {
-                        showShareCodePanel(CodeChannels.AddBlood, null, () => {
+                    showShare(1);
                 NetManager.ins.hc_askForEnergy((success) => {
                     NetManager.ins.hc_home(() => {
                         SceneCtrl.instance.updateScene();
                     }, window['collectRuleId']);
                     wait(2000).then(() => {
-                                    showToast('分享成功');
+                        showToast('分享成功~');
                     });
                 })
-                        });
-                    }
-                }
+                //0224修改，微信环境不变
+                // if (iswx()) {
+                //     getShareUrl(this.stage);
+                //     NetManager.ins.hc_askForEnergy((success) => {
+                //         NetManager.ins.hc_home(() => {
+                //             SceneCtrl.instance.updateScene();
+                //         }, window['collectRuleId']);
+                //         wait(2000).then(() => {
+                //             showToast('分享成功~');
+                //         });
+                //     })
+                // } else
+                // // showShare(1);
+                // {
+                //     if (window["test0228"]) {
+                //         //如果之前没获取到，就再发接口，几率很低
+                //         if (!DataManager.ins.getData("getUserShareCode")) {
+                //             this.touchEnabled = false
+                //             this.touchChildren = false
+                //             NetManager.ins.getUserShareCode((s, res) => {
+                //                 this.touchEnabled = true
+                //                 this.touchChildren = true
+                //                 if (!s) {
+                //                     showToast("获取分享信息失败，请重试")
+                //                 } else {
+                //                     showShareCodePanel(
+                //                         CodeChannels.AddBlood,
+                //                         res.data,
+                //                         () => { wait(2000).then(() => { showToast('分享成功'); }); }
+                //                     )
+                //                 }
+                //             })
+                //         } else {
+                //             showShareCodePanel(
+                //                 CodeChannels.AddBlood,
+                //                 DataManager.ins.getData("getUserShareCode").data,
+                //                 () => { wait(2000).then(() => { showToast('分享成功'); }); }
+                //             );
+                //         }
+                //     } else {
+                //         showShareCodePanel(CodeChannels.AddBlood, null, () => {
+                //             NetManager.ins.hc_askForEnergy((success) => {
+                //                 NetManager.ins.hc_home(() => {
+                //                     SceneCtrl.instance.updateScene();
+                //                 }, window['collectRuleId']);
+                //                 wait(2000).then(() => {
+                //                     showToast('分享成功');
+                //                 });
+                //             })
+                //         });
+                //     }
+                // }
             }
             return;
         }

egret/src/something/anis/HoneyPotShootAni.ts

+import { RecoverName } from "../enum/RecoverName";
+import { Pool } from "../Pool";
+
+
+/**
+ * 需要回调的
+ * 手动修改this.shoot.rotation=
+ */
+export class HoneyPotShootAni extends egret.DisplayObjectContainer {
+    shoot: egret.Bitmap;
+    // imageAni: ImageAni
+    constructor() {
+        super()
+        var texture = RES.getRes("ele34_png")
+        this.shoot = new egret.Bitmap(texture);
+        this.shoot.anchorOffsetX = 74 / 2;
+        this.shoot.anchorOffsetY = 74 / 2;
+        this.addChild(this.shoot);
+    }
+
+    private reset(p: number[]) {
+        this.x = p[0];
+        this.y = p[1] - 30;
+    }
+
+    play(rotation: number, from: number[], p: number[], callback: Function) {
+        this.reset(from)
+        // this.shoot.rotation = rotation;
+        egret.Tween.get(this)
+            .set({ scaleX: 0, scaleY: 0 })
+            .to({ x: p[0], y: p[1], scaleX: 1, scaleY: 1 }, 700)
+            .to({ scaleX: 1.2, scaleY: 1.2 }, 400)
+            .to({ scaleX: 1, scaleY: 1 }, 200)
+            .call(() => {
+                //播放动效
+                callback();
+                if (this.parent) {
+                    this.parent.removeChild(this)
+                };
+                Pool.recover(RecoverName.HONEY_SHOOT_ANI, this)
+            })
+    }
+}
\ No newline at end of file

egret/src/something/anis/MonsterShootAni.ts

@@ -2,7 +2,7 @@ import { RecoverName } from "../enum/RecoverName";
 import { Pool } from "../Pool";
 
 
-export const monstShootAniDur: number=400;
+export const monstShootAniDur: number = 400;
 /**
  * 需要回调的
  * 手动修改this.shoot.rotation=
@@ -12,10 +12,10 @@ export class MonsterShootAni extends egret.DisplayObjectContainer {
     // imageAni: ImageAni
     constructor() {
         super()
-        var texture = RES.getRes("monster_shoot_png")
+        var texture = RES.getRes("ele34_png")
         this.shoot = new egret.Bitmap(texture);
-        this.shoot.anchorOffsetX = 87;
-        this.shoot.anchorOffsetY = 28 / 2;
+        this.shoot.anchorOffsetX = 74 / 2;
+        this.shoot.anchorOffsetY = 74 / 2;
         this.addChild(this.shoot);
     }
 
@@ -28,6 +28,7 @@ export class MonsterShootAni extends egret.DisplayObjectContainer {
         this.reset(from)
         this.shoot.rotation = rotation;
         egret.Tween.get(this)
+            
             .to({ x: p[0], y: p[1] }, monstShootAniDur)
             .call(() => {
                 callback();

egret/src/something/chapters/Chapter17.ts

@@ -30,7 +30,7 @@ export const Chapters17: ChapterData[] = [
    //429
    { baseElementTypes: [ 0, 1, 2, 3 ], bubbleProbability: 0, stepCount: 27, passTarget: { type: 1, elements: [ { type: 9, count: 69 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 0, 3, 3, 3, 3, 3, 0, 0, 0, 0, 3, 3, 3, 3, 3, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 6, 3, 3, 3, 3, 3, 6, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 6, 3, 3, 3, 3, 3, 6, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3 ], connectedLats: [], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 2, 2, 12, 1, 1, 1, 1, 1, 1, 1, 12, 2, 2, 1, 1, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, 1, 2, 2, 12, 1, 1, 1, 1, 1, 1, 1, 12, 2, 2, 9, 1, 9, 1, 9, 2, 2 ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 18, type: null }, { index: 19, type: null }, { index: 25, type: null }, { index: 26, type: null } ] } },
    //430
-   { baseElementTypes: [ 0, 1, 2, 4 ], bubbleProbability: 0, stepCount: 30, passTarget: { type: 1, elements: [ { type: 34, count: 15 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1 ], connectedLats: [ [ 5, 75 ], [ 13, 67 ], [ 30, 50 ], [ 29, 51 ], [ 37, 43 ], [ 45, 35 ] ], elements: [ 1, 1, 1, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 16, 1, 1, 1, 1, 1, 1, 1, 16, 1, 1, 1, 1, 1, 1, 1, 16, 1, 1, 1, 1, 1, 1, 1, 16, 1, 1, 1, 1, 1, 1, 1, 16, 1, 1, 1, 1, 1, 1, 1, 16, 1, 1, 1, 1, 1, 1, 1, 16, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 1, 1, 1, 1, 1 ], baseElements: [ 0, 0, 0, 0, 20, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 50, 0, 0, 0, 0, 0, 0, 12, 20, 10, 50, 0, 0 ], recycles: [], generateLats: [ { index: 0, type: null }, { index: 1, type: null }, { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 16, type: null }, { index: 24, type: null }, { index: 32, type: null }, { index: 40, type: null }, { index: 48, type: null }, { index: 56, type: null }, { index: 64, type: null } ] } }
+   { baseElementTypes: [ 0, 1, 2, 4 ], bubbleProbability: 0, stepCount: 35, passTarget: { type: 1, elements: [ { type: 34, count: 15 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1 ], connectedLats: [ [ 5, 75 ], [ 13, 67 ], [ 30, 50 ], [ 29, 51 ], [ 37, 43 ], [ 45, 35 ] ], elements: [ 1, 1, 1, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 16, 1, 1, 1, 1, 1, 1, 1, 16, 1, 1, 1, 1, 1, 1, 1, 16, 1, 1, 1, 1, 1, 1, 1, 16, 1, 1, 1, 1, 1, 1, 1, 16, 1, 1, 1, 1, 1, 1, 1, 16, 1, 1, 1, 1, 1, 1, 1, 16, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 1, 1, 1, 1, 1 ], baseElements: [ 0, 0, 0, 0, 20, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 50, 0, 0, 0, 0, 0, 0, 12, 20, 10, 50, 0, 0 ], recycles: [], generateLats: [ { index: 0, type: null }, { index: 1, type: null }, { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 16, type: null }, { index: 24, type: null }, { index: 32, type: null }, { index: 40, type: null }, { index: 48, type: null }, { index: 56, type: null }, { index: 64, type: null } ] } }
 ,
    //431
    { baseElementTypes: [ 0, 1, 2, 4 ], bubbleProbability: 0, stepCount: 25, passTarget: { type: 1, elements: [ { type: 9, count: 63 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 1, 0, 3, 3, 3, 3, 1, 1, 0, 3, 3, 3, 3, 3, 3, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 6, 0, 3, 3, 3, 3, 3, 3, 3, 6, 3, 3, 3, 3, 3, 3, 3, 3, 6, 3, 3, 3, 3, 3, 3, 3, 3, 6, 3, 0, 3, 3, 3, 3, 3, 3, 6, 3, 0, 0, 0, 3, 3, 3, 3, 6, 3, 0, 1, 1, 3, 3, 3, 3, 0, 1 ], connectedLats: [], elements: [
@@ -44,7 +44,18 @@ export const Chapters17: ChapterData[] = [
  1, 1, 9, 1, 9, 1, 9, 1, 1, 
 1, 1, 1, 1, 1, 1, 1, 1, 1 ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 0, type: null }, { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 7, type: null }, { index: 10, type: null }, { index: 25, type: null }, { index: 35, type: null }, { index: 73, type: null } ] } },
    //432
-   { baseElementTypes: [ 1, 2, 3, 4 ], bubbleProbability: 0, stepCount: 21, passTarget: { type: 1, elements: [ { type: 34, count: 15 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0 ], connectedLats: [], elements: [ 1, 1, 1, 16, 1, 16, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 2, 2, 1, 2, 2, 1, 1, 1, 2, 2, 2, 1, 2, 2, 2, 1, 2, 2, 2, 2, 1, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 16, 1, 1, 1, 1 ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 20, type: null }, { index: 24, type: null }, { index: 28, type: null }, { index: 34, type: null }, { index: 36, type: null }, { index: 44, type: null } ] } },
+   { baseElementTypes: [ 1, 2, 3, 4 ], bubbleProbability: 0, stepCount: 23, passTarget: { type: 1, elements: [ { type: 34, count: 20 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0 ], connectedLats: [], elements: [
+ 1, 1, 1, 16, 1, 16, 1, 1, 1,
+ 1, 1, 1, 2, 1, 2, 1, 1, 1,
+ 1, 1, 2, 2, 1, 2, 2, 1, 1,
+ 1, 2, 2, 2, 1, 2, 2, 2, 1,
+ 2, 2, 2, 2, 1, 2, 2, 2, 2,
+ 1, 1, 1, 1, 1, 1, 1, 16, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 16, 1, 1, 1, 1
+ ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 20, type: null }, { index: 24, type: null }, { index: 28, type: null }, { index: 34, type: null }, { index: 36, type: null }, { index: 44, type: null } ] } }
+,
    //433
    { baseElementTypes: [ 0, 1, 3, 4 ], bubbleProbability: 10, stepCount: 27, passTarget: { type: 1, elements: [ { type: 9, count: 59 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 3, 3, 3, 3, 3, 3, 3, 0, 0, 3, 3, 3, 3, 3, 3, 3, 0, 2, 0, 3, 3, 3, 3, 3, 0, 2, 0, 0, 3, 3, 3, 3, 3, 0, 0, 0, 0, 3, 3, 3, 3, 3, 0, 0, 5, 0, 3, 3, 3, 3, 3, 0, 5, 0, 3, 3, 3, 3, 3, 3, 3, 0, 0, 3, 3, 3, 3, 3, 3, 3, 0, 0, 3, 3, 3, 3, 3, 3, 3, 0 ], connectedLats: [ [ 18, 45 ], [ 26, 53 ] ], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 2, 1, 1, 2, 2, 1, 1, 1, 2, 2, 1, 1, 2, 2, 1, 1, 1, 2, 2, 1 ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 1, type: null }, { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 7, type: null }, { index: 18, type: null }, { index: 26, type: null } ] } },
    //434
@@ -75,19 +86,39 @@ export const Chapters17: ChapterData[] = [
    //436
    { baseElementTypes: [ 1, 0, 3, 4 ], bubbleProbability: 0, stepCount: 26, passTarget: { type: 1, elements: [ { type: 22, count: 20 }, { type: 23, count: 20 }, { type: 25, count: 20 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ], connectedLats: [ [ 12, 30 ], [ 14, 32 ], [ 13, 31 ] ], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 13, 13, 13, 13, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 1, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 1, 1, 1, 1, 1, 1, 2, 13, 2, 1, 1, 1 ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 0, type: null }, { index: 1, type: null }, { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 7, type: null }, { index: 8, type: null } ] } },
    //437
-   { baseElementTypes: [ 1, 2, 3, 4 ], bubbleProbability: 0, stepCount: 29, passTarget: { type: 1, elements: [ { type: 34, count: 30 }, { type: 5, count: 31 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1 ], connectedLats: [], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 1, 1, 1, 2, 2, 2, 1, 1, 14, 2, 1, 2, 14, 1, 1, 2, 16, 2, 1, 1, 1, 2, 16, 2, 2, 1, 2, 1, 14, 1, 2, 1, 2, 2, 1, 2, 2, 2, 2, 2, 1, 2, 1, 16, 1, 1, 2, 1, 1, 16, 1, 2, 1, 2, 2, 2, 2, 2, 1, 2, 1, 1, 1, 16, 1, 16, 1, 1, 1 ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 0, type: null }, { index: 1, type: null }, { index: 2, type: null }, { index: 3, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 7, type: null }, { index: 8, type: null }, { index: 13, type: null }, { index: 63, type: null }, { index: 71, type: null } ] } },
+   { baseElementTypes: [ 1, 2, 3, 4 ], bubbleProbability: 0, stepCount: 23, passTarget: { type: 1, elements: [ { type: 34, count: 30 }, { type: 5, count: 31 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1 ], connectedLats: [], elements: [ 
+1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 2, 2, 2, 1, 1, 1, 2, 2, 2,
+ 1, 1, 1, 2, 1, 2, 1, 1, 1,
+ 2, 16, 2, 1, 1, 1, 2, 16, 2,
+ 2, 1, 2, 1, 14, 1, 2, 1, 2,
+ 2, 1, 2, 2, 2, 2, 2, 1, 2,
+ 1, 16, 1, 1, 2, 1, 1, 16, 1,
+ 2, 1, 2, 2, 2, 2, 2, 1, 2, 
+1, 1, 1, 16, 1, 16, 1, 1, 1
+ ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 0, type: null }, { index: 1, type: null }, { index: 2, type: null }, { index: 3, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 7, type: null }, { index: 8, type: null }, { index: 13, type: null }, { index: 63, type: null }, { index: 71, type: null } ] } },
    //438
-   { baseElementTypes: [ 0, 1, 2, 3 ], bubbleProbability: 0, stepCount: 28, passTarget: { type: 1, elements: [ { type: 34, count: 15 }, { type: 5, count: 17 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0 ], connectedLats: [ [ 29, 47 ], [ 30, 48 ], [ 31, 49 ], [ 32, 50 ], [ 33, 51 ] ], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 1, 1, 1, 1, 2, 2, 2, 2, 2, 1, 1, 1, 1, 16, 2, 2, 2, 16, 1, 1, 1, 1, 2, 2, 16, 2, 2, 1, 1 ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 0, 0, 0, 0, 0, 0, 0, 20, 10, 30, 20, 0, 0, 0, 0, 20, 10, 20, 10, 10, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 1, type: null }, { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 7, type: null } ] } },
+   { baseElementTypes: [ 0, 1, 2, 3 ], bubbleProbability: 0, stepCount: 28, passTarget: { type: 1, elements: [ { type: 34, count: 15 }, { type: 5, count: 17 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0 ], connectedLats: [ [ 29, 47 ], [ 30, 48 ], [ 31, 49 ], [ 32, 50 ], [ 33, 51 ] ], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 1, 1, 1, 1, 2, 2, 2, 2, 2, 1, 1, 1, 1, 16, 2, 2, 2, 16, 1, 1, 1, 1, 2, 2, 16, 2, 2, 1, 1 ], baseElements: [ 
+0, 20, 40, 30, 20, 20, 10, 20, 0, 
+0, 10, 30, 20, 40, 10, 40, 30, 0,
+ 0, 40, 10, 20, 10, 30, 20, 10, 0,
+ 0, 30, 20, 10, 20, 10, 10, 30, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 1, type: null }, { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 7, type: null } ] } }
+,
    //439
-   { baseElementTypes: [ 1, 0, 3, 4 ], bubbleProbability: 0, stepCount: 24, passTarget: { type: 1, elements: [ { type: 0, count: 88 }, { type: 3, count: 99 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0 ], connectedLats: [], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 2, 2, 1, 1, 2, 2, 1, 1, 1, 2, 2, 1, 1, 2, 2, 1, 1, 1, 2, 2, 1, 1, 2, 2, 1, 1, 1, 2, 2, 1, 1, 2, 2, 1, 1, 1, 2, 2, 1, 1, 2, 2, 2, 2, 2, 2, 2, 1, 1, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 10, type: null }, { index: 16, type: null }, { index: 18, type: null }, { index: 26, type: null } ] } },
+   { baseElementTypes: [ 1, 0, 3, 4 ], bubbleProbability: 0, stepCount: 20, passTarget: { type: 1, elements: [ { type: 0, count: 138 }, { type: 3, count: 138 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0 ], connectedLats: [], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 2, 2, 1, 1, 2, 2, 1, 1, 1, 2, 2, 1, 1, 2, 2, 1, 1, 1, 2, 2, 1, 1, 2, 2, 1, 1, 1, 2, 2, 1, 1, 2, 2, 1, 1, 1, 2, 2, 1, 1, 2, 2, 2, 2, 2, 2, 2, 1, 1, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 10, type: null }, { index: 16, type: null }, { index: 18, type: null }, { index: 26, type: null } ] } },
    //440
    { baseElementTypes: [ 0, 2, 1, 4 ], bubbleProbability: 0, stepCount: 27, passTarget: { type: 1, elements: [ { type: 9, count: 69 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 0, 0, 3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 0, 0, 3, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 0, 3, 3, 3, 0, 3, 0 ], connectedLats: [ [ 38, 56 ], [ 39, 57 ], [ 41, 59 ], [ 42, 60 ] ], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 1, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 1, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 1, 9, 1, 9, 1, 9, 1 ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 0, type: null }, { index: 1, type: null }, { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 7, type: null }, { index: 8, type: null } ] } },
    //441
    { baseElementTypes: [ 0, 1, 2, 3 ], bubbleProbability: 0, stepCount: 28, passTarget: { type: 1, elements: [ { type: 1, count: 110 }, { type: 2, count: 110 }, { type: 3, count: 110 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 4, 1, 41, 1, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 41, 1, 1, 1, 1, 1, 4, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0 ], connectedLats: [ [ 0, 45 ], [ 10, 37 ], [ 20, 38 ], [ 24, 42 ], [ 16, 43 ], [ 8, 53 ] ], elements: [ 2, 2, 1, 1, 1, 1, 1, 2, 2, 1, 2, 2, 1, 1, 1, 2, 2, 1, 1, 1, 2, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 2, 2, 1, 2, 2, 5, 1, 1, 2, 2, 2, 7, 2, 2, 2, 1, 1, 2, 2, 1, 1, 1, 2, 2, 1, 1, 2, 2, 2, 7, 2, 2, 2, 1, 1, 1, 1, 2, 1, 2, 1, 1, 1 ], baseElements: [ 0, 0, 20, 20, 40, 30, 20, 0, 0, 0, 0, 0, 20, 20, 30, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 0, 40, 0, 0, 0, 20, 0, 0, 0, 40, 0, 0, 0, 20, 40, 20, 0, 0, 0, 30, 0, 0, 0, 10, 0, 0, 0, 10, 0, 30, 0, 0, 40, 0, 0, 20, 0 ], recycles: [], generateLats: [ { index: 0, type: null }, { index: 1, type: null }, { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 7, type: null }, { index: 8, type: null } ] } },
    //442
-   { baseElementTypes: [ 1, 2, 3, 4 ], bubbleProbability: 0, stepCount: 27, passTarget: { type: 1, elements: [ { type: 34, count: 20 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 4, 0, 0, 0, 4, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 4, 0, 0, 0, 4, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0 ], connectedLats: [], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 16, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 16, 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 16, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 16, 1, 1, 1, 1, 1, 2, 2, 2, 1, 1, 1 ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 11, type: null }, { index: 15, type: null }, { index: 19, type: null }, { index: 25, type: null }, { index: 27, type: null }, { index: 35, type: null } ] } },
+   { baseElementTypes: [ 1, 2, 3, 4 ], bubbleProbability: 0, stepCount: 24, passTarget: { type: 1, elements: [ { type: 34, count: 20 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 4, 0, 0, 0, 4, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 4, 0, 0, 0, 4, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0 ], connectedLats: [], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 16, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 16, 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 16, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 16, 1, 1, 1, 1, 1, 2, 2, 2, 1, 1, 1 ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 11, type: null }, { index: 15, type: null }, { index: 19, type: null }, { index: 25, type: null }, { index: 27, type: null }, { index: 35, type: null } ] } },
    //443
-   { baseElementTypes: [ 0, 1, 3, 4 ], bubbleProbability: 0, stepCount: 28, passTarget: { type: 1, elements: [ { type: 9, count: 61 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 0, 3, 0, 3, 0, 3, 0, 0, 0, 3, 3, 3, 0, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 3, 3, 3, 3, 3, 0, 0, 2, 0, 0, 3, 3, 3, 0, 0, 2, 2, 2, 0, 61, 0, 6, 0, 2, 2 ], connectedLats: [ [ 45, 63 ], [ 46, 73 ], [ 52, 79 ], [ 53, 71 ] ], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 14, 1, 1, 1, 1, 1, 14, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 2, type: null }, { index: 4, type: null }, { index: 6, type: null }, { index: 10, type: null }, { index: 12, type: null }, { index: 14, type: null }, { index: 16, type: null }, { index: 18, type: null }, { index: 26, type: null } ] } },
+   { baseElementTypes: [ 0, 1, 3, 4 ], bubbleProbability: 0, stepCount: 28, passTarget: { type: 1, elements: [ { type: 9, count: 61 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 0, 3, 0, 3, 0, 3, 0, 0, 0, 3, 3, 3, 0, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 3, 3, 3, 3, 3, 0, 0, 3, 0, 0, 3, 3, 3, 0, 0, 3, 3, 3, 0, 61, 0, 6, 0, 3, 3 ], connectedLats: [ [ 45, 63 ], [ 46, 73 ], [ 52, 79 ], [ 53, 71 ] ], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 14, 1, 1, 1, 1, 1, 14, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 2, type: null }, { index: 4, type: null }, { index: 6, type: null }, { index: 10, type: null }, { index: 12, type: null }, { index: 14, type: null }, { index: 16, type: null }, { index: 18, type: null }, { index: 26, type: null } ] } },
    //444
    { baseElementTypes: [ 1, 0, 2, 4 ], bubbleProbability: 0, stepCount: 28, passTarget: { type: 1, elements: [ { type: 2, count: 128 }, { type: 4, count: 88 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 2, 1, 1, 1, 0, 1, 1, 1, 2, 2, 2, 1, 1, 1, 0, 1, 2, 2, 2, 2, 2, 1, 1, 1, 0, 2, 2 ], connectedLats: [ [ 30, 57 ], [ 40, 67 ], [ 50, 77 ] ], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 8, 1, 1, 1, 1, 1, 12, 1, 1, 1, 8, 1, 1, 1, 1, 1, 12, 1, 1, 1, 8, 1, 8, 1, 1, 1, 12, 1, 1, 1, 1, 1, 8, 1, 1, 1, 12, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 7, type: null }, { index: 8, type: null }, { index: 27, type: null }, { index: 37, type: null }, { index: 47, type: null } ] } },
    //445
@@ -95,11 +126,33 @@ export const Chapters17: ChapterData[] = [
    //446
    { baseElementTypes: [ 1, 2, 3, 4 ], bubbleProbability: 10, stepCount: 25, passTarget: { type: 1, elements: [ { type: 9, count: 66 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 0, 3, 3, 3, 3, 3, 0, 0, 2, 0, 3, 3, 3, 3, 3, 0, 2, 3, 6, 3, 3, 3, 3, 3, 6, 3, 3, 6, 3, 3, 3, 3, 3, 6, 3, 3, 6, 3, 3, 3, 3, 3, 6, 3, 3, 6, 3, 3, 3, 3, 3, 6, 3, 2, 0, 3, 3, 3, 3, 3, 0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 3, 3, 3, 3, 3, 2, 2 ], connectedLats: [ [ 46, 73 ], [ 56, 74 ], [ 57, 75 ], [ 58, 76 ], [ 59, 77 ], [ 60, 78 ], [ 52, 79 ] ], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 9, type: null }, { index: 17, type: null }, { index: 19, type: null }, { index: 25, type: null } ] } },
    //447
-   { baseElementTypes: [ 0, 1, 2, 4 ], bubbleProbability: 0, stepCount: 24, passTarget: { type: 1, elements: [ { type: 34, count: 10 }, { type: 10, count: 12 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 41, 4, 41, 4, 41, 4, 41, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0 ], connectedLats: [], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 1, 1, 1, 1, 1, 1, 1, 9, 1, 9, 1, 1, 1, 1, 1, 9, 1, 1, 1, 9, 1, 1, 1, 9, 1, 1, 1, 1, 1, 16, 1, 16, 1, 1, 1 ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 1, type: null }, { index: 3, type: null }, { index: 5, type: null }, { index: 7, type: null }, { index: 9, type: null }, { index: 11, type: null }, { index: 13, type: null }, { index: 15, type: null }, { index: 17, type: null } ] } },
+   { baseElementTypes: [ 0, 1, 2, 4 ], bubbleProbability: 0, stepCount: 24, passTarget: { type: 1, elements: [ { type: 34, count: 30 }, { type: 10, count: 5 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 41, 4, 41, 4, 41, 4, 41, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0 ], connectedLats: [], elements: [ 
+1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 16, 1, 1, 1, 1, 1, 1, 1, 16,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 9, 1, 1, 1, 1, 1, 1, 1, 9,
+ 1, 9, 1, 1, 1, 1, 1, 9, 1,
+ 16, 1, 9, 1, 1, 1, 9, 1, 16,
+ 1, 1, 1, 16, 1, 16, 1, 1, 1
+ ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 1, type: null }, { index: 3, type: null }, { index: 5, type: null }, { index: 7, type: null }, { index: 9, type: null }, { index: 11, type: null }, { index: 13, type: null }, { index: 15, type: null }, { index: 17, type: null } ] } }
+,
    //448
    { baseElementTypes: [ 0, 1, 2, 3 ], bubbleProbability: 0, stepCount: 27, passTarget: { type: 1, elements: [ { type: 9, count: 69 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 3, 3, 3, 0, 0, 0, 3, 3, 3, 3, 3, 3, 6, 3, 6, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 0, 0, 3, 3, 3, 3, 3, 3, 3, 0, 0, 3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 6, 3, 6, 3, 3, 3, 3, 3, 3, 0, 0, 0, 3, 3, 3 ], connectedLats: [], elements: [ 2, 2, 2, 1, 1, 1, 2, 2, 2, 2, 9, 2, 1, 1, 1, 2, 9, 2, 2, 2, 2, 1, 1, 1, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 14, 1, 14, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 1, 1, 1, 2, 2, 2, 2, 9, 2, 1, 1, 1, 2, 9, 2, 2, 2, 2, 1, 1, 1, 2, 2, 2 ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 0, type: null }, { index: 1, type: null }, { index: 2, type: null }, { index: 6, type: null }, { index: 7, type: null }, { index: 8, type: null }, { index: 12, type: null }, { index: 13, type: null }, { index: 14, type: null } ] } },
    //449
-   { baseElementTypes: [ 0, 2, 3, 4 ], bubbleProbability: 0, stepCount: 26, passTarget: { type: 1, elements: [ { type: 34, count: 30 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1 ], connectedLats: [ [ 4, 22 ], [ 54, 72 ], [ 55, 73 ], [ 56, 74 ], [ 60, 78 ], [ 61, 79 ], [ 62, 80 ] ], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 14, 2, 2, 1, 2, 1, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 2, 2, 2, 1, 1, 1, 16, 16, 16, 1, 1, 1, 16, 16, 16 ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 12, 0, 12, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 0, type: null }, { index: 1, type: null }, { index: 4, type: null }, { index: 7, type: null }, { index: 8, type: null }, { index: 11, type: null }, { index: 12, type: null }, { index: 14, type: null }, { index: 15, type: null } ] } },
+   { baseElementTypes: [ 0, 2, 3, 4 ], bubbleProbability: 0, stepCount: 22, passTarget: { type: 1, elements: [ { type: 34, count: 30 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 
+1, 1, 0, 0, 1, 0, 0, 1, 1,
+ 1, 1, 1, 1, 0, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 4, 1, 4, 1, 4, 1, 4, 1, 4,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 1, 1, 1, 0, 0, 0,
+ 1, 1, 1, 0, 1, 0, 1, 1, 1
+ ], connectedLats: [ [ 4, 22 ], [ 54, 72 ], [ 55, 73 ], [ 56, 74 ], [ 60, 78 ], [ 61, 79 ], [ 62, 80 ] ], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 14, 2, 2, 1, 2, 1, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 2, 2, 2, 1, 1, 1, 16, 16, 16, 1, 1, 1, 16, 16, 16 ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 12, 0, 12, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 0, type: null }, { index: 1, type: null }, { index: 4, type: null }, { index: 7, type: null }, { index: 8, type: null }, { index: 11, type: null }, { index: 12, type: null }, { index: 14, type: null }, { index: 15, type: null } ] } }
+,
    //450
    { baseElementTypes: [ 1, 0, 3, 4 ], bubbleProbability: 0, stepCount: 28, passTarget: { type: 1, elements: [ { type: 9, count: 70 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 3, 3, 3, 3, 3, 3, 3, 0, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 0, 3, 3, 3, 3, 3, 3, 3, 0 ], connectedLats: [ [ 41, 59 ], [ 51, 69 ], [ 61, 79 ] ], elements: [ 1, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 2, 2, 2, 14, 2, 2, 1, 1, 1, 1, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 2, 1, 1, 14, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1 ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 1, type: null }, { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 7, type: null }, { index: 9, type: null }, { index: 17, type: null }, { index: 19, type: null }, { index: 29, type: null }, { index: 39, type: null }, { index: 49, type: null } ] } }
 

egret/src/something/class/HoneyPot.ts

-import { ElementType } from "../enum/ElementType";
-import { loadSvga } from "../../loadSvga";
 import getResPath from "../../../libs/new_tc/getResPath";
-import { createMonsterStatusAni } from "../../effect/createMonsterStatusAni";
-const frames = [
-    [1, 120],
-    [121, 360],
-    [361, 600],
-    [601, 960],
-];
+import { createHoneyPotStatusAni } from "../../effect/createHoneyPotStatusAni";
+import { loadSvga } from "../../loadSvga";
+import HoneyPotElement from "./HoneyPotElement";
+import wait from "../../../libs/new_tc/wait";
+
 export class HoneyPot extends eui.Component {
-    async nextStatus() {
+
+    fixStatus() {
+        this._mvList.forEach(mv => {
+            mv.visible = false;
+        });
+        this._mvList[2].visible = true;
+    }
+    playAni() {
+        const mc = this._mvList[2];
+        if (!mc) return;
+
+        this._mvList.forEach(mv => {
+            mv.visible = false;
+        });
+        mc.visible = true;
+
+        mc.anchorOffsetY = 86;
+        mc.y += 86 / 2 + 3;
+
+        egret.Tween.get(mc).to({ scaleX: 1.2, scaleY: 1.2 }, 200)
+            .to({ scaleY: 1 }, 700).to({ scaleY: 1.2 }, 300, egret.Ease.getBackIn(20))
+            .wait(100).call(() => {
+                mc.anchorOffsetY = 86 / 2;
+                mc.y = 0;
+                egret.Tween.get(mc).wait(400).to({ scaleY: 0, scaleX: 0 }, 300);
+            })
+
+    }
+    nextStatus() {
         this._statusNum++;
         if (this._statusNum >= 3) {
             this.removeEvents();
         }
         //播放动画，动画时间要短200ms以内
         if (this._statusNum <= 2) {
-            createMonsterStatusAni(this.x, this.y, this.parent);
+            createHoneyPotStatusAni(this._honeyPotElement.x, this._honeyPotElement.y, this._honeyPotElement.parent);
             this.changeSource();
         }
     }
@@ -29,40 +53,61 @@ export class HoneyPot extends eui.Component {
      * 状态变化 0,1,2,3 
      */
     private _statusNum: number;
-    _mv;
+    private _honeyPotElement: HoneyPotElement;
+    private _mvList: any[];
 
-    constructor(n: number = 0) {
+    constructor(honeyPotElement: HoneyPotElement, n: number = 0) {
         super();
         this._statusNum = n;
+        this._honeyPotElement = honeyPotElement;
         this.initSvga();
     }
 
     async initSvga() {
-        const mv: any = await loadSvga(getResPath() + 'resource/assets/svgas/monster0.svga');
-        this._mv = mv;
+        const mvList: any[] = await Promise.all([
+            loadSvga(getResPath() + 'resource/assets/svgas/honeypot1.svga'),
+            loadSvga(getResPath() + 'resource/assets/svgas/honeypot2.svga'),
+            loadSvga(getResPath() + 'resource/assets/svgas/honeypot3.svga'),
+        ]);
+
+        this._mvList = mvList;
+        this._mvList.forEach(mv => {
             this.addChild(mv);
-        mv.anchorOffsetX = 87 / 2;
-        mv.anchorOffsetY = 92 / 2;
-        this.addEvents();
-        this.changeSource();
+            mv.anchorOffsetX = 80 / 2;
+            mv.anchorOffsetY = 86 / 2 - 3;
+        });
+
+        // this.addEvents();
+        this.changeSource(1);
     }
 
     private addEvents() {
-        this._mv.addEventListener(egret.Event.ENTER_FRAME, this.onEnterFrame, this);
+        // this._mv.addEventListener(egret.Event.ENTER_FRAME, this.onEnterFrame, this);
     }
 
     onEnterFrame() {
-        if (this._statusNum <= 3 && this._mv.currentFrame == frames[this._statusNum][1]) {
-            this._mv.gotoAndPlay(frames[this._statusNum][0]);
-        }
+        // if (this._statusNum <= 3 && this._mv.currentFrame == frames[this._statusNum][1]) {
+        //     this._mv.gotoAndPlay(frames[this._statusNum][0]);
+        // }
     }
 
     removeEvents() {
-        this._mv.removeEventListener(egret.Event.ENTER_FRAME, this.onEnterFrame, this);
+        // this._mv.removeEventListener(egret.Event.ENTER_FRAME, this.onEnterFrame, this);
+    }
+
+    async changeSource(first = 0) {
+        if (this._mvList) {
+            if (!first) {
+                // await wait(300);
+                egret.Tween.get(this._mvList[this._statusNum]).set({ scaleX: 0.9, scaleY: 0.9 })
+                    .to({ scaleX: 1, scaleY: 1 }, 600, egret.Ease.getBackIn(10))
             }
 
-    changeSource() {
-        if (this._mv)
-            this._mv.gotoAndPlay(frames[this._statusNum][0]);
+            this._mvList.forEach(mv => {
+                mv.visible = false;
+            });
+            this._mvList[this._statusNum].visible = true;
+            this._mvList[this._statusNum].gotoAndPlay(1);
+        }
     }
 }
\ No newline at end of file

egret/src/something/class/HoneyPotElement.ts

@@ -3,10 +3,13 @@ import { Element } from "./Element";
 import { HoneyPot } from "./HoneyPot";
 
 export default class HoneyPotElement extends Element {
+    fixStatus() {
+        this.honeyPot.fixStatus();
+    }
     
     honeyPot: HoneyPot;
     resetView() {
-        this.honeyPot = new HoneyPot();
+        this.honeyPot = new HoneyPot(this);
         this.addChild(this.honeyPot);
         this.showImage.alpha = 0;
     }

egret/src/something/enum/ElementType.ts

@@ -56,6 +56,7 @@ export enum ElementType {
     FISH,//气鼓鱼
     HONEY,// 蜂蜜
     HONEY_POT//蜂蜜罐
+    // HONEY_POT//蜂蜜罐 
 }
 
 export const isMonsterEle = (t: ElementType) => {

egret/src/something/enum/LatticeType.ts

@@ -8,7 +8,8 @@ export enum LatticeType {
     DARK_ICE = 3,
     BlOCK = 4, //会持续存在，无法像冰块一样被消除，但是上方可以存在元素。只是展示的时候
     BLOCK_AND_ICE = 5,
-    BLOCK_AND_DARK_ICE = 6
+    BLOCK_AND_DARK_ICE = 6,
+    // BLOCK_AND_DARK_ICE = 7,
 }
 
 

egret/src/something/enum/RecoverName.ts

@@ -18,6 +18,7 @@ export enum RecoverName {
     //带回调的动画，和不带的合并不了，因为可能还有其他参数
     BONUSSHOOT_ANI = "BonusShootAni",
     MONSTER_SHOOT_ANI = "MONSTER_SHOOT_ANI",
+    HONEY_SHOOT_ANI = "HONEY_SHOOT_ANI",
     JELLYSPREAD_ANI = "JellySpreadAni",
     PIECETOEGG_ANI = "PieceToEggAni",
     BUBBLE_ANI = "BubbleAni",

mock/happyclear/hbRainBaseInfo.json

@@ -5,18 +5,18 @@
     "timestamp": 1573210800000,
     "data": {
         "currentRemainTimes": 0,
-        "currentSession": {
+        "currentSession1": {
             "sessionIndex": 6,
             "startTime": 1573210800000,
             "endTime": 1573299903000,
             "limitScore": 10
         },
-        "nextSession": {
+        "nextSession1": {
             "sessionIndex": 10,
             "startTime": 1573440915952,
             "endTime": 1573299903000,
             "limitScore": 10
         },
-        "canJoin": true
+        "canJoin1": true
     }
 }

mock/happyclear/home.json

@@ -2247,21 +2247,6 @@
                 "levelNum": 447,
                 "maxScore": 47440,
                 "stars": 1
-            },
-            {
-                "levelNum": 448,
-                "maxScore": 47440,
-                "stars": 1
-            },
-            {
-                "levelNum": 449,
-                "maxScore": 47440,
-                "stars": 1
-            },
-            {
-                "levelNum": 450,
-                "maxScore": 47440,
-                "stars": 1
             }
 
         ],