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

egret/resource/skins/MapSkin.exml

@@ -5,27 +5,29 @@
 		<e:Group id="scrollGroup">
 		</e:Group>
 	</e:Scroller>
-	<e:Group id="treasureboxBtn" y="-3.06" x="548.23" scaleX="0.8" scaleY="0.8">
-		<e:Image source="宝箱bg_png" y="22" height="101" width="229" x="9.18"/>
-		<e:Group x="102.96" y="45.48">
+	<e:Group id="treasureboxBtn" y="37.67" x="478.29" scaleX="0.8" scaleY="0.8" locked="true">
+		<e:Image source="宝箱bg_png" y="22" x="9.18"/>
+		<e:Group x="80.34" y="31.46">
 		<e:Rect id="rect" width="124" height="45" x="0" y="0" visible="false"/>
 		<e:Image id="progressbg" source="progress2_png" y="0" x="0" visible="false"/>
 		<e:Image id="progressfront" source="progress1_png" y="0" x="0" visible="false"/>
 		<e:Image source="星星_png" verticalCenter="-2.5" x="-17.31"/>
-		<e:Label id="totalStarTxt" text="300/300" x="24.04" verticalAlign="middle" textAlign="left" size="22" verticalCenter="1.5" bold="true" fontFamily="FZY3JW"/>
+		<e:Label id="totalStarTxt" text="300/300" verticalAlign="middle" textAlign="left" size="18" bold="true" fontFamily="FZY3JW" verticalCenter="-4" x="16"/>
 		</e:Group>
-		<e:Image id="box" source="宝箱_png" right="185" verticalCenter="14" anchorOffsetX="34" anchorOffsetY="34"/>
-		<e:Group id="boxiconWrapper" x="41.68" y="34.86" touchEnabled="false" touchChildren="false">
+		<e:Image id="box" source="宝箱_png" right="185" verticalCenter="8" anchorOffsetX="34" anchorOffsetY="34"/>
+		<e:Group id="boxiconWrapper" x="34" y="16.85" touchEnabled="false" touchChildren="false" scaleX="0.85" scaleY="0.85">
 		<e:Image x="8.32" y="0" source="iconbg_png"/>
 		<e:Label id="boxNumsTxt" text="0" x="0" verticalAlign="middle" textAlign="center" size="18" width="46" y="6.14" fontFamily="FZY3JW"/>
 		</e:Group>
 	</e:Group>
-	<e:Group id="top" x="167.04" y="18.05" scaleX="0.8" scaleY="0.8">
-		<e:Image source="元宝bg_png" x="0" y="0"/>
-		<e:Label id="bloodTxt" text="5" x="12.71" y="22.84" width="49" verticalAlign="middle" textAlign="center" size="36" fontFamily="FZY3JW"/>
-		<e:Label id="fullTxt" text="已满" x="76.71" y="29.84" width="82" verticalAlign="middle" textAlign="center" size="24" visible="false"/>
-		<e:Label id="goldTxt" text="0" x="317.23" y="30.34" width="88" verticalAlign="middle" textAlign="center" fontFamily="FZY3JW" size="22"/>
-		<e:Button id="bloodBtn" label="" x="168.38" y="16.6">
+	<e:Group id="top" x="170.88" y="47.51" scaleX="0.8" scaleY="0.8" anchorOffsetX="0" width="383.5" locked="true">
+		<e:Image source="元宝bg_png" x="4.8" y="12"/>
+		<e:Label id="bloodTxt" text="5" x="11.88" width="49" verticalAlign="middle" textAlign="center" size="23" fontFamily="FZY3JW" verticalCenter="0.5"/>
+		<e:Label id="fullTxt" text="已满" x="59.21" width="69.5" verticalAlign="middle" textAlign="center" size="24" anchorOffsetX="0" verticalCenter="0" visible="false"/>
+		<e:Label id="goldTxt" text="0" x="262.23" width="55.5" verticalAlign="middle" textAlign="center" fontFamily="FZY3JW" size="22" anchorOffsetX="0" anchorOffsetY="0" height="22" verticalCenter="0"/>
+		<e:Group id="bloodBtn" width="158.33" height="54.17" x="10" y="13.33" anchorOffsetX="0" anchorOffsetY="0"/>
+		<e:Group id="goldBtn" width="158.33" height="54.17" x="202.9" y="13.33" anchorOffsetX="0" anchorOffsetY="0"/>
+		<e:Button id="bloodBtn1" label="" x="167.54" y="15.77" anchorOffsetX="0" anchorOffsetY="0" visible="false">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="关闭 拷贝_png" source.down="关闭 拷贝_png" source.disabled="关闭 拷贝_png"/>
@@ -33,7 +35,7 @@
 			</e:Skin>
 		</e:skinName>
 		</e:Button>
