Merge branch 'master' of http://47.122.5.112:3000/mojito/FGUIProject

assets/CommonDialog/paiming_01.xml

@@ -5,8 +5,8 @@
     <component id="n4_nyxd" name="n4" src="nyxdav" fileName="Touxiang.xml" xy="142,13"/>
     <image id="n2_nyxd" name="n2" src="nyxdmu" fileName="第一名.png" xy="130,0" size="150,150"/>
     <image id="n3_nyxd" name="n3" src="nyxdmx" fileName="奖牌-1.png" xy="32,17" size="100,100"/>
-    <text id="n5_nyxd" name="n5" xy="275,43" size="224,54" font="YouYuan" fontSize="40" color="#ffffff" bold="true" strokeColor="#000000" text="你,过来啊！"/>
-    <text id="n8_nyxd" name="n8" xy="800,38" size="147,64" fontSize="48" color="#ffe358" bold="true" strokeColor="#4d1799" strokeSize="0.1" text="9999+"/>
+    <text id="n5_nyxd" name="n5" xy="275,43" size="224,54" font="SimHei" fontSize="40" color="#ffffff" bold="true" strokeColor="#000000" text="你,过来啊！"/>
+    <text id="n8_nyxd" name="n8" xy="800,38" size="124,64" font="SimHei" fontSize="48" color="#ffe358" bold="true" strokeColor="#4d1799" text="9999+"/>
     <text id="n9_nyxd" name="n9" xy="600,38" size="118,64" fontSize="48" color="#3964e5" bold="true" text="9999"/>
   </displayList>
 </component>

assets/CommonDialog/paiming_02.xml

@@ -4,8 +4,8 @@
     <image id="n0_nyxd" name="n0" src="nyxdmp" fileName="结算排名_01.png" xy="0,0" size="1024,140"/>
     <component id="n4_nyxd" name="n4" src="nyxdav" fileName="Touxiang.xml" xy="142,13"/>
     <image id="n10_nyxd" name="n10" src="nyxdmw" fileName="第二名.png" xy="128,0" size="150,150"/>
-    <text id="n5_nyxd" name="n5" xy="275,43" size="224,54" font="YouYuan" fontSize="40" color="#ffffff" bold="true" strokeColor="#000000" text="你,过来啊！"/>
-    <text id="n8_nyxd" name="n8" xy="800,38" size="147,64" fontSize="48" color="#ffe358" bold="true" strokeColor="#4d1799" strokeSize="0.1" text="9999+"/>
+    <text id="n5_nyxd" name="n5" xy="275,43" size="224,54" font="SimHei" fontSize="40" color="#ffffff" bold="true" strokeColor="#000000" text="你,过来啊！"/>
+    <text id="n8_nyxd" name="n8" xy="800,38" size="124,64" font="SimHei" fontSize="48" color="#ffe358" bold="true" strokeColor="#4d1799" text="9999+"/>
     <text id="n9_nyxd" name="n9" xy="600,38" size="118,64" fontSize="48" color="#3964e5" bold="true" text="9999"/>
     <image id="n11_nyxd" name="n11" src="nyxdmy" fileName="奖牌-2.png" xy="32,18" size="100,100"/>
   </displayList>

assets/CommonDialog/paiming_03.xml

@@ -3,8 +3,8 @@
   <displayList>
     <image id="n0_nyxd" name="n0" src="nyxdmp" fileName="结算排名_01.png" xy="0,0" size="1024,140"/>
     <component id="n4_nyxd" name="n4" src="nyxdav" fileName="Touxiang.xml" xy="142,13"/>
-    <text id="n5_nyxd" name="n5" xy="275,43" size="224,54" font="YouYuan" fontSize="40" color="#ffffff" bold="true" strokeColor="#000000" text="你,过来啊！"/>
-    <text id="n8_nyxd" name="n8" xy="800,38" size="147,64" fontSize="48" color="#ffe358" bold="true" strokeColor="#4d1799" strokeSize="0.1" text="9999+"/>
+    <text id="n5_nyxd" name="n5" xy="275,43" size="224,54" font="SimHei" fontSize="40" color="#ffffff" bold="true" strokeColor="#000000" text="你,过来啊！"/>
+    <text id="n8_nyxd" name="n8" xy="800,38" size="124,64" font="SimHei" fontSize="48" color="#ffe358" bold="true" strokeColor="#4d1799" text="9999+"/>
     <text id="n9_nyxd" name="n9" xy="600,38" size="118,64" fontSize="48" color="#3964e5" bold="true" text="9999"/>
     <image id="n12_nyxd" name="n12" src="nyxdmz" fileName="奖牌-3.png" xy="32,18" size="100,100"/>
     <image id="n13_nyxd" name="n13" src="nyxdmv" fileName="第三名.png" xy="128,0" size="150,150"/>

assets/CommonDialog/paiming_04.xml

@@ -2,8 +2,8 @@
 <component size="1024,140">
   <displayList>
     <image id="n0_nyxd" name="n0" src="nyxdmp" fileName="结算排名_01.png" xy="0,0" size="1024,140"/>
