1

egret/src/something/Tool.ts

@@ -298,7 +298,7 @@ export class Tool {
             !lat.element.hasState(StateType.HAIRBALLGREY) &&
             !lat.element.hasState(StateType.HAIRBALLBROWN) &&
             !lat.element.hasState(StateType.BLOCK_LOCK) &&
-            lat.element.type != ElementType.JELLY_MONSTER,
+            lat.element.type != ElementType.JELLY_MONSTER &&
             lat.element.type != ElementType.FESTIVALELE_SMALL
         ) {
             return true
@@ -336,7 +336,7 @@ export class Tool {
             return false
         }
         //上方元素为冰淇淋
-        else if (lat.element.type == ElementType.LOLLIPOP || 
+        else if (lat.element.type == ElementType.LOLLIPOP ||
             lat.element.type == ElementType.JELLY_MONSTER) {
             return false
         }
@@ -673,7 +673,7 @@ export class Tool {
                 if (this.judgeMove(up) && up.element.type != ElementType.LOLLIPOP) return [effectElement, up.element];
                 //下格子
                 var down = lattices[effectElement.index + Tool.colNum];
-                if (this.judgeMove(down) && down.element.type != ElementType.LOLLIPOP ) return [effectElement, down.element];
+                if (this.judgeMove(down) && down.element.type != ElementType.LOLLIPOP) return [effectElement, down.element];
                 //左格子
                 var col = Tool.indexToRc(effectElement.index)[1];//列数
                 if (col != 0) {

egret/src/something/class/Element.ts

@@ -42,28 +42,10 @@ export class Element extends eui.Component {
         mv.anchorOffsetY = 150;
         mv.x = - 3;
         mv.y = - 6;
-        // mv.gotoAndPlay(361, true);
-        // mv.addEventListener(egret.Event.ENTER_FRAME, () => {
-        //     // if (mv.currentFrame == 360) //待机
-        //     //     mv.gotoAndPlay(1, true);
-        //     if (mv.currentFrame == 508) { //向上吹
-        //         mv.gotoAndPlay(361, true);
-        //     }
-        //     if (mv.currentFrame == 361 + 100) {
-        //         const tex: egret.Texture = RES.getRes("ele20_png");
-        //         const pic = new egret.Bitmap(tex);
-        //         pic.anchorOffsetX = tex.textureWidth / 2;
-        //         pic.anchorOffsetY = tex.textureHeight;
-        //         pic.x = p[0];
-        //         pic.y = p[1];
-        //         this.stage.addChild(pic);
-        //         egret.Tween.get(pic).set({ scaleX: 0, scaleY: 0 }).to({ scaleX: 1, scaleY: 1 }, 300);
-        //     }
-        // }, this);
-        setInterval(() => {
-            this.toAction();
-        }, 5000);
-
+        // setInterval(() => {
+        //     this.toAction();
+        // }, 5000);
+        this.toStandByAction();
     }
 
     toStandByAction() {

egret/src/startScene/StartScene.ts

@@ -117,7 +117,7 @@ export const createData = () => {
     if (_startSceneData) return _startSceneData;
     const startSceneData: any = {};
     _startSceneData = startSceneData;
-    if(_startSceneData.level === null || _startSceneData.level === undefined)
+    if(_startSceneData.level !== null && _startSceneData.level !== undefined)
         delete _startSceneData.level
 
     const repeatCount = getRepeatCount();