1

egret/libs/new_wx/MainBase.ts

@@ -56,7 +56,6 @@ export default class MainBase extends eui.UILayer {
 
         NetManager.ins.offline = () => {
             Loading.instace.hide();
-            PanelCtrl.instance.closeCurrent();
             showAlertPanel('网络异常，请重试');
         }
     }

egret/libs/new_wx/components/PrizePanel.ts

@@ -2,9 +2,8 @@ import showLog from "../../new_tw/ctrls/showLog";
 import { LotteryType } from "../../tw/enum/LotteryType";
 import { DataManager } from "../../tw/manager/DataManager";
 import { NetManager } from "../../tw/manager/NetManager";
-import Panel from "./Panel";
 import SceneCtrl from "../ctrls/sceneCtrl";
-import { ModuleTypes } from "../types/sceneTypes";
+import Panel from "./Panel";
 export default class PrizePanel extends Panel {
     start(data) {
         const lottery = DataManager.ins.gameGetSubmitResultData.lottery;
@@ -19,7 +18,7 @@ export default class PrizePanel extends Panel {
 
     onTouchTap_closeBtn(): any {
         super.onTouchTap_closeBtn();
-        SceneCtrl.instance.change(ModuleTypes.START_SCENE);
+        SceneCtrl.instance.callFunc('update');
     }
 
     get picBigWidth() { return 510 };
@@ -53,7 +52,7 @@ export default class PrizePanel extends Panel {
 
     img: eui.Image;
     useBtn: eui.Button;
-     get skinKey() { return 'Prize' }
+    get skinKey() { return 'Prize' }
 
     protected get closeBtns(): eui.Button[] {
         return [this['closeBtn']]

egret/libs/new_wx/ctrls/panelCtrl.ts

@@ -14,6 +14,9 @@ export default class PanelCtrl {
     }
 
     show(type: ModuleTypes, data?) {
+        if (this._current){
+            this.closeCurrent();
+        }
         const cls = this._panelClassMap[type];
         const panel: Panel = new cls(data);
         this.addMask();
@@ -78,6 +81,7 @@ export default class PanelCtrl {
                     this.removeMask(useTween);
                 }, this);
         }
+        this._current=null;
     }
 
     private onPanelHide(e: egret.Event) {

egret/libs/new_wx/ctrls/sceneCtrl.ts

@@ -10,10 +10,15 @@ export default class SceneCtrl {
     static get instance() {
         return SceneCtrl._instance || (SceneCtrl._instance = new SceneCtrl())
     }
+
     init(parent: egret.Sprite) {
         this._parent = parent;
     }
 
+    callFunc(funcName: string, data?): any {
+        this._currentScene[funcName](data);
+    }
+
     change(type: ModuleTypes, data?, onComplete?: Function) {
         const cls = this._sceneClassMap[type];
         const scene: Scene = new cls();

egret/src/TreasurePanel.ts

@@ -31,7 +31,7 @@ export default class TreasurePanel extends Panel {
         submitAfterDostart(() => {
             PanelCtrl.instance.show(ModuleTypes.PRIZE_PANEL);
             Loading.instace.hide();
-         }, 10);
+        }, 10);
     }
 
     private onTweenGroupComplete(): void {

egret/src/startScene/StartScene.ts

@@ -26,6 +26,10 @@ export default class StartScene extends StartSceneBase {
 
     }
 
+    update() {
+
+    }
+
     updateProgress() {
         const percent = this.score / this.MAX_SCORE;
         const maxwidth = this.progressfront.width;