dzduole 1 month ago
parent
commit
338c5b75da

+ 1 - 4
art/fgui/.objs/metas/isxx5ak7/kt443qc.info

@@ -13,11 +13,8 @@
       "hidden": true
       "hidden": true
     },
     },
     "n77_vhzh": {
     "n77_vhzh": {
-      "collapsed": true,
-      "locked": true,
-      "hidden": true
+      "locked": true
     }
     }
   },
   },
-  "adaptiveTest": true,
   "fitScreen": "FitSize"
   "fitScreen": "FitSize"
 }
 }

+ 1 - 0
art/fgui/assets/game/UIGame/Component146.xml

@@ -4,5 +4,6 @@
     <component id="n89_jaak" name="n89" src="jaakv55y" fileName="UIGame/Component111_1.xml" xy="0,0" visible="false"/>
     <component id="n89_jaak" name="n89" src="jaakv55y" fileName="UIGame/Component111_1.xml" xy="0,0" visible="false"/>
     <component id="n90_jaak" name="n90" src="jaakv55z" fileName="UIGame/Component64_1.xml" xy="29,109" touchable="false"/>
     <component id="n90_jaak" name="n90" src="jaakv55z" fileName="UIGame/Component64_1.xml" xy="29,109" touchable="false"/>
     <loader id="n92_jaak" name="guideBtn" xy="42,105" size="50,64" visible="false" fill="scaleFree"/>
     <loader id="n92_jaak" name="guideBtn" xy="42,105" size="50,64" visible="false" fill="scaleFree"/>
+    <text id="n93_jzka" name="n93" xy="59,132" size="36,42" fontSize="30" color="#9900cc" text="FF"/>
   </displayList>
   </displayList>
 </component>
 </component>

+ 2 - 2
art/fgui/assets/game/UIGame/component/Component113.xml

@@ -10,11 +10,11 @@
     </text>
     </text>
     <component id="n77_r5f8" name="n77" src="r5f8v4hw" fileName="UIGame/component/Component114.xml" xy="1252,230" group="n87_r5f8"/>
     <component id="n77_r5f8" name="n77" src="r5f8v4hw" fileName="UIGame/component/Component114.xml" xy="1252,230" group="n87_r5f8"/>
     <component id="n79_r5f8" name="n79" src="wp26456" fileName="UISkill/component/Component64.xml" xy="1199,381" pivot="0.5,0.5" group="n87_r5f8" scale="-1,1" visible="false"/>
     <component id="n79_r5f8" name="n79" src="wp26456" fileName="UISkill/component/Component64.xml" xy="1199,381" pivot="0.5,0.5" group="n87_r5f8" scale="-1,1" visible="false"/>
-    <image id="n80_r5f8" name="n80" src="r5f8v4hu" fileName="UIGame/asset2/xsyd_bk.png" xy="1110,392" size="78,74" group="n87_r5f8"/>
+    <image id="n80_r5f8" name="n80" src="r5f8v4hu" fileName="UIGame/asset2/xsyd_bk.png" xy="1083,392" size="115,79" group="n87_r5f8"/>
     <text id="n81_r5f8" name="n81" xy="1087,382" size="111,86" group="n87_r5f8" fontSize="21" color="#ffffff" align="center" vAlign="middle" leading="2" letterSpacing="1" autoSize="none" text="Drag up and down"/>
     <text id="n81_r5f8" name="n81" xy="1087,382" size="111,86" group="n87_r5f8" fontSize="21" color="#ffffff" align="center" vAlign="middle" leading="2" letterSpacing="1" autoSize="none" text="Drag up and down"/>
     <component id="n82_r5f8" name="n82" src="r5f8v4hw" fileName="UIGame/component/Component114.xml" xy="1253,617" group="n87_r5f8" scale="1,-1"/>
     <component id="n82_r5f8" name="n82" src="r5f8v4hw" fileName="UIGame/component/Component114.xml" xy="1253,617" group="n87_r5f8" scale="1,-1"/>
     <image id="n84_r5f8" name="n84" src="wp26455" fileName="UISkill/asset/img_shouzhi2.png" xy="1154,393" pivot="0.783,0.806" size="81,92" group="n87_r5f8" aspect="true" scale="-1,1"/>
     <image id="n84_r5f8" name="n84" src="wp26455" fileName="UISkill/asset/img_shouzhi2.png" xy="1154,393" pivot="0.783,0.806" size="81,92" group="n87_r5f8" aspect="true" scale="-1,1"/>
