dzduole 4 viikkoa sitten
vanhempi
commit
42657b7d06

+ 3 - 3
art/fgui/assets/game/UIAddProp/component/hb_jinbi1.xml

@@ -11,11 +11,11 @@
     <text id="n44_u58x" name="getTips" xy="105,405" size="45,35" font="Arial" fontSize="25" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="Get">
       <relation target="n39_ehto" sidePair="left-right"/>
     </text>
-    <image id="n39_ehto" name="n39" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="57,407" group="n41_ehto"/>
-    <text id="n40_ehto" name="diamondTxt" xy="99,403" size="68,39" group="n41_ehto" font="Arial" fontSize="28" color="#ffffff" align="center" vAlign="middle" text="2000">
+    <image id="n39_ehto" name="n39" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="57,406" group="n41_ehto"/>
+    <text id="n40_ehto" name="diamondTxt" xy="99,402" size="68,39" group="n41_ehto" font="Arial" fontSize="28" color="#ffffff" align="center" vAlign="middle" text="2000">
       <relation target="n39_ehto" sidePair="left-right"/>
     </text>
-    <group id="n41_ehto" name="n41" xy="57,403" size="110,39" visible="false" advanced="true">
+    <group id="n41_ehto" name="n41" xy="57,402" size="110,39" visible="false" advanced="true">
       <relation target="n38_ehto" sidePair="center-center"/>
     </group>
     <text id="n42_ehto" name="n42" xy="48,137" size="118,39" font="Arial" fontSize="28" color="#ffffff" align="center" italic="true" text="gold coin"/>

+ 5 - 5
art/fgui/assets/game/UIAddProp/component/hb_jinbi2.xml

@@ -3,18 +3,18 @@
   <displayList>
     <image id="n20_ehto" name="n20" src="ehtov4fi" fileName="UIAddProp/asset/hb_db1.png" xy="0,0"/>
     <image id="n25_ehto" name="n25" src="ehtov4fz" fileName="UIAddProp/asset/hb_yuandian.png" xy="71,153"/>
-    <text id="n26_ehto" name="coinTxt" xy="49,70" pivot="0.5,0.5" size="128,66" fontSize="50" color="#5330ce" align="center" vAlign="middle" bold="true" strokeColor="#ffffff" text="5000"/>
+    <text id="n26_ehto" name="coinTxt" xy="55,70" pivot="0.5,0.5" size="116,66" fontSize="50" color="#5330ce" align="center" vAlign="middle" bold="true" strokeColor="#ffffff" text="5000"/>
     <image id="n28_ehto" name="n28" src="ehtov4fz" fileName="UIAddProp/asset/hb_yuandian.png" xy="150,153"/>
     <component id="n32_ehto" name="n32" src="ehtov4g0" fileName="UIAddProp/component/dh_jingbi2.xml" xy="28,246"/>
     <image id="n38_ehto" name="n38" src="ehtov4ga" fileName="UIAddProp/asset/hb_bz2.png" xy="0,392"/>
-    <image id="n39_ehto" name="n39" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="68,404" size="51,43" group="n41_ehto" scale="0.9,0.9"/>
-    <text id="n40_ehto" name="diamondTxt" xy="120,404" size="52,39" group="n41_ehto" fontSize="28" color="#ffffff" align="center" vAlign="middle" strokeColor="#000000" text="200">
+    <image id="n39_ehto" name="n39" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="68,402" size="51,43" group="n41_ehto" scale="0.9,0.9"/>
+    <text id="n40_ehto" name="diamondTxt" xy="120,402" size="52,39" group="n41_ehto" fontSize="28" color="#ffffff" align="center" vAlign="middle" strokeColor="#000000" text="200">
       <relation target="n39_ehto" sidePair="left-right"/>
     </text>
-    <group id="n41_ehto" name="n41" xy="68,404" size="104,43" advanced="true">
+    <group id="n41_ehto" name="n41" xy="68,402" size="104,43" advanced="true">
       <relation target="n38_ehto" sidePair="center-center"/>
     </group>
