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

egret/index.html

@@ -136,8 +136,8 @@
         // localStorage.clear();
         window['imgver'] = '11112';
         //top 8 ，repeat 22 , bottom 3
-        window['total_level'] = 8 + 3 + 22 * 39;
-        window['last_level'] = 850;
+        window['total_level'] = 8 + 3 + 22 * 40;
+        window['last_level'] = 875;
 
         var sharePic = document.getElementById('pic');
         sharePic.onclick = function () {

egret/libs/new_wx/MainBase.ts

@@ -203,14 +203,18 @@ export default class MainBase extends eui.UILayer {
         super.createChildren();
         egret.lifecycle.addLifecycleListener((context) => {
             // custom lifecycle plugin
+            // console.log("addLifecycleListener--------------------");
         })
 
         egret.lifecycle.onPause = () => {
-            // egret.ticker.pause();
+            // console.log("pause--------------------");
+            egret.ticker.pause();
         }
 
         egret.lifecycle.onResume = () => {
-            // egret.ticker.resume();
+            console.log('resume-------------------');
+            GDispatcher.dispatchEvent('docVisible');
+            egret.ticker.resume();
         }
 
         //inject the custom material parser

egret/src/panels/TaskCenter/TaskCenter.ts

@@ -27,6 +27,7 @@ export default class TaskCenter extends Panel {
     }
 
     private getTaskInfo() {
+        // console.log("刷新任务数据------------------------");
         NetManager.ins.getTaskInfo((success, res) => {
             if(!success) {
                 return;

egret/src/something/chapters/Chapter34.ts

+import { ChapterData } from "../interface/ChapterData";
+
+//851-875
+export const Chapters34: ChapterData[] = [
+  
+]

egret/src/something/chapters/getChapter.ts

@@ -35,6 +35,7 @@ import { Chapters30 } from "./Chapter30";
 import { Chapters31 } from "./Chapter31";
 import { Chapters32 } from "./Chapter32";
 import { Chapters33 } from "./Chapter33";
+import { Chapters34 } from "./Chapter34";
 //所有的关卡
 const chapters: ChapterData[] = [].concat(
     Chapters1,
@@ -69,7 +70,8 @@ const chapters: ChapterData[] = [].concat(
     Chapters30,
     Chapters31,
     Chapters32,
-    Chapters33
+    Chapters33,
+    Chapters34
 )
 // console.log(chapters)
 chapters.forEach((chapter,index) => {

egret/src/statistics.ts

@@ -30,7 +30,7 @@ const handleVisibilityChange = (e) => {
 const sendData = () => {
     const t0 = endTimer - startTimer;
     
-    console.log('停留时间是', t0);
+    // console.log('页面切换停留时间是----------------', t0);
     // if (localStorage.getItem('xxl_first_statistics') == null) {
         // NetManager.ins.remainDuration(t0, true);
         // localStorage.setItem('xxl_first_statistics', '1');

mock/happyclear/home.json

@@ -4263,6 +4263,131 @@
                 "levelNum": 850,
                 "maxScore": 47440,
                 "stars": 1
+            },
+            {
+                "levelNum": 851,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 852,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 853,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 854,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 855,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 856,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 857,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 858,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 859,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 860,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 861,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 862,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 863,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 864,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 865,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 866,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 867,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 868,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 869,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 870,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 871,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 872,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 873,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 874,
+                "maxScore": 47440,
+                "stars": 1
+            },
+            {
+                "levelNum": 875,
+                "maxScore": 47440,
+                "stars": 1
             }
         ],
         "remainProp": [