-    <group id="n87_r5f8" name="n87" xy="1087,230" size="218,505" advanced="true">
+    <group id="n87_r5f8" name="n87" xy="1083,230" size="222,505" advanced="true">
       <relation target="" sidePair="middle-middle,left-left"/>
       <relation target="" sidePair="middle-middle,left-left"/>
     </group>
     </group>
   </displayList>
   </displayList>

+ 13 - 12
art/fgui/assets/game/UIMain/UIMain.xml

@@ -18,7 +18,7 @@
       <relation target="" sidePair="right-right"/>
       <relation target="" sidePair="right-right"/>
       <relation target="n10_ixm4" sidePair="bottom-bottom"/>
       <relation target="n10_ixm4" sidePair="bottom-bottom"/>
     </component>
     </component>
-    <component id="n23_ixm4" name="moneyNode" src="wehi3ug" fileName="UIMoney/UIMoney.xml" xy="434,39" controller="c1,1"/>
+    <component id="n23_ixm4" name="moneyNode" src="wehi3ug" fileName="UIMoney/UIMoney.xml" xy="416,39" size="767,37" controller="c1,1"/>
     <component id="n26_ixm4" name="headNode" src="ixm43xh" fileName="UIMain/component/Component3.xml" xy="97,19"/>
     <component id="n26_ixm4" name="headNode" src="ixm43xh" fileName="UIMain/component/Component3.xml" xy="97,19"/>
     <component id="n16_ixm4" name="bigMoveBtn" src="n43d3vp" fileName="UIMain/component/dh_zy_wanfa.xml" xy="-184,476" pivot="0.5,0.386" size="340,138" group="n44_ixm4"/>
     <component id="n16_ixm4" name="bigMoveBtn" src="n43d3vp" fileName="UIMain/component/dh_zy_wanfa.xml" xy="-184,476" pivot="0.5,0.386" size="340,138" group="n44_ixm4"/>
     <component id="n14_ixm4" name="placeBallBtn" src="n43d3vl" fileName="UIMain/component/dh_zy_ganfa.xml" xy="157,476" size="338,138" group="n44_ixm4"/>
     <component id="n14_ixm4" name="placeBallBtn" src="n43d3vl" fileName="UIMain/component/dh_zy_ganfa.xml" xy="157,476" size="338,138" group="n44_ixm4"/>
@@ -28,12 +28,13 @@
     <group id="n44_ixm4" name="n44" xy="-184,476" size="1702,138" advanced="true">
     <group id="n44_ixm4" name="n44" xy="-184,476" size="1702,138" advanced="true">
       <relation target="" sidePair="center-center"/>
       <relation target="" sidePair="center-center"/>
     </group>
     </group>
-    <component id="n34_ixm4" name="signBtn" src="ixm43xu" fileName="UIMain/component/Component11.xml" xy="1292,127" size="42,60" group="n45_ixm4"/>
-    <component id="n35_ixm4" name="drawBtn" src="ixm43xv" fileName="UIMain/component/Component12.xml" xy="1220,127" size="42,65" group="n45_ixm4"/>
-    <component id="n56_mnrs" name="settingNode" src="mnrs42t" fileName="UIMain/component/UISetting.xml" xy="978,127" size="212,66" group="n45_ixm4" controller="c1,0"/>
-    <group id="n45_ixm4" name="n45" xy="978,127" size="356,66" advanced="true">
+    <component id="n34_ixm4" name="signBtn" src="ixm43xu" fileName="UIMain/component/Component11.xml" xy="1079,106" size="107,96" group="n45_ixm4"/>
+    <component id="n35_ixm4" name="drawBtn" src="ixm43xv" fileName="UIMain/component/Component12.xml" xy="942,106" size="107,96" group="n45_ixm4"/>
+    <component id="n56_mnrs" name="settingNode" src="mnrs42t" fileName="UIMain/component/UISetting.xml" xy="729,121" size="223,96" group="n45_ixm4" controller="c1,0"/>
+    <group id="n45_ixm4" name="n45" xy="729,106" size="457,111" advanced="true">
       <relation target="" sidePair="left-left%"/>
       <relation target="" sidePair="left-left%"/>
