Merge branch 'hotfix20200330_'

egret/index.html

@@ -19,7 +19,7 @@
             background-color: #000;
             background-size: 100%;
             background-position: center;
-            background-image: url("https://yun.duiba.com.cn/db_games/activity/game/0217/startscenebg2.jpg");
+            background-image: url("https://yun.duiba.com.cn/db_games/activity/game/0327/startscenebg.jpg");
             /* background-image: url("https://yun.duiba.com.cn/db_games/activity/game/1565600901/resource/assets/startScene/startscenebg.jpg"); */
             padding: 0;
             border: 0;

egret/libs/new_wx/MainBase.ts

@@ -307,6 +307,8 @@ export default class MainBase extends eui.UILayer {
             }
             RES.getResAsync("ele34_png");
             RES.getResAsync("ele36_png");
+            RES.getResAsync("ele38_png");
+            RES.getResAsync("ele39_png");
             for (var i = 1; i <= 27; i++) {
                 RES.getResAsync("bonusFra" + i + "_png")
             }

egret/src/mainScene/doSandAI.ts

@@ -16,7 +16,7 @@ export default async (thisObj: MainScene) => {
     const sandLattices = thisObj.lattices.filter(lattice => {
         return lattice.sand;
     });
-    console.log(sandLattices);
+    // console.log(sandLattices);
     //map promise
     //先判断是否能跳动，目前都能跳
     const promiseList: Promise<any>[] = [];

egret/src/something/Tool.ts

@@ -2,13 +2,14 @@ import { Element } from "./class/Element";
 import { Lattice } from "./class/Lattice";
 import { RectMask } from "./class/RectMask";
 import { EffectType } from "./enum/EffectType";
-import { ElementType, FiveBaseElementTypes } from "./enum/ElementType";
+import { ElementType, FiveBaseElementTypes, forwardDirection } from "./enum/ElementType";
 import { RecoverName } from "./enum/RecoverName";
 import { StateType } from "./enum/StateType";
 import { FallType } from "./interface/FallAniData";
 import { GenerateLatData } from "./interface/GenerateLatData";
 import { Pool } from "./Pool";
 import HoneyPotElement from "./class/HoneyPotElement";
+import { ElementConfigType } from "./enum/ElementConfigType";
 
 //两种，0无棒棒糖，1有
 const offsetYTwo: number[] = [];
@@ -230,6 +231,21 @@ export class Tool {
         }
         return false
     }
+    /**
+     * 根据idx判断相邻
+     * @param a 
+     * @param b 
+     */
+    public static checkNebByidx(a:number,b:number){
+        var arc = this.indexToRc(a);
+        var brc = this.indexToRc(b);
+        if (Math.abs(arc[0] - brc[0]) == 1 && Math.abs(arc[1] - brc[1]) == 0) {
+            return true
+        } else if (Math.abs(arc[0] - brc[0]) == 0 && Math.abs(arc[1] - brc[1]) == 1) {
+            return true
+        }
+        return false
+    }
 
     /**
      * 数组中插入一个数值，按顺序的
@@ -281,8 +297,10 @@ export class Tool {
             lat.element.type == ElementType.JELLY_MONSTER ||
             lat.element.type == ElementType.FIREWORKS_SHOOTER ||
             lat.element.type == ElementType.CHICKEN_EGG ||
-            lat.element.type == ElementType.FESTIVALELE_BIG //||
+            lat.element.type == ElementType.FESTIVALELE_BIG ||
             // lat.element.type == ElementType.FESTIVALELE_SMALL
+            lat.element.type == ElementType.CANNO ||
+            lat.element.type == ElementType.CANNO_BLOCK
         ) {
             return false
         }
@@ -344,7 +362,9 @@ export class Tool {
         //上方元素为冰淇淋
         else if (lat.element.type == ElementType.LOLLIPOP ||
             lat.element.type == ElementType.JELLY_MONSTER ||
-            lat.element.type == ElementType.FIREWORKS_SHOOTER
+            lat.element.type == ElementType.FIREWORKS_SHOOTER ||
+            lat.element.type == ElementType.CANNO ||
+            lat.element.type == ElementType.CANNO_BLOCK
         ) {
             return false
         }
@@ -353,6 +373,21 @@ export class Tool {
             return true
         }
     }
+    /**
+     * 判断是否是炮台石头
+     * @param lat 
+     */
+    public static judgeIscannoBlock(lat:Lattice){
+        if(!lat||!lat.element){
+            return false;
+        }
+        else if(lat.element.type==ElementType.CANNO_BLOCK){
+            return true;
+        }
+        else{
+            return false;
+        }
+    }
 
     /**
      * 判断格子上是基础元素，包括各种状态的
@@ -428,7 +463,9 @@ export class Tool {
             ele.type == ElementType.FIREWORKS_SHOOTER ||
             ele.type == ElementType.CHICKEN_EGG ||
             ele.type == ElementType.FESTIVALELE_BIG ||
-            ele.type == ElementType.FESTIVALELE_SMALL
+            ele.type == ElementType.FESTIVALELE_SMALL ||
+            ele.type == ElementType.CANNO ||
+            ele.type == ElementType.CANNO_BLOCK
         ) {
             return false;
         }
@@ -454,7 +491,9 @@ export class Tool {
             ele.hasState(StateType.HAIRBALLGREY) ||
             ele.hasState(StateType.BLOCK_LOCK) ||
             ele.hasState(StateType.HAIRBALLBLACK) ||
-            ele.hasState(StateType.HAIRBALLBROWN)
+            ele.hasState(StateType.HAIRBALLBROWN) ||
+            ele.type == ElementType.CANNO ||
+            ele.type == ElementType.CANNO_BLOCK
         ) {
             return false;
         }
@@ -474,7 +513,9 @@ export class Tool {
             ele.hasState(StateType.BLOCK_LOCK) ||
             ele.monster ||
             ele.hasState(StateType.HAIRBALLBLACK) ||
-            ele.hasState(StateType.HAIRBALLBROWN)
+            ele.hasState(StateType.HAIRBALLBROWN) ||
+            ele.type == ElementType.CANNO ||
+            ele.type == ElementType.CANNO_BLOCK
         ) {
             return false;
         }
@@ -860,7 +901,6 @@ export class Tool {
         }
         return Tool.randomT(arr);
     }
-
     /**
      * 根据关卡的地图数据generateLats
      * 
@@ -1177,4 +1217,51 @@ export class Tool {
         }
         return outArr
     }
+    /**
+     * 判断是否是炮台
+     * @param type 
+     */
+    public static IsCanno(type:ElementConfigType){
+        
+        if(type==ElementConfigType.CANNO_DIR_TOP||
+            type==ElementConfigType.CANNO_DIR_BOTTOM||
+            type==ElementConfigType.CANNO_DIR_LEFT||
+            type==ElementConfigType.CANNO_DIR_RIGHT
+        ){
+            return true;
+        }
+        return false;
+    }
+
+    public static getCannoDir(type:ElementConfigType){
+        if(type==ElementConfigType.CANNO_DIR_TOP){
+            return forwardDirection.up;
+        }
+        else if(type==ElementConfigType.CANNO_DIR_BOTTOM){
+            return forwardDirection.down;
+        }
+        else if(type==ElementConfigType.CANNO_DIR_LEFT){
+            return forwardDirection.left;
+        }
+        else if(type==ElementConfigType.CANNO_DIR_RIGHT){
+            return forwardDirection.right;
+        }else{
+            console.error("未定义跑跳");
+        }
+    }
+    //炮台的旋转朝向
+    public static getCannoRoaByDir(cannodir:forwardDirection){
+        var roaidx:number;
+        if(cannodir==forwardDirection.left){
+            roaidx = 0;
+        }else if(cannodir==forwardDirection.up){
+            roaidx = 1;
+        }else if(cannodir==forwardDirection.right){
+            roaidx = 2;
+        }else if(cannodir==forwardDirection.down){
+            roaidx = 3;
+        }
+        var roanum = [-90,0,90,180][roaidx];
+        return roanum;
+    }
 }