-    <text id="n42_ehto" name="n42" xy="48,137" size="129,39" fontSize="28" color="#ffffff" align="center" italic="true" text="gold coin"/>
+    <text id="n42_ehto" name="n42" xy="48,137" size="118,39" fontSize="28" color="#ffffff" align="center" italic="true" text="gold coin"/>
     <image id="n43_xtc7" name="n43" src="jaakv562" fileName="UIAddProp/asset/biaoqian.png" xy="125,298"/>
     <text id="n44_xtc7" name="n44" xy="145,323" size="30,23" font="Arial" fontSize="15" color="#ffffff" align="center" vAlign="bottom" leading="0" bold="true" text="Gift"/>
     <text id="n45_xtc7" name="n45" xy="141,339" size="40,26" font="Arial" fontSize="18" color="#ffffff" align="center" vAlign="bottom" leading="0" bold="true" text="25%"/>

+ 5 - 5
art/fgui/assets/game/UIAddProp/component/hb_jinbi3.xml

@@ -3,18 +3,18 @@
   <displayList>
     <image id="n20_ehto" name="n20" src="ehtov4fi" fileName="UIAddProp/asset/hb_db1.png" xy="0,0"/>
     <image id="n25_ehto" name="n25" src="ehtov4fz" fileName="UIAddProp/asset/hb_yuandian.png" xy="71,153"/>
-    <text id="n26_ehto" name="coinTxt" xy="33,70" pivot="0.5,0.5" size="159,66" fontSize="50" color="#5330ce" align="center" vAlign="middle" bold="true" strokeColor="#ffffff" text="99999"/>
+    <text id="n26_ehto" name="coinTxt" xy="40,70" pivot="0.5,0.5" size="144,66" fontSize="50" color="#5330ce" align="center" vAlign="middle" bold="true" strokeColor="#ffffff" text="99999"/>
     <image id="n28_ehto" name="n28" src="ehtov4fz" fileName="UIAddProp/asset/hb_yuandian.png" xy="150,153"/>
     <component id="n32_ehto" name="n32" src="ehtov4g2" fileName="UIAddProp/component/dh_jingbi3.xml" xy="28,208"/>
     <image id="n38_ehto" name="n38" src="ehtov4ga" fileName="UIAddProp/asset/hb_bz2.png" xy="0,392"/>
-    <image id="n39_ehto" name="n39" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="62,404" group="n41_ehto" scale="0.9,0.9"/>
-    <text id="n40_ehto" name="diamondTxt" xy="112,406" size="52,39" group="n41_ehto" fontSize="28" color="#ffffff" align="center" vAlign="middle" strokeColor="#000000" text="200">
+    <image id="n39_ehto" name="n39" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="62,402" group="n41_ehto" scale="0.9,0.9"/>
+    <text id="n40_ehto" name="diamondTxt" xy="112,404" size="52,39" group="n41_ehto" fontSize="28" color="#ffffff" align="center" vAlign="middle" strokeColor="#000000" text="200">
       <relation target="n39_ehto" sidePair="left-right"/>
     </text>
-    <group id="n41_ehto" name="n41" xy="62,404" size="102,43" advanced="true">
+    <group id="n41_ehto" name="n41" xy="62,402" size="102,43" advanced="true">
       <relation target="n38_ehto" sidePair="center-center"/>
     </group>
-    <text id="n42_ehto" name="n42" xy="48,137" size="129,39" fontSize="28" color="#ffffff" align="center" italic="true" text="gold coin"/>
+    <text id="n42_ehto" name="n42" xy="48,137" size="118,39" fontSize="28" color="#ffffff" align="center" italic="true" text="gold coin"/>
     <image id="n43_xtc7" name="n43" src="jaakv562" fileName="UIAddProp/asset/biaoqian.png" xy="125,298"/>
     <text id="n44_xtc7" name="n44" xy="147,324" size="30,23" font="Arial" fontSize="15" color="#ffffff" align="center" vAlign="bottom" leading="0" bold="true" text="Gift"/>
     <text id="n45_xtc7" name="n45" xy="143,340" size="40,26" font="Arial" fontSize="18" color="#ffffff" align="center" vAlign="bottom" leading="0" bold="true" text="25%"/>

+ 9 - 9
art/fgui/assets/game/UIAddProp/component/hb_zs1.xml

