dzduole 1 ماه پیش
والد
کامیت
68200d78c8

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

@@ -15,8 +15,7 @@
       "hidden": true
     },
     "n77_vhzh": {
-      "locked": true,
-      "hidden": true
+      "locked": true
     }
   },
   "fitScreen": "FitSize",

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

@@ -8,6 +8,7 @@
   ],
   "libview.iconScale": 0,
   "doc.openedDocs": [
+    "ui://isxx5ak7vhzhv4ho",
     "ui://isxx5ak7kt443qc"
   ],
   "test.device": "iPhone Xs Max",

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

@@ -22,12 +22,11 @@
       <relation target="n10_ixm4" sidePair="right-right%"/>
     </component>
     <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="172,479" pivot="0.5,0.386" size="340,138" group="n44_ixm4" aspect="true"/>
-    <component id="n14_ixm4" name="placeBallBtn" src="n43d3vl" fileName="UIMain/component/dh_zy_ganfa.xml" xy="-155,483" size="340,138" group="n44_ixm4" aspect="true"/>
-    <component id="n17_ixm4" name="classicBtn" src="ixm43xq" fileName="UIMain/component/Component7.xml" xy="496,475" size="340,138" group="n44_ixm4" aspect="true"/>
-    <component id="n18_ixm4" name="weeklyBtn" src="ixm43xs" fileName="UIMain/component/Component9.xml" xy="825,476" size="340,138" group="n44_ixm4" aspect="true"/>
-    <component id="n19_ixm4" name="globalBtn" src="ixm43xr" fileName="UIMain/component/Component8.xml" xy="1155,476" size="341,138" group="n44_ixm4" aspect="true"/>
-    <group id="n44_ixm4" name="n44" xy="-155,475" size="1652,146" advanced="true">
+    <component id="n16_ixm4" name="bigMoveBtn" src="n43d3vp" fileName="UIMain/component/dh_zy_wanfa.xml" xy="347,482" pivot="0.5,0.386" size="320,129" group="n44_ixm4" aspect="true"/>
+    <component id="n14_ixm4" name="placeBallBtn" src="n43d3vl" fileName="UIMain/component/dh_zy_ganfa.xml" xy="27,483" group="n44_ixm4"/>
+    <component id="n17_ixm4" name="classicBtn" src="ixm43xq" fileName="UIMain/component/Component7.xml" xy="667,479" size="320,129" group="n44_ixm4" aspect="true"/>
+    <component id="n19_ixm4" name="globalBtn" src="ixm43xr" fileName="UIMain/component/Component8.xml" xy="987,480" size="320,129" group="n44_ixm4" aspect="true"/>
+    <group id="n44_ixm4" name="n44" xy="27,479" size="1280,142" advanced="true">
       <relation target="n10_ixm4" sidePair="width-width,center-center"/>
       <relation target="" sidePair=""/>
     </group>
@@ -58,8 +57,8 @@
       <relation target="" sidePair=""/>
       <relation target="n10_ixm4" sidePair="center-center,middle-middle"/>
     </component>
-    <loader id="n80_lp3l" name="guideBtn" xy="278,469" size="328,140" group="n77_vhzh" fill="scaleFree" clearOnPublish="true"/>
-    <component id="n73_vhzh" name="n73" src="wp26456" fileName="UISkill/component/Component64.xml" xy="350,497" group="n77_vhzh">
+    <loader id="n80_lp3l" name="guideBtn" xy="340,469" size="328,140" group="n77_vhzh" fill="scaleFree" clearOnPublish="true"/>
+    <component id="n73_vhzh" name="n73" src="wp26456" fileName="UISkill/component/Component64.xml" xy="525,497" size="86,107" group="n77_vhzh">
       <relation target="n16_ixm4" sidePair="width-width,center-center"/>
     </component>
     <component id="n79_vhzh" name="wordsNode" src="llhd44g" fileName="UIMain/component/Component60.xml" xy="557,295" group="n77_vhzh" controller="c1,1"/>

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

@@ -4,9 +4,9 @@
     <graph id="n68_vhzh" name="n68" xy="-183,0" size="1700,750" alpha="0.6" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <loader id="n70_vhzh" name="n70" xy="192,470" size="327,138">
+    <loader id="n70_vhzh" name="n70" xy="348,470" size="310,138">
       <relation target="" sidePair=""/>
     </loader>
-    <image id="n69_vhzh" name="myMask" src="vhzhv4hm" fileName="UISkill/asset/zhezhao.png" xy="192,474" size="320,131"/>
+    <image id="n69_vhzh" name="myMask" src="vhzhv4hm" fileName="UISkill/asset/zhezhao.png" xy="350,474" size="310,131"/>
   </displayList>
 </component>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="341,138" pivot="0.5,0.5" extention="Button">
+<component size="320,138" pivot="0.5,0.5" extention="Button">
   <displayList>
