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

egret/resource/TextureMerger/preload.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"preload","version":5,"files":["../assets/blood/blood去分享.png","../assets/blood2/blood2去分享按钮.png"]}
\ No newline at end of file

egret/resource/TextureMerger/turntable.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"turntable","version":5,"files":["../assets/turntable/turntable_bg.png","../assets/turntable/turntable_panel.png","../assets/turntable/turntable_startbtn.png","../assets/turntable/turntable_rulebtn.png","../assets/turntable/turnable_icon1.png","../assets/turntable/turnable_icon2.png","../assets/turntable/turnable_icon3.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"turntable","version":5,"files":["../assets/turntable/turnable_icon1.png","../assets/turntable/turnable_icon2.png","../assets/turntable/turnable_icon3.png","../assets/turntable/turntable_bg.png","../assets/turntable/turntable_panel.png","../assets/turntable/turntable_rulebtn.png","../assets/turntable/turntable_startbtn.png","../assets/turntable/turntable_oupon.png","../assets/turntable/turntable_prop.png","../assets/turntable/turntable_scratch.png","../assets/turntable/turntable_thanks.png","../assets/turntable/turntable_wealth.png","../assets/turntable/turntable_gameTime.png"]}
\ No newline at end of file

egret/resource/TextureMerger/turntableprize.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"turntableprize","version":5,"files":["../assets/turntableprize/turprize继续闯关按钮.png","../assets/turntableprize/turprizebg.png","../assets/turntableprize/turnprize_icon1.png","../assets/turntableprize/turnprize_icon2.png","../assets/turntableprize/turnprize_icon3.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"turntableprize","version":5,"files":["../assets/turntableprize/turnprize_icon1.png","../assets/turntableprize/turnprize_icon2.png","../assets/turntableprize/turnprize_icon3.png","../assets/turntableprize/turprizebg.png","../assets/turntableprize/turprize继续闯关按钮.png"]}
\ No newline at end of file

egret/resource/default.res.json

 {
-	"groups": [{
+	"groups": [
+		{
 			"keys": "startscenebg_jpg,mask3_png,mask2_png,mask_png,loadingbg_png,头顶树丛_png",
 			"name": "start"
 		},
@@ -44,7 +45,7 @@
 			"name": "fail"
 		},
 		{
-			"keys": "blood体力补济站_png,blood按钮_png,blood按钮 副本1_png,blood按钮 副本_png",
+			"keys": "blood体力补济站_png,blood按钮_png,blood按钮 副本1_png,blood按钮 副本_png,blood去分享_png",
 			"name": "blood"
 		},
 		{
@@ -64,7 +65,7 @@
 			"name": "startpanel"
 		},
 		{
-			"keys": "blood2按钮 副本1_png,blood2按钮 副本_png,blood2_png",
+			"keys": "blood2按钮 副本1_png,blood2按钮 副本_png,blood2_png,blood2去分享按钮_png",
 			"name": "blood2"
 		},
 		{
@@ -174,13 +175,10 @@
 		{
 			"keys": "turnprize_icon1_png,turnprize_icon2_png,turnprize_icon3_png,turprizebg_png,turprize继续闯关按钮_png",
 			"name": "turntableprize"
-		},
-		{
-			"name": "preload",
-			"keys": "blood去分享_png,blood2去分享按钮_png"
 		}
 	],
-	"resources": [{
+	"resources": [
+		{
 			"url": "assets/rule/ruleBg.png",
 			"type": "image",
 			"name": "ruleBg_png"
@@ -2814,16 +2812,16 @@
 			"url": "assets/turntable/turntable_gameTime.png",
 			"type": "image",
 			"name": "turntable_gameTime_png"
-		}, 
+		},
 		{
-			"name": "blood去分享_png",
+			"url": "assets/blood/blood去分享.png",
 			"type": "image",
-			"url": "assets/blood/blood去分享.png"
+			"name": "blood去分享_png"
 		},
 		{
-			"name": "blood2去分享按钮_png",
+			"url": "assets/blood2/blood2去分享按钮.png",
 			"type": "image",
-			"url": "assets/blood2/blood2去分享按钮.png"
+			"name": "blood2去分享按钮_png"
 		}
 	]
 }
\ No newline at end of file

egret/src/H52Scene.ts

@@ -13,8 +13,8 @@ export default class H52Scene extends Scene {
         //     PanelCtrl.instance.show('inviterule')
         // },this);
         this['gobtn'].addEventListener(egret.TouchEvent.TOUCH_TAP,()=>{
-            const code = Utils.getRequestByKey('shareCode2');
-            window.location.href =  `${window['targetUrl']}&shareCode2=${code}`
+            const code = Utils.getRequestByKey('shareCode');
+            window.location.href =  `${window['targetUrl']}&shareCode=${code}`
         },this);
     }