@@ -12,22 +12,22 @@
     <text id="n46_lgji" name="shareTxt" xy="2,174" pivot="0.5,0.5" size="221,39" fontSize="26" color="#6379ac" align="center" vAlign="middle" autoSize="none" bold="true" text="(0/3)"/>
     <component id="n32_ehto" name="n32" src="ehtov4gm" fileName="UIAddProp/component/dh_zs1.xml" xy="35,274"/>
     <image id="n38_ehto" name="n38" src="ehtov4ga" fileName="UIAddProp/asset/hb_bz2.png" xy="0,392"/>
-    <image id="n39_ehto" name="n39" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="44,397" size="51,43" group="n41_ehto" scale="0.8,0.8"/>
-    <image id="n44_ehto" name="n44" src="ehtov4fk" fileName="UIAddProp/asset/hb_fx.png" xy="8,401" size="27,27" group="n41_ehto"/>
-    <text id="n40_ehto" name="diamondTxt" xy="88,393" size="84,39" group="n41_ehto" font="Arial" fontSize="28" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="+2000">
+    <image id="n39_ehto" name="n39" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="64,404" size="51,43" group="n41_ehto" scale="0.9,0.9"/>
+    <image id="n44_ehto" name="n44" src="ehtov4fk" fileName="UIAddProp/asset/hb_fx.png" xy="30,412" size="27,27" group="n41_ehto"/>
+    <text id="n40_ehto" name="diamondTxt" xy="112,404" size="84,39" group="n41_ehto" font="Arial" fontSize="28" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="+2000">
       <relation target="n39_ehto" sidePair="left-right"/>
     </text>
-    <group id="n41_ehto" name="n41" xy="8,393" size="164,47" advanced="true">
+    <group id="n41_ehto" name="n41" xy="30,404" size="166,43" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="n38_ehto" sidePair="center-center"/>
     </group>
-    <image id="n45_ehto" name="n45" src="ehtov4fh" fileName="UIAddProp/asset/hb_bq_s.png" xy="197,392"/>
-    <image id="n47_sw70" name="n47" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="45,401" size="51,42" group="n50_sw70" scale="0.8,0.8"/>
-    <image id="n48_sw70" name="n48" src="ehtov4fs" fileName="UIAddProp/asset/hb_sp.png" xy="6,405" size="33,23" group="n50_sw70"/>
-    <text id="n49_sw70" name="randTxt" xy="98,399" size="115,39" group="n50_sw70" font="Arial" fontSize="28" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="50~100">
+    <image id="n45_ehto" name="n45" src="ehtov4fh" fileName="UIAddProp/asset/hb_bq_s.png" xy="206,392"/>
+    <image id="n47_sw70" name="n47" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="50,402" size="51,42" group="n50_sw70" scale="0.9,0.9"/>
+    <image id="n48_sw70" name="n48" src="ehtov4fs" fileName="UIAddProp/asset/hb_sp.png" xy="10,411" size="33,23" group="n50_sw70"/>
+    <text id="n49_sw70" name="randTxt" xy="103,403" size="115,39" group="n50_sw70" font="Arial" fontSize="28" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="50~100">
       <relation target="n47_sw70" sidePair="left-right"/>
     </text>
-    <group id="n50_sw70" name="n50" xy="6,399" size="207,44" advanced="true">
+    <group id="n50_sw70" name="n50" xy="10,402" size="208,42" advanced="true">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="n38_ehto" sidePair="center-center"/>
     </group>

+ 5 - 5
art/fgui/assets/game/UIAddProp/component/hb_zs2.xml

@@ -7,15 +7,15 @@
     <text id="n27_ehto" name="n27" xy="-11,19" pivot="0.5,0.5" size="81,23" rotation="-47" font="Arial" fontSize="15" color="#ffffff" align="center" vAlign="middle" leading="0" bold="true" strokeColor="#000000" text="Timed limit"/>
     <component id="n32_ehto" name="n32" src="ehtov4gw" fileName="UIAddProp/component/dh_zs2.xml" xy="29,191"/>
     <image id="n38_ehto" name="n38" src="ehtov4ga" fileName="UIAddProp/asset/hb_bz2.png" xy="0,392"/>
