Merge branch 'hotfix20200326' into dev

egret/resource/default.res.json

@@ -243,6 +243,10 @@
 		{
 			"keys": "help_blood_1_btn_png,help_blood_1_text_png,help_blood_1_bg_png,help_blood_fail_text_png,help_blood_fail_btn_png,help_blood_fail_png,help_blood_success_text_png,help_blood_success_text2_png,help_blood_success_png,help_invite_bg_png,help_invite_success_btn_png,help_invite_success_png,help_invite_fail_btn_png,help_invite_fail_text1_png,help_invite_fail_text2_png,help_invite_fail_text3_png,help_invite_fail_text4_png,help_invite_fail_png,help_invite2_text_png,help_invite2_btn_png,help_invite2_png,help_invite2_btn2_png,help_invite2_text2_png",
 			"name": "helpGroup"
+		},
+		{
+			"name": "preload",
+			"keys": "help_blood_fail_text2_png,help_blood_fail_text3_png,help_blood_fail_text4_png"
 		}
 	],
 	"resources": [
@@ -5076,6 +5080,21 @@
 			"url": "assets/help/help_invite2_text2.png",
 			"type": "image",
 			"name": "help_invite2_text2_png"
+		},
+		{
+			"name": "help_blood_fail_text2_png",
+			"type": "image",
+			"url": "assets/help/help_blood_fail_text2.png"
+		},
+		{
+			"name": "help_blood_fail_text3_png",
+			"type": "image",
+			"url": "assets/help/help_blood_fail_text3.png"
+		},
+		{
+			"name": "help_blood_fail_text4_png",
+			"type": "image",
+			"url": "assets/help/help_blood_fail_text4.png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/HelpBloodSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="HelpBloodSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui">
 	<e:Image source="help_blood_1_bg_png" y="26" horizontalCenter="0"/>
-	<e:Image source="help_blood_1_btn_png" y="752" horizontalCenter="0"/>
+	<e:Image source="help_blood_1_btn_png" x="108" y="918.5"/>
+	<e:Image source="help_blood_fail_btn_png" x="108" y="1070"/>
 </e:Skin>
\ No newline at end of file