-      <relation target="n10_ixm4" sidePair="middle-middle"/>
+      <relation target="n10_ixm4" sidePair=""/>
+      <relation target="n23_ixm4" sidePair=""/>
     </group>
     </group>
     <component id="n27_ixm4" name="secretaryBtn" src="ixm43xw" fileName="UIMain/component/Component13.xml" xy="1071,657" size="110,85" group="n46_ixm4"/>
     <component id="n27_ixm4" name="secretaryBtn" src="ixm43xw" fileName="UIMain/component/Component13.xml" xy="1071,657" size="110,85" group="n46_ixm4"/>
     <component id="n28_ixm4" name="rankBtn" src="ixm43xz" fileName="UIMain/component/Component16.xml" xy="1147,704" size="1,1" group="n46_ixm4"/>
     <component id="n28_ixm4" name="rankBtn" src="ixm43xz" fileName="UIMain/component/Component16.xml" xy="1147,704" size="1,1" group="n46_ixm4"/>
@@ -55,17 +56,17 @@
       <relation target="" sidePair="width-width"/>
       <relation target="" sidePair="width-width"/>
       <relation target="n10_ixm4" sidePair="height-height,middle-middle"/>
       <relation target="n10_ixm4" sidePair="height-height,middle-middle"/>
     </component>
     </component>
-    <loader id="n80_lp3l" name="guideBtn" xy="568,153" size="398,257" group="n77_vhzh" fill="scaleFree" clearOnPublish="true"/>
-    <component id="n73_vhzh" name="n73" src="wp26456" fileName="UISkill/component/Component64.xml" xy="752,347" group="n77_vhzh">
+    <loader id="n80_lp3l" name="guideBtn" xy="139,414" size="398,257" group="n77_vhzh" fill="scaleFree" clearOnPublish="true"/>
+    <component id="n73_vhzh" name="n73" src="wp26456" fileName="UISkill/component/Component64.xml" xy="-11,546" group="n77_vhzh">
       <relation target="n14_ixm4" sidePair="left-left"/>
       <relation target="n14_ixm4" sidePair="left-left"/>
     </component>
     </component>
-    <component id="n79_vhzh" name="wordsNode" src="llhd44g" fileName="UIMain/component/Component60.xml" xy="638,62" group="n77_vhzh" controller="c1,1"/>
-    <group id="n77_vhzh" name="enterGuide" xy="0,0" size="1334,750" visible="false" advanced="true"/>
+    <component id="n79_vhzh" name="wordsNode" src="llhd44g" fileName="UIMain/component/Component60.xml" xy="589,157" group="n77_vhzh" controller="c1,1"/>
+    <group id="n77_vhzh" name="enterGuide" xy="-11,0" size="1345,750" visible="false" advanced="true"/>
     <component id="n48_hxtr" name="talkNode" src="llhd44g" fileName="UIMain/component/Component60.xml" xy="415,97">
     <component id="n48_hxtr" name="talkNode" src="llhd44g" fileName="UIMain/component/Component60.xml" xy="415,97">
       <relation target="n13_ixm4" sidePair="left-left,top-top"/>
       <relation target="n13_ixm4" sidePair="left-left,top-top"/>
     </component>
     </component>
