Merge branch 'feather-0208' into dev

egret/index.html

@@ -18,8 +18,8 @@
             background-repeat: no-repeat;
             background-color: #000;
             background-size: 100%;
-            background-position:center;
-            background-image: url("//localhost:8080/egret/resource/assets/startScene/startscenebg.jpg");
+            background-position:top;
+            background-image: url("https://yun.duiba.com.cn/db_games/activity/game/1565600901/resource/assets/startScene/startscenebg.jpg");
             padding: 0;
             border: 0;
             margin: 0;

egret/resource/skins/StartSkin.exml

@@ -3,13 +3,13 @@
 	<w:Config id="16705cb4eec"/>
 	<e:Label id="FZY3JW" text=" " y="1048" textColor="0x244B00" fontFamily="FZY3JW" horizontalCenter="0" visible="false"/>
 	<e:Label id="FZY4JW" text=" " y="1048" textColor="0x244B00" fontFamily="FZY4JW" horizontalCenter="0" visible="false"/>
-	<e:Component id="bg" width="750" height="1624" verticalCenter="0"/>
-	<e:Component id="container2" x="0" width="750" height="1624" verticalCenter="0"/>
-	<e:Component id="container1" x="0" width="750" height="1624" verticalCenter="240"/>
-	<e:Group verticalCenter="475" width="750" x="0">
+	<e:Component id="bg" width="750" height="1624" verticalCenter="0" visible="false"/>
+	<e:Component id="container2" x="0" width="750" height="1624" y="0"/>
+	<e:Component id="container1" x="0" width="750" height="1624"/>
+	<e:Group width="750" x="0" y="995">
 		<e:Group y="30.94" x="140">
 			<e:Image source="loadingbg_png" y="0" x="0"/>
-			<e:Group id="maskwrapper" x="14.56" y="7.14" locked="true">
+			<e:Group id="maskwrapper" x="14.56" y="7.14">
 			<e:Group id="container4" x="0" y="0">
 				<e:Group id="container3" x="0" y="0"/>
 				<e:Image source="mask3_png" x="0" y="4"/>
@@ -18,7 +18,8 @@
 			</e:Group>
 			<e:Image id="progressmask2" y="9.14" x="16" source="mask2_png" width="444" height="60" scaleX="1"/>
 		</e:Group>
-		<e:Label id="tips" text="正在加载中，请稍后" y="0" size="24" textColor="0xfcd364" horizontalCenter="0"/>
-		<e:Label id="percentTxt" text="63%" y="117" textColor="0xfcd364" horizontalCenter="0"/>
+		<e:Label id="tips" text="正在加载中，请稍后" y="0" size="24" horizontalCenter="0" textColor="0x244b00"/>
+		<e:Label id="percentTxt" text="63%" y="117" horizontalCenter="0" textColor="0x244b00"/>
 	</e:Group>
+	<e:Image source="头顶树丛_png" x="0" y="0"/>
 </e:Skin>
\ No newline at end of file