Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 676-700关卡

egret/src/mainScene/MainScene.ts

@@ -1519,7 +1519,7 @@ export default class MainScene extends Scene {
     //初始化引导，游戏和道具
     initGuide() {
         //游戏引导
-        const gameGuideChapterNum = [1, 2, 3, 5, 8, 9, 10, 12, 17, 25, 41, 61, 101, 121, 226, 301,331, 377, 406, 426, 453, 501, 556, 601];
+        const gameGuideChapterNum = [1, 2, 3, 5, 8, 9, 10, 12, 17, 25, 41, 61, 101, 121, 226, 301,331, 377, 406, 426, 453, 501, 556, 601,661];
         if (gameGuideChapterNum.indexOf(this.chapter >> 0) > -1) {
             if (!readCache(getCacheKey() + this.chapter)) {
                 this.gameGuide = new GameGuide(this);

egret/src/something/chapters/Chapter26.ts

@@ -180,16 +180,7 @@ export const Chapters26: ChapterData[] = [
     1, 2, 1, 4, 4, 4, 1, 2, 1, 
     1, 1, 2, 1, 1, 1, 2, 1, 1 ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 10, type: null }, { index: 16, type: null }, { index: 18, type: null }, { index: 26, type: null } ] } },
   //661
-  { baseElementTypes: [ 0, 2, 3, 4 ], bubbleProbability: 0, stepCount: 21, passTarget: { type: 1, elements: [ { type: 9, count: 76 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 0, 0, 3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 6, 3, 3, 3, 3, 3, 3, 3, 1 ], connectedLats: [], conveyor: [], conveyorConnectedLats: [], WORMHOLE: [ [ 31, 46, 76, 52 ] ], elements: [ 
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 
-    1, 1, 4, 4, 4, 4, 4, 1, 1, 
-    1, 1, 4, 4, 4, 4, 4, 1, 1, 
-    2, 1, 4, 5, 5, 5, 4, 1, 2, 
-    2, 1, 2, 5, 4, 5, 2, 1, 2, 
-    2, 1, 2, 5, 5, 5, 2, 1, 2, 
-    2, 2, 4, 2, 2, 2, 4, 2, 2, 
-    1, 2, 4, 4, 4, 4, 4, 2, 12 ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 0, type: null }, { index: 1, type: null }, { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 7, type: null }, { index: 8, type: null } ] } },
+  { baseElementTypes: [ 0, 2, 4, 3 ], bubbleProbability: 0, stepCount: 21, passTarget: { type: 1, elements: [ { type: 9, count: 76 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 0, 0, 3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 6, 3, 3, 3, 3, 3, 3, 3, 1 ], connectedLats: [], conveyor: [], conveyorConnectedLats: [], WORMHOLE: [[31,46,76,52]], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 4, 4, 1, 1, 1, 1, 4, 4, 4, 4, 4, 1, 1, 2, 1, 4, 5, 5, 5, 4, 1, 2, 2, 1, 2, 5, 4, 5, 2, 1, 2, 2, 1, 2, 5, 5, 5, 2, 1, 2, 2, 2, 4, 2, 2, 2, 4, 2, 2, 1, 2, 4, 4, 4, 4, 4, 2, 12 ], baseElements: [ 40, 30, 40, 40, 50, 40, 40, 10, 50, 10, 10, 30, 10, 50, 10, 30, 30, 40, 0, 30, 40, 40, 30, 40, 50, 30, 0, 0, 50, 50, 40, 30, 50, 50, 40, 0, 0, 30, 50, 0, 0, 0, 30, 30, 0, 0, 30, 0, 0, 0, 0, 0, 40, 0, 0, 40, 0, 0, 0, 0, 0, 30, 0, 0, 0, 40, 0, 0, 0, 10, 0, 0, 0, 0, 30, 40, 40, 10, 40, 0, 0 ], recycles: [], generateLats: [ { index: 0, type: null }, { index: 1, type: null }, { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 7, type: null }, { index: 8, type: null } ] } },
   //662
   { baseElementTypes: [ 3, 4, 1, 2 ], bubbleProbability: 0, stepCount: 20, passTarget: { type: 1, elements: [ { type: 9, count: 49 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 
     0, 0, 0, 3, 0, 2, 0, 0, 0, 

egret/src/something/class/WormHole.ts

@@ -41,8 +41,13 @@ export default class WormHole extends egret.Sprite{
     }
     createWormHole(){
         this.wormHoleClip = new window["SVGA"].EgretMovieClip(wormvideo);
-        var mvwidth = 82;
-        var mvheight = 82;
+        
+        var mscale = 1.08
+        this.wormHoleClip.scaleX = mscale;
+        this.wormHoleClip.scaleY = mscale;
+        var mvwidth = 78*mscale;
+        var mvheight = 78*mscale;
+        
         this.wormHoleClip.x = -mvwidth/2;
         this.wormHoleClip.y = -mvwidth/2;
         this.addChild(this.wormHoleClip);
@@ -52,7 +57,7 @@ export default class WormHole extends egret.Sprite{
     }
     toFrameAni(){
         var curframe = this.wormHoleClip.currentFrame;
-        if(curframe==123){
+        if(curframe==81){
             var endtime = new Date().getTime();
             // console.log("passtime",endtime-this.playtime);
             this.wormHoleClip.gotoAndStop(1);

egret/src/something/uis/GameGuide.ts

@@ -573,6 +573,21 @@ const chapterFuns = {
             "在藤蔓周围消除，\n解救猩猩会有惊喜哦~"
         ]
     },
+    661:{
+        stepCount: 1,
+        showIndexs: [
+            [1, 10, 11, 19],
+        ],
+        hideIndexs: [
+            [1, 19],
+        ],
+        handIndexs: [
+            [10, 11],
+        ],
+        msg: [
+            "每消除一步，黑洞两端\n的元素就会交换一次哦"
+        ]
+    }
 };
 
 /**