强引导关卡修改

0c1287ef · zjz1994 · 9becb750 · 0c1287ef · 0c1287ef · 0c1287ef
Commit 0c1287ef authored May 22, 2020 by zjz1994
10 changed files
--- a/egret/src/mainScene/MainScene.ts
+++ b/egret/src/mainScene/MainScene.ts
@@ -573,7 +573,7 @@ export default class MainScene extends Scene {
        // window['gm'] = this.gm;
        //第几关
        this.chapter = (data && data.chapter) ? data.chapter : 1;
-        // this.chapter = 1;
+        // this.chapter = 406;
        //关卡数据
        this.chapterData = getChapterData(this.chapter);
        //初始化目标信息

--- a/egret/src/something/chapters/Chapter15.ts
+++ b/egret/src/something/chapters/Chapter15.ts
@@ -9,7 +9,17 @@ export const Chapters15: ChapterData[] = [
    //376
    { baseElementTypes: [ 0, 2, 3, 4 ], bubbleProbability: 0, stepCount: 25, passTarget: { type: 1, elements: [ { type: 1, count: 40 }, { type: 2, count: 66 }, { type: 3, count: 66 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 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, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0 ], connectedLats: [], elements: [ 1, 1, 1, 1, 4, 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, 4, 1, 1, 1, 6, 1, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 2, 2, 1, 2, 1, 2, 4, 2, 2, 2, 2, 2, 4, 2, 1, 2, 1, 2, 4, 2, 1, 2, 1 ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, 20, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 1, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 7, type: null }, { index: 9, type: null }, { index: 17, type: null } ] } },
    //377
-    { baseElementTypes: [ 0, 2, 3, 4 ], bubbleProbability: 0, stepCount: 15, passTarget: { type: 1, elements: [ { type: 5, count: 24 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ], connectedLats: [], elements: [ 1, 2, 2, 2, 1, 2, 2, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 14, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 2, 2, 1, 2, 2, 2, 1 ], baseElements: [ 10, 0, 10, 20, 10, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 30, 10, 10, 30, 0, 0, 0, 0, 10, 40, 50, 30, 10, 0, 0, 10, 0, 50, 10, 1, 50, 10, 0, 10, 0, 0, 30, 30, 40, 10, 40, 0, 0, 0, 0, 10, 50, 30, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 10, 0, 0, 0, 10 ], 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 }, { index: 20, type: null, cus: [40, 50] }, { index: 21, type: null, cus: [10, 50, 40] }, { index: 22, type: null, cus: [30, 10, 30, 10] }, { index: 23, type: null, cus: [50, 30, 50] }, { index: 24, type: null, cus: [10] }, { index: 73, type: null }, { index: 74, type: null }, { index: 75, type: null }, { index: 76, type: null }, { index: 77, type: null }, { index: 78, type: null }, { index: 79, type: null } ] } },
+    { baseElementTypes: [ 0, 2, 3, 4 ], bubbleProbability: 0, stepCount: 15, passTarget: { type: 1, elements: [ { type: 5, count: 24 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ], connectedLats: [], conveyor: [], conveyorConnectedLats: [], WORMHOLE: [], elements: [ 
+        1, 2, 2, 2, 1, 2, 2, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 14, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 2, 2, 1, 2, 2, 2, 1 ], baseElements: [ 
+            10, 0, 0, 0, 10, 0, 0, 0, 10, 
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 
+            0, 0, 30, 30, 10, 10, 30, 0, 0, 
+            0, 0, 10, 40, 50, 30, 10, 0, 0, 
+            10, 0, 50, 10, 1, 50, 10, 0, 10, 
+            0, 0, 30, 30, 40, 10, 40, 0, 0, 
+            0, 0, 10, 50, 30, 10, 10, 0, 0, 
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 
+            10, 0, 0, 0, 10, 0, 0, 0, 10 ], recycles: [], generateLats:[ { index: 0, type: null }, { index: 1, type: null }, { index: 2, type: null,cus :[40] }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 7, type: null }, { index: 8, type: null }, { index: 20, type: null, cus: [40, 50] }, { index: 21, type: null, cus: [10] }, { index: 22, type: null, cus: [30, 10, 30,50] }, { index: 23, type: null, cus: [50, 30, 50, 10] }, { index: 24, type: null, cus: [10,30,40] }, { index: 73, type: null }, { index: 74, type: null }, { index: 75, type: null }, { index: 76, type: null }, { index: 77, type: null }, { index: 78, type: null }, { index: 79, type: null } ] } },
    //378
    { baseElementTypes: [ 0, 1, 2, 3, 4 ], bubbleProbability: 0, stepCount: 25, passTarget: { type: 1, elements: [ { type: 22, count: 10 }, { type: 25, count: 10 }, { type: 26, count: 10 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 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, 1, 0, 4, 1, 4, 1, 4, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 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, 2, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 13, 1, 13, 1, 13, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 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: 3, type: null }, { index: 5, type: null }, { index: 7, type: null }, { index: 9, type: null }, { index: 10, type: null }, { index: 20, type: null }, { index: 22, type: null }, { index: 24, type: null }, { index: 53, type: null } ] } },
    //379

--- a/egret/src/something/chapters/Chapter16.ts
+++ b/egret/src/something/chapters/Chapter16.ts
@@ -35,25 +35,16 @@ export const Chapters16: ChapterData[] = [
   //405
   { 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 }] } },
