Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 拆home接口分页

# Conflicts:
#	mock/happyclear/home.json

egret/index.html

@@ -26,8 +26,8 @@
             background-color: #000;
             background-size: 100%;
             background-position: center;
-            background-image: url("https://yun.duiba.com.cn/aurora/assets/4ce98ebbdcad2050890d43e97893b8a2e75c16cf.jpg");
-            /* background-image: url("http://yun.duiba.com.cn/aurora/assets/725d621e300323c578fd0d56d6f56d0ea800e61d.jpg"); */
+            /* background-image: url("https://yun.duiba.com.cn/aurora/assets/4ce98ebbdcad2050890d43e97893b8a2e75c16cf.jpg"); */
+            background-image: url("http://yun.duiba.com.cn/aurora/assets/faabac61df75454560f114bacb26932c136dd04c.jpg");
             /* background-image: url("https://yun.duiba.com.cn/db_games/activity/game/0327/startscenebg.jpg"); */
             /* background-image: url("https://yun.duiba.com.cn/db_games/activity/game/1565600901/resource/assets/startScene/startscenebg.jpg"); */
             padding: 0;
@@ -137,8 +137,8 @@
         // localStorage.clear();
         window['imgver'] = '11112';
         //top 8 ，repeat 22 , bottom 3
-        window['total_level'] = 8 + 3 + 22 * 55;
-        window['last_level'] = 1220;
+        window['total_level'] = 8 + 3 + 22 * 56;
+        window['last_level'] = 1240;
 
         var sharePic = document.getElementById('pic');
         sharePic.onclick = function () {

egret/src/something/chapters/Chapter52.ts

+import { ChapterData } from "../interface/ChapterData";
+
+//1221-1240
+export const Chapters52: ChapterData[] = [
+  
+]
\ No newline at end of file

egret/src/something/chapters/getChapter.ts

@@ -53,6 +53,7 @@ import { Chapters48 } from "./Chapter48";
 import { Chapters49 } from "./Chapter49";
 import { Chapters50 } from "./Chapter50";
 import { Chapters51 } from "./Chapter51";
+import { Chapters52 } from "./Chapter52";
 //所有的关卡
 const chapters: ChapterData[] = [].concat(
     Chapters1,
@@ -105,7 +106,8 @@ const chapters: ChapterData[] = [].concat(
     Chapters48,
     Chapters49,
     Chapters50,
-    Chapters51
+    Chapters51,
+    Chapters52
 )
 // console.log(chapters)
 chapters.forEach((chapter,index) => {