\ No newline at end of file

egret/src/something/chapters/Chapter14.ts

@@ -4,7 +4,17 @@ import { ElementType } from "../enum/ElementType";
 
 export const Chapters14: ChapterData[] = [
     //301
-    { baseElementTypes: [0, 1, 2, 3, 4], bubbleProbability: 0, stepCount: 15, passTarget: { type: 1, elements: [{ type: 0, count: 47 }, { type: 1, count: 55 }, { type: 5, count: 10 }] }, starScores: [15000, 20000, 25000], map: { lattices: [0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 1, 1, 1, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 1, 1, 1, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], connectedLats: [[18, 36], [26, 44], [54, 72], [62, 80]], elements: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 2, 2, 12, 1, 1, 1, 1, 1, 1, 1, 12, 2, 2, 5, 5, 5, 5, 5, 2, 2, 2, 2, 1, 1, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, 1, 2, 2, 12, 1, 1, 1, 1, 1, 1, 1, 12, 2, 2, 11, 1, 1, 1, 11, 2, 2], 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: 18, type: null }, { index: 19, type: null }, { index: 25, type: null }, { index: 26, type: null }] } },
+    { baseElementTypes: [0, 1, 2, 3, 4], bubbleProbability: 0, stepCount: 15, passTarget: { type: 1, elements: [{ type: 0, count: 47 }, { type: 1, count: 55 }, { type: 5, count: 10 }] }, starScores: [15000, 20000, 25000], map: { lattices: [0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 41, 1, 1, 1, 1, 1, 41, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 41, 1, 1, 1, 1, 1, 41, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], connectedLats: [[18, 36], [26, 44], [54, 72], [62, 80]], elements: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 2, 2, 12, 1, 1, 1, 1, 1, 1, 1, 12, 2, 2, 5, 5, 5, 5, 5, 2, 2, 2, 2, 1, 1, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, 1, 2, 2, 12, 1, 1, 1, 1, 1, 1, 1, 12, 2, 2, 11, 1, 1, 1, 11, 2, 2], baseElements: [
+        0, 0, 50, 20, 30, 10, 40, 0, 0, 
+        0, 0, 30, 30, 50, 50, 40, 0, 0, 
+        0, 0, 20, 20, 30, 50, 10, 0, 0, 
+        0, 20, 20, 40, 30, 10, 10, 20, 0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 50, 50, 30, 20, 40, 0, 0, 
+        0, 0, 30, 30, 50, 40, 30, 0, 0, 
+        0, 20, 20, 30, 10, 40, 20, 20, 0, 
+        0, 0, 0, 20, 10, 20, 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: 18, type: null }, { index: 19, type: null }, { index: 25, type: null }, { index: 26, type: null }] } },
     //302
     { baseElementTypes: [0, 2, 4, 3], bubbleProbability: 10, stepCount: 25, passTarget: { type: 1, elements: [{ type: 2, count: 38 }, { type: 3, count: 38 }, { type: 9, count: 65 }] }, starScores: [15000, 20000, 25000], map: { lattices: [2, 2, 2, 2, 0, 2, 2, 2, 2, 2, 2, 2, 0, 2, 0, 2, 2, 2, 2, 2, 0, 2, 2, 2, 0, 2, 2, 2, 0, 2, 2, 2, 2, 2, 0, 2, 0, 2, 2, 2, 2, 2, 2, 2, 0, 2, 0, 2, 2, 2, 2, 2, 0, 2, 2, 2, 0, 2, 2, 2, 0, 2, 2, 2, 2, 2, 0, 2, 0, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 2, 2], connectedLats: [], elements: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 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: 0, type: null }, { index: 1, type: null }, { index: 2, type: null }, { index: 3, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 7, type: null }, { index: 8, type: null }, { index: 13, type: null }, { index: 45, type: null }, { index: 53, type: null }] } },
     //303
@@ -64,7 +74,8 @@ export const Chapters14: ChapterData[] = [
     //330
     { baseElementTypes: [0, 2, 3, 4], bubbleProbability: 0, stepCount: 25, passTarget: { type: 1, elements: [{ type: 1, count: 299 }] }, starScores: [15000, 20000, 25000], map: { lattices: [1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1], connectedLats: [], elements: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 1, 1, 1, 1, 1, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 1, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 1, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 1, 1, 1, 1, 1, 6, 1, 1, 1, 1, 1, 1, 1, 1, 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: 0, type: null }, { index: 1, type: null }, { index: 2, type: null }, { index: 6, type: null }, { index: 7, type: null }, { index: 8, type: null }, { index: 21, type: null }, { index: 22, type: null }, { index: 23, type: null }, { index: 37, type: null }, { index: 43, type: null }, { index: 54, type: null }, { index: 55, type: null }, { index: 61, type: null }, { index: 62, type: null }] } },
     //331
