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

egret/resource/default.thm.json

@@ -36,7 +36,8 @@
         "resource/skins/ConfirmSkin.exml",
         "resource/skins/JoinShareSkin.exml",
         "resource/skins/PKScoreSkin.exml",
-        "resource/skins/CertificateSkin.exml"
+        "resource/skins/CertificateSkin.exml",
+        "resource/skins/ShareStarterSkin.exml"
     ],
     "path": "resource/default.thm.json"
 }
\ No newline at end of file

egret/src/Main.ts

@@ -221,11 +221,12 @@ class Main extends MainBase {
                     // ToastCtrl.instance.show("网络异常请重试~");
                     return;
                 }
-            }, window['projectId'], GameConst.getQueryString("InviteSource"))
-            Waiting.instance.hide();
-            let data = DataManager.ins.getData("homeBaseInfo").data;
+                Waiting.instance.hide();
+                let data = DataManager.ins.getData("homeBaseInfo").data;
 
-            SceneCtrl.instance.change(ModuleTypes.START_SCENE, data);
+                SceneCtrl.instance.change(ModuleTypes.START_SCENE, data);
+            }, window['projectId'], GameConst.getQueryString("InviteSource"))
+            
         } else {
             yzwNet.homeBaseInfo((s) => {
                 if (!s) {

egret/src/startScene/StartScene.ts

@@ -129,8 +129,55 @@ export default class StartScene extends Scene {
     private arr = ["hz","am","xg","tb","rb","hg","cx","mg"]
 
     showMap(num){
-        for(let i = 0;i<num;i++){
-            this[this.arr[i]].source = this[this.arr[i]].source.substring(2);
+        // for(let i = 0;i<num;i++){
+        //     this[this.arr[i]].source = this[this.arr[i]].source.substring(2);
+        // }
+        if(num = 1){
+            this.hz.source = "CHNhangzhou_png"
+        }else if(num = 2){
+            this.hz.source = "CHNhangzhou_png"
+            this.am.source = "CHNaomen_png"
+        }else if(num = 3){
+            this.hz.source = "CHNhangzhou_png"
+            this.am.source = "CHNaomen_png"
+            this.xg.source = "CHNxianggang_png"
+        }else if(num = 4){
+            this.hz.source = "CHNhangzhou_png"
+            this.am.source = "CHNaomen_png"
+            this.xg.source = "CHNxianggang_png"
+            this.tb.source = "CHNtaiwanpng_png"
+        }else if(num = 5){
+            this.hz.source = "CHNhangzhou_png"
+            this.am.source = "CHNaomen_png"
+            this.xg.source = "CHNxianggang_png"
+            this.tb.source = "CHNtaiwanpng_png"
+            this.rb.source = "riben_png"
+        }else if(num = 6){
+            this.hz.source = "CHNhangzhou_png"
+            this.am.source = "CHNaomen_png"
+            this.xg.source = "CHNxianggang_png"
+            this.tb.source = "CHNtaiwanpng_png"
+            this.rb.source = "riben_png"
+            this.hg.source = "hanguo_png"
+        }else if(num = 7){
+            this.hz.source = "CHNhangzhou_png"
+            this.am.source = "CHNaomen_png"
+            this.xg.source = "CHNxianggang_png"
+            this.tb.source = "CHNtaiwanpng_png"
+            this.rb.source = "riben_png"
+            this.hg.source = "hanguo_png"
+            this.cx.source = "chaoxian_png"
+        }else if(num = 8){
+            this.hz.source = "CHNhangzhou_png"
+            this.am.source = "CHNaomen_png"
+            this.xg.source = "CHNxianggang_png"
+            this.tb.source = "CHNtaiwanpng_png"
+            this.rb.source = "riben_png"
+            this.hg.source = "hanguo_png"
+            this.cx.source = "chaoxian_png"
+            this.mg.source = "menggu_png"
+        }else{
+
         }
     }