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

egret/resource/default.res.json

@@ -5,7 +5,7 @@
 			"name": "Preload"
 		},
 		{
-			"keys": "mrxg_png,mrtitle_png,mrtb_png,mrrb_png,mrmg_png,mrhz_png,mrhg_png,mrcx_png,mrbg_jpg,mram_png,mapshareBtn_png,mappass_png,maphz_png,mapBtn_png,rulebg_png,rankmybg_png,rankline_png,ranklight_png,rankbg2_png,rankbg_png,lessscoreBtn_png,lessscorebg_png,finishlogo_png,finishlight_png,finishBtn_png,finishbg_png,progress_png,bg_png,xuanshiBtn_png,xuanshiBG_png",
+			"keys": "mrxg_png,mrtitle_png,mrtb_png,mrrb_png,mrmg_png,mrhz_png,mrhg_png,mrcx_png,mrbg_jpg,mram_png,mapshareBtn_png,mappass_png,maphz_png,mapBtn_png,rulebg_png,rankmybg_png,rankline_png,ranklight_png,rankbg2_png,rankbg_png,lessscoreBtn_png,lessscorebg_png,finishlogo_png,finishlight_png,finishBtn_png,finishbg_png,progress_png,bg_png,xuanshiBtn_png,xuanshiBG_png,mapcx_png,maphg_png,mapmg_png,mapxg_png,mapam_png,maprb_png,maptb_png",
 			"name": "Normal"
 		},
 		{
@@ -622,6 +622,41 @@
 			"url": "assets/waiting/progress.png",
 			"type": "image",
 			"name": "progress_png"
+		},
+		{
+			"url": "assets/map/mapcx.png",
+			"type": "image",
+			"name": "mapcx_png"
+		},
+		{
+			"url": "assets/map/maphg.png",
+			"type": "image",
+			"name": "maphg_png"
+		},
+		{
+			"url": "assets/map/mapmg.png",
+			"type": "image",
+			"name": "mapmg_png"
+		},
+		{
+			"url": "assets/map/mapxg.png",
+			"type": "image",
+			"name": "mapxg_png"
+		},
+		{
+			"url": "assets/map/mapam.png",
+			"type": "image",
+			"name": "mapam_png"
+		},
+		{
+			"url": "assets/map/maprb.png",
+			"type": "image",
+			"name": "maprb_png"
+		},
+		{
+			"url": "assets/map/maptb.png",
+			"type": "image",
+			"name": "maptb_png"
 		}
 	]
 }
\ No newline at end of file

egret/src/startScene/StartScene.ts

@@ -132,46 +132,46 @@ export default class StartScene extends Scene {
         // for(let i = 0;i<num;i++){
         //     this[this.arr[i]].source = this[this.arr[i]].source.substring(2);
         // }
-        if(num = 1){
+        if(num == 1){
             this.hz.source = "CHNhangzhou_png"
-        }else if(num = 2){
+        }else if(num == 2){
             this.hz.source = "CHNhangzhou_png"
             this.am.source = "CHNaomen_png"
-        }else if(num = 3){
+        }else if(num == 3){
             this.hz.source = "CHNhangzhou_png"
             this.am.source = "CHNaomen_png"
             this.xg.source = "CHNxianggang_png"
-        }else if(num = 4){
+        }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.tb.source = "CHNtaiwan_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.tb.source = "CHNtaiwan_png"
             this.rb.source = "riben_png"
-        }else if(num = 6){
+        }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.tb.source = "CHNtaiwan_png"
             this.rb.source = "riben_png"
             this.hg.source = "hanguo_png"
-        }else if(num = 7){
+        }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.tb.source = "CHNtaiwan_png"
             this.rb.source = "riben_png"
             this.hg.source = "hanguo_png"
             this.cx.source = "chaoxian_png"
-        }else if(num = 8){
+        }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.tb.source = "CHNtaiwan_png"
             this.rb.source = "riben_png"
             this.hg.source = "hanguo_png"
             this.cx.source = "chaoxian_png"

egret/src/yazuwei/RecordMapScene.ts

@@ -17,23 +17,23 @@ export default class RecordMapScene extends Scene{
     }
 
     initUI(data){
-        // if(data.num == 1){
-        //     this.mapBG.source = "maphz_png"
-        // }else if(data.num == 2){
-        //     this.mapBG.source = "mapam_png"
-        // }else if(data.num == 3){
-        //     this.mapBG.source = "mapxg_png"
-        // }else if(data.num == 4){
-        //     this.mapBG.source = "maptb_png"
-        // }else if(data.num == 5){
-        //     this.mapBG.source = "maprb_png"
-        // }else if(data.num == 6){
-        //     this.mapBG.source = "maphg_png"
-        // }else if(data.num == 7){
-        //     this.mapBG.source = "mapcx_png"
-        // }else if(data.num == 8){
-        //     this.mapBG.source = "mapmg_png"
-        // }
+        if(data.num == 1){
+            this.mapBG.source = "maphz_png"
+        }else if(data.num == 2){
+            this.mapBG.source = "mapam_png"
+        }else if(data.num == 3){
+            this.mapBG.source = "mapxg_png"
+        }else if(data.num == 4){
+            this.mapBG.source = "maptb_png"
+        }else if(data.num == 5){
+            this.mapBG.source = "maprb_png"
+        }else if(data.num == 6){
+            this.mapBG.source = "maphg_png"
+        }else if(data.num == 7){
+            this.mapBG.source = "mapcx_png"
+        }else if(data.num == 8){
+            this.mapBG.source = "mapmg_png"
+        }
         const arr = ["HZ","AM","XG","TB","RB","HG","CX","MG"];
 
         for(let i =0;i<data.data.length;i++){