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

egret/src/mainScene/MainScene.ts

@@ -729,7 +729,7 @@ export default class MainScene extends Scene {
             this.lattices[festivalIndex].element.visible = false;
             ani.play(p, () => {
                 this.lattices[festivalIndex].element.visible = true;
-                RectsWaveAni(this.lattices,this.map)
+                RectsWaveAni(this.lattices, this.map)
                 //检查三消
                 if (this.threeMatch()) {
                     this.eliminate();
@@ -955,7 +955,7 @@ export default class MainScene extends Scene {
             this.propGuide.once(egret.TouchEvent.TOUCH_TAP, () => {
                 //还原事件
                 this.addEventListener(egret.Event.ENTER_FRAME, this.onEnterFrame, this);
-                this.removeChild(this.stepCircle)
+                if (this.stepCircle.parent) this.removeChild(this.stepCircle)
             }, this);
         }
     }