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

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"]}
+{"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"]}
\ 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"]}
+{"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/src/mainScene/MainScene.ts

@@ -163,8 +163,6 @@ export default class MainScene extends Scene {
     oneStepScore: number;
     //果冻有消除的标记；
     jellyBrokenMark: boolean;
-    //有毛球消失的动画时，延迟掉落时间
-    hairballBrokenMark: boolean;
     /**
      * 判断连通的状态
      * 1表示存在小列连通到大列，从右往左遍历
@@ -1710,15 +1708,13 @@ export default class MainScene extends Scene {
                 this.eliminate();
             }, 200)
         } else {
-            //没有可消除元素，执行掉落，又加定制，因为毛球的消失动画比较长 650ms，用500
-            var time = this.hairballBrokenMark ? 500 : 200;
-            this.hairballBrokenMark = false;
+            //没有可消除元素，执行掉落,
             setTimeout(() => {
                 this.fall(() => {
                     //掉落停止回调
                     this.fallCallback();
                 });
-            }, time)
+            }, 200)
         }
     }
     /**
@@ -2053,8 +2049,6 @@ export default class MainScene extends Scene {
                 ele.setState(StateType.HAIRBALLGREY, false)
                 //算个数
                 this.goElementTarget(ElementType.HAIRBALLGREY, [ele.x, ele.y]);
-                //标记有毛球消失
-                this.hairballBrokenMark = true
             }
             //有黑色毛球的，一次眩晕，两次消失
             else if (ele.hasState(StateType.HAIRBALLGREY)) {
@@ -2071,8 +2065,6 @@ export default class MainScene extends Scene {
                     ele.setState(StateType.HAIRBALLBLACK, false)
                     //算个数
                     this.goElementTarget(ElementType.HAIRBALLBLACK, [ele.x, ele.y]);
-                    //标记有毛球消失
-                    this.hairballBrokenMark = true
                 }
             }
             //如果有特效，存下

egret/src/mapScene/MapScene.ts

@@ -26,6 +26,7 @@ import ScratchIcon from "./icon/ScratchIcon";
 import TurntableIcon from "./icon/TurntableIcon";
 
 let doHelpFlag = false;
+let doScratchHelpFlag = false;
 // let adTag = false;
 export default class MapScene extends Scene {
     static adData;
@@ -43,12 +44,12 @@ export default class MapScene extends Scene {
     sendInvite() {
         const code = Utils.getRequestByKey('shareCode');
         if(!code) return;
-        const dojoin = DataManager.ins.getData('hc_doJoin');
-        if(!dojoin) return;
         if(doHelpFlag) {
             return;
         }
         if(code.indexOf("12345678") == -1){  // 邀请有礼
+            const dojoin = DataManager.ins.getData('hc_doJoin');
+            if(!dojoin) return;
             NetManager.ins.doHelp((success, res) => {
                 doHelpFlag = true;
                 switch(true) {

egret/src/mapScene/icon/ScratchIcon.ts

@@ -72,17 +72,16 @@ export default class ScratchIcon extends IconBase {
                 return;
             }
             let status = res.data.taskStatus;
+            let data = Utils.deepClone(res.data);
             switch(true) {
                 case (status == 0): // 当前无任务（一般icon不会出现），拦截
                     break;
                 case (status == 1): // 当前任务进行中 打开任务面板
                     loadSvga(getResPath() + 'resource/assets/svgas/sprize.svga').then(async (mv: any) => {
                         // await wait(100);
-                        let data = Utils.deepClone(res.data);
                         data.mv = mv;
                         PanelCtrl.instance.show('scratch', data);
                     });
-                    // PanelCtrl.instance.show('scratch', res.data);
                     break;
                 case (status == 2): // 当前任务完成待领奖 请求领奖接口
                     NetManager.ins.scratchTakePrize((success, res) => {
@@ -92,7 +91,7 @@ export default class ScratchIcon extends IconBase {
                             }
                             return;
                         }
-                        PanelCtrl.instance.show("scratchPrize", res.data);
+                        PanelCtrl.instance.show("scratchPrize", data);
                     }, res.data.scratchCardTaskId);
                     break;
 

egret/src/panels/ScratchPanel.ts

@@ -188,25 +188,6 @@ export default class ScratchPanel extends Panel {
         let dProgress = Math.abs(progress - this["progress"].width / this["progressBg"].width);   // 比当前进度的差值的绝对值
         let _duration = 1000 * dProgress / 100; // 算出变化的时间
         egret.Tween.get(this["progress"]).to({width: _width}, _duration);
-        let i = new eui.Image();
-        // if(progress >= 100) {
-        //     this["scratch_progress"].visible = false;
-        // } else if(progress >= 98 && progress < 100) {
-        //     this["scratch_progress"].visible = true;
-        //     this["scratch_progress"].source = "scratch_card_98_png";
-        // } else if(progress >= 96 && progress < 98) {
-        //     this["scratch_progress"].visible = true;
-        //     this["scratch_progress"].source = "scratch_card_96_png";
-        // } else if(progress >= 94 && progress < 96) {
-        //     this["scratch_progress"].visible = true;
-        //     this["scratch_progress"].source = "scratch_card_94_png";
-        // } else if(progress >= 92 && progress < 96) {
-        //     this["scratch_progress"].visible = true;
-        //     this["scratch_progress"].source = "scratch_card_92_png";
-        // } else if(progress < 92) {
-        //     this["scratch_progress"].visible = true;
-        //     this["scratch_progress"].source = "scratch_card_90_png";
-        // }
     }
 
     private setWXShareTip() {

mock/happyclear/scratchGetTaskInfo.json

@@ -2,17 +2,17 @@
     "success": true,
     "code": "0000000000",
     "desc": "OK",
-    "timestamp": 1572405066301,
+    "timestamp": 1572420059060,
     "data": {
-        "scratchCardTaskId": 1,
-        "taskStatus": 1,
+        "scratchCardTaskId": 3,
+        "taskStatus": 2,
         "prizeImage": "//yun.dui88.com/images/201910/9u6nk8sjt8.jpg",
-        "currentTime": 1572405066290,
-        "endTime": 1572491337000,
-        "completePercent": "96",
-        "remainPercent": "9.0",
+        "currentTime": 1572420059060,
+        "endTime": 1572493282000,
+        "completePercent": "100",
+        "remainPercent": "0",
         "totalNeedCount": 1,
-        "helpedCount": 0,
-        "avatarList": []
+        "helpedCount": 1,
+        "avatarList": null
     }
 }
\ No newline at end of file