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

egret/index.html

@@ -114,8 +114,8 @@
     ];
         // localStorage.clear();
         window['imgver']='1022'
-        window['total_level'] = 18 + 13 * 8;
-window['last_level'] = 120;//必须大于等于total_level
+        window['total_level'] = 18 + 13 * 14;
+window['last_level'] = 200;//必须大于等于total_level
 
 
         // localStorage.clear();

egret/src/something/chapters/Chapter2.ts

@@ -319,12 +319,34 @@ export const Chapters2: ChapterData[] = [
                 { index: 1, type: [0], cus: [] },
                 { index: 36, type: [0], cus: [] },
                 { index: 37, type: [0], cus: [] },
+
                 { index: 21, type: [0], cus: [] },
                 { index: 22, type: [0], cus: [] },
                 { index: 23, type: [0], cus: [] },
                 { index: 24, type: [0], cus: [] },
                 { index: 25, type: [0], cus: [] },
                 { index: 26, type: [0], cus: [] },
+
+                { index: 30, type: [0], cus: [] },
+                { index: 31, type: [0], cus: [] },
+                { index: 32, type: [0], cus: [] },
+                { index: 33, type: [0], cus: [] },
+                { index: 34, type: [0], cus: [] },
+                { index: 35, type: [0], cus: [] },
+
+                { index: 39, type: [0], cus: [] },
+                { index: 40, type: [0], cus: [] },
+                { index: 41, type: [0], cus: [] },
+                { index: 42, type: [0], cus: [] },
+                { index: 43, type: [0], cus: [] },
+                { index: 44, type: [0], cus: [] },
+
+                { index: 48, type: [0], cus: [] },
+                { index: 49, type: [0], cus: [] },
+                { index: 50, type: [0], cus: [] },
+                { index: 51, type: [0], cus: [] },
+                { index: 52, type: [0], cus: [] },
+                { index: 53, type: [0], cus: [] },
             ],
         },
     },

egret/src/something/class/Element.ts

@@ -21,6 +21,7 @@ import { Tool } from "../Tool";
 /**
  * 考虑到底继承白鹭的啥Component还是Container
  * 坐标原点需要坐落在格子的中心点
+ * 最好到时按，底图，动效，气泡，笼子，毛球，进行分层，如果多个状态要共存时，必须分层，到时气泡的动画，要写再自己的层里
  */
 export class Element extends eui.Component {
     /**

mock/config.js

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