1

egret/index.html

@@ -54,7 +54,7 @@
         // window['pageID'] = 'TeamShareScene';
         // window['pageID'] = 'JoinShareScene';
         // window['pageID'] = 'Share2Scene';
-        // window['pageID'] = 'TransScene';
+        window['pageID'] = 'TransScene';
         window['projectId'] = "1";
         window['playwayId'] = "join_1";
         window["appId"] = "";

egret/resource/skins/SloganSkin.exml

@@ -2,5 +2,5 @@
 <e:Skin class="SloganSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<e:Image source="slogan_bg_png" y="222" horizontalCenter="0"/>
 	<e:Image id="btn" source="slogan_btn_png" y="636" horizontalCenter="0"/>
-	<e:Image id="closeBtn" source="关闭按钮 _png" x="652" y="139"/>
+	<e:Image id="closeBtn" source="关闭按钮 _png" x="652" y="139" visible="false"/>
 </e:Skin>
\ No newline at end of file

egret/src/yazuwei/SloganPanel.ts

@@ -18,6 +18,6 @@ export default class SloganPanel extends Panel {
     }
 
     onTap_btn() {
-        console.log('onTap_btn');
+        this.onTouchTap();
     }
 }
\ No newline at end of file

egret/src/yazuwei/TransScene.ts

@@ -7,6 +7,7 @@ import { DataManager } from "../../libs/tw/manager/DataManager";
 import { yzwNet } from "../NetConst";
 import SceneCtrl from "../ctrls/sceneCtrl";
 import { ModuleTypes } from "../types/sceneTypes";
+import PanelCtrl from "../ctrls/panelCtrl";
 
 export default class TransScene extends Scene {
     _bg: SVGA.EgretMovieClip;
@@ -118,7 +119,7 @@ export default class TransScene extends Scene {
                 this._standby.x = 40;
                 this._standby.y = 10;
             }
-            
+
             const data = DataManager.ins.getData('accept').data;
             data.from = 'TransScene';
             SceneCtrl.instance.change(ModuleTypes.CertificateScene, data);
@@ -128,19 +129,26 @@ export default class TransScene extends Scene {
     onTap_btn() {
         this['btn'].visible = false;
         console.log('onTap_btn');
-        this['shareTips'].visible = true;
-        //进入页面后发送确认消息
-        yzwNet.accept((success) => {
-            if (success) {
-                yzwNet.openPass(() => {
-                    this.addShareEvent();
-                }, window['projectId'], GameConst.getQueryString("shareCode"))
-            }
-        }, window['projectId'], GameConst.getQueryString("shareCode"));
 
-        setTimeout(() => {
-            this.onshake();
-        }, 3000);
+        const panel = PanelCtrl.instance.show(ModuleTypes.SloganPanel);
+        panel.once('onDestroy', () => {
+            this['shareTips'].visible = true;
+            //进入页面后发送确认消息
+            yzwNet.accept((success) => {
+                if (success) {
+                    yzwNet.openPass(() => {
+                        this.addShareEvent();
+                    }, window['projectId'], GameConst.getQueryString("shareCode"))
+                } else {
+                    location.href = window['indexUrl'];
+                }
+            }, window['projectId'], GameConst.getQueryString("shareCode"));
+
+            setTimeout(() => {
+                this.onshake();
+            }, 3000);
+        }, this);
+
     }
 
     initEvents() {