+   { 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: [], conveyor: [], conveyorConnectedLats: [], WORMHOLE: [], 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, 40, 30, 10, 0, 0, 0, 
+      0, 0, 10, 50, 12, 40, 10, 0, 0, 
+      0, 30, 10, 40, 50, 10, 50, 30, 0, 
+      0, 10, 30, 40, 0, 10, 30, 20, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 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,cus:[10,10,30,50,40] }, { index: 12, type: null, cus: [40,10]}, { index: 14, type: null, cus: [50,10,50,40] }, { index: 20, type: null, cus: [30] }, { index: 24, type: null, cus: [30,30,50,40] }, { index: 28, type: null, cus: [40] }, { index: 34, type: null, cus: [40,50] }, { index: 36, type: null }, { index: 44, 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
 import { ChapterData } from "../interface/ChapterData";
 //426-450
 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, 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 } ] } },
+ //426
+   { baseElementTypes: [ 0, 1, 3, 4 ], bubbleProbability: 0, stepCount: 25, passTarget: { type: 1, elements: [ { type: 34, count: 25 }, { type: 5, count: 22 } ] }, 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 ] ], conveyor: [], conveyorConnectedLats: [], WORMHOLE: [], 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, 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, cus:[ 50,10,20,10,10] }, { index: 4, type: null, cus:[ 50,,20,10,10,20] }, { index: 5, type: null, cus: [40,10,50,50,10,20] }, { index: 9, type: null }, { index: 17, type: null }, { index: 19, type: null }, { index: 25, type: null }, { index: 29, type: null, cus: [40,50] }, { 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/Chapter22.ts
+++ b/egret/src/something/chapters/Chapter22.ts
@@ -31,17 +31,8 @@ export const Chapters22: ChapterData[] = [
   { baseElementTypes: [ 1, 2, 3, 4 ], bubbleProbability: 0, stepCount: 28, passTarget: { type: 1, elements: [ { type: 9, count: 70 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 3, 0, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 0, 3, 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, 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: [], conveyor: [], conveyorConnectedLats: [], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 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, 2, 2, 2, 2, 2, 2, 2, 2, 4, 4, 4, 4, 4, 4, 4, 4, 4, 9, 9, 9, 9, 9, 9, 9, 9, 9 ], 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: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 8, type: null }, { index: 10, type: null }, { index: 16, type: null } ] } },
   //555
   { baseElementTypes: [ 1, 2, 3, 4 ], bubbleProbability: 0, stepCount: 21, passTarget: { type: 1, elements: [ { type: 36, count: 39 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 7, 7, 7, 0, 7, 7, 7, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 0, 1, 7, 7, 7, 7, 7, 7, 7, 1, 1, 7, 7, 7, 7, 7, 7, 7, 1, 1, 7, 7, 7, 7, 7, 7, 7, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ], connectedLats: [], conveyor: [ [ 64, 70 ] ], conveyorConnectedLats: [ [ 70, 64 ] ], 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, 8, 1, 1, 1, 1, 2, 9, 9, 9, 8, 9, 9, 9, 2, 2, 2, 2, 4, 4, 4, 4, 2, 2, 2, 5, 5, 5, 5, 5, 5, 5, 2, 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: [], generateLats: [ { 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: 13, type: null }, { index: 36, type: null }, { index: 44, type: null } ] } },
-   //556
-   { baseElementTypes: [ 0, 2, 3, 4 ], bubbleProbability: 0, stepCount: 30, passTarget: { type: 1, elements: [ { type: 6, count: 7 } ] }, 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, 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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 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 ], connectedLats: [ [ 46, 64 ],  [ 48, 66 ],  [ 50, 68 ],[ 47, 65 ],  [ 49, 67 ],  [ 51, 69 ], [ 52, 70 ], [ 10, 28 ], [ 12, 30 ], [ 14, 32 ], [ 16, 34 ] ], conveyor: [], conveyorConnectedLats: [], elements: [ 
-1, 1, 3, 1, 3, 1, 3, 1, 1, 
-1, 1, 1, 1, 1, 1, 1, 1, 1, 
-1, 1, 22, 1, 22, 1, 22, 1, 1, 
-1, 1, 22, 1, 22, 1, 22, 1, 1, 
-1, 1, 1, 1, 1, 1, 1, 1, 1, 
-1, 1, 1, 1, 1, 1, 1, 1, 1, 
-1, 1, 18, 1, 18, 1, 18, 1, 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, 50, 0, 30, 0, 10, 0, 10, 0, 0, 30, 40, 30, 30, 10, 50, 10, 0, 0, 50, 10, 50, 10, 50, 10, 30, 0, 0, 0, 0, 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, 76, 77, 78, 79, 80 ], 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 } ] } }
-,
+//556
+   { baseElementTypes: [ 0, 3, 4, 2 ], bubbleProbability: 0, stepCount: 30, passTarget: { type: 1, elements: [ { type: 6, count: 7 } ] }, 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, 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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 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 ], connectedLats: [ [ 10, 28 ], [ 12, 30 ], [ 14, 32 ], [ 16, 34 ], [ 46, 64 ], [ 48, 66 ], [ 50, 68 ], [ 52, 70 ] ], conveyor: [], conveyorConnectedLats: [], WORMHOLE: [], elements: [ 1, 1, 3, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 22, 1, 22, 1, 22, 1, 1, 1, 1, 22, 1, 22, 1, 22, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 18, 1, 18, 1, 18, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ], baseElements: [ 50, 40, 0, 30, 0, 30, 0, 30, 30, 10, 30, 40, 10, 10, 50, 10, 50, 10, 40, 0, 0, 0, 0, 0, 0, 0, 50, 50, 50, 0, 30, 0, 10, 0, 10, 10, 40, 30, 40, 30, 30, 10, 50, 10, 10, 10, 50, 10, 50, 10, 50, 10, 30, 50, 40, 0, 0, 0, 0, 0, 0, 0, 40, 30, 10, 10, 40, 10, 30, 30, 10, 10, 30, 30, 10, 40, 10, 30, 10, 10, 40 ], recycles: [], generateLats: [ { index: 0, type: null }, { index: 1, type: null }, { index: 2, type: null }, { index: 3, type: null, cus: [50,50,30,30,40] }, { index: 4, type: null, cus: [50] }, { index: 5, type: null, cus: [30] }, { index: 6, type: null, cus: [50] }, { index: 7, type: null, cus: [40,50] }, { index: 8, type: null, cus: [40] } ] } },
   //557
   { baseElementTypes: [ 0, 1, 3, 4 ], bubbleProbability: 0, stepCount: 30, passTarget: { type: 1, elements: [ { type: 9, count: 50 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 0, 3, 3, 3, 3, 3, 3, 3, 0, 0, 3, 3, 3, 3, 3, 3, 3, 0, 0, 3, 3, 3, 3, 3, 0, 0, 0, 0, 3, 3, 3, 3, 3, 0, 0, 0, 0, 1, 6, 1, 6, 1, 0, 0, 0, 0, 3, 3, 3, 3, 3, 0, 0, 0, 0, 3, 3, 3, 3, 3, 0, 0, 3, 3, 3, 3, 3, 3, 3, 0, 0, 3, 3, 3, 3, 3, 3, 3, 0, 0 ], connectedLats: [], conveyor: [], conveyorConnectedLats: [], elements: [ 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 2, 2, 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, 9, 9, 9, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 1, 1, 2, 2, 2, 2, 2, 2, 2, 1, 1 ], baseElements: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], recycles: [], generateLats: [ { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 7, type: null }, { index: 8, type: null }, { index: 63, type: null }, { index: 64, type: null } ] } },
   //558