-    <text id="n5_nyxd" name="n5" xy="275,43" size="224,54" font="YouYuan" fontSize="40" color="#ffffff" bold="true" strokeColor="#000000" text="你,过来啊！"/>
-    <text id="n8_nyxd" name="n8" xy="815,42" size="108,48" fontSize="35" color="#ffe358" bold="true" strokeColor="#4d1799" strokeSize="0.1" text="9999+"/>
+    <text id="n5_nyxd" name="n5" xy="275,43" size="224,54" font="SimHei" fontSize="40" color="#ffffff" bold="true" strokeColor="#000000" text="你,过来啊！"/>
+    <text id="n8_nyxd" name="n8" xy="815,42" size="92,48" font="SimHei" fontSize="35" color="#ffe358" bold="true" strokeColor="#4d1799" text="9999+"/>
     <text id="n9_nyxd" name="n9" xy="612,42" size="87,48" fontSize="35" color="#3964e5" bold="true" text="9999"/>
     <component id="n14_nyxd" name="n14" src="nyxdn4" fileName="Touxiang02.xml" xy="160,33"/>
     <text id="n15_nyxd" name="n15" xy="60,9" size="45,104" font="FZShuTi" fontSize="80" color="#ffffff" autoSize="none" bold="true" strokeColor="#3964e6" shadowColor="#0066ff" shadowOffset="2,2" text="4"/>

assets/Login/Btn_ContinueGame.xml

@@ -3,7 +3,7 @@
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <image id="n3_px1c" name="n3" src="px1csl" fileName="btn.png" xy="0,64" pivot="0,0.5" anchor="true"/>
-    <text id="n2_pdjl" name="title" xy="0,0" size="332,128" font="Microsoft YaHei" fontSize="50" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#0044cc" outlineSoftness="0.1" singleLine="true" text="启动">
+    <text id="n2_pdjl" name="title" xy="0,0" size="332,128" font="Microsoft YaHei" fontSize="50" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#0044cc" outlineSoftness="0.1" singleLine="true" text="登录">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

assets/Login/Login.xml

@@ -5,9 +5,12 @@
     <text id="n23_rwz6" name="Text_Version" xy="0,1703" size="1125,292" fontSize="26" color="#ffffff" align="right" vAlign="bottom" autoSize="none" strokeColor="#0044ff" strokeSize="0.15" text="Version:1"/>
     <component id="n36_px1c" name="comp_login" src="px1csp" fileName="gLoginInfo.xml" xy="0,1168"/>
     <component id="n38_sx4d" name="listServer" src="sx4dsy" fileName="ComboBox2.xml" xy="650,81">
-      <ComboBox visibleItemCount="10"/>
+      <ComboBox title="本地服" visibleItemCount="10"/>
     </component>
     <image id="n39_pk7q" name="n39" src="pk7qsz" fileName="logo(1).png" xy="267,487"/>
+    <component id="n40_f82v" name="listResolution" src="px1cst" fileName="ComboBox1.xml" xy="845,148" size="260,60">
+      <ComboBox title="分辨率4K" visibleItemCount="10"/>
+    </component>
   </displayList>
   <transition name="t1"/>
 </component>

assets/Login/gLoginInfo.xml

@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1125,800">
   <displayList>
-    <image id="n36_px1c" name="n36" src="px1csk" fileName="输入底.png" xy="562,111" pivot="0.5,0" anchor="true" size="1000,110"/>
-    <text id="n38_px1c" name="txtID" xy="93,116" size="941,93" fontSize="50" color="#ffffff" vAlign="middle" autoSize="none" strokeColor="#0044cc" strokeSize="0.1" outlineSoftness="1" text="" input="true"/>
-    <text id="n39_px1c" name="n39" xy="64,0" size="1061,108" font="Microsoft YaHei" fontSize="50" color="#ffffff" vAlign="bottom" autoSize="none" strokeColor="#0044cc" text="请输入直播间ID:"/>
+    <text id="n38_px1c" name="txtID" xy="63,112" size="941,93" fontSize="36" color="#ffffff" vAlign="middle" autoSize="none" strokeColor="#0044cc" strokeSize="0.1" outlineSoftness="1" text="" input="true"/>
+    <text id="n39_px1c" name="n39" xy="64,0" size="1061,108" font="Microsoft YaHei" fontSize="50" color="#ffffff" vAlign="bottom" autoSize="none" strokeColor="#0044cc" text="room token:"/>
     <component id="n40_px1c" name="btn_go" src="brolsg" fileName="Btn_ContinueGame.xml" xy="562,374" pivot="0.5,0" anchor="true"/>
     <text id="n41_px1c" name="txt_tips" xy="74,506" size="994,272" visible="false" fontSize="32" color="#ff3300" align="center" ubb="true" autoSize="none" strokeColor="#ff9900" strokeSize="0.05" text=""/>
     <image id="n42_px1c" name="img_tips" src="pxxk1" fileName="UIMajorCity_48.PNG" xy="512,238" visible="false"/>
-    <component id="n44_px1c" name="listResolution" src="px1cst" fileName="ComboBox1.xml" xy="73,264" size="260,60">
-      <ComboBox title="分辨率4K" visibleItemCount="10"/>
-    </component>
   </displayList>
   <transition name="t1" autoPlay="true" autoPlayRepeat="-1">
     <item time="0" type="Pivot" target="n42_px1c" value="0.5,0.5"/>