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

egret/resource/skins/InviteRulePanelSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="RuleSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<e:Rect left="0" bottom="0" top="0" right="0" fillColor="0x000000" fillAlpha="0.7"/>
-	<e:Image id="ruleBg" horizontalCenter="0" verticalCenter="-177" source="invite_rule_bg_png"/>
-	<e:Scroller id="scroller" width="545" height="534" y="391.2" horizontalCenter="0.5" anchorOffsetY="0">
-		<e:Group id="group" width="100%" x="0" y="-8" anchorOffsetY="0" height="535">
+	<e:Image id="ruleBg" horizontalCenter="0" source="invite_rule_bg_png" y="410.58"/>
+	<e:Scroller id="scroller" width="545" height="534" anchorOffsetY="0" y="521.06" horizontalCenter="0.5">
+		<e:Group id="group" width="100%" x="-0.5" y="111.38" anchorOffsetY="0" height="535">
 			<e:Label id="labContent" width="100%" text="" lineSpacing="10" size="30" multiline="true" textColor="0xa54615" fontFamily="FZY3JW"/>
 			<e:layout>
 				<e:VerticalLayout/>
 			</e:layout>
 		</e:Group>
 	</e:Scroller>
-	<e:Button id="closeBtn" label="" x="604.5" y="276">
+	<e:Button id="closeBtn" label="" x="604.5" y="410.58">
 		<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"/>

egret/resource/skins/InviteRuleSkin.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:Image id="ruleBg" horizontalCenter="1" y="399.11" source="invite_rule_bg_png"/>
-	<e:Scroller id="scroller" width="545" height="538" y="505.61" anchorOffsetY="0" horizontalCenter="1.5">
-		<e:Group id="group" width="100%" y="2" x="1" anchorOffsetY="0" height="511">
+	<e:Image id="ruleBg" source="invite_rule_bg_png" horizontalCenter="0" y="425.94"/>
+	<e:Scroller id="scroller" width="545" height="538" y="535.91" anchorOffsetY="0" horizontalCenter="0">
+		<e:Group id="group" width="100%" y="21.21" x="1" anchorOffsetY="0" height="511">
 			<e:Label id="labContent" width="100%" text="" lineSpacing="10" size="30" multiline="true" textColor="0xa54615"/>
 			<e:layout>
 				<e:VerticalLayout/>
 			</e:layout>
 		</e:Group>
 	</e:Scroller>
-	<e:Button id="closeBtn" label="" x="599.5" y="399.11">
+	<e:Button id="closeBtn" label="" x="599.5" y="426.38">
 		<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"/>

egret/resource/skins/ScratchRuleSkin.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" bottom="0" top="0" right="0" fillColor="0x000000" fillAlpha="0.7"/>
-	<e:Image id="ruleBg" y="262.61" source="scratch_rule_bg_png" horizontalCenter="0"/>
-	<e:Scroller id="scroller" width="545" x="104.76" height="507" y="377.2">
-		<e:Group id="group" width="100%">
+	<e:Image id="ruleBg" source="scratch_rule_bg_png" horizontalCenter="0" y="434.82"/>
+	<e:Scroller id="scroller" width="545" x="104.76" height="507" y="553.02">
+		<e:Group id="group" width="100%" y="-3.03">
 			<e:Label id="labContent" width="100%" text="" lineSpacing="10" size="30" multiline="true" textColor="0xa54615" fontFamily="FZY3JW"/>
 			<e:layout>
 				<e:VerticalLayout/>
 			</e:layout>
 		</e:Group>
 	</e:Scroller>
-	<e:Button id="closeBtn" label="" x="606.26" y="262.61">
+	<e:Button id="closeBtn" label="" x="599" y="437.85">
 		<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"/>