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

egret/src/mainScene/MainScene.ts

@@ -639,12 +639,14 @@ export default class MainScene extends Scene {
             var arr: number[] = Tool.returnTO(elements[i]);
             //基础类型，没有就是null，有就-1，对ElementType对应
             var baseType = arr[1] ? arr[1] - 1 : null;
-            //不是基础类型，跳出
-            if (FiveBaseElementTypes.indexOf(baseType) == -1) continue;
+            //baseType不是基础类型，且不是null，跳出
+            if (FiveBaseElementTypes.indexOf(baseType) == -1 && baseType != null) continue;
             let ele: Element = this.lattices[i].element;
-            if (baseType != null) {
-                ele.resetType(baseType);
-            }
+            //原先元素的类型不是基础元素
+            if (FiveBaseElementTypes.indexOf(ele.type) == -1) continue;
+            //如果baseType不为null，重置类型
+            if (baseType != null) ele.resetType(baseType);
+
             //特效类型,有气炮的不能加特效
             if (!ele.hasState(StateType.BUBBLE)) ele.effectType = arr[0] ? arr[0] - 1 : null;
         }

egret/src/something/chapters/Chapter1.ts

@@ -22,7 +22,7 @@ export const Chapters1: ChapterData[] = [
                 },
             ],
         },
-        starScores: [4000, 8000, 12000],
+        starScores: [100, 500, 950],
         map: {
             lattices: [
                 0, 0, 0, 0, 0, 0, 0, 0, 0,

egret/src/something/chapters/Chapter10.ts

@@ -11,7 +11,7 @@ export const Chapters10: ChapterData[] = [
         baseElementTypes: [0, 1, 2, 3, 4],
         bubbleProbability: 0.1,
         stepCount: 27,
-        passTarget: { type: 1, elements: [{ type: 9, count: 103 }] },
+        passTarget: { type: 1, elements: [{ type: 9, count: 60 }] },
         starScores: [5000, 12000, 21000],
         map: {
             lattices: [
@@ -64,13 +64,32 @@ export const Chapters10: ChapterData[] = [
     },
     //182
     {
-        baseElementTypes: [0, 2, 1, 3, 4], bubbleProbability: 0, stepCount: 21, passTarget: { type: 1, elements: [{ type: 9, count: 59 }] }, starScores: [50001, 12000, 21000], map: { lattices: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 3, 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, 0, 3, 3, 3, 0, 3, 3, 3, 0, 3, 3, 3, 3, 3, 0, 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, 2, 1, 1, 2, 2, 2, 1, 1, 2, 1, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 2, 5, 5, 5, 2, 1, 1, 1, 2, 1, 2, 2, 2, 1, 2, 1, 5, 1, 2, 2, 2, 2, 2, 1, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5], 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, 1, 3, 4],
+        bubbleProbability: 0,
+        stepCount: 30,
+        passTarget: { type: 1, elements: [{ type: 9, count: 55 }] },
+        starScores: [50001, 12000, 21000],
+        map: {
+            lattices: [
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                3, 3, 3, 3, 3, 3, 3, 3, 3,
+                3, 0, 0, 3, 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, 0, 3, 3, 3, 0, 3, 3,
+                3, 0, 3, 3, 3, 3, 3, 0, 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, 2, 1, 1, 2, 2, 2, 1, 1, 2, 1, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 2, 5, 5, 5, 2, 1, 1, 1, 2, 1, 2, 2, 2, 1, 2, 1, 5, 1, 2, 2, 2, 2, 2, 1, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5], 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 }]
+        }
     },
     //183
     {
         baseElementTypes: [0, 3, 4, 2],
-        bubbleProbability: 0.2,
-        stepCount: 22,
+        bubbleProbability: 0.1,
+        stepCount: 30,
         passTarget: { type: 1, elements: [{ type: 1, count: 30 }] },
         starScores: [5000, 18888, 43000],
         map: {

mock/config.js

@@ -46,7 +46,7 @@ const config = {
         data: './happyclear/openTreasureBox.json'
     },
     '/customActivity/happyclear/home': {
-        data: './happyclear/home.json'
+        data: './happyclear/homemax.json'
     },
     '/customActivity/happyclear/getLevelInfo': {
         data: './happyclear/getLevelInfo.json'