-    <component id="n83_jpsz" name="n83" src="jpszv4n9" fileName="_sharecomponent/dh_zuanshi.xml" xy="347,37"/>
-    <component id="n84_jpsz" name="n84" src="jpszv4ni" fileName="_sharecomponent/Component141.xml" xy="1008,124" scale="0.8,0.8" visible="false">
+    <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="759,125" scale="0.8,0.8" visible="false">
       <relation target="n45_ixm4" sidePair="middle-middle,left-left"/>
       <relation target="n45_ixm4" sidePair="middle-middle,left-left"/>
     </component>
     </component>
   </displayList>
   </displayList>

+ 3 - 3
art/fgui/assets/game/UIMain/asset/Component112.xml

@@ -4,10 +4,10 @@
     <graph id="n68_vhzh" name="n68" xy="0,0" size="1334,750" alpha="0.6" type="rect" lineSize="0" fillColor="#ff000000">
     <graph id="n68_vhzh" name="n68" xy="0,0" size="1334,750" alpha="0.6" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
     </graph>
-    <loader id="n70_vhzh" name="n70" xy="548,136" size="693,449">
-      <relation target="" sidePair="right-right%"/>
+    <loader id="n70_vhzh" name="n70" xy="8,289" size="693,449">
+      <relation target="" sidePair="left-left%"/>
     </loader>
     </loader>
-    <image id="n69_vhzh" name="myMask" src="vhzhv4hm" fileName="UISkill/asset/zhezhao.png" xy="914,155" size="320,256">
+    <image id="n69_vhzh" name="myMask" src="vhzhv4hm" fileName="UISkill/asset/zhezhao.png" xy="13,475" size="320,241">
       <relation target="n70_vhzh" sidePair="left-left,top-top"/>
       <relation target="n70_vhzh" sidePair="left-left,top-top"/>
     </image>
     </image>
   </displayList>
   </displayList>

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


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


+ 1 - 2
art/fgui/assets/game/UIMain/component/Component11(1).xml

@@ -2,7 +2,6 @@
 <component size="40,60" pivot="0.5,0.5" extention="Button">
 <component size="40,60" pivot="0.5,0.5" extention="Button">
   <displayList>
   <displayList>
     <image id="n34_ixm4" name="n34" src="n43d3x2" fileName="UIMain/asset/zjm_icon2.png" xy="0,0"/>
     <image id="n34_ixm4" name="n34" src="n43d3x2" fileName="UIMain/asset/zjm_icon2.png" xy="0,0"/>
-    <text id="n42_ixm4" name="n42" xy="0,34" size="40,26" alpha="0.7" fontSize="18" color="#ffffff" text="签到"/>
   </displayList>
   </displayList>
-  <Button downEffect="scale" downEffectValue=".96"/>
+  <Button downEffect="scale" downEffectValue="0.96"/>
 </component>
 </component>

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

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="42,60" pivot="0.5,0.5" extention="Button">
+<component size="96,96" pivot="0.5,0.5" extention="Button">
   <displayList>
   <displayList>
-    <image id="n34_ixm4" name="n34" src="n43d3x2" fileName="UIMain/asset/zjm_icon2.png" xy="1,0"/>
-    <text id="n42_ixm4" name="n42" xy="0,40" size="40,26" alpha="0.7" fontSize="18" color="#ffffff" align="center" vAlign="middle" text="sign"/>
+    <image id="n34_ixm4" name="n34" src="n43d3x2" fileName="UIMain/asset/zjm_icon2.png" xy="0,0"/>
   </displayList>
   </displayList>
   <Button downEffect="scale" downEffectValue="0.96"/>
   <Button downEffect="scale" downEffectValue="0.96"/>
 </component>
 </component>

+ 1 - 2
art/fgui/assets/game/UIMain/component/Component12(1).xml

@@ -2,7 +2,6 @@
 <component size="42,65" pivot="0.5,0.5" extention="Button">
 <component size="42,65" pivot="0.5,0.5" extention="Button">
   <displayList>
   <displayList>
     <image id="n35_ixm4" name="n35" src="n43d3x3" fileName="UIMain/asset/zjm_icon3.png" xy="0,0"/>
     <image id="n35_ixm4" name="n35" src="n43d3x3" fileName="UIMain/asset/zjm_icon3.png" xy="0,0"/>
