Merge branch 'hotfix20200330_' into dev

21800d93 · wildfirecode · 810f11bf · 022fbbb3 · 21800d93 · 21800d93
Commit 21800d93 authored Mar 30, 2020 by wildfirecode
10 changed files
--- a/egret/src/mainScene/MainScene.ts
+++ b/egret/src/mainScene/MainScene.ts
@@ -1111,9 +1111,9 @@ export default class MainScene extends Scene {
    //初始化引导，游戏和道具
    initGuide() {
        //游戏引导
-        const gameGuideChapterNum = [1, 2, 3, 5, 8, 9, 10, 12, 17, 25, 41, 61, 101, 121, 226, 377]
-        if(gameGuideChapterNum.indexOf(this.chapter >> 0) > -1) {
-            if(!readCache(getCacheKey() + this.chapter)) {
+        const gameGuideChapterNum = [1, 2, 3, 5, 8, 9, 10, 12, 17, 25, 41, 61, 101, 121, 226, 301,331, 377,406,426,453,501];
+        if (gameGuideChapterNum.indexOf(this.chapter >> 0) > -1) {
+            if (!readCache(getCacheKey() + this.chapter)) {
                this.gameGuide = new GameGuide(this);
                this.addChild(this.gameGuide);
                this.gameGuide.show();
@@ -3831,8 +3831,6 @@ export default class MainScene extends Scene {
        if(!this.lattices[index] || !this.lattices[index].element) return null
        //先赋值指向
        let ele = this.lattices[index].element;
-        let eletype = ele.type;
-        let eleffectype = ele.effectType;

        //添加进emptys
        this.emptys.push(index)
@@ -3849,7 +3847,7 @@ export default class MainScene extends Scene {
        for(let p=0;p<this.cannoArr.length;p++){
            let pcannoidx = this.cannoArr[p].idx;
            var isnext = Tool.checkNebByidx(pcannoidx,index);
-            if(isnext){
+            if(isnext&&Tool.judgeChosen(ele)){
                var pcannoele = this.cannoArr[p].ele;
                var lastpcannostatnum:number = pcannoele._cannoStat
                pcannoele.addOneCannoStat();

--- a/egret/src/something/chapters/Chapter14.ts
+++ b/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

--- a/egret/src/something/chapters/Chapter16.ts
+++ b/egret/src/something/chapters/Chapter16.ts
@@ -36,24 +36,24 @@ export const Chapters16: ChapterData[] = [
   { baseElementTypes: [ 1, 2, 3, 4 ], bubbleProbability: 0, stepCount: 23, passTarget: { type: 1, elements: [ { type: 23, count: 20 }, { type: 25, count: 20 }, { type: 26, count: 20 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0 ], connectedLats: [ [ 10, 28 ], [ 11, 29 ], [ 13, 31 ], [ 15, 33 ], [ 16, 34 ] ], 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, 8, 1, 1, 1, 1, 1, 8, 1, 2, 8, 1, 1, 1, 1, 1, 8, 2, 1, 2, 1, 1, 1, 1, 1, 2, 1, 1, 13, 2, 1, 2, 1, 2, 13, 1, 1, 1, 1, 13, 1, 13, 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 }, { index: 27, type: null }, { index: 35, type: null } ] } },
   //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,
- 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, 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, 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,
+      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, 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 }] } },
   //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

--- a/egret/src/something/chapters/Chapter17.ts
+++ b/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, 

--- a/egret/src/something/chapters/Chapter18.ts
+++ b/egret/src/something/chapters/Chapter18.ts
@@ -9,15 +9,16 @@ 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,
- 4, 1, 4, 1, 4, 1, 4, 1, 4,
- 1, 1, 7, 7, 7, 7, 7, 1, 1,
- 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 } ] } },
+      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,
+       1, 1, 7, 7, 7, 7, 7, 1, 1,
+       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: [ 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

--- a/egret/src/something/chapters/Chapter20.ts
+++ b/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

--- a/egret/src/something/chapters/Chapter22 copy.ts
+++ b/egret/src/something/chapters/Chapter22 copy.ts
-import { ChapterData } from "../interface/ChapterData";
-import { PassType } from "../enum/PassType";
-import { ElementType } from "../enum/ElementType";
-
-//551-575
-export const Chapters22: ChapterData[] = [
-
-    //1引导基本消除
-    {
-        baseElementTypes: [0, 1, 2, 3],
-        bubbleProbability: 0,
-        stepCount: 25,
-        passTarget: {
-            type: PassType.ELEMENT_TARGET,
-            elements: [
-                {
-                    type: ElementType.CHICKEN,
-                    count: 45,
-                },
-            ],
-        },
-        starScores: [1000, 5000, 10000],
-        map: {
-            lattices: [
-                0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 1, 0, 0, 0, 1, 0, 0,
-                0, 1, 1, 1, 0, 1, 1, 1, 0,
-                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, 0, 1, 1, 1, 1, 1, 0, 0,
-                0, 0, 0, 1, 1, 1, 0, 0, 0,
-                0, 0, 0, 0, 1, 0, 0, 0, 0,
-            ],
-            generateLats: [
-                { index: 11, type: [0], cus: [] },
-                { index: 15, type: [0], cus: [] },
-            ],
-            // connectedLats: [[0, 18], [1, 19], [2, 20]],
-            elements: [
-                0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 1, 0, 0, 0, 1, 0, 0,
-                0, 1, 1, 1, 0, 1, 1, 1, 0,
-                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, 0, 1, 1, 1, 1, 1, 0, 0,
-                0, 0, 0, 1, 1, 1, 0, 0, 0,
-                0, 0, 0, 0, 1, 0, 0, 0, 0,
-            ],
-            baseElements: [
-                0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 20, 0, 0, 0, 20, 0, 0,
-                0, 20, 10, 20, 0, 20, 10, 20, 0,
-                20, 10, 20, 10, 20, 10, 20, 10, 20,
-                20, 10, 20, 14, 11, 20, 20, 10, 20,
-                0, 20, 10, 20, 10, 20, 10, 20, 0,
-                0, 0, 20, 10, 20, 10, 20, 0, 0,
-                0, 0, 0, 20, 10, 20, 0, 0, 0,
-                0, 0, 0, 0, 20, 0, 0, 0, 0,
-            ],
-            // recycles: [70, 71, 72, 73]
-        },
-    }
-  ]
--- a/egret/src/something/chapters/Chapter22.ts
+++ b/egret/src/something/chapters/Chapter22.ts
--- a/egret/src/something/uis/GameGuide.ts
+++ b/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: [
+           "每回合，传送带会带着它上面的动物向指定方向移动一格"
+        ]
    }
 }


--- a/mock/happyclear/homemax.json
+++ b/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": [
            {