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

egret/src/something/chapters/Chapter31.ts

@@ -174,7 +174,12 @@ export const Chapters31: ChapterData[] = [
     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: [ 64,74, 75, 76, 77, 78,70 ], foodsdata: [ ], generateLats: [ { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 10, type: null }, { index: 16, type: null }, { index: 18, type: null }, { index: 26, type: null } ] } },
   //785
-  { baseElementTypes: [ 0, 2, 4, 3 ], bubbleProbability: 0, stepCount: 24, passTarget: { type: 1, elements: [ { type: 41, count: 70 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 
+  { baseElementTypes: [ 0, 2, 4, 3 ], bubbleProbability: 0, 
+    stepCount: 24, 
+    passTarget: { 
+      type: 1, 
+      elements: [ { type: 41, count: 70 } ] }
+      , starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 
     1, 1, 1, 1, 1, 1, 1, 1, 1, 
     1, 1, 1, 1, 4, 1, 1, 1, 1, 
     1, 1, 1, 1, 4, 1, 1, 1, 1, 
@@ -185,13 +190,13 @@ export const Chapters31: ChapterData[] = [
     0, 1, 1, 1, 4, 1, 1, 1, 0, 
     4, 1, 1, 1, 1, 1, 1, 1, 0 ], connectedLats: [], conveyor: [], conveyorConnectedLats: [], WORMHOLE: [], elements: [ 
     2, 2, 1, 1, 1, 1, 1, 2, 2, 
-    2, 2, 1, 1, 4, 1, 1, 2, 2, 
-    2, 2, 1, 1, 4, 1, 1, 2, 2, 
+    2, 1, 1, 1, 4, 1, 1, 1, 2, 
+    2, 1, 1, 1, 4, 1, 1, 1, 2, 
     1, 1, 1, 1, 4, 1, 1, 1, 1, 
     1, 4, 4, 4, 4, 4, 4, 4, 1, 
     1, 2, 0, 0, 4, 0, 0, 2, 1, 
-    1, 0, 0, 0, 4, 0, 0, 0, 1, 
-    1, 0, 0, 0, 4, 0, 0, 0, 1, 
+    1, 2, 0, 0, 4, 0, 0, 2, 1, 
+    1, 2, 0, 0, 4, 0, 0, 2, 1, 
     4, 5, 5, 5, 5, 5, 5, 5, 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: [], foodsdata: [ ], 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 } ] } },
   //786
   { baseElementTypes: [ 0, 2, 3, 4 ], bubbleProbability: 0, stepCount: 30, passTarget: { type: 1, elements: [ { type: 22, count: 18 }, { type: 24, count: 18 }, { type: 25, count: 18 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 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, 41, 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 4, 1, 41, 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 ], connectedLats: [], conveyor: [], conveyorConnectedLats: [], WORMHOLE: [], elements: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 1, 1, 1, 1, 1, 4, 1,13, 4, 1, 1, 1, 1, 1, 4, 13, 13, 4, 1, 1, 2, 9, 1, 4, 13, 13, 4, 1, 2, 14, 2, 1, 4, 13, 1, 4, 1, 9, 2, 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, 11, 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: [], foodsdata: [ ], generateLats: [ { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 10, type: null }, { index: 16, type: null }, { index: 18, type: null }, { index: 26, type: null } ] } },
@@ -391,7 +396,11 @@ export const Chapters31: ChapterData[] = [
     5 ,0, 0, 1, 1, 1, 0, 0, 2, 
     5, 0, 0, 1, 1, 1, 0, 0, 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: [], foodsdata: [ ], 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 } ] } },
   //797
-  { baseElementTypes: [ 0, 2, 3, 4 ], bubbleProbability: 0, stepCount: 28, passTarget: { type: 1, elements: [ { type: 1, count: 62 }, { type: 9, count: 68 }, { type: 10, count: 6 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 
+  { baseElementTypes: [ 0, 2, 3, 4 ], 
+    bubbleProbability: 0, stepCount: 28, 
+    passTarget: { type: 1, elements: [ 
+      { type: 9, count: 68 }, 
+      { type: 10, count: 6 },{type:1,count:62}] }, 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, 61, 3, 3, 3, 3, 3, 4, 3, 
@@ -401,15 +410,15 @@ export const Chapters31: ChapterData[] = [
     3, 3, 3, 4, 3, 61, 3, 3, 3, 
     3, 3, 4, 3, 3, 3, 61, 3, 3, 
     0, 4, 3, 3, 3, 3, 3, 61, 0 ], connectedLats: [], conveyor: [], conveyorConnectedLats: [], WORMHOLE: [], elements: [ 
-    1, 1, 2, 4, 1, 4, 2, 1, 1, 
-    1, 1, 2, 1, 4, 1, 2, 1, 1, 
-    15, 8, 1, 2, 1, 2, 1, 6, 15, 
+    1, 1, 2, 1, 1, 1, 2, 1, 1, 
+    1, 1, 2, 1, 14, 1, 2, 1, 1, 
+    1, 8, 1, 2, 1, 2, 1, 6, 1, 
     1, 1, 8, 1, 2, 1, 6, 1, 1, 
     1, 1, 1, 8, 1, 6, 1, 1, 1, 
     4, 1, 1, 1, 1, 1, 1, 1, 4, 
     4, 1, 1, 6, 1, 8, 1, 1, 4, 
     4, 4, 6, 1, 1, 1, 8, 4, 4, 
-    1, 6, 1, 1, 14, 1, 1, 8, 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: [], foodsdata: [ ], 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: 18, type: null }, { index: 26, type: null } ] } },
+    1, 6, 1, 1, 1, 1, 1, 8, 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: [], foodsdata: [ ], 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: 18, type: null }, { index: 26, type: null } ] } },
   //798
   { baseElementTypes: [ 1, 2, 3, 4 ], bubbleProbability: 0, stepCount: 25, passTarget: { type: 1, elements: [ { type: 23, count: 22 }, { type: 24, count: 22 }, { type: 26, count: 22 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 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, 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, 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 ], 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, 4, 4, 4, 1, 1, 1, 1, 1, 2, 1, 4, 1, 2, 1, 1, 1, 1, 2, 1, 4, 1, 2, 1, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 15, 15, 2, 1, 14, 1, 2, 15, 15, 1, 1, 4, 4, 11, 4, 4, 1, 1, 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: [], foodsdata: [ ], generateLats: [ { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 10, type: null }, { index: 16, type: null }, { index: 18, type: null }, { index: 26, type: null } ] } },
   //799