-    <text id="n43_ixm4" name="n43" xy="1,39" size="40,26" alpha="0.7" fontSize="18" color="#ffffff" text="转盘"/>
   </displayList>
   </displayList>
-  <Button downEffect="scale" downEffectValue=".96"/>
+  <Button downEffect="scale" downEffectValue="0.96"/>
 </component>
 </component>

+ 1 - 15
art/fgui/assets/game/UIMain/component/Component12.xml

@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="42,65" pivot="0.5,0.5" extention="Button">
+<component size="96,96" pivot="0.5,0.5" extention="Button">
   <displayList>
   <displayList>
     <image id="n35_ixm4" name="n35" src="n43d3x3" fileName="UIMain/asset/zjm_icon3.png" xy="0,0" pivot="0.503,0.461"/>
     <image id="n35_ixm4" name="n35" src="n43d3x3" fileName="UIMain/asset/zjm_icon3.png" xy="0,0" pivot="0.503,0.461"/>
-    <text id="n43_ixm4" name="n43" xy="-1,41" size="48,26" alpha="0.7" fontSize="18" color="#ffffff" align="center" vAlign="middle" text="raffle"/>
   </displayList>
   </displayList>
   <Button downEffect="scale" downEffectValue="0.96"/>
   <Button downEffect="scale" downEffectValue="0.96"/>
-  <transition name="t0" autoPlay="true" autoPlayRepeat="-1">
-    <item time="0" type="Rotation" target="n35_ixm4" tween="true" startValue="0" endValue="0" duration="48"/>
-    <item time="48" type="Rotation" target="n35_ixm4" tween="true" startValue="0" endValue="-20" duration="17"/>
-    <item time="65" type="Rotation" target="n35_ixm4" tween="true" startValue="-20" endValue="1050" duration="25"/>
-    <item time="90" type="Rotation" target="n35_ixm4" tween="true" startValue="1050" endValue="1060" duration="17"/>
-    <item time="107" type="Rotation" target="n35_ixm4" tween="true" startValue="1060" endValue="1097.26" duration="36"/>
-    <item time="143" type="Rotation" target="n35_ixm4" tween="true" startValue="1097.26" endValue="1063.96" duration="24"/>
-    <item time="167" type="Rotation" target="n35_ixm4" tween="true" startValue="1063.96" endValue="1087.56" duration="15"/>
-    <item time="182" type="Rotation" target="n35_ixm4" tween="true" startValue="1087.56" endValue="1072.86" duration="14"/>
-    <item time="196" type="Rotation" target="n35_ixm4" tween="true" startValue="1072.86" endValue="1085.16" duration="10"/>
-    <item time="206" type="Rotation" target="n35_ixm4" tween="true" startValue="1085.16" endValue="1076.26" duration="9"/>
-    <item time="215" type="Rotation" target="n35_ixm4" tween="true" startValue="1076.26" endValue="1080" duration="5"/>
-  </transition>
 </component>
 </component>

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


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

@@ -12478,7 +12478,6 @@
         }
         }
         onConstruct() {
         onConstruct() {
             this.n34 = (this.getChild("n34"));
             this.n34 = (this.getChild("n34"));
-            this.n42 = (this.getChild("n42"));
         }
         }
     }
     }
     ui_Component11.URL = "ui://isxx5ak7ixm43xu";
     ui_Component11.URL = "ui://isxx5ak7ixm43xu";
@@ -12489,8 +12488,6 @@
         }
         }
         onConstruct() {
         onConstruct() {
             this.n35 = (this.getChild("n35"));
             this.n35 = (this.getChild("n35"));
-            this.n43 = (this.getChild("n43"));
-            this.t0 = this.getTransition("t0");
         }
         }
     }
     }
     ui_Component12.URL = "ui://isxx5ak7ixm43xv";
     ui_Component12.URL = "ui://isxx5ak7ixm43xv";
