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

egret/resource/skins/MapSkin.exml

@@ -12,7 +12,7 @@
 		<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="0/0" x="24.04" verticalAlign="middle" textAlign="left" size="26" verticalCenter="1.5" bold="true" fontFamily="FZY3JW"/>
+		<e:Label id="totalStarTxt" text="0/0" x="24.04" verticalAlign="middle" textAlign="left" size="22" verticalCenter="1.5" bold="true" fontFamily="FZY3JW"/>
 		</e:Group>
 		<e:Image id="box" source="宝箱_png" right="32" verticalCenter="13.5" anchorOffsetX="34" anchorOffsetY="34"/>
 		<e:Group id="boxiconWrapper" x="197.33" y="34.86" touchEnabled="false" touchChildren="false">
@@ -24,7 +24,7 @@
 		<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="27.84" width="88" verticalAlign="middle" textAlign="center" fontFamily="FZY3JW"/>
+		<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:skinName>
 			<e:Skin states="up,down,disabled">