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

egret/index.html

@@ -124,6 +124,7 @@
     }
 </script>
 <script>
+    // window['fresp']
     window['signconfigs'] = [
         {nums: '0.10元', type: 'quan10'},
         {nums: '*1', type: 'hammer'},

egret/src/mainScene/MainScene.ts

@@ -148,7 +148,7 @@ const redBombPanelName = "RedBombAlert";
 const fesChapterData: number[] = [];
 
 for (let i = 1; i < 999; i++) {  /// TODO 测试
-    if (i == 25 || i == 44 || i == 226) continue;
+    if (i == 25 || i == 44 || i == 226  || i == 330) continue;
     fesChapterData.push(i);
 }
 

egret/src/something/chapters/getChapter.ts

@@ -13,6 +13,9 @@ import { Chapters6 } from "./Chapter6";
 import { Chapters7 } from "./Chapter7";
 import { Chapters8 } from "./Chapter8";
 import { Chapters9 } from "./Chapter9";
+import { PassTargetData } from "../interface/PassTargetData";
+import { PassType } from "../enum/PassType";
+import { submitTran } from "../enum/ElementType";
 
 //所有的关卡
 const chapters: ChapterData[] = [].concat(

egret/src/something/class/Element.ts

@@ -127,18 +127,7 @@ export class Element extends eui.Component {
                     this.toStandByAction();
                 }
                 if (mv.currentFrame == 391) {
-
                     r();
-                    // 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.1, scaleY: 1.1 }, 300).wait(1000).call(()=>{
-                    //     pic.parent.removeChild(pic);
-                    // });
                 }
             };
             this._mv.addEventListener(egret.Event.ENTER_FRAME, cb, this);