@@ -12707,6 +12704,7 @@
             this.n89 = (this.getChild("n89"));
             this.n89 = (this.getChild("n89"));
             this.n90 = (this.getChild("n90"));
             this.n90 = (this.getChild("n90"));
             this.guideBtn = (this.getChild("guideBtn"));
             this.guideBtn = (this.getChild("guideBtn"));
+            this.n93 = (this.getChild("n93"));
         }
         }
     }
     }
     ui_Component146.URL = "ui://isxx5ak7jaakv55w";
     ui_Component146.URL = "ui://isxx5ak7jaakv55w";

File diff suppressed because it is too large
+ 0 - 0
client/laya/bin/js/bundle.js.map


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

@@ -3,7 +3,6 @@
 export default class ui_Component11 extends fgui.GButton {
 export default class ui_Component11 extends fgui.GButton {
 
 
 	public n34:fgui.GImage;
 	public n34:fgui.GImage;
-	public n42:fgui.GTextField;
 	public static URL:string = "ui://isxx5ak7ixm43xu";
 	public static URL:string = "ui://isxx5ak7ixm43xu";
 
 
 	public static createInstance():ui_Component11 {
 	public static createInstance():ui_Component11 {
@@ -12,6 +11,5 @@ export default class ui_Component11 extends fgui.GButton {
 
 
 	protected onConstruct():void {
 	protected onConstruct():void {
 		this.n34 = <fgui.GImage>(this.getChild("n34"));
 		this.n34 = <fgui.GImage>(this.getChild("n34"));
-		this.n42 = <fgui.GTextField>(this.getChild("n42"));
 	}
 	}
 }
 }

+ 0 - 4
client/laya/src/fgui/res/game/ui_Component12.ts

@@ -3,8 +3,6 @@
 export default class ui_Component12 extends fgui.GButton {
 export default class ui_Component12 extends fgui.GButton {
 
 
 	public n35:fgui.GImage;
 	public n35:fgui.GImage;
-	public n43:fgui.GTextField;
-	public t0:fgui.Transition;
 	public static URL:string = "ui://isxx5ak7ixm43xv";
 	public static URL:string = "ui://isxx5ak7ixm43xv";
 
 
 	public static createInstance():ui_Component12 {
 	public static createInstance():ui_Component12 {
@@ -13,7 +11,5 @@ export default class ui_Component12 extends fgui.GButton {
 
 
 	protected onConstruct():void {
 	protected onConstruct():void {
 		this.n35 = <fgui.GImage>(this.getChild("n35"));
 		this.n35 = <fgui.GImage>(this.getChild("n35"));
-		this.n43 = <fgui.GTextField>(this.getChild("n43"));
-		this.t0 = this.getTransition("t0");
 	}
 	}
 }
 }

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

@@ -8,6 +8,7 @@ export default class ui_Component146 extends fgui.GComponent {
 	public n89:ui_Component111_1;
 	public n89:ui_Component111_1;
 	public n90:ui_Component64_1;
 	public n90:ui_Component64_1;
 	public guideBtn:fgui.GLoader;
 	public guideBtn:fgui.GLoader;
+	public n93:fgui.GTextField;
 	public static URL:string = "ui://isxx5ak7jaakv55w";
 	public static URL:string = "ui://isxx5ak7jaakv55w";
 
 
 	public static createInstance():ui_Component146 {
 	public static createInstance():ui_Component146 {
@@ -18,5 +19,6 @@ export default class ui_Component146 extends fgui.GComponent {
 		this.n89 = <ui_Component111_1>(this.getChild("n89"));
 		this.n89 = <ui_Component111_1>(this.getChild("n89"));
 		this.n90 = <ui_Component64_1>(this.getChild("n90"));
 		this.n90 = <ui_Component64_1>(this.getChild("n90"));
 		this.guideBtn = <fgui.GLoader>(this.getChild("guideBtn"));
 		this.guideBtn = <fgui.GLoader>(this.getChild("guideBtn"));
+		this.n93 = <fgui.GTextField>(this.getChild("n93"));
 	}
 	}
 }
 }

Some files were not shown because too many files changed in this diff