--- a/egret/src/something/chapters/Chapter24.ts
+++ b/egret/src/something/chapters/Chapter24.ts
@@ -2,25 +2,15 @@ import { ChapterData } from "../interface/ChapterData";

 //601-625
 export const Chapters24: ChapterData[] = [
-   //601
-  { baseElementTypes: [ 1, 2, 3, 4 ], bubbleProbability: 0, stepCount: 25, passTarget: { type: 1, elements: [ { type: 9, count: 78 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 3, 3, 0, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 61, 6, 61, 6, 61, 6, 61, 6, 61, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3 ], connectedLats: [], conveyor: [], conveyorConnectedLats: [], elements: [ 2, 1, 1, 2, 2, 2, 1, 2, 1,
- 2, 2, 2, 2, 2, 2, 2, 2, 1,
-1, 1, 1, 1, 1, 2, 2, 2, 1,
- 1, 23, 23, 1, 1, 1, 23, 23, 1,
- 1, 23, 23, 1, 1, 1, 23, 23, 1,
- 1, 1, 1, 2, 2, 2, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 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,
- 30, 20, 20, 30, 20, 0, 0, 0, 0,
- 50, 0, 0, 40, 40, 50, 0, 0, 0,
- 50, 0, 0, 40, 30, 0, 0, 0, 0,
- 40, 20, 20, 50, 0, 0, 0, 0, 0,
- 0, 0, 0, 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: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 7, type: null }, { index: 8, type: null }, { index: 11, type: null }, { index: 15, type: null } ] } },
+  //601
+   { baseElementTypes: [ 1, 2, 3, 4 ], bubbleProbability: 0, stepCount: 25, passTarget: { type: 1, elements: [ { type: 9, count: 78 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 3, 3, 0, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 6, 3, 6, 3, 6, 3, 6, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3 ], connectedLats: [], conveyor: [], conveyorConnectedLats: [], WORMHOLE: [], elements: [ 2, 1, 1, 2, 2, 2, 1, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 2, 1, 1, 23, 23, 1, 1, 1, 23, 23, 1, 1, 23, 23, 1, 1, 1, 23, 23, 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, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2 ], baseElements: [ 
+       0, 20, 0, 0, 0, 0, 0, 0, 50, 
+       0, 0, 0, 0, 0, 0, 0, 0, 20, 
+       30, 20, 20, 30, 20, 0, 0, 0, 40, 
+       50, 0, 0, 40, 40, 50, 0, 0, 30, 
+       50, 0, 0, 40, 30, 20, 0, 0, 30, 
+       40, 20, 20, 50, 20, 30, 30, 50, 40, 
+       20, 0, 30, 0, 40, 0, 20, 0, 40, 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: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 7, type: null }, { index: 8, type: null }, { index: 11, type: null }, { index: 15, type: null } ] } },
  //602
  { baseElementTypes: [ 1, 2, 3, 4 ], bubbleProbability: 5, stepCount: 28, passTarget: { type: 1, elements: [ { type: 9, count: 71 }, { type: 1, count: 128 } ] }, 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, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 0, 0, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 3, 3, 1, 3, 3, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 3, 3, 3, 3 ], connectedLats: [ [ 40, 58 ], [ 18, 54 ], [ 26, 62 ] ], conveyor: [], conveyorConnectedLats: [], 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, 23, 23, 1, 23, 23, 1, 1, 1, 1, 23, 23, 1, 23, 23, 1, 1, 1, 1, 2, 2, 6, 2, 2, 1, 1, 4, 4, 2, 2, 2, 2, 2, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 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: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 7, type: null }, { index: 8, type: null } ] } },
  //603

