1

egret/libs/tw/manager/NetManager.ts

@@ -1513,6 +1513,7 @@ export class NetManager extends ABNetManager {
      * @param {IExposureData} exposure
      */
     public showLog(exposure: IExposureData): void {
+        console.log(JSON.stringify(exposure))
         const net: INetData = {
             name: 'showLog',
             uri: exposure.domain + '/exposure/standard',

egret/src/Main.ts

@@ -141,20 +141,20 @@ class Main extends MainBase {
             // this.loadBg("startBg.png");
             GDispatcher.dispatchEvent('PreloadLoaded');
             window['isPreloadLoaded'] = true;
-                RES.loadGroup("Normal");
-            } else if (event.groupName == "Normal") {
-                this.trace("Normal组加载完成");
-                this.trace("开始加载Garbage资源");
-                GDispatcher.dispatchEvent('NormalLoaded');
-                RES.loadGroup("Garbage");
-            } else if (event.groupName == "Garbage") {
-                this.trace("Garbage组加载完成");
-                this.trace("开始加载Delay资源");
-                GDispatcher.dispatchEvent('GarbageLoaded');
-                RES.loadGroup("Delay");
-            } else if (event.groupName == "Delay") {
-                this.trace("Delay组加载完成");
-                GDispatcher.dispatchEvent('DelayLoaded');
+            RES.loadGroup("Normal");
+        } else if (event.groupName == "Normal") {
+            this.trace("Normal组加载完成");
+            this.trace("开始加载Garbage资源");
+            GDispatcher.dispatchEvent('NormalLoaded');
+            RES.loadGroup("Garbage");
+        } else if (event.groupName == "Garbage") {
+            this.trace("Garbage组加载完成");
+            this.trace("开始加载Delay资源");
+            GDispatcher.dispatchEvent('GarbageLoaded');
+            RES.loadGroup("Delay");
+        } else if (event.groupName == "Delay") {
+            this.trace("Delay组加载完成");
+            GDispatcher.dispatchEvent('DelayLoaded');
             RES.removeEventListener(RES.ResourceEvent.GROUP_COMPLETE, this.onResourceLoadComplete, this);
             RES.removeEventListener(RES.ResourceEvent.GROUP_LOAD_ERROR, this.onResourceLoadError, this);
             RES.removeEventListener(RES.ResourceEvent.GROUP_PROGRESS, this.onResourceProgress, this);
@@ -172,20 +172,7 @@ class Main extends MainBase {
 
         if (window['pageID']) {
             Buried.init();
-            // if (GameConst.getQueryString("InviteSource")) {
-                yzwNet.homeBaseInfo((s) => {
-                    if (!s) {
-                        if((DataManager.ins.getData("homeBaseInfo").message)){
-                            ToastCtrl.instance.show(DataManager.ins.getData("homeBaseInfo").message)
-                        }else{
-                            ToastCtrl.instance.show("网络异常请重试~");
-                        }
-                        
-                        // ToastCtrl.instance.show("网络异常请重试~");
-                        return;
-                    }
-                }, window['projectId'])
-            // }
+            
             Waiting.instance.hide();
 
             if (window['pageID'] == 'Share2Scene') {
@@ -198,7 +185,9 @@ class Main extends MainBase {
                 SceneCtrl.instance.change(ModuleTypes.TeamShareScene);
             }
             if (window['pageID'] == 'TransScene') {
-                SceneCtrl.instance.change(ModuleTypes.TransScene);
+                yzwNet.homeBaseInfo((s) => { 
+                    SceneCtrl.instance.change(ModuleTypes.TransScene);
+                }, window['projectId']);  
             }
             return;
         }
@@ -229,23 +218,23 @@ class Main extends MainBase {
 
         //         SceneCtrl.instance.change(ModuleTypes.START_SCENE, data);
         //     }, window['projectId'], GameConst.getQueryString("InviteSource"))
-            
+
         // } else {
-            yzwNet.homeBaseInfo((s) => {
-                if (!s) {
-                    if(DataManager.ins.getData("homeBaseInfo") && DataManager.ins.getData("homeBaseInfo").message){
-                        ToastCtrl.instance.show(DataManager.ins.getData("homeBaseInfo").message)
-                    }else{
-                        ToastCtrl.instance.show("网络异常请重试~");
-                    }
-                    
-                    // ToastCtrl.instance.show("网络异常请重试~");
-                    return;
+        yzwNet.homeBaseInfo((s) => {
+            if (!s) {
+                if (DataManager.ins.getData("homeBaseInfo") && DataManager.ins.getData("homeBaseInfo").message) {
+                    ToastCtrl.instance.show(DataManager.ins.getData("homeBaseInfo").message)
+                } else {
+                    ToastCtrl.instance.show("网络异常请重试~");
                 }
-                Waiting.instance.hide();
-                let data = DataManager.ins.getData("homeBaseInfo").data;
-                SceneCtrl.instance.change(ModuleTypes.START_SCENE, data);
-            }, window['projectId'])
+
+                // ToastCtrl.instance.show("网络异常请重试~");
+                return;
+            }
+            Waiting.instance.hide();
+            let data = DataManager.ins.getData("homeBaseInfo").data;
+            SceneCtrl.instance.change(ModuleTypes.START_SCENE, data);
+        }, window['projectId'])
 
         // }
 

egret/src/yazuwei/ConfirmPanel.ts

@@ -20,9 +20,9 @@ export default class ConfirmPanel extends Panel {
         NetManager.ins.yyh_queryInviterPhone(() => {
             const data = DataManager.ins.getData('yyh_queryInviterPhone').data;
             if (data)
-                this['tips'].text = `是否确认加入“${data}”的战队参与队伍PK`;
+                this['tips'].text = `是否确认加入“${data}”的战队\n参与队伍PK`;
             else
-                this['tips'].text = `是否确认加入“未知号码”的战队参与队伍PK`;
+                this['tips'].text = `是否确认加入“未知号码”的战队\n参与队伍PK`;
         }, GameConst.getQueryString('joinTeamCode'));
     }
 

egret/src/yazuwei/JoinShareScene.ts

@@ -29,7 +29,7 @@ export default class JoinShareScene extends Scene {
                 this['sharemask'].visible = false;
             }, this);
         } else {
-            const url = `${window['indexUrl']}?joinTeamCode=${GameConst.getQueryString("shareCode")}&wayId=3`
+            const url = `${window['indexUrl']}?joinTeamCode=${GameConst.getQueryString("joinTeamCode")}&wayId=3`
             deeplink(url);
             // PanelCtrl.instance.show(ModuleTypes.ConfirmPanel);
         }
@@ -43,7 +43,9 @@ export default class JoinShareScene extends Scene {
 
 export const deeplink = (activeUrl) => {
     let state = false;
-    window.location.href = 'esports://openapp?url=http://aghzact.zjkczn.com/h5/defaultActive.html?activeUrl=' + encodeURIComponent(activeUrl);
+    const url ='esports://openapp?url=http://aghzact.zjkczn.com/h5/defaultActive.html?activeUrl=' + encodeURIComponent(activeUrl)
+    console.log(url)
+    window.location.href = url;
     state = true;
 
     let timer = setTimeout(() => {