-    <image id="n39_ehto" name="n39" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="83,401" size="51,43" group="n41_ehto" scale="0.8,0.8"/>
-    <image id="n44_ehto" name="n44" src="ehtov4fs" fileName="UIAddProp/asset/hb_sp.png" xy="43,406" size="33,24" group="n41_ehto"/>
-    <text id="n40_ehto" name="diamondTxt" xy="128,400" size="52,39" group="n41_ehto" font="Arial" fontSize="28" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="+20">
+    <image id="n39_ehto" name="n39" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="86,405" size="51,43" group="n41_ehto" scale="0.9,0.9"/>
+    <image id="n44_ehto" name="n44" src="ehtov4fs" fileName="UIAddProp/asset/hb_sp.png" xy="35,413" size="33,24" group="n41_ehto"/>
+    <text id="n40_ehto" name="diamondTxt" xy="138,406" size="52,39" group="n41_ehto" font="Arial" fontSize="28" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="+20">
       <relation target="n39_ehto" sidePair="left-right"/>
     </text>
-    <group id="n41_ehto" name="n41" xy="43,400" size="137,44" advanced="true">
+    <group id="n41_ehto" name="n41" xy="35,405" size="155,43" advanced="true">
       <relation target="n38_ehto" sidePair="center-center"/>
     </group>
-    <image id="n45_ehto" name="n45" src="ehtov4fh" fileName="UIAddProp/asset/hb_bq_s.png" xy="197,392"/>
+    <image id="n45_ehto" name="n45" src="ehtov4fh" fileName="UIAddProp/asset/hb_bq_s.png" xy="206,392"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.02"/>
   <transition name="t0" autoPlay="true">

+ 1 - 1
art/fgui/assets/game/UIAddProp/component/hb_zs3.xml

@@ -7,7 +7,7 @@
     <text id="n27_ehto" name="n27" xy="-5,21" pivot="0.5,0.5" size="60,23" rotation="-47" font="Arial" fontSize="15" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="Hotspot"/>
     <component id="n32_ehto" name="n32" src="ehtov4gy" fileName="UIAddProp/component/dh_zs3.xml" xy="29,195"/>
     <image id="n38_ehto" name="n38" src="ehtov4ga" fileName="UIAddProp/asset/hb_bz2.png" xy="0,392"/>
-    <text id="n47_ehto" name="n47" xy="4,401" size="218,42" font="Arial" fontSize="30" color="#ffffff" align="center" bold="true" strokeColor="#000000" text="Challenge Now"/>
+    <text id="n47_ehto" name="n47" xy="4,404" size="218,42" font="Arial" fontSize="30" color="#ffffff" align="center" bold="true" strokeColor="#000000" text="Challenge Now"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.02"/>
   <transition name="t0" autoPlay="true">

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

@@ -11,8 +11,8 @@
     <image id="n22_trk9" name="n22" src="trk948z" fileName="UIRepentProp/asset/bq4_3.png" xy="103,94" size="24,24" group="n23_trk9">
       <relation target="n13_p4tr" sidePair="right-left"/>
     </image>
-    <text id="n13_p4tr" name="tipsTxt" xy="137,90" size="354,32" group="n23_trk9" font="Arial" fontSize="22" color="#6e7b9a" vAlign="middle" autoSize="none" text="White ball into the hole"/>
-    <group id="n23_trk9" name="n23" xy="103,90" size="388,32" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">
+    <text id="n13_p4tr" name="tipsTxt" xy="137,92" size="354,28" group="n23_trk9" font="Arial" fontSize="22" color="#6e7b9a" vAlign="middle" autoSize="none" text="White ball into the hole"/>
+    <group id="n23_trk9" name="n23" xy="103,92" size="388,28" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>
     <text id="n24_trk9" name="n24" xy="131,170" size="339,39" font="Arial" fontSize="28" color="#697ab8" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" text="Do you regret the ball?"/>

+ 0 - 1
art/fgui/assets/game/UISecretary/UIShop/component/Component28_11.xml

@@ -21,7 +21,6 @@
       <gearDisplay controller="c1" pages="0,1"/>
       <gearText controller="c1" pages="0,1" values="In use|Click to use" default="使用中"/>
     </text>
-    <text id="n18_kh6z" name="n18" xy="0,-4" size="58,42" fontSize="30" text="FFF"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.04"/>
 </component>

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

