Merge branch 'hotfix20200326' into dev

egret/resource/default.res.json

@@ -246,7 +246,7 @@
 		},
 		{
 			"name": "preload",
-			"keys": "help_blood_fail_text2_png,help_blood_fail_text3_png,help_blood_fail_text4_png,help_invite2_text3_png,help_invite2_text4_png"
+			"keys": "help_blood_fail_text2_png,help_blood_fail_text3_png,help_blood_fail_text4_png,help_invite2_text3_png,help_invite2_text4_png,help_invite_text_png,help_invite_success_txt_png,help_closebtn1_png,help_invite_btn1_png"
 		}
 	],
 	"resources": [
@@ -5105,6 +5105,26 @@
 			"name": "help_invite2_text4_png",
 			"type": "image",
 			"url": "assets/help/help_invite2_text4.png"
+		},
+		{
+			"name": "help_invite_text_png",
+			"type": "image",
+			"url": "assets/help/help_invite_text.png"
+		},
+		{
+			"name": "help_invite_success_txt_png",
+			"type": "image",
+			"url": "assets/help/help_invite_success_txt.png"
+		},
+		{
+			"name": "help_closebtn1_png",
+			"type": "image",
+			"url": "assets/help/help_closebtn1.png"
+		},
+		{
+			"name": "help_invite_btn1_png",
+			"type": "image",
+			"url": "assets/help/help_invite_btn1.png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/HelpScratchSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="HelpScratchSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
-	<e:Image y="26" horizontalCenter="0" source="help_invite2_png"/>
-	<e:Group y="855" horizontalCenter="0">
-		<e:Image id="helpbtn" x="0" y="0" source="help_invite2_btn_png"/>
-		<e:Image id="gobtn" x="0" y="0" source="help_invite2_btn2_png" visible="false"/>
+	<e:Image y="240" horizontalCenter="0" source="help_invite_bg_png"/>
+	<e:Group y="695" horizontalCenter="0">
+		<e:Image id="helpbtn" y="0" source="help_invite_btn1_png" horizontalCenter="0"/>
+		<e:Image id="gobtn2" x="0" y="0" source="help_invite_fail_btn_png" visible="false"/>
+		<e:Image id="gobtn1" source="help_invite_success_btn_png" horizontalCenter="0" visible="false"/>
 	</e:Group>
-	<e:Group y="88" width="100%" horizontalCenter="0">
-		<e:Image id="txt_standby" y="0" horizontalCenter="0" source="help_invite2_text_png" visible="false"/>
-		<e:Image id="txt_success" horizontalCenter="0" source="help_invite2_text2_png" visible="false"/>
-		<e:Image id="txt_error0200202" horizontalCenter="0" source="help_invite2_text3_png" visible="false"/>
-		<e:Image id="txt_error400017" horizontalCenter="0" source="help_invite2_text4_png" visible="false"/>
+	<e:Group y="294" width="100%" horizontalCenter="0">
+		<e:Image id="txt_standby" y="0" horizontalCenter="0" source="help_invite_text_png" visible="false"/>
+		<e:Image id="txt_success" horizontalCenter="0" source="help_invite_success_txt_png" visible="false"/>
+		<e:Image id="txt_error1" source="help_invite_fail_text1_png" horizontalCenter="0" visible="false"/>
+		<e:Image id="txt_error400017" source="help_invite_fail_text2_png" horizontalCenter="0" visible="false"/>
+		<e:Image id="txt_error0" source="help_invite_fail_text3_png" horizontalCenter="0" visible="false"/>
+		<e:Image id="txt_error2" horizontalCenter="0" source="help_invite_fail_text4_png" visible="false"/>
 	</e:Group>
+	<e:Image id="closeBtn" source="help_closebtn1_png" x="613" y="238"/>
 </e:Skin>
\ No newline at end of file

egret/src/panels/help/HelpInvitePanel.ts

@@ -13,7 +13,8 @@ export default class HelpInvitePanel extends Panel {
         this.code = data.code;
         // NetManager.ins.showLog(getlogItem(87));
 
-        this['gobtn'].once(egret.TouchEvent.TOUCH_TAP, this.onclick_gobtn, this);
+        this['go1btn'].once(egret.TouchEvent.TOUCH_TAP, this.onclick_gobtn, this);
+        this['go2btn'].once(egret.TouchEvent.TOUCH_TAP, this.onclick_gobtn, this);
         this['helpbtn'].once(egret.TouchEvent.TOUCH_TAP, this.onClick, this);
         this['txt_standby'].visible = true;
         this['helpbtn'].visible = true;