1
0
dzduole 1 сар өмнө
parent
commit
b76c90103f

+ 2 - 2
art/fgui/assets/game/UIRepentProp/component/Component41_1.xml

@@ -14,7 +14,7 @@
       <gearDisplay controller="c1" pages="0,1"/>
       <gearXY controller="c1" pages="1" values="218,306" default="344,306"/>
     </component>
-    <text id="n27_trk9" name="n27" xy="30,371" size="542,26" fontSize="18" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="Activate the assist, make sure to hit the hole with one shot!"/>
+    <text id="n27_trk9" name="n27" xy="18,371" size="565,26" fontSize="18" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="Activate the assist, make sure to hit the hole with one shot!"/>
     <image id="n30_trk9" name="n30" src="trk9496" fileName="UIRepentProp/asset/组 43.png" xy="566,11" pivot="0,0.736"/>
     <image id="n31_trk9" name="n31" src="trk9493" fileName="UIRepentProp/asset/超长路径,.png" xy="617,24" pivot="-0.399,1.339">
       <gearDisplay controller="c1" pages=""/>
@@ -24,7 +24,7 @@
     <image id="n34_trk9" name="n34" src="trk9497" fileName="UIRepentProp/asset/组 44.png" xy="150,124"/>
     <image id="n35_trk9" name="n35" src="trk9499" fileName="UIRepentProp/asset/组 46.png" xy="404,211" pivot="0.5,0.5"/>
     <image id="n36_trk9" name="n36" src="trk949a" fileName="UIRepentProp/asset/组 47.png" xy="159,122" pivot="0.5,0.5"/>
-    <text id="n1_p4tr" name="n1" xy="17,14" size="568,54" fontSize="36" color="#ffffff" align="center" vAlign="middle" letterSpacing="1" autoSize="none" bold="true" text="Auxiliary line prompt"/>
+    <text id="n1_p4tr" name="n1" xy="17,14" size="568,54" font="Arial" fontSize="36" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="Auxiliary line prompt"/>
     <loader id="n37_pbej" name="n37" xy="456,-62" pivot="0,1" size="197,356" scale="0.7,0.7" url="ui://isxx5ak7pbejv4lf" align="center" vAlign="bottom" autoSize="true">
       <relation target="n0_p4tr" sidePair="bottom-bottom"/>
     </loader>

+ 4 - 4
art/fgui/assets/game/UISign/component/SignMax.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="214,387">
-  <controller name="c1" alias="状态" exported="true" pages="0,未领取,1,已领取,3,今日待领取" selected="0"/>
+  <controller name="c1" alias="状态" exported="true" pages="0,未领取,1,已领取,3,今日待领取" selected="2"/>
   <displayList>
     <image id="n7_bf9j" name="n7" src="bf9jv4jp" fileName="UISign/asset/qd_1.png" xy="0,0" size="214,30"/>
     <image id="n15_wcn5" name="n15" src="wcn5v4k3" fileName="UISign/asset/qd_1_1.png" xy="0,0" size="214,30">
       <gearDisplay controller="c1" pages="3"/>
     </image>
     <image id="n8_bf9j" name="n8" src="bf9jv4jk" fileName="UISign/asset/qd_4.png" xy="0,30" size="214,357"/>
-    <text id="n9_bf9j" name="titleTxt" xy="17,0" pivot="0.5,0.5" size="177,29" fontSize="20" color="#ffffff" align="center" vAlign="middle" vars="true" text="Collect the reward"/>
+    <text id="n9_bf9j" name="titleTxt" xy="16,0" pivot="0.5,0.5" size="179,29" font="Arial" fontSize="20" color="#ffffff" align="center" vAlign="middle" vars="true" bold="true" text="Collect the reward"/>
     <loader id="n10_bf9j" name="myIcon1" xy="26,21" pivot="0.5,0.5" size="160,160" scale="0.7,0.7" url="ui://isxx5ak7kys749j" align="center" vAlign="middle" fill="scale" shrinkOnly="true"/>
-    <text id="n11_bf9j" name="numTxt1" xy="92,157" size="30,32" fontSize="22" color="#6079ad" align="center" vAlign="middle" text="88">
+    <text id="n11_bf9j" name="numTxt1" xy="92,157" size="30,32" fontSize="22" color="#ffffff" align="center" vAlign="middle" strokeColor="#000000" text="88">
       <relation target="" sidePair="center-center"/>
     </text>
     <loader id="n18_wcn5" name="myIcon2" xy="26,210" pivot="0.5,0.5" size="160,160" scale="0.7,0.7" url="ui://isxx5ak7ehtov4fp" align="center" vAlign="middle" fill="scale" shrinkOnly="true"/>
@@ -19,7 +19,7 @@
     <component id="n17_wcn5" name="n17" src="wcn5v4k4" fileName="UISign/component/Sign_guang.xml" xy="23,49">
       <gearDisplay controller="c1" pages="3"/>
     </component>