@@ -3,7 +3,7 @@
   <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,1" size="164,48" font="Arial" fontSize="22" color="#ffffff" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" strokeColor="#000000" text="No-regret shot">
+    <text id="n1_hkrz" name="n1" xy="0,1" size="164,48" font="Arial" fontSize="22" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="No-regret shot">
       <gearText controller="c1" pages="0,1,2" values="Cancel|No-regret shot|Next time"/>
     </text>
   </displayList>

+ 4 - 4
art/fgui/assets/game/_sharecomponent/shareBtn.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,退出,3,悔球,4,使用,5,继续,12,充满体力,13,立即体验,14,确定" selected="3"/>
+  <controller name="c1" alias="小按钮" exported="true" pages="0,分享,1,拿来吧你,2,退出,3,悔球,4,使用,5,继续,12,充满体力,13,立即体验,14,确定" selected="8"/>
   <displayList>
     <image id="n2_hkrz" name="n2" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="0,0" size="165,51" aspect="true"/>
-    <text id="n1_hkrz" name="n1" xy="14,0" size="164,48" font="Arial" fontSize="22" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" text="undo a shot">
+    <text id="n1_hkrz" name="n1" xy="0,3" size="164,48" font="Arial" fontSize="22" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" text="确定&#xA;">
       <gearDisplay controller="c1" pages="0,3,4"/>
       <gearXY controller="c1" pages="3,4" values="14,0|23,3" default="0,3"/>
       <gearText controller="c1" pages="0,3,4,14" values="share|undo a shot|USE|确定&#xA;" default="悔球"/>
@@ -12,11 +12,11 @@
       <gearDisplay controller="c1" pages="1,12,13"/>
       <gearText controller="c1" pages="1,12,13" values="Get|Full of energy|Now" default="充满体力"/>
     </text>
-    <image id="n4_p4tr" name="n4" src="hkrz3te" fileName="_shareasset/1.png" xy="1,15" pivot="0.5,0.5" size="28,20" aspect="true">
+    <image id="n4_p4tr" name="n4" src="hkrz3te" fileName="_shareasset/1.png" xy="19,14" pivot="0.5,0.5" size="28,20" aspect="true">
       <gearDisplay controller="c1" pages="1,3,4,12,13"/>
       <gearXY controller="c1" pages="3,4,12" values="1,15|37,14|2,0" default="19,14"/>
     </image>
-    <text id="n5_mnrs" name="n5" xy="1,1" size="164,48" font="Arial" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" text="退出&#xA;">
+    <text id="n5_mnrs" name="n5" xy="1,1" size="164,48" font="Arial" fontSize="26" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="OK">
       <gearDisplay controller="c1" pages="2,14"/>
       <gearText controller="c1" pages="2,14" values="Exit|OK" default="退出&#xA;"/>
     </text>

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


+ 0 - 1
client/laya/bin/js/bundle.js

@@ -12299,7 +12299,6 @@
             this.diamondTxt = (this.getChild("diamondTxt"));
             this.n15 = (this.getChild("n15"));
             this.n16 = (this.getChild("n16"));
-            this.n18 = (this.getChild("n18"));
         }
     }
     ui_Component28_11.URL = "ui://isxx5ak7g1giv4eh";

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
client/laya/bin/js/bundle.js.map


+ 0 - 2
client/laya/src/fgui/res/game/ui_Component28_11.ts

@@ -9,7 +9,6 @@ export default class ui_Component28_11 extends fgui.GButton {
 	public diamondTxt:fgui.GTextField;
 	public n15:fgui.GGroup;
 	public n16:fgui.GTextField;
-	public n18:fgui.GTextField;
 	public static URL:string = "ui://isxx5ak7g1giv4eh";
 
 	public static createInstance():ui_Component28_11 {
@@ -24,6 +23,5 @@ export default class ui_Component28_11 extends fgui.GButton {
 		this.diamondTxt = <fgui.GTextField>(this.getChild("diamondTxt"));
 		this.n15 = <fgui.GGroup>(this.getChild("n15"));
 		this.n16 = <fgui.GTextField>(this.getChild("n16"));
-		this.n18 = <fgui.GTextField>(this.getChild("n18"));
 	}
 }

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä