Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 猩猩

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","../assets/common/turnprize_icon3.png","../assets/common/turnprize_icon2.png","../assets/common/turnprize_icon1.png","../assets/common/commom_prop_bg.png","../assets/common/arrowbg.png","../assets/common/common_closebtn2.png"]}
+{"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","../assets/common/turnprize_icon3.png","../assets/common/turnprize_icon2.png","../assets/common/turnprize_icon1.png","../assets/common/commom_prop_bg.png","../assets/common/arrowbg.png","../assets/common/common_closebtn2.png","../assets/common/commom_share1.png","../assets/common/turnnoprize继续闯关.png","../assets/common/commom_prop_bg.png","../assets/common/combglight.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/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","../assets/mainScene/ele36.png","../assets/mainScene/lef.png","../assets/mainScene/propBg.png","../assets/mainScene/check0.png","../assets/mainScene/check1.png","../assets/mainScene/check2.png","../assets/mainScene/check3.png","../assets/mainScene/check4.png","../assets/mainScene/check7.png","../assets/mainScene/check8.png","../assets/mainScene/check9.png","../assets/mainScene/check关.png","../assets/mainScene/check第.png","../assets/mainScene/check6.png","../assets/mainScene/check5.png","../assets/mainScene/ele38.png","../assets/mainScene/ele39.png"]}
+{"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/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","../assets/mainScene/ele36.png","../assets/mainScene/lef.png","../assets/mainScene/propBg.png","../assets/mainScene/check0.png","../assets/mainScene/check1.png","../assets/mainScene/check2.png","../assets/mainScene/check3.png","../assets/mainScene/check4.png","../assets/mainScene/check7.png","../assets/mainScene/check8.png","../assets/mainScene/check9.png","../assets/mainScene/check关.png","../assets/mainScene/check第.png","../assets/mainScene/check6.png","../assets/mainScene/check5.png","../assets/mainScene/ele38.png","../assets/mainScene/ele39.png","../assets/mainScene/gameGuide.png"]}
\ No newline at end of file

egret/src/panels/SignPanel.ts

@@ -331,6 +331,9 @@ export default class SignPanel extends Panel {
         super.removeEvents();
         this["closeBtn"].removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap_closeBtn, this);
         this["btn1"].removeEventListener(egret.TouchEvent.TOUCH_TAP, this.signToday, this);
+    
+    
+        this.rmMvListener();
     }
 
     movep1:egret.Point;