-    <text id="n19_wcn5" name="numTxt2" xy="92,346" size="30,32" fontSize="22" color="#6079ad" align="center" vAlign="middle" text="88">
+    <text id="n19_wcn5" name="numTxt2" xy="92,346" size="30,32" fontSize="22" color="#ffffff" align="center" vAlign="middle" strokeColor="#000000" text="88">
       <relation target="" sidePair="center-center"/>
     </text>
     <image id="n12_bf9j" name="n12" src="bf9jv4jq" fileName="UISign/asset/qd_2.png" xy="0,30" size="214,357">

+ 2 - 2
art/fgui/assets/game/UISign/component/SignNormal.xml

@@ -6,10 +6,10 @@
     <image id="n15_wcn5" name="n15" src="wcn5v4k3" fileName="UISign/asset/qd_1_1.png" xy="0,0" size="148,30">
       <gearDisplay controller="c1" pages="3"/>
     </image>
-    <text id="n9_bf9j" name="titleTxt" xy="47,0" pivot="0.5,0.5" size="53,29" fontSize="20" color="#ffffff" align="center" vAlign="middle" vars="true" text="Day1"/>
+    <text id="n9_bf9j" name="titleTxt" xy="48,0" pivot="0.5,0.5" size="51,29" font="Arial" fontSize="20" color="#ffffff" align="center" vAlign="middle" vars="true" bold="true" text="Day1"/>
     <image id="n8_bf9j" name="n8" src="bf9jv4jr" fileName="UISign/asset/qd_3.png" xy="0,30" size="148,161"/>
     <loader id="n10_bf9j" name="myIcon" xy="-6,12" pivot="0.5,0.5" size="160,160" scale="0.7,0.7" url="ui://isxx5ak7ehtov4gt" align="center" vAlign="middle" fill="scale" shrinkOnly="true"/>
-    <text id="n11_bf9j" name="numTxt" xy="59,152" size="30,32" fontSize="22" color="#6079ad" align="center" vAlign="middle" text="88">
+    <text id="n11_bf9j" name="numTxt" xy="59,152" size="30,32" fontSize="22" color="#ffffff" align="center" vAlign="middle" strokeColor="#683aff" text="88">
       <relation target="" sidePair="center-center"/>
     </text>
     <image id="n12_bf9j" name="n12" src="bf9jv4jq" fileName="UISign/asset/qd_2.png" xy="0,30" size="148,161">

+ 2 - 2
art/fgui/assets/game/_sharecomponent/cancelBtn.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="165,51" pivot="0.5,0.5" extention="Button">
-  <controller name="c1" alias="按钮" exported="true" pages="0,取消,1,不悔球,2,下次一定" selected="2"/>
+  <controller name="c1" alias="按钮" exported="true" pages="0,取消,1,不悔球,2,下次一定" selected="1"/>
   <displayList>
     <image id="n0_hkrz" name="n0" src="hkrz3ta" fileName="_shareasset/ty_an1.png" xy="0,0" size="165,51" aspect="true"/>
-    <text id="n1_hkrz" name="n1" xy="0,2" size="164,48" fontSize="22" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="next time">
+    <text id="n1_hkrz" name="n1" xy="0,2" size="164,48" font="Arial" fontSize="22" color="#ffffff" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" text="No-regret shot">
       <gearText controller="c1" pages="0,1,2" values="Cancel|No-regret shot|next time"/>
     </text>
   </displayList>

+ 6 - 6
art/fgui/assets/game/_sharecomponent/cancelBtn2.xml

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="238,72" pivot="0.5,0.5" extention="Button">
-  <controller name="c1" alias="结算按钮" exported="true" pages="5,三倍领取,0,领取,1,再试一次 有金币,2,返回大厅,4,再试一次 无金币,18,再试一次+体力,20,放弃机会" selected="1"/>
+  <controller name="c1" alias="结算按钮" exported="true" pages="5,三倍领取,0,领取,1,再试一次 有金币,2,返回大厅,4,再试一次 无金币,18,再试一次+体力,20,放弃机会" selected="5"/>
   <displayList>
     <image id="n0_hkrz" name="n0" src="hkrz3ta" fileName="_shareasset/ty_an1.png" xy="0,0" size="238,73" aspect="true"/>
-    <text id="n1_hkrz" name="n1" xy="8,5" size="223,61" font="Arial" fontSize="30" color="#ffffff" align="center" vAlign="middle" letterSpacing="1" autoSize="none" bold="true" text="Receive">
+    <text id="n1_hkrz" name="n1" xy="8,5" size="223,61" font="Arial" fontSize="30" color="#ffffff" align="center" vAlign="middle" letterSpacing="1" autoSize="none" bold="true" text="领取">
       <gearDisplay controller="c1" pages="0"/>
       <gearText controller="c1" pages="5,0" values="三倍领取|Receive" default="领取"/>
     </text>
     <text id="n2_p4tr" name="n2" xy="23,38" size="233,44" fontSize="32" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" text="放弃机会">
       <gearDisplay controller="c1" pages="1,4,20"/>
