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

egret/resource/default.res.json

@@ -195,6 +195,10 @@
 		{
 			"keys": "redbagact_rule按钮_png,redbagactbtn_png,redbagact热门活动专区_png,redbagact退出按钮_png",
 			"name": "redbagactivity"
+		},
+		{
+			"keys": "hbRule_bg_png",
+			"name": "hbrule"
 		}
 	],
 	"resources": [
@@ -3292,6 +3296,11 @@
 			"url": "assets/mainScene/festivalTargetBg.png",
 			"type": "image",
 			"name": "festivalTargetBg_png"
+		},
+		{
+			"url": "assets/hbRule/hbRule_bg.png",
+			"type": "image",
+			"name": "hbRule_bg_png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/HbCutTimeSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="InviteSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui"
         xmlns:w="http://ns.egret.com/wing">
-	<e:Image y="-63.67" horizontalCenter="-1" source="hbCutTime_bg_png"/>
-	<e:BitmapLabel id="cutTimeLabel" y="525.33" text="00时00分00秒" letterSpacing="8" font="hbCutTimeFont_fnt" horizontalCenter="9"/>
-	<e:Image id="tipImage" y="477" source="hbCutTime_cutLine_disable_png" horizontalCenter="0"/>
-	<e:Button id="closeBtn" label="" x="615" y="208.33">
+	<e:Image y="30.33" horizontalCenter="0" source="hbCutTime_bg_png"/>
+	<e:BitmapLabel id="cutTimeLabel" y="619.33" text="00时00分00秒" letterSpacing="8" font="hbCutTimeFont_fnt" horizontalCenter="10"/>
+	<e:Image id="tipImage" y="571" source="hbCutTime_cutLine_disable_png" horizontalCenter="1.5"/>
+	<e:Button id="closeBtn" label="" x="616" y="302.33">
 		<e:skinName>
 			<e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing">
 				<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png"
@@ -13,7 +13,7 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Button id="rule_btn" label="" y="740" horizontalCenter="0">
+	<e:Button id="rule_btn" label="" y="834" horizontalCenter="1">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="hbCutTime_rule_btn_png" source.down="hbCutTime_rule_btn_png" source.disabled="hbCutTime_rule_btn_png"/>
@@ -21,5 +21,5 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Image id="ok_btn" y="623" source="hbCutTime_btn_enable_png" horizontalCenter="0"/>
+	<e:Image id="ok_btn" y="717" source="hbCutTime_btn_enable_png" horizontalCenter="1"/>
 </e:Skin>
\ No newline at end of file

egret/resource/skins/HbRuleSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="InviteRuleSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<e:Rect left="0" top="0" bottom="0" right="0" fillAlpha="0.65"/>
-	<e:Image id="ruleBg" horizontalCenter="0.5" y="152" source="hbRule_bg_png"/>
-	<e:Scroller id="scroller" width="545" x="104.76" height="507" y="377.2">
+	<e:Image id="ruleBg" horizontalCenter="0" y="112" source="hbRule_bg_png"/>
+	<e:Scroller id="scroller" width="545" x="103.76" height="507" y="337.2">
 		<e:Group id="group" width="100%">
 			<e:Label id="labContent" width="100%" text="" lineSpacing="10" size="30" multiline="true" textColor="0xa54615"/>
 			<e:layout>
@@ -10,7 +10,7 @@
 			</e:layout>
 		</e:Group>
 	</e:Scroller>
-	<e:Button id="closeBtn" label="" x="614" y="301">
+	<e:Button id="closeBtn" label="" x="613" y="261">
 		<e:skinName>
 		<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>