@@ -653,10 +656,10 @@ export default class SignPanel extends Panel {
         if(!svgaParser) svgaParser = new window["SVGA"].Parser();
         var svgas = ["signgiftbox", "signsandot", "signshine", "signxistar"];
         for (let i = 0; i < svgas.length; i++) {
-            // if (movieClips[svgas[i]]){
-            //     // this.addMvListener(svgas[i]);
-            //     continue;
-            // }
+            if (movieClips[svgas[i]]){
+                this.addMvListener(svgas[i]);
+                continue;
+            }
             let mvname = svgas[i];
             svgaParser.load(resPath + 'resource/assets/svgas/' + svgas[i] + ".svga", (videoItem) => {
                 var mv = new window["SVGA"].EgretMovieClip(videoItem);
@@ -694,9 +697,18 @@ export default class SignPanel extends Panel {
             })
         }
     }
+
+    completeCall:{signxistar:Function,signshine:Function,signsandot:Function,signgiftbox:Function} = {
+        signxistar:null,signshine:null,signsandot:null,signgiftbox:null
+    };
+    enterFrameCall:{signxistar:Function,signshine:Function,signsandot:Function,signgiftbox:Function} = {
+        signxistar:null,signshine:null,signsandot:null,signgiftbox:null
+    };
     addMvListener(mvname){
-        let fun;
-        movieClips[mvname].addEventListener(egret.Event.COMPLETE, fun = function(e) {
+        if(this.completeCall[mvname]){
+            this.completeCall[mvname] = null;
+        }
+        this.completeCall[mvname] = function(e) {
             if(mvname=="signxistar"){
                 if(this.autoClose){
                     e.target.stop()
@@ -718,10 +730,13 @@ export default class SignPanel extends Panel {
             //     movieClips['signxistar'].alpha = 1;
             //     movieClips['signxistar'].gotoAndPlay(1,1);
             // }
-        }, this)
+        }.bind(this);
+        movieClips[mvname].addEventListener(egret.Event.COMPLETE, this.completeCall[mvname], this)
         if(mvname=="signshine"){
-            let fun1;
-            movieClips['signshine'].addEventListener(egret.Event.ENTER_FRAME,fun1 = function(e){
+            if(this.enterFrameCall[mvname]){
+                this.enterFrameCall[mvname] = null;
+            }
+            this.enterFrameCall[mvname] = function(e){
                 var curframe = movieClips['signshine'].currentFrame;
                 if(curframe==20){
                     egret.Tween.get(movieClips['signxistar'])
@@ -735,10 +750,14 @@ export default class SignPanel extends Panel {
                         movieClips['signxistar'].gotoAndPlay(1,1);
                     },this);
                 }
-            },this);
+            }.bind(this);
+            
+            movieClips['signshine'].addEventListener(egret.Event.ENTER_FRAME,this.enterFrameCall[mvname] ,this);
         }else if(mvname=="signgiftbox"){
-            let fun2;
-            movieClips['signgiftbox'].addEventListener(egret.Event.ENTER_FRAME,fun2 = function(e){
+            if(this.enterFrameCall[mvname]){
+                this.enterFrameCall[mvname] = null;
+            }
+            this.enterFrameCall[mvname] = function(e){
                 var curframe = movieClips['signgiftbox'].currentFrame;
                 if(curframe==5){
                     // egret.Tween.get(movieClips['signxistar'])
@@ -760,10 +779,10 @@ export default class SignPanel extends Panel {
                     this.playShineDot();
                     this.tweenShowGroup();
                 }
-            },this);
+            }.bind(this);
 
+            movieClips['signgiftbox'].addEventListener(egret.Event.ENTER_FRAME,this.enterFrameCall[mvname],this);
             
-            movieClips['signgiftbox']
         }
         // if(mvname=="signxistar"){//开始收
         //     let fun1;
@@ -780,4 +799,23 @@ export default class SignPanel extends Panel {
         //     },this)
         // }
     }
+
+    rmMvListener(){
+        var svgas = ["signgiftbox", "signsandot", "signshine", "signxistar"];
+        for (let i = 0; i < svgas.length; i++) {
+            let mvname = svgas[i];
+            if(movieClips[mvname]&&this.completeCall[mvname]){
+                movieClips[mvname].removeEventListener(egret.Event.COMPLETE,this.completeCall[mvname], this);
+            }
+            if(mvname=="signshine"){
+                if(movieClips[mvname]&&this.enterFrameCall[mvname]){
+                    movieClips['signshine'].removeEventListener(egret.Event.ENTER_FRAME,this.enterFrameCall[mvname] ,this);
+                }
+            }else if(mvname=="signgiftbox"){
+                if(movieClips[mvname]&&this.enterFrameCall[mvname]){
+                    movieClips['signgiftbox'].removeEventListener(egret.Event.ENTER_FRAME,this.enterFrameCall[mvname] ,this);
+                }
+            }
+        }
+    }
 }
\ No newline at end of file

egret/src/something/anis/BonusShootAni.ts

@@ -4,29 +4,32 @@ import { RecoverName } from "../enum/RecoverName";
 import { playSound, SoundType } from "../../soundCtrl";
 
 
-export const stepPosition: number[] = [125, 115];
+export const stepPosition: number[] = [175, 165];
+
 /**
  * 需要回调的
  * 手动修改this.shoot.rotation=
  */
 export class BonusShootAni extends egret.DisplayObjectContainer {
     shoot: egret.Bitmap;
-    imageAni: ImageAni
+    imageAni: ImageAni;
+
     constructor() {
-        super()
-        var texture = RES.getRes("bonusShoot_png")
+        super();
+        var texture = RES.getRes("bonusShoot_png");
         this.shoot = new egret.Bitmap(texture);
         this.shoot.anchorOffsetX = 78;
         this.shoot.anchorOffsetY = 37 / 2;
         this.addChild(this.shoot);
-        var arr = []
-        for (var i = 1; i <= 27; i++) {
+        var arr = [];
+        for(var i = 1; i <= 27; i++) {
             arr.push("bonusFra" + i + "_png");
         }
         this.imageAni = new ImageAni(arr);
         this.addChild(this.imageAni);
         this.imageAni.visible = false
     }
+
     reset() {
         this.shoot.visible = true;
         this.imageAni.visible = false;
@@ -35,19 +38,19 @@ export class BonusShootAni extends egret.DisplayObjectContainer {
     }
 
     play(rotation: number, p: number[], callback: Function) {
-        this.reset()
+        this.reset();
         this.shoot.rotation = rotation;
         egret.Tween.get(this)
-            .to({ x: p[0], y: p[1] }, 300)
+            .to({x: p[0], y: p[1]}, 300)
             .call(() => {
                 callback();
-                playSound(SoundType.bonusShoot)
+                playSound(SoundType.bonusShoot);
                 this.shoot.visible = false;
                 this.imageAni.visible = true;
                 this.imageAni.play(() => {
-                    if (this.$parent) {
+                    if(this.$parent) {
                         this.$parent.removeChild(this)
-                    };
+                    }
                     Pool.recover(RecoverName.BONUSSHOOT_ANI, this)
                     // callback();
                 })

egret/src/something/uis/BonusTime.ts

@@ -3,7 +3,7 @@
 export class BonusTime extends egret.Bitmap {
     constructor() {
         super();
-        this.texture = RES.getRes("bonusTime_png")
+        this.texture = RES.getRes("bonusTime_png");
         this.anchorOffsetX = this.texture.textureWidth / 2;
         this.anchorOffsetY = this.texture.textureHeight / 2;
     }

egret/src/something/uis/ScoreProgress.ts

@@ -40,7 +40,7 @@ export class ScoreProgress {
                     return
                 }
             }
-            w = (640 - 563) * scale + 563 - 138;
+            w = (640 - 583) * scale + 583 - 138;
             if(this.star3.source != "lightedStar_png") {
                 this.star3.source = "lightedStar_png";
                 this.star2.source = "lightedStar_png";
@@ -51,7 +51,7 @@ export class ScoreProgress {
         //是否超过2星
         else if(value >= this.starScores[1]) {
             scale = (value - this.starScores[1]) / (this.starScores[2] - this.starScores[1]);
-            w = (563 - 476) * scale + 476 - 138;
+            w = (583 - 496) * scale + 496 - 138;
             if(this.star2.source != "lightedStar_png") {
                 this.star2.source = "lightedStar_png";
                 this.star1.source = "lightedStar_png";
@@ -61,14 +61,14 @@ export class ScoreProgress {
         //是否超过1星
         else if(value >= this.starScores[0]) {
             scale = (value - this.starScores[0]) / (this.starScores[1] - this.starScores[0]);
-            w = (476 - 390) * scale + 390 - 138;
+            w = (496 - 410) * scale + 410 - 138;
             if(this.star1.source != "lightedStar_png") {
                 this.star1.source = "lightedStar_png";
                 this.starCount = 1;
             }
         } else {
             scale = value / this.starScores[0];
-            w = (390 - 138) * scale;
+            w = (410 - 138) * scale;
         }
         //(466-428)/428,扩分数
         //星星
@@ -110,15 +110,15 @@ export class ScoreProgress {
         //星星1   lightedStar_png
         var textureStar = RES.getRes("unlightedStar_png");
         this.star1 = new eui.Image(textureStar);    // width (27 * 2)
-        this.star1.x = 363; // 390
+        this.star1.x = 383; // 410
         this.star1.y = 201;
         p.addChild(this.star1);
         this.star2 = new eui.Image(textureStar);
-        this.star2.x = 449; // 476
+        this.star2.x = 469; // 496
         this.star2.y = 201;
         p.addChild(this.star2);
         this.star3 = new eui.Image(textureStar);
-        this.star3.x = 536; // 563
+        this.star3.x = 556; // 583
         this.star3.y = 201;
         p.addChild(this.star3);
     }

mock/sign/getSignInfo.json

 {
     "success": true,
     "signInfoVO": {
-        "continueDay": 4,
+        "continueDay": 5,
         "todaySigned": 0
     }
 }
\ No newline at end of file