-      <gearXY controller="c1" pages="1,4,20" values="23,36|2,14|3,14" default="23,38"/>
+      <gearXY controller="c1" pages="1,4,20" values="2,21|2,14|3,14" default="23,38"/>
       <gearText controller="c1" pages="1,4,20" values="try again|try again|give up" default="放弃机会"/>
     </text>
     <image id="n3_p4tr" name="n3" src="p4tr425" fileName="UIGameEnd/asset/dj2.png" xy="40,20" visible="false">
       <gearDisplay controller="c1" pages="1"/>
     </image>
-    <text id="n4_p4tr" name="n4" xy="0,4" size="141,36" font="Arial" fontSize="25" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" text="返回大厅">
+    <text id="n4_p4tr" name="n4" xy="66,18" size="163,36" font="Arial" fontSize="25" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" text="Try again">
       <gearDisplay controller="c1" pages="5,2,18"/>
-      <gearXY controller="c1" pages="5,2,18" values="74,18|3,18|70,18" default="0,4"/>
-      <gearText controller="c1" pages="5,2,18" values="Get triple|Return to the lobby|try again" default="返回大厅"/>
+      <gearXY controller="c1" pages="5,2,18" values="74,18|5,18|66,18" default="0,4"/>
+      <gearText controller="c1" pages="5,2,18" values="Get triple|Return to the lobby|Try again" default="返回大厅"/>
     </text>
     <text id="n5_trk9" name="n5" xy="112,3" size="52,39" group="n7_vhzh" fontSize="28" color="#ffffff" text="500">
       <gearDisplay controller="c1" pages="1"/>

+ 5 - 5
art/fgui/assets/game/_sharecomponent/shareBtn2.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="239,73" pivot="0.5,0.5" extention="Button" designImageLayer="1">
-  <controller name="c1" alias="按钮" exported="true" pages="0,换人再战,1,下一关要看视频,2,下一关不用看视频,3,开心收下,4,下一关要花费金币,5,立即挑战,6,知道了,7,领取,8,已领取,9,免费抽奖,10,普通领取,11,体力+开始游戏,21,连点开箱,22,连点开箱+视频,23,体力挑战下一关,24,三倍领取" selected="8"/>
+  <controller name="c1" alias="按钮" exported="true" pages="0,换人再战,1,下一关要看视频,2,下一关不用看视频,3,开心收下,4,下一关要花费金币,5,立即挑战,6,知道了,7,领取,8,已领取,9,免费抽奖,10,普通领取,11,体力+开始游戏,21,连点开箱,22,连点开箱+视频,23,体力挑战下一关,24,三倍领取" selected="14"/>
   <displayList>
     <image id="n2_hkrz" name="n2" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="0,0" size="239,73" aspect="true">
       <gearDisplay controller="c1" pages="0,1,2,3,4,5,6,7,9,10,11,21,22,23,24"/>
@@ -13,17 +13,17 @@
       <gearXY controller="c1" pages="0,4,21" values="7,16|7,27|7,11" default="0,12"/>
       <gearText controller="c1" pages="0,3,4,5,6,21" values="Change players|start|next level|Start|Start|Unpacking" default="开始游戏"/>
     </text>
-    <text id="n3_p4tr" name="n3" xy="44,11" size="100,44" fontSize="32" color="#ffffff" align="center" vAlign="middle" leading="0" bold="true" text="下一关">
+    <text id="n3_p4tr" name="n3" xy="44,11" size="189,44" fontSize="32" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" text="下一关">
       <gearDisplay controller="c1" pages="2,5,6"/>
       <gearText controller="c1" pages="0,2,5,6" values="next level|next level|Start|" default="下一关"/>
     </text>
-    <text id="n23_lp3l" name="n23" xy="0,7" size="234,57" font="Arial" fontSize="27" color="#ffffff" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" text="Received already">
+    <text id="n23_lp3l" name="n23" xy="0,7" size="234,57" font="Arial" fontSize="27" color="#ffffff" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" text="知道了">
       <gearDisplay controller="c1" pages="6,7,8"/>
       <gearText controller="c1" pages="0,5,6,7,8" values="OK|OK|OK|receive|Received already" default="知道了"/>
     </text>
-    <text id="n4_p4tr" name="n4" xy="53,14" size="180,44" font="Arial" fontSize="30" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" text="下一关">
+    <text id="n4_p4tr" name="n4" xy="53,14" size="180,44" font="Arial" fontSize="30" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" text="Next level">
       <gearDisplay controller="c1" pages="1,9,11,22,23,24"/>
-      <gearText controller="c1" pages="0,1,5,6,9,11,22,23,24" values="next level|next level|Next Level|Next Level|Free prize draw|Start|Unpacking|next level|Triple claim" default="下一关"/>
+      <gearText controller="c1" pages="0,1,5,6,9,11,22,23,24" values="next level|next level|Next Level|Next Level|Free prize draw|Start|Unpacking|Next level|Triple claim" default="下一关"/>
     </text>
     <image id="n5_p4tr" name="n5" src="hkrz3te" fileName="_shareasset/1.png" xy="46,22" size="42,30" aspect="true">
       <gearDisplay controller="c1" pages="1,9,22,24"/>

BIN
client/laya/bin/asset/fgui/game.obj