-    { baseElementTypes: [0, 2, 3, 4], bubbleProbability: 0, stepCount: 27, passTarget: { type: 1, elements: [{ type: 22, count: 30 }, { type: 24, count: 30 }, { type: 25, count: 30 }] }, starScores: [15000, 20000, 25000], map: { lattices: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], connectedLats: [], elements: [1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 1, 1, 1, 1, 1, 1, 1, 13, 13, 1, 1, 1, 1, 1, 1, 1, 13, 13, 1, 1, 1, 1, 1, 1, 1, 13, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 1, 1, 1, 1, 1, 1, 1, 13, 13, 1, 1, 1, 1, 1, 1, 1, 13, 13, 1, 1, 1, 1, 1, 1, 1, 13], 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: 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, 3, 4], bubbleProbability: 0, stepCount: 27, passTarget: { type: 1, elements: [{ type: 22, count: 30 }, { type: 24, count: 30 }, { type: 25, count: 30 }] }, starScores: [15000, 20000, 25000], map: { lattices: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], connectedLats: [], elements: [1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 1, 1, 1, 1, 1, 1, 1, 13, 13, 1, 1, 1, 1, 1, 1, 1, 13, 13, 1, 1, 1, 1, 1, 1, 1, 13, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 1, 1, 1, 1, 1, 1, 1, 13, 13, 1, 1, 1, 1, 1, 1, 1, 13, 13, 1, 1, 1, 1, 1, 1, 1, 13], baseElements: [40, 40, 30, 50, 50, 30, 10, 50, 40, 0, 10, 10, 40, 50, 30, 10, 40, 0, 0, 30, 30, 40, 30, 10, 40, 40, 0, 0, 40, 50, 50, 30, 30, 10, 10, 0, 30, 30, 10, 30, 10, 50, 30, 30, 40, 30, 50, 50, 40, 10, 10, 40, 40, 10, 0, 40, 30, 10, 30, 40, 30, 50, 0, 0, 50, 50, 10, 40, 40, 10, 10, 0, 0, 10, 30, 50, 30, 50, 30, 10, 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 }] } },
     //332
     { baseElementTypes: [0, 1, 2, 3, 4], bubbleProbability: 0, stepCount: 25, passTarget: { type: 1, elements: [{ type: 9, count: 81 }] }, starScores: [15000, 20000, 25000], map: { lattices: [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, 3, 61, 3, 3, 3, 3, 3, 3, 6, 61, 3, 61, 6, 3, 3, 3, 3, 3, 3, 61, 3, 3, 3, 3, 3, 3, 3, 3, 6, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3], connectedLats: [], elements: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 4, 1, 4, 1, 2, 1, 2, 5, 2, 5, 1, 5, 2, 5, 2, 2, 4, 5, 4, 5, 4, 5, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2], 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: 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 }] } },
     //333

egret/src/something/chapters/Chapter16.ts

@@ -37,23 +37,23 @@ export const Chapters16: ChapterData[] = [
    //406
    { baseElementTypes: [ 0, 2, 3, 4 ], bubbleProbability: 0, stepCount: 26, passTarget: { type: 1, elements: [ { type: 9, count: 45 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [
       0, 0, 0, 0, 3, 0, 0, 0, 0, 
-0, 0, 0, 3, 3, 3, 0, 0, 0, 
-0, 0, 3, 3, 3, 3, 3, 0, 0, 
-0, 3, 3, 3, 3, 3, 3, 3, 0,
+     0, 0, 0, 3, 3, 3, 0, 0, 0, 
+     0, 0, 3, 3, 3, 3, 3, 0, 0, 
+     0, 3, 3, 3, 3, 3, 3, 3, 0,
       3, 3, 3, 3, 3, 3, 3, 3, 3, 
-0, 3, 3, 3, 3, 3, 3, 3, 0, 
-0, 0, 3, 3, 3, 3, 3, 0, 0,
+     0, 3, 3, 3, 3, 3, 3, 3, 0, 
+     0, 0, 3, 3, 3, 3, 3, 0, 0,
       0, 0, 0, 3, 3, 3, 0, 0, 0,
       0, 1, 3, 3, 3, 3, 3, 1, 0 ], connectedLats: [], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 15, 1, 1, 1, 15, 1, 1, 1, 15, 1, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 15, 15, 15, 1, 1, 1, 1, 15, 15, 15, 15, 15, 15, 15, 1 ], baseElements: [ 
-0, 0, 0, 0, 10, 0, 0, 0, 0,
- 0, 0, 0, 0, 30, 10, 50, 0, 0, 
-0, 0, 0, 0, 40, 30, 10, 50, 0, 
-0, 0, 0, 0, 50, 10, 30, 30, 0,
- 0, 0, 0, 0, 0, 11, 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: 4, type: null }, { index: 12, type: null }, { index: 14, type: null }, { index: 20, type: null }, { index: 24, type: null }, { index: 28, type: null }, { index: 34, type: null }, { index: 36, type: null }, { index: 44, type: null } , { index: 73, type: null }, { index: 79, type: null }] } },
+     0, 0, 0, 0, 10, 0, 0, 0, 0,
+      0, 0, 0, 0, 30, 10, 50, 0, 0, 
+     0, 0, 0, 0, 40, 30, 10, 50, 0, 
+     0, 0, 0, 0, 50, 10, 30, 30, 0,
+      0, 0, 0, 0, 0, 11, 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: 4, type: null }, { index: 12, type: null }, { index: 14, type: null }, { index: 20, type: null }, { index: 24, type: null }, { index: 28, type: null }, { index: 34, type: null }, { index: 36, type: null }, { index: 44, type: null } , { index: 73, type: null }, { index: 79, type: null }] } },
    //407
    { baseElementTypes: [ 0, 1, 3, 4 ], bubbleProbability: 0, stepCount: 21, passTarget: { type: 1, elements: [ { type: 0, count: 168 }, { type: 1, count: 188 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 4, 41, 4, 41, 4, 41, 4, 41, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ], connectedLats: [ [ 20, 38 ], [ 38, 56 ], [ 24, 42 ], [ 40, 60 ] ], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 14, 1, 1, 1, 2, 12, 1, 1, 1, 1, 1, 1, 1, 12, 1, 1, 1, 1, 14, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 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: 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 } ] } },
    //408

egret/src/something/chapters/Chapter17.ts