-		<e:Button id="goldBtn" label="" x="401.45" y="16.6">
+		<e:Button id="goldBtn1" label="" x="401.45" y="16.6" visible="false">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="关闭 拷贝_png" source.down="关闭 拷贝_png" source.disabled="关闭 拷贝_png"/>
@@ -41,7 +43,7 @@
 			</e:Skin>
 		</e:skinName>
 		</e:Button>
-		<e:Label id="countdown" text="00:00:00" x="77.39" y="31.19" verticalAlign="middle" textAlign="center" size="22" fontFamily="FZY3JW"/>
+		<e:Label id="countdown" text="00:00:00" x="65.46" verticalAlign="middle" textAlign="center" size="16" fontFamily="FZY3JW" verticalCenter="0"/>
 	</e:Group>
 	<e:Button id="shopBtn" label="" x="613.08" y="174.01" visible="false">
 		<e:skinName>
@@ -51,7 +53,7 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Button id="recordBtn" label="" x="606.14" y="175">
+	<e:Button id="recordBtn" label="" x="606.14" y="175" locked="true">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="recordbtn_png" source.down="recordbtn_png" source.disabled="recordbtn_png"/>
@@ -59,14 +61,14 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Group id="friendBtn" x="-0.12" y="22.31" width="171" height="120">
+	<e:Group id="friendBtn" x="-0.12" y="22.31" width="171" height="120" locked="true">
 		<e:Image source="avatar_png" y="0" horizontalCenter="0"/>
 		<e:Group x="38.5" y="10">
-		<e:Image id="avatar" y="0" source="" width="96" height="96" x="0"/>
-		<e:Rect id="avatarMask" width="96" height="96" x="0" y="0" ellipseWidth="96" ellipseHeight="96"/>
+		<e:Image id="avatar" y="-2.87" source="" width="70" height="70" x="11.31" anchorOffsetX="0" anchorOffsetY="0"/>
+		<e:Rect id="avatarMask" width="70" height="70" x="11.31" y="-2.87" ellipseWidth="96" ellipseHeight="96" anchorOffsetX="0" anchorOffsetY="0"/>
 		</e:Group>
 		<e:Image source="namebg_png" horizontalCenter="-4" bottom="-4"/>
-		<e:Label id="nameTxt" text="La121233bel" y="91.5" size="20" horizontalCenter="1" fontFamily="FZY3JW"/>
+		<e:Label id="nameTxt" text="La121233bel" y="80.06" size="19" horizontalCenter="-3" fontFamily="FZY3JW"/>
 	</e:Group>
 	<e:Image id="adBtn" y="478" source="ad_icon_png" right="602" width="122" height="122"/>
 	<e:Button id="taskBtn1" label="" x="572.62" y="248.51" visible="false">
@@ -78,7 +80,7 @@
 		</e:skinName>
 	</e:Button>
 	<e:Group id="signGroup" x="26.69" y="172.57">
-		<e:Button id="signBtn" label="" x="0" y="0">
+		<e:Button id="signBtn" label="" y="0" horizontalCenter="0">
 			<e:skinName>
 			<e:Skin states="up,down,disabled">
 				<e:Image width="100%" height="100%" source="map_signicon_png" source.down="map_signicon_png" source.disabled="recordbtn_png"/>
@@ -86,9 +88,9 @@
 			</e:Skin>
 			</e:skinName>
 		</e:Button>
-		<e:Group y="92" x="9">
+		<e:Group y="80" horizontalCenter="0">
 			<e:Image id="sign_s1" source="map今日可领_png" x="0" y="0" visible="false"/>
-			<e:Image id="sign_s2" source="map明日可领_png" x="0" y="0" visible="false"/>
+			<e:Image id="sign_s2" source="map明日可领_png" x="1.33" y="0" visible="false"/>
 		</e:Group>
 	</e:Group>
 	<e:Group id="inviteGroup" x="16.69" y="323.76">
@@ -165,54 +167,54 @@
 				<e:Image id="act2Btn" source="map2红包大作战_png" x="0" y="0"/>
 			</e:Group>
 		</e:Group>