--- a/egret/src/something/chapters/Chapter4.ts
+++ b/egret/src/something/chapters/Chapter4.ts
@@ -6,64 +6,18 @@ import { ElementType } from "../enum/ElementType";
 * 61到80关数据
 */
 export const Chapters4: ChapterData[] = [
-    //61 鸡蛋引导 待加引导
+      //61 鸡蛋引导 待加引导
    {
-        baseElementTypes: [0, 4, 2, 3],
-        bubbleProbability: 0,
-        stepCount: 37,
-        passTarget: { type: 1, elements: [{ type: 1, count: 30 }] },
-        starScores: [8000, 15000, 22000],
-        map: {
-            lattices: [
-                0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 0, 1, 1, 1, 0, 0, 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,
-                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
-            ],
-            connectedLats: [],
-            elements: [
-                0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 0, 1, 1, 1, 0, 0, 0,
-                0, 0, 1, 1, 1, 1, 1, 0, 0,
-                0, 1, 1, 1, 1, 1, 1, 1, 0,
-                1, 1, 6, 1, 1, 1, 6, 1, 1,
-                1, 1, 6, 1, 1, 1, 6, 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
-            ],
-            baseElements: [
-                0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 0, 10, 50, 30, 0, 0, 0,
-                0, 0, 40, 40, 30, 50, 50, 0, 0,
-                0, 30, 30, 50, 50, 40, 40, 10, 0,
-                50, 40, 0, 10, 20, 30, 0, 10, 20,
-                50, 40, 0, 10, 20, 50, 0, 30, 20,
-                0, 50, 40, 20, 40, 30, 30, 50, 0,
-                0, 0, 20, 10, 40, 10, 10, 0, 0,
-                0, 0, 0, 50, 30, 30, 0, 0, 0,
-            ],
-            recycles: [],
-            generateLats: [
-                { index: 12, type: null },
-                { index: 13, 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 }
-            ]
-        }
-    },
+         baseElementTypes: [ 1, 2, 3, 4, 0 ], bubbleProbability: 0, stepCount: 37, passTarget: { type: 1, elements: [ { type: 1, count: 30 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 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, 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 ], connectedLats: [], conveyor: [], conveyorConnectedLats: [], WORMHOLE: [], 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, 6, 1, 1, 1, 6, 1, 1, 1, 1, 6, 1, 1, 1, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 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, 10, 50, 30, 0, 0, 0, 
+             0, 0, 40, 40, 30, 50, 50, 0, 0, 
+             0, 50, 30, 50, 50, 40, 40, 10, 0, 
+             50, 40, 0, 10, 20, 30, 0, 10, 20, 
+             50, 40, 0, 10, 20, 50, 0, 30, 20, 
+             0, 10, 40, 20, 40, 30, 30, 50, 0, 
+             0, 0, 20, 10, 40, 10, 10, 0, 0, 
+             0, 0, 0, 50, 30, 30, 0, 0, 0 ], recycles: [], generateLats: [ { index: 12, type: null, cus: [10,20 ]}, { index: 13, type: null }, { index: 14, type: null }, { index: 20, type: null }, { index: 24, type: null }, { index: 28, type: null ,cus:[30,30,40]}, { index: 34, type: null }, { index: 36, type: null }, { index: 44, type: null } ] } },
    //62
    {
        baseElementTypes: [2, 3, 4, 0],

--- a/egret/src/something/chapters/Chapter7.ts
+++ b/egret/src/something/chapters/Chapter7.ts
@@ -6,65 +6,65 @@ import { ElementType } from "../enum/ElementType";
 * 121到140关数据
 */
 export const Chapters7: ChapterData[] = [
-    //121 褐色毛球  引导代加
-    {
-        baseElementTypes: [0, 1, 2, 3, 4],
-        bubbleProbability: 0,
-        stepCount: 37,
-        passTarget: { type: 1, elements: [{ type: 9, count: 38 }] },
-        starScores: [6000, 12000, 21000],
-        map: {
-            lattices: [
-                0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 1, 1, 1, 1, 0, 0, 0,
-                0, 3, 3, 3, 3, 3, 3, 0, 0,
-                3, 3, 3, 3, 3, 3, 3, 3, 0,
-                0, 3, 3, 3, 3, 3, 3, 0, 0,
-                0, 0, 3, 3, 3, 3, 0, 0, 0,
-                3, 3, 3, 3, 3, 3, 3, 3, 0,
-                0, 3, 3, 3, 3, 3, 3, 0, 0,
-                0, 0, 0, 0, 0, 0, 0, 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,
-                9, 4, 1, 1, 1, 1, 4, 9, 1,
-                1, 1, 1, 1, 1, 1, 1, 1, 1,
-                1, 1, 1, 1, 1, 1, 1, 1, 1,
-                9, 1, 1, 1, 1, 1, 1, 9, 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, 20, 10, 10, 20, 0, 0, 0,
-                0, 10, 30, 30, 40, 40, 50, 0, 0,
-                0, 13, 40, 10, 20, 20, 13, 0, 0,
-                0, 50, 40, 10, 50, 30, 50, 0, 0,
-                0, 0, 10, 20, 20, 40, 30, 0, 0,
-                0, 11, 20, 20, 30, 30, 40, 40, 0,
-                0, 0, 10, 40, 40, 50, 50, 10, 0,
-                0, 0, 0, 0, 0, 0, 0, 0, 0
-            ],
-            recycles: [],
-            generateLats: [
-                { index: 11, type: null },
-                { index: 12, type: null },
-                { index: 13, type: null },
-                { index: 14, type: null },
-
-                { index: 19, type: null },
-                { index: 24, type: null },
-                { index: 27, type: null },
-                { index: 34, type: null },
-
-                { index: 54, type: null },
-                { index: 61, type: null },
-            ]
-        }
-    },
+    //121 褐色毛球  引导代加
+    {
+                baseElementTypes: [0, 1, 2, 3, 4],
+                bubbleProbability: 0,
+                stepCount: 37,
+                passTarget: { type: 1, elements: [{ type: 9, count: 38 }] },
+                starScores: [6000, 12000, 21000],
+                map: {
+                    lattices: [
+                        0, 0, 0, 0, 0, 0, 0, 0, 0,
+                        0, 0, 1, 1, 1, 1, 0, 0, 0,
+                        0, 3, 3, 3, 3, 3, 3, 0, 0,
+                        3, 3, 3, 3, 3, 3, 3, 3, 0,
+                        0, 3, 3, 3, 3, 3, 3, 0, 0,
+                        0, 0, 3, 3, 3, 3, 0, 0, 0,
+                        3, 3, 3, 3, 3, 3, 3, 3, 0,
+                        0, 3, 3, 3, 3, 3, 3, 0, 0,
+                        0, 0, 0, 0, 0, 0, 0, 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,
+                        9, 4, 1, 1, 1, 1, 4, 9, 1,
+                        1, 1, 1, 1, 1, 1, 1, 1, 1,
+                        1, 1, 1, 1, 1, 1, 1, 1, 1,
+                        9, 1, 1, 1, 1, 1, 1, 9, 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, 20, 10, 10, 20, 0, 0, 0,
+                        0, 10, 30, 30, 40, 40, 50, 0, 0,
+                        0, 13, 40, 10, 20, 20, 13, 0, 0,
+                        0, 50, 40, 10, 50, 30, 50, 0, 0,
+                        0, 0, 10, 20, 20, 40, 30, 0, 0,
+                        0, 11, 20, 20, 30, 30, 40, 40, 0,
+                        0, 0, 10, 50, 40, 50, 50, 10, 0,
+                        0, 0, 0, 0, 0, 0, 0, 0, 0
+                    ],
+                    recycles: [],
+                    generateLats: [
+                        { index: 11, type: null,cus:[20,50,10,50,30] },
+                        { index: 12, type: null,cus:[50,10,10] },
+                        { index: 13, type: null },
+                        { index: 14, type: null,cus:[40,40,50] },
+        
+                        { index: 19, type: null },
+                        { index: 24, type: null },
+                        { index: 27, type: null },
+                        { index: 34, type: null },
+        
+                        { index: 54, type: null },
+                        { index: 61, type: null },
+                    ]
+                }
+            },
    //122
    {
        baseElementTypes: [0, 1, 3, 2, 4],

--- a/egret/src/something/class/Element.ts
+++ b/egret/src/something/class/Element.ts
@@ -215,6 +215,7 @@ export class Element extends eui.Component {
    resetToFishView(s='toStandBy') {
        this._fishState = 0;
        this._isNeb = false;
+        this.fishCanEliFlag = false;
        this['fish'] = new Fish(s);
        this.addChild(this['fish']);
        this.changeSource("ele33_0_png");

--- a/egret/src/something/uis/GameGuide.ts
+++ b/egret/src/something/uis/GameGuide.ts
@@ -377,18 +377,26 @@ const chapterFuns = {
    },
    //鸡蛋
    61: {
-        stepCount: 1,
+        stepCount: 3,
        showIndexs: [
-            [66, 57, 48, 39],
+            [39, 48, 57, 66],
+            [37,46,55,56],
+            [28,29,37,46],
        ],
        hideIndexs: [
-            [48, 39],
+            [39, 48],
+            [37,46],
+            [37,46]
        ],
        handIndexs: [
-            [66, 57]
+            [57, 66],
+            [56,55],
+            [29,28]
        ],
        msg: [
-            "鸡蛋边上不断有动物消除\n时,会孵出小鸡"
+            "消除鸡蛋周围的动物1次",
+            "消除鸡蛋周围的动物2次",
+            "再消除一次，小鸡孵出来啦！"
        ]
    },
    //灰毛球
@@ -409,18 +417,22 @@ const chapterFuns = {
    },
    //褐色毛球
    121: {
-        stepCount: 1,
+        stepCount: 2,
        showIndexs: [
-            [55, 56, 65, 47],
+            [47, 55, 56, 65],
+            [47,56,57,58],
        ],
        hideIndexs: [
-            [65, 47],
+            [47, 65],
+            [57,58],
        ],
        handIndexs: [
-            [55, 56]
+            [56, 55],
+            [47,56]
        ],
        msg: [
-            "需用特效将褐色毛球分裂成\n两个灰色毛球，才能将它消除"
+            "利用特效将黑毛球分解",
+            "再一次消除就可以消灭它啦！"
        ]
    },
    226: {
@@ -469,48 +481,72 @@ const chapterFuns = {
        ]
    },
    377: {
-        stepCount: 1,
+        stepCount: 4,
        showIndexs: [
-            [29, 38, 39, 40],
+            [39, 40, 41,42],
+            [40,41,42,33],
+            [21,22,31,40],
+            [23,22,31,40],
        ],
        hideIndexs: [
            [39, 40],
+            [40,41],
+            [31,40],
+            [31,40]
        ],
        handIndexs: [
-            [29, 38],
+            [42, 41],
+            [33,42],
+            [21,22],
+            [23,22],
        ],
        msg: [
-            "独眼仔被相同颜色的元素消除4次就能激活哦～"
+            "匹配独眼仔的颜色让它睁开眼睛",
+            "再消除1次让它眼睛睁大一点",
+            "快让独眼仔完全睁开眼睛吧",
+            "再消除1次会有惊喜哦！",
        ]
    },
    406: {
-        stepCount: 1,
+        stepCount: 2,
        showIndexs: [
-            [23, 24, 32, 41],
+            [4,13,14,22],
+            [31,32,40,49],
        ],
        hideIndexs: [
-            [32, 41],
+            [4,22],
+            [40,49]
        ],
        handIndexs: [
-            [23, 24],
+            [13, 14],
+            [31,32]
        ],
        msg: [
-            "使用特效击中气鼓鱼，膨胀起来在周围消除一次即可引爆气鼓鱼"
+            "移动一步触发特效，激活河豚",
+            "在激活的河豚旁消除，就可以消灭它啦！",
        ],
    },
    426: {
-        stepCount: 1,
+        stepCount: 3,
        showIndexs: [
-            [59, 68, 67, 66],
+            [50, 59, 68, 67],
+            [39,48,57,66],
+            [48,49,50,57],
        ],
        hideIndexs: [
-            [67, 66],
+            [50, 59],
+            [39,48],
+            [49,50]
        ],
        handIndexs: [
-            [59, 68],
+            [67,68],
+            [57,66],
+            [48,57]
        ],
        msg: [
-            "在蜜罐旁消除三次即可打开并释放蜂蜜\n然后消除被蜂蜜黏住的小动物吧~"
+            "在蜜罐周围消除3次就能激活它",
+            "看，蜂蜜增加了一点，再移动一下",
+            "快把蜂蜜释放出来吧，记得利用同色消除收集哦！"
        ],
    },
    453: {
@@ -544,33 +580,45 @@ const chapterFuns = {
        ]
    },
    556: {
-        stepCount: 1,
+        stepCount: 3,
        showIndexs: [
            [41, 49, 50, 51],
+            [48,49,50,51],
+            [48,49,50,51]
        ],
        hideIndexs: [
            [49, 51],
+            [50,51],
+            [50,51]
        ],
        handIndexs: [
            [41, 50],
+            [48,49],
+            [49,48]
        ],
        msg: [
-            "在周围消除给大炮充能释放\n炮弹，消除炮口方向的\n所有元素。"
+            "在激光炮旁消除1次试试",
+            "蓄能条有变化，再移动1步继续蓄能",
+            "快消除激活激光炮，消除前方的石头吧！"
        ]
    },
    601: {
-        stepCount: 1,
+        stepCount: 2,
        showIndexs: [
            [19, 20, 21, 22],
+            [45,46,47,54],
        ],
        hideIndexs: [
            [19, 20],
+            [46,47]
        ],
        handIndexs: [
            [21, 22],
+            [45,54],
        ],
        msg: [
-            "在藤蔓周围消除，\n解救猩猩会有惊喜哦~"
+            "解救猩猩，在藤蔓周围消除试试",
+            "在移动一步即可解救猩猩，有惊喜哦！",
        ]
    },
    661:{