dzduole 4 тижнів тому
батько
коміт
49b338cd5b

+ 1 - 0
art/fgui/.objs/fonts.json

@@ -1,2 +1,3 @@
+ui://isxx5ak7d33kv57a
 ui://isxx5ak7m0q7v4ic
 ui://isxx5ak7p4tr42d

+ 1 - 1
art/fgui/assets/game/UIModeSelection/UIModeSelection.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1334,750" designImageAlpha="100">
   <displayList>
-    <loader id="n23_jaak" name="closeBtn" xy="1,0" size="1334,750">
+    <loader id="n23_jaak" name="closeBtn" xy="0,0" size="1334,750">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
     <graph id="n19_lrxg" name="n19" xy="0,0" size="1334,750" alpha="0.8" type="rect" lineSize="0" fillColor="#ff000000">

+ 1 - 5
art/fgui/assets/game/UIModeSelection/component/ModeSelection_com123.xml

@@ -4,19 +4,15 @@
     <component id="n22_lrxg" name="type1" src="lrxgv50m" fileName="UIModeSelection/component/ModeSelection_com1.xml" xy="0,-1"/>
     <component id="n36_lrxg" name="type2" src="lrxgv50n" fileName="UIModeSelection/component/ModeSelection_com2.xml" xy="350,0"/>
     <component id="n37_lrxg" name="type3" src="lrxgv50o" fileName="UIModeSelection/component/ModeSelection_com3.xml" xy="696,0"/>
-    <text id="n38_lrxg" name="n38" xy="320,427" size="428,34" alpha="0.9" font="Arial" fontSize="24" color="#ffffff" align="center" leading="0" autoSize="none" bold="true" text="Click on the blank area to close">
-      <relation target="n36_lrxg" sidePair="center-center"/>
-    </text>
+    <text id="n39_d33k" name="n39" xy="321,432" size="369,34" alpha="0.8" font="ui://isxx5ak7d33kv57a" fontSize="24" color="#ffffff" vAlign="middle" bold="true" text="Click on the blank area to close"/>
   </displayList>
   <transition name="t0" autoPlay="true">
     <item time="0" type="Alpha" target="n22_lrxg" tween="true" startValue="0" endValue="1" duration="8"/>
     <item time="0" type="Alpha" target="n36_lrxg" value="0"/>
     <item time="0" type="Alpha" target="n37_lrxg" value="0"/>
-    <item time="0" type="Alpha" target="n38_lrxg" tween="true" startValue="0" endValue="0.6" duration="12"/>
     <item time="0" type="Scale" target="n22_lrxg" tween="true" startValue="0.5,0.5" endValue="1,1" duration="12"/>
     <item time="0" type="Scale" target="n36_lrxg" value="0.5,0.5"/>
     <item time="0" type="Scale" target="n37_lrxg" value="0.5,0.5"/>
-    <item time="0" type="XY" target="n38_lrxg" tween="true" startValue="417,539" endValue="417,415" duration="12"/>
     <item time="3" type="Alpha" target="n36_lrxg" tween="true" startValue="0" endValue="1" duration="8"/>
     <item time="3" type="Scale" target="n36_lrxg" tween="true" startValue="0.5,0.5" endValue="1,1" duration="12"/>
     <item time="6" type="Alpha" target="n37_lrxg" tween="true" startValue="0" endValue="1" duration="8"/>

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


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

@@ -13066,7 +13066,7 @@
             this.type1 = (this.getChild("type1"));
             this.type2 = (this.getChild("type2"));
             this.type3 = (this.getChild("type3"));
-            this.n38 = (this.getChild("n38"));
+            this.n39 = (this.getChild("n39"));
             this.t0 = this.getTransition("t0");
         }
     }

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
client/laya/bin/js/bundle.js.map


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

@@ -9,7 +9,7 @@ export default class ui_ModeSelection_com123 extends fgui.GComponent {
 	public type1:ui_ModeSelection_com1;
 	public type2:ui_ModeSelection_com2;
 	public type3:ui_ModeSelection_com3;
-	public n38:fgui.GTextField;
+	public n39:fgui.GTextField;
 	public t0:fgui.Transition;
 	public static URL:string = "ui://isxx5ak7jaakv561";
 
@@ -21,7 +21,7 @@ export default class ui_ModeSelection_com123 extends fgui.GComponent {
 		this.type1 = <ui_ModeSelection_com1>(this.getChild("type1"));
 		this.type2 = <ui_ModeSelection_com2>(this.getChild("type2"));
 		this.type3 = <ui_ModeSelection_com3>(this.getChild("type3"));
-		this.n38 = <fgui.GTextField>(this.getChild("n38"));
+		this.n39 = <fgui.GTextField>(this.getChild("n39"));
 		this.t0 = this.getTransition("t0");
 	}
 }

Деякі файли не було показано, через те що забагато файлів було змінено