-    <image id="n17_ixm4" name="n17" src="n43d3wy" fileName="UIMain/asset/zjm_db4.png" xy="0,1"/>
+    <image id="n17_ixm4" name="n17" src="n43d3wy" fileName="UIMain/asset/zjm_db4.png" xy="0,1" size="320,126" aspect="true"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.02"/>
 </component>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="341,138" pivot="0.5,0.5" extention="Button">
+<component size="320,138" pivot="0.5,0.5" extention="Button">
   <displayList>
-    <image id="n19_ixm4" name="n19" src="n43d3wz" fileName="UIMain/asset/zjm_db5.png" xy="0,1"/>
+    <image id="n19_ixm4" name="n19" src="n43d3wz" fileName="UIMain/asset/zjm_db5.png" xy="0,1" size="320,126" aspect="true"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.02"/>
 </component>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="341,138" pivot="0.5,0.5" extention="Button">
+<component size="320,138" pivot="0.5,0.5" extention="Button">
   <displayList>
-    <image id="n18_ixm4" name="n18" src="n43d3wx" fileName="UIMain/asset/zjm_db3.png" xy="0,1"/>
+    <image id="n18_ixm4" name="n18" src="n43d3wx" fileName="UIMain/asset/zjm_db3.png" xy="0,1" size="320,126" aspect="true"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.02"/>
 </component>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="341,138" pivot="0.5,0.5" opaque="false" extention="Button" hitTest="n0_vol2">
+<component size="320,138" pivot="0.5,0.5" opaque="false" extention="Button" hitTest="n0_vol2">
   <displayList>
-    <image id="n0_vol2" name="n0" src="n43d3wu" fileName="UIMain/asset/zjm_db1.png" xy="0,0"/>
+    <image id="n0_vol2" name="n0" src="n43d3wu" fileName="UIMain/asset/zjm_db1.png" xy="0,0" size="320,129" aspect="true"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.02"/>
 </component>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="341,138" pivot="0.5,0.5" extention="Button" designImageLayer="1">
+<component size="320,138" pivot="0.5,0.5" extention="Button" designImageLayer="1">
   <displayList>
-    <image id="n0_osxc" name="n0" src="n43d3ww" fileName="UIMain/asset/zjm_db2.png" xy="0,1"/>
+    <image id="n0_osxc" name="n0" src="n43d3ww" fileName="UIMain/asset/zjm_db2.png" xy="0,1" size="320,126" aspect="true"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.02"/>
 </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


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


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

@@ -4250,7 +4250,6 @@
             this.bigMoveBtn = (this.getChild("bigMoveBtn"));
             this.placeBallBtn = (this.getChild("placeBallBtn"));
             this.classicBtn = (this.getChild("classicBtn"));
-            this.weeklyBtn = (this.getChild("weeklyBtn"));
             this.globalBtn = (this.getChild("globalBtn"));
             this.n44 = (this.getChild("n44"));
             this.signBtn = (this.getChild("signBtn"));
@@ -6596,7 +6595,6 @@
             this.addUIClick(this.ui.bigMoveBtn, this.startGame, [GameMode.bigMove]);
             this.addUIClick(this.ui.ganFaMoShiBtn, this.startGame, [GameMode.bigMove]);
             this.addUIClick(this.ui.globalBtn, this.startGlobal);
-            this.addUIClick(this.ui.weeklyBtn, this.startWeekly);
             this.addUIClick(this.ui.placeBallBtn, this.startPlaceBall);
             this.addUIClick(this.ui.headNode, this.onGetUserInfo, [true]);
             this.addUIClick(this.ui, this.interuptSecretary);
@@ -12786,16 +12784,6 @@
     }
     ui_Component8.URL = "ui://isxx5ak7ixm43xr";
 
