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

egret/resource/default.res.json

@@ -81,7 +81,7 @@
 			"name": "signprize"
 		},
 		{
-			"keys": "turnnoprize再来一次2_png,toast_png,sharenums_png,sharenums_fnt,share_btn2_png,share_btn1_png,prizePanelbg_png,nums3_png,nums3_fnt,nums2_png,nums2_fnt,nums_png,nums_fnt,lightani_png,exchangebtn_png,cutTimeFont_png,cutTimeFont_fnt,common_yuanbao_png,common_prop3_png,common_prop2_png,common_prop1_png,common_prizelight_png,common_money_png,common_blood_png,common_adbg_png,commmon_okbtn1_png,closeCommonBtn_png,btn_png,alertbg_png,朋友圈中间分享蒙层1_jpg,按钮 副本 4_png,按钮 副本 3_png,common_block_png,common_block_front_png,common_block_bg_yellow_png,common_block_bg_red_png,common_block_bg_blue_png,chocolate3_png,chocolate1_png,chocolate0_png,chocolate2_png,turnprize_icon3_png,turnprize_icon2_png,turnprize_icon1_png,commom_prop_bg_png,arrowbg_png",
+			"keys": "turnnoprize再来一次2_png,toast_png,sharenums_png,sharenums_fnt,share_btn2_png,share_btn1_png,prizePanelbg_png,nums3_png,nums3_fnt,nums2_png,nums2_fnt,nums_png,nums_fnt,lightani_png,exchangebtn_png,cutTimeFont_png,cutTimeFont_fnt,common_yuanbao_png,common_prop3_png,common_prop2_png,common_prop1_png,common_prizelight_png,common_money_png,common_blood_png,common_adbg_png,commmon_okbtn1_png,closeCommonBtn_png,btn_png,alertbg_png,朋友圈中间分享蒙层1_jpg,按钮 副本 4_png,按钮 副本 3_png,common_block_png,common_block_front_png,common_block_bg_yellow_png,common_block_bg_red_png,common_block_bg_blue_png,chocolate3_png,chocolate1_png,chocolate0_png,chocolate2_png,turnprize_icon3_png,turnprize_icon2_png,turnprize_icon1_png,commom_prop_bg_png,arrowbg_png,common_closebtn2_png",
 			"name": "common"
 		},
 		{
@@ -5237,6 +5237,11 @@
 			"url": "assets/mainScene/propNum关.png",
 			"type": "image",
 			"name": "propNum关_png"
+		},
+		{
+			"url": "assets/common/common_closebtn2.png",
+			"type": "image",
+			"name": "common_closebtn2_png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/HelpBloodSkin.exml

@@ -13,4 +13,5 @@
 		<e:Image id="txt_error2002002036" source="help_blood_fail_text3_png" horizontalCenter="0" visible="false"/>
 		<e:Image id="txt_error2002002025" source="help_blood_fail_text4_png" horizontalCenter="0" visible="false"/>
 	</e:Group>
+	<e:Image id="closeBtn" x="613" y="200" anchorOffsetX="2" source="common_closebtn2_png"/>
 </e:Skin>
\ No newline at end of file

egret/resource/skins/HelpInviteSkin.exml

@@ -11,4 +11,5 @@
 		<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>
+	<e:Image id="closeBtn" source="common_closebtn2_png" x="613" y="350.12" anchorOffsetX="2"/>
 </e:Skin>
\ No newline at end of file