@@ -3,15 +3,24 @@ import { ChapterData } from "../interface/ChapterData";
 export const Chapters17: ChapterData[] = [
    //426
    { baseElementTypes: [ 0, 1, 3, 4 ], bubbleProbability: 0, stepCount: 25, passTarget: { type: 1, elements: [ { type: 5, count: 22 }, { type: 34, count: 25 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 4, 0, 1, 1, 1, 0, 4, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ], connectedLats: [ [ 19, 37 ], [ 25, 43 ] ], elements: [ 
-1, 1, 1, 1, 1, 1, 1, 1, 1, 
-16, 1, 1, 1, 1, 1, 1, 1, 16, 
-1, 1, 1, 1, 1, 1, 1, 1, 1, 
-1, 1, 1, 1, 1, 1, 1, 1, 1, 
-1, 2, 1, 1, 1, 1, 1, 2, 1, 
-2, 2, 1, 1, 1, 1, 1, 2, 2, 
-2, 2, 1, 1, 16, 1, 1, 2, 2, 
-16, 2, 2, 1, 1, 1, 2, 2, 16, 
-2, 2, 2, 2, 1, 2, 2, 2, 2 ], 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: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 9, type: null }, { index: 17, type: null }, { index: 19, type: null }, { index: 25, type: null }, { index: 29, type: null }, { index: 33, type: null }, { index: 45, type: null }, { index: 53, type: null } ] } },
+      1, 1, 1, 1, 1, 1, 1, 1, 1, 
+      16, 1, 1, 1, 1, 1, 1, 1, 16, 
+      1, 1, 1, 1, 1, 1, 1, 1, 1, 
+      1, 1, 1, 1, 1, 1, 1, 1, 1, 
+      1, 2, 1, 1, 1, 1, 1, 2, 1, 
+      2, 2, 1, 1, 1, 1, 1, 2, 2, 
+      2, 2, 1, 1, 16, 1, 1, 2, 2, 
+      16, 2, 2, 1, 1, 1, 2, 2, 16, 
+      2, 2, 2, 2, 1, 2, 2, 2, 2 ], baseElements: [ 0, 0, 0, 10, 50, 50, 0, 0, 0, 
+      0, 0, 0, 50, 50, 40, 0, 0, 0, 
+      0, 0, 0, 20, 20, 10, 0, 0, 0, 
+      0, 0, 50, 40, 50, 10, 10, 0, 0, 
+      0, 0, 10, 10, 50, 40, 50, 0, 0, 
+      0, 0, 20, 10, 40, 10, 50, 0, 0, 
+      0, 0, 50, 50, 0, 10, 40, 0, 0, 
+      0, 0, 0, 10, 10, 20, 0, 0, 0, 
+      0, 0, 0, 0, 20, 0, 0, 0, 0
+      ], recycles: [], generateLats: [ { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 9, type: null }, { index: 17, type: null }, { index: 19, type: null }, { index: 25, type: null }, { index: 29, type: null }, { index: 33, type: null }, { index: 45, type: null }, { index: 53, type: null } ] } },
    //427
    { baseElementTypes: [ 1, 2, 3, 4 ], bubbleProbability: 0, stepCount: 24, passTarget: { type: 1, elements: [ { type: 5, count: 14 }, { type: 34, count: 10 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0 ], connectedLats: [], elements: [
  1, 1, 1, 1, 1, 1, 1, 1, 1, 

egret/src/something/chapters/Chapter18.ts

@@ -9,7 +9,7 @@ export const Chapters18: ChapterData[] = [
    { baseElementTypes: [ 0, 1, 2, 3 ], bubbleProbability: 0, stepCount: 31, passTarget: { type: 1, elements: [ { type: 22, count: 20 }, { type: 23, count: 20 }, { type: 24, count: 20    } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0 ], connectedLats: [], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 12, 1, 1, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 1, 1, 12, 1, 1, 13, 13, 13, 13, 13, 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: 1, type: null }, { index: 2, type: null }, { index: 3, type: null }, { index: 22, type: null }, { index: 23, type: null }, { index: 24, type: null }, { index: 25, type: null } ] } },
    //453
    { baseElementTypes: [ 0, 1, 2, 3 ], bubbleProbability: 10, stepCount: 22, passTarget: { type: 1, elements: [ { type: 36, count: 24 }, { type: 1, count: 188 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 
-1, 1, 1, 1, 1, 1, 1, 1, 1,
+      1, 1, 1, 1, 1, 1, 1, 1, 1,
        1, 1, 1, 1, 1, 1, 1, 1, 1,
        1, 1, 1, 1, 1, 1, 1, 1, 1,
        4, 1, 4, 1, 4, 1, 4, 1, 4,
@@ -17,7 +17,8 @@ export const Chapters18: ChapterData[] = [
        1, 1, 7, 7, 1, 7, 7, 1, 1,
        1, 1, 7, 7, 7, 7, 7, 1, 1,
        1, 1, 7, 7, 7, 7, 7, 1, 1,
- 0, 1, 7, 7, 7, 7, 7, 1, 0 ], connectedLats: [], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 1, 1, 2, 1, 1, 1, 1, 1, 2, 1, 1, 2, 1, 1, 1, 1, 1, 2, 1, 1, 2, 1, 1, 12, 1, 1, 2, 1, 1, 2, 1, 1, 1, 1, 1, 2, 1, 1, 2, 1, 1, 1, 1, 1, 2, 1, 1, 2, 2, 2, 2, 2, 2, 2, 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: 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 } ] } },
+       0, 1, 7, 7, 7, 7, 7, 1, 0 ], connectedLats: [], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 1, 1, 2, 1, 1, 1, 1, 1, 2, 1, 1, 2, 1, 1, 1, 1, 1, 2, 1, 1, 2, 1, 1, 12, 1, 1, 2, 1, 1, 2, 1, 1, 1, 1, 1, 2, 1, 1, 2, 1, 1, 1, 1, 1, 2, 1, 1, 2, 2, 2, 2, 2, 2, 2, 1 ], baseElements: [ 20, 30, 20, 20, 10, 20, 30, 10, 10, 10, 20, 10, 10, 30, 10, 40, 30, 20, 40, 0, 0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 20, 0, 40, 0, 0, 0, 30, 0, 30, 40, 40, 30, 40, 0, 20, 30, 0, 0, 40, 0, 40, 20, 0, 20, 20, 0, 40, 10, 30, 10, 30, 0, 40, 40, 0, 40, 10, 10, 20, 30, 0, 20, 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 } ] } },
    //454
    { baseElementTypes: [ 0, 1, 2, 3 ], bubbleProbability: 0, stepCount: 25, passTarget: { type: 1, elements: [ { type: 6, count: 9 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0 ], connectedLats: [ [ 49, 67 ], [ 50, 68 ], [ 51, 69 ], [ 52, 70 ], [ 76, 18 ], [ 77, 19 ], [ 78, 20 ], [ 79, 21 ] ], elements: [ 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, 1, 2, 2, 2, 2, 12, 12, 12, 12, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 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: [ 72, 73, 74, 75 ], generateLats: [ { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 7, type: null } ] } },
    //455

egret/src/something/chapters/Chapter20 copy.ts

-import { ChapterData } from "../interface/ChapterData";
-//501-525
-export const Chapters20: ChapterData[] = [
-    {
-        baseElementTypes: [0, 1, 2, 3], bubbleProbability: 0, stepCount: 27, passTarget: { type: 1, elements: [{ type: 3, count: 98 }] }, starScores: [15000, 20000, 25000], map: {
-            lattices: [1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1], connectedLats: [],
-            conveyor: [[2, 65]],
-            conveyorConnectedLats: [[65, 2]], elements: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
-                , 1, 1, 1, 1, 1, 1, 12, 1, 12, 1, 12, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 1, 1, 4
-                , 1, 2, 1, 2, 1, 4, 1, 1, 4, 
-                12, 2, 12, 2, 12, 4, 1, 1, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 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: 0, type: null }, { index: 2, type: null }, { index: 4, type: null }, { index: 6, type: null }, { index: 8, type: null }, { index: 10, type: null }, { index: 12, type: null }, { index: 14, type: null }, { index: 16, type: null }]
-        }
-    }
-]
\ No newline at end of file