-    class ui_Component9 extends fgui.GButton {
-        static createInstance() {
-            return (fgui.UIPackage.createObject("game", "Component9"));
-        }
-        onConstruct() {
-            this.n18 = (this.getChild("n18"));
-        }
-    }
-    ui_Component9.URL = "ui://isxx5ak7ixm43xs";
-
     class ui_Component10 extends fgui.GButton {
         static createInstance() {
             return (fgui.UIPackage.createObject("game", "Component10"));
@@ -15064,7 +15052,6 @@
             fgui.UIObjectFactory.setExtension(ui_Component4.URL, ui_Component4);
             fgui.UIObjectFactory.setExtension(ui_Component7.URL, ui_Component7);
             fgui.UIObjectFactory.setExtension(ui_Component8.URL, ui_Component8);
-            fgui.UIObjectFactory.setExtension(ui_Component9.URL, ui_Component9);
             fgui.UIObjectFactory.setExtension(ui_Component10.URL, ui_Component10);
             fgui.UIObjectFactory.setExtension(ui_Component11.URL, ui_Component11);
             fgui.UIObjectFactory.setExtension(ui_Component12.URL, ui_Component12);
@@ -21290,7 +21277,6 @@
             this.addUIClick(this.ui.bigMoveBtn, this.startGame, [GameMode.bigMove]);
             this.addUIClick(this.ui.ganFaMoShiBtn, this.startGame, [GameMode.bigMove]);
             this.addUIClick(this.ui.globalBtn, this.startGlobal);
-            this.addUIClick(this.ui.weeklyBtn, this.startWeekly);
             this.addUIClick(this.ui.placeBallBtn, this.startPlaceBall);
             this.addUIClick(this.ui.headNode, this.onGetUserInfo, [true]);
             this.addUIClick(this.ui, this.interuptSecretary);

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
client/laya/bin/js/bundle.js.map


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

@@ -96,7 +96,6 @@ import ui_Component3 from "./ui_Component3";
 import ui_Component4 from "./ui_Component4";
 import ui_Component7 from "./ui_Component7";
 import ui_Component8 from "./ui_Component8";
-import ui_Component9 from "./ui_Component9";
 import ui_Component10 from "./ui_Component10";
 import ui_Component11 from "./ui_Component11";
 import ui_Component12 from "./ui_Component12";
@@ -360,7 +359,6 @@ export default class gameBinder {
 		fgui.UIObjectFactory.setExtension(ui_Component4.URL, ui_Component4);
 		fgui.UIObjectFactory.setExtension(ui_Component7.URL, ui_Component7);
 		fgui.UIObjectFactory.setExtension(ui_Component8.URL, ui_Component8);
-		fgui.UIObjectFactory.setExtension(ui_Component9.URL, ui_Component9);
 		fgui.UIObjectFactory.setExtension(ui_Component10.URL, ui_Component10);
 		fgui.UIObjectFactory.setExtension(ui_Component11.URL, ui_Component11);
 		fgui.UIObjectFactory.setExtension(ui_Component12.URL, ui_Component12);

+ 0 - 15
client/laya/src/fgui/res/game/ui_Component9.ts

@@ -1,15 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-export default class ui_Component9 extends fgui.GButton {
-
-	public n18:fgui.GImage;
-	public static URL:string = "ui://isxx5ak7ixm43xs";
-
-	public static createInstance():ui_Component9 {
-		return <ui_Component9>(fgui.UIPackage.createObject("game", "Component9"));
-	}
-
-	protected onConstruct():void {
-		this.n18 = <fgui.GImage>(this.getChild("n18"));
-	}
-}

+ 0 - 3
client/laya/src/fgui/res/game/ui_UIMain.ts

@@ -6,7 +6,6 @@ import ui_Component3 from "./ui_Component3";
 import ui_dh_zy_wanfa from "./ui_dh_zy_wanfa";
 import ui_dh_zy_ganfa from "./ui_dh_zy_ganfa";
 import ui_Component7 from "./ui_Component7";
-import ui_Component9 from "./ui_Component9";
 import ui_Component8 from "./ui_Component8";
 import ui_Component11 from "./ui_Component11";
 import ui_Component12 from "./ui_Component12";
@@ -33,7 +32,6 @@ export default class ui_UIMain extends fgui.GComponent {
 	public bigMoveBtn:ui_dh_zy_wanfa;
 	public placeBallBtn:ui_dh_zy_ganfa;
 	public classicBtn:ui_Component7;
-	public weeklyBtn:ui_Component9;
 	public globalBtn:ui_Component8;
 	public n44:fgui.GGroup;
 	public signBtn:ui_Component11;
@@ -72,7 +70,6 @@ export default class ui_UIMain extends fgui.GComponent {
 		this.bigMoveBtn = <ui_dh_zy_wanfa>(this.getChild("bigMoveBtn"));
 		this.placeBallBtn = <ui_dh_zy_ganfa>(this.getChild("placeBallBtn"));
 		this.classicBtn = <ui_Component7>(this.getChild("classicBtn"));
-		this.weeklyBtn = <ui_Component9>(this.getChild("weeklyBtn"));
 		this.globalBtn = <ui_Component8>(this.getChild("globalBtn"));
 		this.n44 = <fgui.GGroup>(this.getChild("n44"));
 		this.signBtn = <ui_Component11>(this.getChild("signBtn"));

+ 2 - 1
client/laya/src/ui/UIMain.ts

@@ -142,6 +142,7 @@ export default class UIMain extends UIBase {
         this.ui = ui_UIMain.createInstance();
         this.contentPane = this.ui;
         this.isEject = false;
+       // this.ui.weeklyBtn.visible = false;
         this.addEvent();
         this.addClickSpine();
         //设置界面
@@ -200,7 +201,7 @@ export default class UIMain extends UIBase {
         this.addUIClick(this.ui.ganFaMoShiBtn, this.startGame, [GameMode.bigMove])
         //
         this.addUIClick(this.ui.globalBtn, this.startGlobal);
-        this.addUIClick(this.ui.weeklyBtn, this.startWeekly);
+      //  this.addUIClick(this.ui.weeklyBtn, this.startWeekly);
         this.addUIClick(this.ui.placeBallBtn, this.startPlaceBall);
         //
         this.addUIClick(this.ui.headNode, this.onGetUserInfo, [true]);

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است