-		<e:Image id="actsShowBtn" source="map2+_png" x="-7.64" y="5.45"/>
-		<e:Image id="actTips" source="maphot_png" x="91.52" y="15.72"/>
+		<e:Image id="actsShowBtn" source="map2+_png" x="4.98" y="1"/>
+		<e:Image id="actTips" source="maphot_png" x="94.82" y="-4.56"/>
 	</e:Group>
-	<e:Group id="settingsx" x="30" scaleX="1.4" scaleY="1.4" bottom="23" touchEnabled="false" locked="true">
-		<e:Group id="settingGroup" x="2" y="6.08" visible="false">
-			<e:Image id="settingbg" source="设置bg_png" y="0" x="0" scale9Grid="9,84,54,76" height="231"/>
-			<e:Button id="soundBtn" label="" y="59.65" horizontalCenter="0.5">
+	<e:Group id="settingsx" scaleX="1" scaleY="1" touchEnabled="false" bottom="23" left="30">
+		<e:Group id="settingGroup" verticalCenter="0" horizontalCenter="0" visible="false">
+			<e:Image id="settingbg" source="设置bg_png" verticalCenter="0" horizontalCenter="0" scale9Grid="44,0,250,89"/>
+			<e:Button id="musicBtn" label="" horizontalCenter="-39" verticalCenter="0">
 				<e:skinName>
 				<e:Skin states="up,down,disabled">
-					<e:Image width="100%" height="100%" source="声音_png" source.down="声音_png" source.disabled="声音_png"/>
+					<e:Image width="100%" height="100%" source="音乐_png" source.down="音乐_png" source.disabled="音乐_png"/>
 					<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
 				</e:Skin>
 				</e:skinName>
 			</e:Button>
-			<e:Button id="questionBtn" label="" y="109.41" horizontalCenter="0.5">
+			<e:Button id="soundBtn" label="" horizontalCenter="43.5" verticalCenter="0">
 				<e:skinName>
 				<e:Skin states="up,down,disabled">
-					<e:Image width="100%" height="100%" source="问题_png" source.down="问题_png" source.disabled="问题_png"/>
+					<e:Image width="100%" height="100%" source="声音_png" source.down="声音_png" source.disabled="声音_png"/>
 					<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
 				</e:Skin>
 				</e:skinName>
 			</e:Button>
-			<e:Button id="musicBtn" label="" y="14.36" horizontalCenter="0.5">
+			<e:Button id="soundOffBtn" label="" y="6" x="178" visible="false">
 				<e:skinName>
 				<e:Skin states="up,down,disabled">
-					<e:Image width="100%" height="100%" source="音乐_png" source.down="音乐_png" source.disabled="音乐_png"/>
+					<e:Image width="100%" height="100%" source="声音关闭_png" source.down="声音关闭_png" source.disabled="声音关闭_png"/>
 					<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
 				</e:Skin>
 				</e:skinName>
 			</e:Button>
-			<e:Button id="musicOffBtn" label="" y="13.69" horizontalCenter="0.5" visible="false">
+			<e:Button id="questionBtn" label="" horizontalCenter="124.5" verticalCenter="0">
 				<e:skinName>
 				<e:Skin states="up,down,disabled">
-					<e:Image width="100%" height="100%" source="音乐关闭_png" source.down="音乐关闭_png" source.disabled="音乐关闭_png"/>
+					<e:Image width="100%" height="100%" source="问题_png" source.down="问题_png" source.disabled="问题_png"/>
 					<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
 				</e:Skin>
 				</e:skinName>
 			</e:Button>
-			<e:Button id="soundOffBtn" label="" y="60.32" horizontalCenter="0.5" visible="false">
+			<e:Button id="musicOffBtn" label="" y="6" x="96" visible="false">
 				<e:skinName>
 					<e:Skin states="up,down,disabled">
-					<e:Image width="100%" height="100%" source="声音关闭_png" source.down="声音关闭_png" source.disabled="声音关闭_png"/>
+					<e:Image width="100%" height="100%" source="音乐关闭_png" source.down="音乐关闭_png" source.disabled="音乐关闭_png"/>
 					<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
 					</e:Skin>
 				</e:skinName>
 			</e:Button>
 		</e:Group>
-		<e:Button id="settingBtn" label="" y="162.34" horizontalCenter="0">
+		<e:Button id="settingBtn" label="" horizontalCenter="-128.5" verticalCenter="0">
 			<e:skinName>
 			<e:Skin states="up,down,disabled">
 				<e:Image width="100%" height="100%" source="设置_png" source.down="设置_png" source.disabled="设置_png"/>