egret/src/something/chapters/Chapter20.ts

@@ -4,7 +4,8 @@ import { ElementType } from "../enum/ElementType";
 //501-525
 export const Chapters20: ChapterData[] = [
     //501
-    { baseElementTypes: [ 0, 1, 2, 3, 4 ], bubbleProbability: 0, stepCount: 25, passTarget: { type: 1, elements: [ { type: 9, count: 44 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 3, 3, 3, 3, 3, 3, 3, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 3, 3, 3, 3, 3, 3, 3, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 3, 3, 3, 3, 3, 3, 3, 0 ], connectedLats: [], conveyor: [ [ 27, 35 ], [ 53,45 ] ], conveyorConnectedLats: [ [ 35, 27 ], [ 45,53 ] ], elements: [ 1, 1, 1, 1, 1, 1, 1, 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, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 12, 1, 1, 1, 12, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 12, 1, 1, 12, 1, 1, 12, 1, 1, 1, 1, 1, 1, 1, 1, 1, 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: 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 } ] } },
+    { baseElementTypes: [ 0, 1, 2, 3, 4 ], bubbleProbability: 0, stepCount: 25, passTarget: { type: 1, elements: [ { type: 9, count: 44 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 3, 3, 3, 3, 3, 3, 3, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 3, 3, 3, 3, 3, 3, 3, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 3, 3, 3, 3, 3, 3, 3, 0 ], connectedLats: [], conveyor: [ [ 27, 35 ], [ 53,45 ] ], conveyorConnectedLats: [ [ 35, 27 ], [ 45,53 ] ], elements: [ 1, 1, 1, 1, 1, 1, 1, 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, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 12, 1, 1, 1, 12, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 12, 1, 1, 12, 1, 1, 12, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ], baseElements: [0, 30, 40, 30, 20, 20, 40, 10, 0, 0, 20, 50, 40, 30, 20, 30, 10, 0, 50, 50, 40, 10, 20, 10, 30, 50, 50, 50, 40, 50, 30, 50, 20, 10, 30, 40, 0, 40, 10, 50, 30, 20, 20, 10, 0, 0, 30, 30, 10, 0, 50, 10, 20, 20, 0, 30, 10, 40, 50, 30, 20, 30, 0, 0, 20, 50, 0, 10, 40, 0, 50, 20, 0, 30, 10, 30, 30, 40, 30, 30, 0
+    ], recycles: [], generateLats: [ { 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 } ] } },
     //502
     { baseElementTypes: [ 0, 1, 2, 3 ], bubbleProbability: 0, stepCount: 29, passTarget: { type: 1, elements: [ { type: 9, count: 55 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 0, 3, 0, 3, 0, 3, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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 ], connectedLats: [ [ 72, 0 ], [ 73, 1 ], [ 74, 2 ], [ 75, 3 ], [ 76, 4 ], [ 77, 5 ], [ 78, 6 ], [ 79, 7 ], [ 80, 8 ] ], conveyor: [], conveyorConnectedLats: [], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 14, 4, 1, 4, 14, 4, 1, 1, 1, 4, 1, 4, 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 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: 45, type: null }, { index: 46, type: null }, { index: 47, type: null }, { index: 48, type: null }, { index: 49, type: null }, { index: 50, type: null }, { index: 51, type: null }, { index: 52, type: null }, { index: 53, type: null } ] } },
     //503

egret/src/something/chapters/Chapter22.ts

 import { ChapterData } from "../interface/ChapterData";
+import { PassType } from "../enum/PassType";
+import { ElementType } from "../enum/ElementType";
 
 //551-575
 export const Chapters22: ChapterData[] = [
+    //551
+    {
+        baseElementTypes: [0, 2, 3, 4, 1],
+        bubbleProbability: 0,
+        stepCount: 35,
+        passTarget: {
+            type: 1,
+            elements: [{
+                type: 22,
+                count: 20
+            }, {
+                type: 24,
+                count: 20
+            }, {
+                type: 26,
+                count: 20
+            }]
+        },
+        starScores: [15000, 20000, 25000],
+        map: {
+            lattices: [
+                1, 1, 0, 0, 0, 0, 0, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                0, 1, 1, 1, 1, 1, 1, 1, 0,
+                0, 1, 1, 1, 1, 1, 1, 1, 0, 
+                0, 1, 1, 1, 1, 1, 1, 1, 0, 
+                0, 1, 1, 1, 1, 1, 1, 1, 0,
+                0, 1, 1, 1, 1, 1, 1, 1, 0,
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 
+                1, 1, 1, 1, 1, 1, 1, 1, 1
+            ],
+            connectedLats: [],
+            conveyor: [],
+            conveyorConnectedLats: [],
+            elements: [
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 13, 22, 1, 22, 13, 1, 1,
+                1, 1, 22, 13, 1, 13, 22, 1, 1,
+                1, 1, 22, 22, 22, 22, 22, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 
+                1, 1, 18, 18, 18, 18, 18, 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, 14, 11, 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: 7,
+                type: null
+            }, {
+                index: 8,
+                type: null
+            }, {
+                index: 11,
+                type: null
+            }, {
+                index: 12,
+                type: null
+            }, {
+                index: 13,
+                type: null
+            }, {
+                index: 14,
+                type: null
+            }, {
+                index: 15,
+                type: null
+            }, {
+                index: 46,
+                type: null
+            }, {
+                index: 47,
+                type: null
+            }, {
+                index: 48,
+                type: null
+            }, {
+                index: 49,
+                type: null
+            }, {
+                index: 50,
+                type: null
+            }, {
+                index: 51,
+                type: null
+            }, {
+                index: 52,
+                type: null
+            }]
+        }
+    }
   ]

