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

egret/libs/new_wx/MainBase.ts

@@ -392,16 +392,16 @@ export default class MainBase extends eui.UILayer {
         });
     }
 
-    getBackReward() {
-        return new Promise((r) => {
-            try {
-                if(window['getRST']) window['getRST']();
-            } catch(error) {  }
-            NetManager.ins.hc_getBackReward(() => {
-                r();
-            })
-        });
-    }
+    // getBackReward() {
+    //     return new Promise((r) => {
+    //         try {
+    //             if(window['getRST']) window['getRST']();
+    //         } catch(error) {  }
+    //         NetManager.ins.hc_getBackReward(() => {
+    //             r();
+    //         })
+    //     });
+    // }
 
     ajaxElement() {
         return new Promise((r) => {
@@ -441,7 +441,7 @@ export default class MainBase extends eui.UILayer {
             this.ajaxElement(),
             this.hcHome(),
             this.hc_userInfo(),
-            this.getBackReward(),
+            // this.getBackReward(),
             this.hcRedBoobBaseInfo(),
         ]);
 

egret/libs/new_wx/components/NoPrizePanel.ts

@@ -32,7 +32,7 @@ export default class NoPrizePanel extends Panel {
 
         this['goBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
             this.hidePanel();
-            if (this._level + 1 <= 70)
+            if (this._level + 1 <= window['last_level'])
                 changeMapScene({ level: this._level + 1 });
             else
                 changeMapScene();

egret/libs/tw/manager/NetManager.ts

@@ -975,23 +975,23 @@ export class NetManager extends ABNetManager {
         };
         this.send(net);
     }
-    public hc_getBackReward(callback: Function): void {
-        const d: any = {
-            activityId: DataManager.ins.customCfgData.actId,
-            detect: window['detect'],
-            deviceSessionId: window['_device_session_id']
-        };
-        const net: INetData = {
-            name: 'hc_getBackReward',
-            uri: window['duiba'] + '/customActivity/happyclear/getBackReward',
-            type: 'get',
-            dataType: 'json',
-            hideMsg:true,
-            param: d,
-            callback: callback
-        };
-        this.send(net);
-    }
+    // public hc_getBackReward(callback: Function): void {
+    //     const d: any = {
+    //         activityId: DataManager.ins.customCfgData.actId,
+    //         detect: window['detect'],
+    //         deviceSessionId: window['_device_session_id']
+    //     };
+    //     const net: INetData = {
+    //         name: 'hc_getBackReward',
+    //         uri: window['duiba'] + '/customActivity/happyclear/getBackReward',
+    //         type: 'get',
+    //         dataType: 'json',
+    //         hideMsg:true,
+    //         param: d,
+    //         callback: callback
+    //     };
+    //     this.send(net);
+    // }
     public hc_turnableDojoin(callback: Function): void {
         const d: any = {
             activityId: DataManager.ins.customCfgData.actId,

egret/src/mapScene/MapScene.ts

@@ -127,10 +127,10 @@ export default class MapScene extends Scene {
                 localStorage.setItem('nowTimer2Str' + window['CFG'].consumerId, nowTimerStr2);
             }
 
-            const backData = DataManager.ins.getData('hc_getBackReward');
-            if (backData.success && backData.data) {
-                panels.push('back');
-            }
+            // const backData = DataManager.ins.getData('hc_getBackReward');
+            // if (backData.success && backData.data) {
+            //     panels.push('back');
+            // }
 
             const { signInfoVO } = DataManager.ins.getData('getSignInfo');
             if (signInfoVO.continueDay < 7) { //表示明天还可以签到