1
0
dzduole 1 сар өмнө
parent
commit
6e1234cc71

+ 3 - 6
art/fgui/.objs/metas/isxx5ak7/kt443qc.info

@@ -5,20 +5,17 @@
       "locked": true,
       "hidden": true
     },
-    "n48_hxtr": {
-      "locked": true,
+    "n84_jpsz": {
       "hidden": true
     },
-    "n84_jpsz": {
+    "n48_hxtr": {
+      "locked": true,
       "hidden": true
     },
     "n77_vhzh": {
       "collapsed": true,
       "locked": true,
       "hidden": true
-    },
-    "n45_ixm4": {
-      "collapsed": true
     }
   },
   "fitScreen": "FitSize",

+ 7 - 7
art/fgui/assets/game/UIMain/UIMain.xml

@@ -10,11 +10,11 @@
     <loader id="n13_ixm4" name="secretary" xy="134,81" size="626,951" scale="0.7,0.7" url="ui://isxx5ak7wehi3ut" clearOnPublish="true">
       <relation target="n10_ixm4" sidePair="left-right,bottom-bottom%"/>
     </loader>
-    <image id="n33_ixm4" name="n33" src="n43d3x0" fileName="UIMain/asset/zjm_db6.png" xy="1,659" size="1334,90">
+    <image id="n33_ixm4" name="n33" src="n43d3x0" fileName="UIMain/asset/zjm_db6.png" xy="-1,659" size="1335,90">
       <relation target="n10_ixm4" sidePair="bottom-bottom"/>
       <relation target="" sidePair="width-width"/>
     </image>
-    <component id="n15_ixm4" name="shopBtn" src="n43d3vn" fileName="UIMain/component/dh_zy_sc_guang.xml" xy="1228,671" size="105,79">
+    <component id="n15_ixm4" name="shopBtn" src="n43d3vn" fileName="UIMain/component/dh_zy_sc_guang.xml" xy="1229,671" size="105,79">
       <relation target="" sidePair="right-right"/>
       <relation target="n10_ixm4" sidePair="bottom-bottom"/>
     </component>
@@ -30,10 +30,10 @@
     <group id="n44_ixm4" name="n44" xy="-161,475" size="1656,139" advanced="true">
       <relation target="n10_ixm4" sidePair="width-width,center-center"/>
     </group>
-    <component id="n34_ixm4" name="signBtn" src="ixm43xu" fileName="UIMain/component/Component11.xml" xy="1227,106" size="107,96" group="n45_ixm4"/>
-    <component id="n35_ixm4" name="drawBtn" src="ixm43xv" fileName="UIMain/component/Component12.xml" xy="1090,106" size="107,96" group="n45_ixm4"/>
-    <component id="n56_mnrs" name="settingNode" src="mnrs42t" fileName="UIMain/component/UISetting.xml" xy="929,121" size="166,96" group="n45_ixm4" controller="c1,0"/>
-    <group id="n45_ixm4" name="n45" xy="929,106" size="405,111" advanced="true">
+    <component id="n34_ixm4" name="signBtn" src="ixm43xu" fileName="UIMain/component/Component11.xml" xy="1227,121" size="107,96" group="n45_ixm4"/>
+    <component id="n35_ixm4" name="drawBtn" src="ixm43xv" fileName="UIMain/component/Component12.xml" xy="1090,121" size="107,96" group="n45_ixm4"/>
+    <component id="n56_mnrs" name="settingNode" src="mnrs42t" fileName="UIMain/component/UISetting.xml" xy="923,121" size="166,96" group="n45_ixm4" controller="c1,0"/>
+    <group id="n45_ixm4" name="n45" xy="923,121" size="411,96" advanced="true">
       <relation target="n10_ixm4" sidePair="left-right%"/>
     </group>
     <component id="n27_ixm4" name="secretaryBtn" src="ixm43xw" fileName="UIMain/component/Component13.xml" xy="942,662" size="110,85" group="n46_ixm4"/>
@@ -66,7 +66,7 @@
       <relation target="n13_ixm4" sidePair="left-left,top-top"/>
     </component>
     <component id="n83_jpsz" name="n83" src="jpszv4n9" fileName="_sharecomponent/dh_zuanshi.xml" xy="457,12"/>
-    <component id="n84_jpsz" name="n84" src="jpszv4ni" fileName="_sharecomponent/Component141.xml" xy="959,125" scale="0.8,0.8" visible="false">
+    <component id="n84_jpsz" name="n84" src="jpszv4ni" fileName="_sharecomponent/Component141.xml" xy="953,132" scale="0.8,0.8" visible="false">
       <relation target="n45_ixm4" sidePair="middle-middle,left-left"/>
     </component>
     <component id="n86_r4l5" name="ganFaMoShiBtn" src="r4l5v577" fileName="UIMain/component/Component1302.xml" xy="1092,662" size="110,85" group="n87_r4l5"/>

BIN
art/fgui/assets/game/UIMain/asset/zim_icon1.png


BIN
art/fgui/assets/game/UIMain/asset/zjm_db6.png


+ 2 - 3
art/fgui/assets/game/UIMain/component/Component10.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="46,68" pivot="0.5,0.5" extention="Button">
-  <controller name="c1" alias="设置" exported="true" pages="0,收起,1,打开" selected="0"/>
+<component size="96,96" pivot="0.5,0.5" extention="Button">
+  <controller name="c1" alias="设置" exported="true" pages="0,收起,1,打开" selected="1"/>
   <displayList>
     <image id="n40_ixm4" name="n40" src="n43d3ws" fileName="UIMain/asset/zim_icon1.png" xy="0,0"/>
-    <text id="n41_ixm4" name="n41" xy="1,42" size="45,26" fontSize="18" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="set"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="0.96"/>
 </component>

+ 6 - 6
art/fgui/assets/game/UIMain/component/UISetting.xml

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="212,66">
+<component size="244,96">
   <controller name="c1" alias="设置" exported="true" pages="0,关闭,1,打开" selected="0"/>
   <displayList>
-    <image id="n4_mnrs" name="n4" src="mnrs42u" fileName="UIMain/asset/zy_sztb_4(1).png" xy="29,3" size="6,39">
+    <image id="n4_mnrs" name="n4" src="mnrs42u" fileName="UIMain/asset/zy_sztb_4(1).png" xy="0,3" size="6,39">
       <gearDisplay controller="c1" pages="1"/>
-      <gearSize controller="c1" pages="1" values="183,39,1,1" default="6,39,1,1" tween="true"/>
+      <gearSize controller="c1" pages="1" values="244,39,1,1" default="6,39,1,1" tween="true"/>
     </image>
     <component id="n1_mnrs" name="soundBtn" src="mnrs42s" fileName="UIMain/component/Component37.xml" xy="50,6" alpha="0" controller="c1,1">
       <gearDisplay controller="c1" pages="1"/>
-      <gearXY controller="c1" pages="0,1" values="50,6|62,6" tween="true"/>
+      <gearXY controller="c1" pages="0,1" values="50,6|96,6" tween="true"/>
       <gearLook controller="c1" pages="0" values="0,0,0,1" default="1,0,0,1" tween="true"/>
     </component>
     <component id="n2_mnrs" name="shakeBtn" src="mnrs42r" fileName="UIMain/component/Component36.xml" xy="101,6" alpha="0" controller="c1,0">
       <gearDisplay controller="c1" pages="0,1"/>
-      <gearXY controller="c1" pages="0,1" values="101,6|113,6" tween="true"/>
+      <gearXY controller="c1" pages="0,1" values="101,6|147,6" tween="true"/>
       <gearLook controller="c1" pages="0" values="0,0,0,1" default="1,0,0,1" tween="true"/>
     </component>
     <component id="n3_mnrs" name="clickNode" src="ixm43xt" fileName="UIMain/component/Component10.xml" xy="0,0"/>
     <component id="n5_yjr4" name="xyBtn" src="yjr4v4m6" fileName="UIMain/component/Component127.xml" xy="161,8" alpha="0">
       <gearDisplay controller="c1" pages="1"/>
-      <gearXY controller="c1" pages="0,1" values="161,8|170,8" tween="true"/>
+      <gearXY controller="c1" pages="0,1" values="161,8|204,8" tween="true"/>
       <gearLook controller="c1" pages="0" values="0,0,0,1" default="1,0,0,1" tween="true"/>
     </component>
   </displayList>

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


BIN
client/laya/bin/asset/fgui/game_atlas0.png


BIN
client/laya/bin/asset/fgui/game_atlas0_1.png


BIN
client/laya/bin/asset/fgui/game_atlas0_2.png


BIN
client/laya/bin/asset/fgui/game_atlas0_3.png


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

@@ -12470,7 +12470,6 @@
         onConstruct() {
             this.c1 = this.getController("c1");
             this.n40 = (this.getChild("n40"));
-            this.n41 = (this.getChild("n41"));
         }
     }
     ui_Component10.URL = "ui://isxx5ak7ixm43xt";

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
client/laya/bin/js/bundle.js.map


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

@@ -4,7 +4,6 @@ export default class ui_Component10 extends fgui.GButton {
 
 	public c1:fgui.Controller;
 	public n40:fgui.GImage;
-	public n41:fgui.GTextField;
 	public static URL:string = "ui://isxx5ak7ixm43xt";
 
 	public static createInstance():ui_Component10 {
@@ -14,6 +13,5 @@ export default class ui_Component10 extends fgui.GButton {
 	protected onConstruct():void {
 		this.c1 = this.getController("c1");
 		this.n40 = <fgui.GImage>(this.getChild("n40"));
-		this.n41 = <fgui.GTextField>(this.getChild("n41"));
 	}
 }

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно