1

egret/libs/new_tw/ctrls/showLog.ts

@@ -3,6 +3,7 @@ import { DataManager } from "../../../libs/tw/manager/DataManager";
 import { NetManager } from "../../../libs/tw/manager/NetManager";
 
 const showLog = (lottery: LotteryData): void => {
+    if(window['development'] )return
     //曝光埋点
     if (lottery.imgExposure) {
         NetManager.ins.showLog(lottery.imgExposure);

egret/libs/new_wx/MainBase.ts

+import TreasurePanel from "../../src/TreasurePanel";
 import getResPath from "../new_tc/getResPath";
-import { check_webp_feature, getImgURL } from "../tc/util/GFun";
+import { check_webp_feature } from "../tc/util/GFun";
 import { DataManager } from "../tw/manager/DataManager";
 import { NetManager } from "../tw/manager/NetManager";
 import AssetAdapter from "./adapter/AssetAdapter";
@@ -18,7 +19,6 @@ import SceneCtrl from "./ctrls/sceneCtrl";
 import showAlertPanel from "./ctrls/showAlertPanel";
 import { ModuleTypes } from "./types/sceneTypes";
 import layers from "./views/layers";
-import TreasurePanel from "../../src/TreasurePanel";
 
 export default class MainBase extends eui.UILayer {
     constructor() {
@@ -56,7 +56,8 @@ export default class MainBase extends eui.UILayer {
 
         NetManager.ins.offline = () => {
             Loading.instace.hide();
-            showAlertPanel('网络异常')
+            PanelCtrl.instance.closeCurrent();
+            showAlertPanel('网络异常，请重试');
         }
     }
 

egret/libs/new_wx/ctrls/panelCtrl.ts

@@ -51,10 +51,13 @@ export default class PanelCtrl {
         this._parent.addChild(this._mask);
     }
 
-    removeMask() {
+    removeMask(useTween) {
         if (this._mask) {
-            egret.Tween.get(this._mask).to({ alpha: 0 }, 300, egret.Ease.quartIn).call(
-                () => this._parent.removeChild(this._mask), this);
+            if (useTween)
+                egret.Tween.get(this._mask).to({ alpha: 0 }, 300, egret.Ease.quartIn).call(
+                    () => this._parent.removeChild(this._mask), this);
+            else
+                this._parent.removeChild(this._mask)
         }
     }
 
@@ -63,13 +66,18 @@ export default class PanelCtrl {
         panel.addEventListener('onDestroy', this.onPanelHide, this);
     }
 
-    private remove(panel: Panel) {
-        const tw = egret.Tween.get(panel);
-        tw.to({ y: panel.stage.stageHeight }, 300, egret.Ease.quartIn)
-            .call(() => {
-                this._parent.removeChild(panel);
-                this.removeMask();
-            }, this);
+    private remove(panel: Panel, useTween = true) {
+        if (!useTween) {
+            this._parent.removeChild(panel);
+            this.removeMask(useTween);
+        } else {
+            const tw = egret.Tween.get(panel);
+            tw.to({ y: panel.stage.stageHeight }, 300, egret.Ease.quartIn)
+                .call(() => {
+                    this._parent.removeChild(panel);
+                    this.removeMask(useTween);
+                }, this);
+        }
     }
 
     private onPanelHide(e: egret.Event) {
@@ -88,7 +96,9 @@ export default class PanelCtrl {
     private _current: Panel;
 
     closeCurrent() {
-        if (this._current)
-            this.remove(this._current);
+        if (this._current) {
+            this._current.removeEventListener('onDestroy', this.onPanelHide, this);
+            this.remove(this._current, false);
+        }
     }
 }
\ No newline at end of file

egret/libs/tc/manager/ABNetManager.ts

@@ -7,6 +7,7 @@ export abstract class ABNetManager {
      * 接口底层错误
      */
     public static ERROR = 'Error';
+    public static NET_ERROR = 'NET_ERROR';
 
     /**
      * 调用接口对象池

egret/libs/tw/manager/NetManager.ts

@@ -1477,7 +1477,7 @@ export class NetManager extends ABNetManager {
         }
 
         if (!net.hideMsg) {
-            GDispatcher.dispatchEvent(ABNetManager.ERROR, net);
+            GDispatcher.dispatchEvent(ABNetManager.NET_ERROR, net);
         }
 
         this.offline && this.offline();

egret/src/TreasurePanel.ts

@@ -3,6 +3,8 @@ import Panel from "../libs/new_wx/components/Panel";
 import { DataManager } from "../libs/tw/manager/DataManager";
 import { NetManager } from "../libs/tw/manager/NetManager";
 import submitAfterDostart from "../libs/new_tw/ctrls/submitAfterDostart";
+import PanelCtrl from "../libs/new_wx/ctrls/panelCtrl";
+import { ModuleTypes } from "../libs/new_wx/types/sceneTypes";
 
 export default class TreasurePanel extends Panel {
     start(data) {
@@ -25,8 +27,10 @@ export default class TreasurePanel extends Panel {
         this.tweenGroup.stop();
         this.closeBtns.forEach(btn => btn.touchEnabled = false);
         Loading.instace.show();
+
         submitAfterDostart(() => {
-            // Loading.instace.hide();
+            PanelCtrl.instance.show(ModuleTypes.PRIZE_PANEL);
+            Loading.instace.hide();
          }, 10);
     }
 

egret/src/startScene/StartScene.ts

@@ -8,6 +8,8 @@ import createBubblePic from "./createBubblePic";
 import createItems from "./createItems";
 import random from "./random";
 import { startStandbyBubblesLeft, startStandbyBubblesRight, stopStandbyBubblesLeft, stopStandbyBubblesRight } from "./standbyBubbles";
+import { GDispatcher } from "../../libs/tc/util/GDispatcher";
+import { ABNetManager } from "../../libs/tc/manager/ABNetManager";
 
 export default class StartScene extends StartSceneBase {
     _engine: Matter.Engine;
@@ -20,6 +22,10 @@ export default class StartScene extends StartSceneBase {
     MAX_SCORE = 20;
     private scoreTxt: eui.Label;
 
+    onNetError() {
+
+    }
+
     updateProgress() {
         const percent = this.score / this.MAX_SCORE;
         const maxwidth = this.progressfront.width;
@@ -56,6 +62,7 @@ export default class StartScene extends StartSceneBase {
 
     async start(data?) {
         super.start();
+        GDispatcher.addEvent(ABNetManager.NET_ERROR, this.onNetError, this);
         egret.lifecycle.onPause = () => {
             console.log("app 进入后台");
             egret.ticker.pause(); // 关闭渲染与心跳