egret/src/something/chapters/getChapter.ts

@@ -69,7 +69,7 @@ chapters.forEach((chapter,index) => {
  */
 export function getChapterData(index: number): ChapterData {
     //没有数据就返回第一关数据
-    return chapters[index] || chapters[1];
+    return chapters[index] || chapters[551];
 }
 
 var a = {

egret/src/something/class/Element.ts

@@ -13,7 +13,7 @@ import { createCandyDis3Ani } from "../anis/candy/createCandyDis3Ani";
 import { createCandyDis4Ani } from "../anis/candy/createCandyDis4Ani";
 import { createCandySubAni } from "../anis/candy/createCandySubAni";
 import { EffectType } from "../enum/EffectType";
-import { CandyBaseElementType, ElementType, FiveBaseElementTypes, transElementRes } from "../enum/ElementType";
+import { CandyBaseElementType, ElementType, FiveBaseElementTypes, transElementRes, forwardDirection } from "../enum/ElementType";
 import { RecoverName } from "../enum/RecoverName";
 import { stateDatas, StateType } from "../enum/StateType";
 import { ExplosiveBgAni } from "../periodAni/ExplosiveBgAni";
@@ -30,16 +30,33 @@ import { Monster } from "./Monster";
 import { State } from "./State";
 import wait from "../../../libs/new_tc/wait";
 import { Fish } from "./Fish";
+import MainScene from "../../mainScene/MainScene";
 /**
  * 考虑到底继承白鹭的啥Component还是Container
  * 坐标原点需要坐落在格子的中心点
  * 最好到时按，底图，动效，气泡，笼子，毛球，进行分层，如果多个状态要共存时，必须分层，到时气泡的动画，要写再自己的层里
  */
+
+ //加载器
+let svgaParser;
 export class Element extends eui.Component {
     private _fishState = 0;
     private _isNeb: boolean;//是否
     get isNeb() { return this._isNeb }
     fishCanEliFlag: boolean;
+
+    cannoMoveClip:any;
+    // cannoCnClip:any;
+    // cannoStat:number[] = [1,71,131,191,241,361];
+    /**
+     * 1--初始
+     * 71--一格能量
+     * 131--两格
+     * 191--三格
+     * 351--开始蓄力
+     * 441--开始发射，
+     * 481--结束
+     */
     //尝试设置碰撞状态，如果之前被特效集中，那么可以设置碰撞状态。碰撞状态之后可以准备消除。
     setFishNebFlag() {
         if (this._fishState > 0) {
@@ -188,6 +205,83 @@ export class Element extends eui.Component {
         this.addCandyStandbyAni();
     }
 
+    _cannoDir:forwardDirection;
+    _cannoStat:number = 0;
+    cannoAmnStat:number = 0;
+    mainScene:MainScene;
+    resetToCannoView(cannodir:forwardDirection,mainscene:MainScene){
+        this._cannoDir = cannodir;
+        this.resetCannoStat();
+        this.mainScene = mainscene;
+        var roanum = Tool.getCannoRoaByDir(cannodir);
+        this.cannobox.rotation = roanum;
+    }
+    changeShowCannoStat(){
+        this.cannolab.text = this._cannoStat+"";
+        // this.changeMvPlay(this._cannoStat);
+    }
+    changeMvPlay(_stat:number){
+        if(this.cannoMoveClip){
+            var endframe:number;
+            var curframe:number = this.cannoMoveClip.currentFrame;
+            if(curframe>=351){
+                if(_stat==3||_stat==2){
+                    return;
+                }
+            }
+            if(_stat==0){
+                curframe = 0;
+                endframe = 1;
+            }else if(_stat==1){
+                curframe = 61;
+                endframe = 71;
+            }else if(_stat==2){
+                curframe = 121
+                endframe = 131;
+            }else if(_stat==3){
+                curframe = 181;
+                endframe = 191;
+            }else if(_stat==4){
+                curframe = 351;
+                endframe = 481;
+            }
+            // console.log("ele播放大炮动画",curframe,endframe,_stat);
+            // this.cannoMoveClip.gotoAndPlay(curframe,true);
+            this.stopFrame = endframe;
+            this.cannoMoveClip.gotoAndPlay(curframe,1);
+        }
+    }
+    /**
+     * 炮台能否发射
+     */
+    checkCannoStat(){
+        if(this._cannoStat==3){
+            return true;
+        }
+        return false;
+    }
+    /**
+     * 炮台发射
+     */
+    fireCanno(){
+        // console.error("ele播放蓄力动画-----",this.index,this.cannoMoveClip.currentFrame);
+        this.changeMvPlay(4);
+    }
+    resetCannoStat(){
+        this._cannoStat = 0;
+        this.changeShowCannoStat();
+        this.changeMvPlay(this._cannoStat);
+    }
+    addOneCannoStat(){
+        this._cannoStat += 1;
+        if(this._cannoStat>3){
+            this._cannoStat = 3;
+        }else{//充能动画
+            // this.cannoCnClip.gotoAndPlay(1,true);
+        }
+        this.changeShowCannoStat();
+    }
+
     playCandyDieAni() {
         var p = Tool.getPositionByIndex(this.index);
         createCandyDieBgAni(p[0], p[1], this.stage);
@@ -255,6 +349,9 @@ export class Element extends eui.Component {
      * 显示的图片，直接改source，"ele"+type
      */
     protected showImage: eui.Image;
+    protected cannobox:eui.Group;
+    cannoboxwid:number = 116;
+    cannoboxhei:number = 116;
 
     temEffectType: EffectType = null;
     /**
@@ -358,6 +455,8 @@ export class Element extends eui.Component {
      */
     private states: State[] = []
 
+    //模拟炮台发射情况
+    protected cannolab: eui.Label;
     /**
      *
      * @param type 只应该是基础元素和特殊元素
@@ -366,8 +465,29 @@ export class Element extends eui.Component {
         super();
         this._type = type;
         this.showImage = new eui.Image();
+        
         this.changeSource("ele" + this.type + "_png");
         this.addChild(this.showImage);
+
+        this.cannobox = new eui.Group();
+        this.cannobox.width = this.cannoboxwid;
+        this.cannobox.height = this.cannoboxhei;
+        this.cannobox.anchorOffsetX = this.cannoboxwid/2;
+        this.cannobox.anchorOffsetY = this.cannoboxhei/2;
+        this.addChild(this.cannobox);
+        
+
+        this.cannolab = new eui.Label();
+        this.cannolab.size = 30;
+        this.cannolab.textColor = 0xff0000;
+        this.cannolab.x = 0;
+        this.cannolab.y = 0;
+        this.addChild(this.cannolab);
+
+        this.cannobox.visible = this.cannolab.visible = type == ElementType.CANNO;
+        this.touchEnabled = this.showImage.visible = type != ElementType.CANNO;
+        
+        this.cannolab.visible = false;
         //鸡蛋
         if (type == ElementType.CHICKEN_EGG) {
             this.chickenEgg = Pool.takeOut(RecoverName.CHICKEN_EGG)
@@ -389,8 +509,63 @@ export class Element extends eui.Component {
             }
             this.addChild(this.festivalEle)
         }
+
+
+        this.createCanno();
     }
 
+    //添加炮台
+    createCanno(){
+        if(this.type==ElementType.CANNO){
+            if(this.cannoMoveClip){
+                return;
+            }
+            if (!svgaParser) svgaParser = new window["SVGA"].Parser();
+            var svgas = ["canno1"]//,"cannofire","cannoparticle","cannolight"];
+            for(let i=0;i<svgas.length;i++){
+                let mvname = svgas[i];
+                svgaParser.load(resPath + 'resource/assets/svgas/'+mvname+'.svga',(videoItem)=>{
+                    if(mvname=="canno1"){
+                        this.cannoMoveClip = new window["SVGA"].EgretMovieClip(videoItem);
+                        
+                        // this.cannoMoveClip.lockStep = true;
+                        var mvwidth = 82;
+                        var mvheight = 132;
+                        this.cannoMoveClip.x = (this.cannoboxwid-mvwidth)/2;
+                        this.cannoMoveClip.y = -mvheight/4;
+                        this.cannobox.addChild(this.cannoMoveClip);
+                        this.cannoMoveClip.gotoAndStop(1);
+                        this.cannoMoveClip.addEventListener(egret.Event.ENTER_FRAME,this.toFrameAni,this);
+                    }
+                });
+            }
+        }
+    }
+    stopFrame:number;
+    /**
+     * 炮台动画停止
+     */
+    toFrameAni(){
+        var curframe = this.cannoMoveClip.currentFrame;
+        if(curframe==441){//发射光柱
+            this.mainScene.selectPlayCannoFire(this.index);
+        }
+        if(curframe>=this.stopFrame){
+            if(this.stopFrame==481){
+                this.cannoMoveClip.gotoAndStop(1);
+                return;
+                // console.log("炮台发射完毕");
+            }
+            this.cannoMoveClip.gotoAndStop(this.stopFrame-1);
+        }
+    }
+    // /**
+    //  * 光圈充能动画，现放在mainscene
+    //  */
+    // addOnePower(){
+    //     console.log("一次光圈充能");
+    //     this.cannoCnClip.gotoAndStop(1);
+    // }
     /**
      * 替换资源时,同时修改
      * @param source
@@ -398,7 +573,7 @@ export class Element extends eui.Component {
     changeSource(source: string) {
         // this.showImage.source = source;
         var texture: egret.Texture = RES.getRes(source);
-        if (!texture) { return; }
+        if (!texture) { return console.error("未找到纹理",source,this.type); }
         this.showImage.texture = texture
 
         this.showImage.x = -texture.textureWidth / 2;
@@ -429,6 +604,10 @@ export class Element extends eui.Component {
         egret.Tween.removeTweens(this.showImage);
         //类型重置，showImage修改
         this._type = type;
+        this.cannobox.visible = this.cannolab.visible = type == ElementType.CANNO;
+        this.showImage.visible = type != ElementType.CANNO;
+        this.cannolab.visible = false;
+
         this.changeSource("ele" + type + "_png");
         //特效重置
         this.effectType = null;

egret/src/something/enum/ElementConfigType.ts

@@ -67,4 +67,11 @@ export enum ElementConfigType {
     FISH = 15,
     HONEY_POT = 16,
     FLOWER = 17,
+    /** 大炮 */
+    CANNO_DIR_TOP = 18,
+    CANNO_DIR_BOTTOM = 19,
+    CANNO_DIR_LEFT = 20,
+    CANNO_DIR_RIGHT = 21,
+    /** 大炮石头 */
+    CANNO_BLOCK = 22,
 }
\ No newline at end of file

egret/src/something/enum/ElementType.ts

@@ -30,34 +30,36 @@ export enum ElementType {
     FESTIVALELE_BIG,  //节日元素大中间一个13
     FESTIVALELE_SMALL,  //节日元素飞溅的小元素14
 
-    CANDY_RABBIT,//兔子
-    CANDY_CHICKEN,//鸟
-    CANDY_CATTLE,//牛
-    CANDY_LION,//狮子
-    CANDY_PIG,//猪
-
-    MONSTER_JELLY1,
-    JELLY_MONSTER,
-
-    FIREWORKS_RABBIT,//烟花目标元素，下同
-    FIREWORKS_CHICKEN,
-    FIREWORKS_CATTLE,
-    FIREWORKS_LION,
-    FIREWORKS_PIG,
-
-    FIREWORKS_SHOOTER,//烟花
-
-    MONSTER_RABBIT,//独眼怪
-    MONSTER_CHICKEN,
-    MONSTER_CATTLE,
-    MONSTER_LION,
-    MONSTER_PIG,
-    
-    FISH,//气鼓鱼
-    HONEY,// 蜂蜜
-    HONEY_POT,//蜂蜜罐
-    SAND,
-    FLOWER,
+    CANDY_RABBIT,//兔子15
+    CANDY_CHICKEN,//鸟16
+    CANDY_CATTLE,//牛17
+    CANDY_LION,//狮子18
+    CANDY_PIG,//猪19
+
+    MONSTER_JELLY1,//20
+    JELLY_MONSTER,//21
+
+    FIREWORKS_RABBIT,//烟花目标元素，下同22
+    FIREWORKS_CHICKEN,//23
+    FIREWORKS_CATTLE,//24
+    FIREWORKS_LION,//25
+    FIREWORKS_PIG,//26
+
+    FIREWORKS_SHOOTER,//烟花27
+
+    MONSTER_RABBIT,//独眼怪28
+    MONSTER_CHICKEN,//29
+    MONSTER_CATTLE,//30
+    MONSTER_LION,//31
+    MONSTER_PIG,//32
+    
+    FISH,//气鼓鱼33
+    HONEY,// 蜂蜜34
+    HONEY_POT,//蜂蜜罐35
+    SAND,//36
+    FLOWER,//37
+    CANNO,//38
+    CANNO_BLOCK,//39
 }
 
 export const isMonsterEle = (t: ElementType) => {
@@ -88,6 +90,12 @@ export enum MonsterBaseElementType {
 
 }
 
+export enum forwardDirection{
+    left="left",
+    up="up",
+    right="right",
+    down="down",
+}
 export const fireworksTypeMap: any = {}
 fireworksTypeMap[ElementType.RABBIT] = ElementType.FIREWORKS_RABBIT;
 fireworksTypeMap[ElementType.CHICKEN] = ElementType.FIREWORKS_CHICKEN;
@@ -151,6 +159,13 @@ export const monsterElementMap = {
     "5": ElementType.PIG,
 }
 
+export const connoDirection = {
+    "1":forwardDirection.left,
+    "2":forwardDirection.up,
+    "3":forwardDirection.right,
+    "4":forwardDirection.down,
+}
+
 export const elementMonsterResMap = {
     "0": ElementType.MONSTER_RABBIT,
     "1": ElementType.MONSTER_CHICKEN,

egret/src/something/interface/MapData.ts

 import { GenerateLatData } from "./GenerateLatData";
 import { LatticeType } from "../enum/LatticeType";
+import { ElementConfigType } from "../enum/ElementConfigType";
 
 /**
  * 地图数据接口
  * 包括地图格子，和地图上的特殊元素，生成口，联通口
  */
 export interface MapData {
+    /**
+     * 传送带
+     */
     conveyor?:number[][];
     conveyorConnectedLats?:number[][];
     /**
@@ -42,7 +46,7 @@ export interface MapData {
      * 9褐色毛球 特效消除，分裂
      * 10黑色毛球 两次消除，一次眩晕，
      */
-    elements?: number[];
+    elements?: ElementConfigType[];
     /**
      * 9*9的格子，不修改写null或[]
      * 十位是基础元素类型，对应数字减1就是基础元素类型

egret/src/something/uis/GameGuide.ts

@@ -68,6 +68,9 @@ export class GameGuide extends egret.DisplayObjectContainer {
         if (this.thisObj.chapter == 101 && step == 0) {
             this.msg.y += 80;
         }
+        if (this.thisObj.chapter == 406 ) {
+            this.msg.y += 80;
+        }
 
         this.stepCount--;
     }
@@ -383,6 +386,36 @@ const chapterFuns = {
            "每走三步都会翻转的石门！\n在石门开启的时候赶快消除吧～"
         ]
     },
+    301:{
+        stepCount: 1,
+        showIndexs: [
+            [64,65,66,75],
+        ],
+        hideIndexs: [
+            [ 64,65],
+        ],
+        handIndexs: [
+            [66,75],
+        ],
+        msg: [
+           "每操作一步，怪兽都会吐毒液\n消除毒液的回合不会再产生毒液"
+        ]
+    },
+    331:{
+        stepCount: 1,
+        showIndexs: [
+            [64,65,66,75],
+        ],
+        hideIndexs: [
+            [ 64,65],
+        ],
+        handIndexs: [
+            [66,75],
+        ],
+        msg: [
+           "在烟花附近消除，就会释放美丽的烟花哦~"
+        ]
+    },
     377:{
         stepCount: 1,
         showIndexs: [
@@ -397,6 +430,66 @@ const chapterFuns = {
         msg: [
            "独眼仔被相同颜色的元素消除4次\n就能激活哦～"
         ]
+    },
+    406:{
+        stepCount: 1,
+        showIndexs: [
+            [23,24,32,41],
+        ],
+        hideIndexs: [
+            [ 32,41],
+        ],
+        handIndexs: [
+            [23,24],
+        ],
+        msg: [
+           "使用特效击中气鼓鱼，膨胀起来在周围消除一次即可引爆气鼓鱼"
+        ],
+    },
+    426:{
+        stepCount: 1,
+        showIndexs: [
+            [59,68,67,66],
+        ],
+        hideIndexs: [
+            [ 67,66],
+        ],
+        handIndexs: [
+            [59,68],
+        ],
+        msg: [
+           "在蜜罐旁消除三次即可打开并释放蜂蜜\n然后消除被蜂蜜黏住的小动物吧~"
+        ],
+    },
+    453:{
+        stepCount: 1,
+        showIndexs: [
+            [59,68,67,66],
+        ],
+        hideIndexs: [
+            [ 67,66],
+        ],
+        handIndexs: [
+            [59,68],
+        ],
+        msg: [
+           "流沙每回合都会向四方随机移动，消除流沙上的小动物可以收集流沙"
+        ],
+    },
+    501:{
+        stepCount: 1,
+        showIndexs: [
+            [42,51,52,53],
+        ],
+        hideIndexs: [
+            [ 52,53],
+        ],
+        handIndexs: [
+            [42,51],
+        ],
+        msg: [
+           "每回合，传送带会带着它上面的动物向指定方向移动一格"
+        ]
     }
 }
 

mock/happyclear/homemax.json

@@ -2763,8 +2763,132 @@
                 "levelNum": 550,
                 "maxScore": 47440,
                 "stars": 1
+            },
+            {
+                "levelNum": 551,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 552,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 553,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 554,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 555,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 556,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 557,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 558,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 559,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 560,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 561,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 562,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 563,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 564,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 565,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 566,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 567,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 568,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 569,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 570,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 571,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 572,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 573,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 574,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 575,
+                "maxScore": 47440,
+                "stars": 1
             }
-
         ],
         "remainProp": [
             {