dzduole 4 giorni fa
parent
commit
4b974d1bb8

+ 3 - 10
art/fgui/.objs/workspace.json

@@ -7,25 +7,18 @@
     "/"
   ],
   "libview.iconScale": 0,
-  "doc.openedDocs": [
-    "ui://isxx5ak7bobav57u",
-    "ui://isxx5ak7a1zav5ao",
-    "ui://isxx5ak7bobav57v"
-  ],
+  "doc.openedDocs": [],
   "test.device": "iPhone 8 Plus",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://isxx5ak7a1zav5ao",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "isxx5ak7",
     "/",
     "isxx5ak7",
-    "/UIUser/",
+    "/UISecretary/",
     "isxx5ak7",
-    "/font/",
-    "37nctnhw",
-    "/"
+    "/UIUser/"
   ],
   "auxline1": true,
   "snapToGrid": true,

+ 1 - 3
art/fgui/assets/game/UISecretary/UIFuli/UIFuli1.xml

@@ -4,8 +4,6 @@
     <graph id="n1_im8n" name="n1" xy="-183,0" size="1700,750" alpha="0.6" type="rect" fillColor="#ff000000">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
-    <component id="n2_im8n" name="n2" src="im8nv59h" fileName="UISecretary/UIFuli/component/Component_fl_1.xml" xy="0,0">
-      <relation target="" sidePair=""/>
-    </component>
+    <component id="n2_im8n" name="n2" src="im8nv59h" fileName="UISecretary/UIFuli/component/Component_fl_1.xml" xy="0,0"/>
   </displayList>
 </component>

+ 1 - 3
art/fgui/assets/game/UISecretary/UIFuli/UIFuli2.xml

@@ -4,8 +4,6 @@
     <graph id="n1_im8n" name="n1" xy="-183,0" size="1700,750" visible="false" alpha="0.6" type="rect" fillColor="#ff000000">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
-    <component id="n0_im8n" name="n2" src="im8nv59n" fileName="UISecretary/UIFuli/component/Component_fl_2.xml" xy="0,0">
-      <relation target="" sidePair=""/>
-    </component>
+    <component id="n0_im8n" name="n2" src="im8nv59n" fileName="UISecretary/UIFuli/component/Component_fl_2.xml" xy="0,0"/>
   </displayList>
 </component>

+ 1 - 1
art/fgui/assets/game/UISecretary/UIFuli/component/Component_fl_1.xml

@@ -4,7 +4,7 @@
     <loader id="n18_a1za" name="n_zzq_fl1" xy="-183,0" size="1700,750" url="ui://isxx5ak7a1zav5ah" align="center" vAlign="middle">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
-    <text id="n11_im8n" name="txt_price" xy="1055,342" size="153,79" skew="-20,-10" font="Arial" fontSize="60" color="#fefefe" align="center" vAlign="middle" bold="true" strokeColor="#0000ff" strokeSize="3" text="$4.99"/>
+    <text id="n11_im8n" name="txt_price" xy="1055,342" size="190,79" skew="-20,-10" font="ui://isxx5ak7veupv5aq" fontSize="60" color="#fefefe" align="center" vAlign="middle" bold="true" strokeColor="#9e30d1" strokeSize="6" text="$4.99"/>
     <component id="n12_loyp" name="n_no" src="loypv59r" fileName="UISecretary/UIFuli/component/Button_h.xml" xy="597,495"/>
     <component id="n13_loyp" name="n_buy" src="loypv59s" fileName="UISecretary/UIFuli/component/Button_lv.xml" xy="920,495"/>
   </displayList>

+ 1 - 1
art/fgui/assets/game/UISecretary/UIFuli/component/Component_fl_2.xml

@@ -4,7 +4,7 @@
     <loader id="n14_a1za" name="n_zzq_fl2" xy="-183,0" size="1700,750" url="ui://isxx5ak7fyonv5ad" align="center" vAlign="middle">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
-    <text id="n3_im8n" name="txt_price" xy="1013,345" size="207,94" skew="-20,-10" fontSize="60" color="#ffff00" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#0000ff" strokeSize="3" text="$14.99"/>
+    <text id="n3_im8n" name="txt_price" xy="1013,345" size="207,94" skew="-20,-10" fontSize="60" color="#ffe400" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#2c1cbf" strokeSize="6" text="$14.99"/>
     <component id="n10_loyp" name="n_no" src="loypv59r" fileName="UISecretary/UIFuli/component/Button_h.xml" xy="597,495"/>
     <component id="n11_loyp" name="n_buy" src="loypv59s" fileName="UISecretary/UIFuli/component/Button_lv.xml" xy="920,495"/>
   </displayList>

+ 11 - 1
art/fgui/assets/game/UIUser/UILogin.xml

@@ -5,6 +5,16 @@
     <graph id="n18_p8p3" name="n18" xy="0,0" size="1700,750" alpha="0.6" type="rect" fillColor="#ff000000">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
-    <component id="n19_lciv" name="n19" src="a1zav5ao" fileName="UIUser/Component1305_logo.xml" xy="377,84"/>
+    <image id="n21_ftmm" name="n21" src="hgftv582" fileName="UIUser/asset/bg.png" xy="359,84" size="945,582" group="n27_ftmm">
+      <relation target="" sidePair=""/>
+    </image>
+    <component id="n22_ftmm" name="closeBtn" src="xs1r483" fileName="UILevelProp/component/Component86.xml" xy="1285,109" size="56,55" group="n27_ftmm"/>
+    <text id="n23_ftmm" name="txt_ua" xy="772,283" size="300,49" group="n27_ftmm" font="ui://isxx5ak7veupv5aq" fontSize="36" color="#3e3e3e" align="center" vAlign="middle" autoSize="none" bold="true" autoClearText="true" text="123abcABC" input="true" maxLength="15"/>
+    <component id="n24_ftmm" name="btn_gotoReg" src="bobav57y" fileName="UIUser/component/Button_reg.xml" xy="828,554" size="321,82" group="n27_ftmm">
+      <Button titleColor="#000000"/>
+    </component>
+    <component id="n25_ftmm" name="btn_login" src="nnz5v587" fileName="UIUser/component/Button_login.xml" xy="491,554" size="321,82" group="n27_ftmm"/>
+    <text id="n26_ftmm" name="txt_up" xy="772,382" size="300,49" group="n27_ftmm" font="ui://isxx5ak7veupv5aq" fontSize="36" color="#3e3e3e" align="center" vAlign="middle" autoSize="none" bold="true" autoClearText="true" text="123abcABC" input="true" maxLength="15"/>
+    <group id="n27_ftmm" name="n27" xy="359,84" size="982,582"/>
   </displayList>
 </component>

+ 9 - 9
art/fgui/assets/game/UIUser/UIReg.xml

@@ -2,14 +2,14 @@
 <component size="1700,750" designImageLayer="1">
   <displayList>
     <graph id="n38_d6k9" name="n38" xy="0,0" size="1700,750" alpha="0.6" type="rect" fillColor="#ff000000"/>
-    <image id="n51_a1za" name="n51" src="a1zav5an" fileName="UIUser/asset/reg_bj1.png" xy="377,86" size="945,582" group="n52_a1za"/>
-    <component id="n37_d6k9" name="closeBtn" src="xs1r483" fileName="UILevelProp/component/Component86.xml" xy="1289,112" size="56,55" group="n52_a1za"/>
-    <text id="n35_nnz5" name="lab_tip" xy="541,509" size="617,42" group="n52_a1za" visible="false" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="Registration successful!"/>
-    <text id="n28_nnz5" name="txt_ua" xy="788,228" size="288,54" group="n52_a1za" font="ui://isxx5ak7veupv5aq" fontSize="40" color="#3e3e3e" align="center" vAlign="middle" autoSize="none" bold="true" autoClearText="true" text="aaaadDDDD" input="true"/>
-    <text id="n30_nnz5" name="txt_up1" xy="787,328" size="288,54" group="n52_a1za" font="ui://isxx5ak7veupv5aq" fontSize="40" color="#3e3e3e" align="center" vAlign="middle" autoSize="none" bold="true" autoClearText="true" text="AAAaa" input="true"/>
-    <text id="n33_nnz5" name="txt_up2" xy="792,425" size="282,54" group="n52_a1za" font="ui://isxx5ak7veupv5aq" fontSize="40" color="#3e3e3e" align="center" vAlign="middle" autoSize="none" bold="true" autoClearText="true" text="aaaDDD" input="true"/>
-    <component id="n49_so7l" name="btn_gotoLogin" src="nnz5v587" fileName="UIUser/component/Button_login.xml" xy="839,556" size="321,82" group="n52_a1za"/>
-    <component id="n13_hgft" name="btn_reg" src="bobav57y" fileName="UIUser/component/Button_reg.xml" xy="492,556" size="321,82" group="n52_a1za"/>
-    <group id="n52_a1za" name="n52" xy="377,86" size="968,582"/>
+    <image id="n51_a1za" name="n51" src="a1zav5an" fileName="UIUser/asset/reg_bj1.png" xy="366,84" size="945,582" group="n52_a1za"/>
+    <component id="n37_d6k9" name="closeBtn" src="xs1r483" fileName="UILevelProp/component/Component86.xml" xy="1278,110" size="56,55" group="n52_a1za"/>
+    <text id="n35_nnz5" name="lab_tip" xy="530,504" size="617,42" group="n52_a1za" visible="false" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="Registration successful!"/>
+    <text id="n28_nnz5" name="txt_ua" xy="777,230" size="290,49" group="n52_a1za" font="ui://isxx5ak7veupv5aq" fontSize="36" color="#3e3e3e" align="center" vAlign="middle" autoSize="none" bold="true" autoClearText="true" text="1234567890123" input="true" maxLength="15"/>
+    <text id="n30_nnz5" name="txt_up1" xy="777,329" size="290,49" group="n52_a1za" font="ui://isxx5ak7veupv5aq" fontSize="36" color="#3e3e3e" align="center" vAlign="middle" autoSize="none" bold="true" autoClearText="true" text="AAAaa" input="true" maxLength="15"/>
+    <text id="n33_nnz5" name="txt_up2" xy="777,428" size="290,49" group="n52_a1za" font="ui://isxx5ak7veupv5aq" fontSize="36" color="#3e3e3e" align="center" vAlign="middle" autoSize="none" bold="true" autoClearText="true" text="aaaDDD" input="true" maxLength="15"/>
+    <component id="n49_so7l" name="btn_gotoLogin" src="nnz5v587" fileName="UIUser/component/Button_login.xml" xy="828,554" size="321,82" group="n52_a1za"/>
+    <component id="n13_hgft" name="btn_reg" src="bobav57y" fileName="UIUser/component/Button_reg.xml" xy="491,554" size="321,82" group="n52_a1za"/>
+    <group id="n52_a1za" name="n52" xy="366,84" size="968,582"/>
   </displayList>
 </component>

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


+ 22 - 33
client/laya/bin/js/bundle.js

@@ -7020,7 +7020,12 @@
         onConstruct() {
             this.c1 = this.getController("c1");
             this.n18 = (this.getChild("n18"));
-            this.n19 = (this.getChild("n19"));
+            this.n21 = (this.getChild("n21"));
+            this.closeBtn = (this.getChild("closeBtn"));
+            this.txt_ua = (this.getChild("txt_ua"));
+            this.btn_gotoReg = (this.getChild("btn_gotoReg"));
+            this.btn_login = (this.getChild("btn_login"));
+            this.txt_up = (this.getChild("txt_up"));
         }
     }
     ui_UILogin.URL = "ui://isxx5ak7bobav57u";
@@ -7040,8 +7045,8 @@
         onFontLoaded() {
             try {
                 Laya.Text.defaultFont = this.fontStr;
-                this.ui.n19.txt_ua.font = this.fontStr;
-                this.ui.n19.txt_up.font = this.fontStr;
+                this.ui.txt_ua.font = this.fontStr;
+                this.ui.txt_up.font = this.fontStr;
                 console.log("zh: onFontLoaded 设置" + this.fontStr + "字体成功");
             }
             catch (error) {
@@ -7052,9 +7057,9 @@
             this.ui = ui_UILogin.createInstance();
             this.contentPane = this.ui;
             this.isEject = false;
-            this.addUIClick(this.ui.n19.closeBtn, this.closeSelf);
-            this.addUIClick(this.ui.n19.btn_gotoReg, this.gotoRegPage);
-            this.addUIClick(this.ui.n19.btn_login, this.userLogin);
+            this.addUIClick(this.ui.closeBtn, this.closeSelf);
+            this.addUIClick(this.ui.btn_gotoReg, this.gotoRegPage);
+            this.addUIClick(this.ui.btn_login, this.userLogin);
         }
         show() {
             super.show();
@@ -7066,9 +7071,9 @@
             this.hide();
         }
         userLogin() {
-            let ua = this.ui.n19.txt_ua.text;
-            let up = this.ui.n19.txt_up.text;
-            console.log('zh:ua font' + this.ui.n19.txt_ua.font);
+            let ua = this.ui.txt_ua.text;
+            let up = this.ui.txt_up.text;
+            console.log('zh:ua font' + this.ui.txt_ua.font);
             if (ua && up) {
                 let reqData = JSON.stringify({
                     username: ua.trim(),
@@ -13335,21 +13340,6 @@
     }
     ui_powerEft.URL = "ui://isxx5ak79u9xv4mr";
 
-    class ui_Component1305_logo extends fgui.GComponent {
-        static createInstance() {
-            return (fgui.UIPackage.createObject("game", "Component1305_logo"));
-        }
-        onConstruct() {
-            this.n7 = (this.getChild("n7"));
-            this.closeBtn = (this.getChild("closeBtn"));
-            this.txt_ua = (this.getChild("txt_ua"));
-            this.btn_gotoReg = (this.getChild("btn_gotoReg"));
-            this.btn_login = (this.getChild("btn_login"));
-            this.txt_up = (this.getChild("txt_up"));
-        }
-    }
-    ui_Component1305_logo.URL = "ui://isxx5ak7a1zav5ao";
-
     class ui_PutBallLevelDisplay extends fgui.GComponent {
         static createInstance() {
             return (fgui.UIPackage.createObject("game", "PutBallLevelDisplay"));
@@ -16845,7 +16835,6 @@
             fgui.UIObjectFactory.setExtension(ui_Component129.URL, ui_Component129);
             fgui.UIObjectFactory.setExtension(ui_Component130.URL, ui_Component130);
             fgui.UIObjectFactory.setExtension(ui_powerEft.URL, ui_powerEft);
-            fgui.UIObjectFactory.setExtension(ui_Component1305_logo.URL, ui_Component1305_logo);
             fgui.UIObjectFactory.setExtension(ui_UILevelDisplay.URL, ui_UILevelDisplay);
             fgui.UIObjectFactory.setExtension(ui_PutBallLevelDisplay.URL, ui_PutBallLevelDisplay);
             fgui.UIObjectFactory.setExtension(ui_Component79.URL, ui_Component79);
@@ -24129,8 +24118,8 @@
         onFontLoaded() {
             try {
                 Laya.Text.defaultFont = this.fontStr;
-                this.ui.n19.txt_ua.font = this.fontStr;
-                this.ui.n19.txt_up.font = this.fontStr;
+                this.ui.txt_ua.font = this.fontStr;
+                this.ui.txt_up.font = this.fontStr;
                 console.log("zh: onFontLoaded 设置" + this.fontStr + "字体成功");
             }
             catch (error) {
@@ -24141,9 +24130,9 @@
             this.ui = ui_UILogin.createInstance();
             this.contentPane = this.ui;
             this.isEject = false;
-            this.addUIClick(this.ui.n19.closeBtn, this.closeSelf);
-            this.addUIClick(this.ui.n19.btn_gotoReg, this.gotoRegPage);
-            this.addUIClick(this.ui.n19.btn_login, this.userLogin);
+            this.addUIClick(this.ui.closeBtn, this.closeSelf);
+            this.addUIClick(this.ui.btn_gotoReg, this.gotoRegPage);
+            this.addUIClick(this.ui.btn_login, this.userLogin);
         }
         show() {
             super.show();
@@ -24155,9 +24144,9 @@
             this.hide();
         }
         userLogin() {
-            let ua = this.ui.n19.txt_ua.text;
-            let up = this.ui.n19.txt_up.text;
-            console.log('zh:ua font' + this.ui.n19.txt_ua.font);
+            let ua = this.ui.txt_ua.text;
+            let up = this.ui.txt_up.text;
+            console.log('zh:ua font' + this.ui.txt_ua.font);
             if (ua && up) {
                 let reqData = JSON.stringify({
                     username: ua.trim(),

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/gameBinder.ts

@@ -5,7 +5,6 @@ import ui_Component92 from "./ui_Component92";
 import ui_Component129 from "./ui_Component129";
 import ui_Component130 from "./ui_Component130";
 import ui_powerEft from "./ui_powerEft";
-import ui_Component1305_logo from "./ui_Component1305_logo";
 import ui_UILevelDisplay from "./ui_UILevelDisplay";
 import ui_PutBallLevelDisplay from "./ui_PutBallLevelDisplay";
 import ui_Component79 from "./ui_Component79";
@@ -284,7 +283,6 @@ export default class gameBinder {
 		fgui.UIObjectFactory.setExtension(ui_Component129.URL, ui_Component129);
 		fgui.UIObjectFactory.setExtension(ui_Component130.URL, ui_Component130);
 		fgui.UIObjectFactory.setExtension(ui_powerEft.URL, ui_powerEft);
-		fgui.UIObjectFactory.setExtension(ui_Component1305_logo.URL, ui_Component1305_logo);
 		fgui.UIObjectFactory.setExtension(ui_UILevelDisplay.URL, ui_UILevelDisplay);
 		fgui.UIObjectFactory.setExtension(ui_PutBallLevelDisplay.URL, ui_PutBallLevelDisplay);
 		fgui.UIObjectFactory.setExtension(ui_Component79.URL, ui_Component79);

+ 0 - 29
client/laya/src/fgui/res/game/ui_Component1305_logo.ts

@@ -1,29 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-import ui_Component86 from "./ui_Component86";
-import ui_Button_reg from "./ui_Button_reg";
-import ui_Button_login from "./ui_Button_login";
-
-export default class ui_Component1305_logo extends fgui.GComponent {
-
-	public n7:fgui.GImage;
-	public closeBtn:ui_Component86;
-	public txt_ua:fgui.GTextInput;
-	public btn_gotoReg:ui_Button_reg;
-	public btn_login:ui_Button_login;
-	public txt_up:fgui.GTextInput;
-	public static URL:string = "ui://isxx5ak7a1zav5ao";
-
-	public static createInstance():ui_Component1305_logo {
-		return <ui_Component1305_logo>(fgui.UIPackage.createObject("game", "Component1305_logo"));
-	}
-
-	protected onConstruct():void {
-		this.n7 = <fgui.GImage>(this.getChild("n7"));
-		this.closeBtn = <ui_Component86>(this.getChild("closeBtn"));
-		this.txt_ua = <fgui.GTextInput>(this.getChild("txt_ua"));
-		this.btn_gotoReg = <ui_Button_reg>(this.getChild("btn_gotoReg"));
-		this.btn_login = <ui_Button_login>(this.getChild("btn_login"));
-		this.txt_up = <fgui.GTextInput>(this.getChild("txt_up"));
-	}
-}

+ 15 - 3
client/laya/src/fgui/res/game/ui_UILogin.ts

@@ -1,12 +1,19 @@
 /** This is an automatically generated class by FairyGUI. Please do not modify it. **/
 
-import ui_Component1305_logo from "./ui_Component1305_logo";
+import ui_Component86 from "./ui_Component86";
+import ui_Button_reg from "./ui_Button_reg";
+import ui_Button_login from "./ui_Button_login";
 
 export default class ui_UILogin extends fgui.GComponent {
 
 	public c1:fgui.Controller;
 	public n18:fgui.GGraph;
-	public n19:ui_Component1305_logo;
+	public n21:fgui.GImage;
+	public closeBtn:ui_Component86;
+	public txt_ua:fgui.GTextInput;
+	public btn_gotoReg:ui_Button_reg;
+	public btn_login:ui_Button_login;
+	public txt_up:fgui.GTextInput;
 	public static URL:string = "ui://isxx5ak7bobav57u";
 
 	public static createInstance():ui_UILogin {
@@ -16,6 +23,11 @@ export default class ui_UILogin extends fgui.GComponent {
 	protected onConstruct():void {
 		this.c1 = this.getController("c1");
 		this.n18 = <fgui.GGraph>(this.getChild("n18"));
-		this.n19 = <ui_Component1305_logo>(this.getChild("n19"));
+		this.n21 = <fgui.GImage>(this.getChild("n21"));
+		this.closeBtn = <ui_Component86>(this.getChild("closeBtn"));
+		this.txt_ua = <fgui.GTextInput>(this.getChild("txt_ua"));
+		this.btn_gotoReg = <ui_Button_reg>(this.getChild("btn_gotoReg"));
+		this.btn_login = <ui_Button_login>(this.getChild("btn_login"));
+		this.txt_up = <fgui.GTextInput>(this.getChild("txt_up"));
 	}
 }

+ 8 - 8
client/laya/src/ui/UILogin.ts

@@ -23,8 +23,8 @@ export default class UILogin extends UIBase {
     private onFontLoaded(): void {
         try {
             Laya.Text.defaultFont = this.fontStr;//仅这样设置无效
-            this.ui.n19.txt_ua.font = this.fontStr;
-            this.ui.n19.txt_up.font = this.fontStr;
+            this.ui.txt_ua.font = this.fontStr;
+            this.ui.txt_up.font = this.fontStr;
             console.log("zh: onFontLoaded 设置" + this.fontStr + "字体成功");
         } catch (error) {
             console.log("zh: constructor onFontLoaded加载" + this.fontStr + "字体失败");
@@ -34,9 +34,9 @@ export default class UILogin extends UIBase {
         this.ui = ui_UILogin.createInstance();
         this.contentPane = this.ui;
         this.isEject = false;
-        this.addUIClick(this.ui.n19.closeBtn, this.closeSelf);
-        this.addUIClick(this.ui.n19.btn_gotoReg, this.gotoRegPage);
-        this.addUIClick(this.ui.n19.btn_login, this.userLogin);
+        this.addUIClick(this.ui.closeBtn, this.closeSelf);
+        this.addUIClick(this.ui.btn_gotoReg, this.gotoRegPage);
+        this.addUIClick(this.ui.btn_login, this.userLogin);
 
 
     }
@@ -53,11 +53,11 @@ export default class UILogin extends UIBase {
     }
     userLogin() {
 
-        let ua = this.ui.n19.txt_ua.text;
-        let up = this.ui.n19.txt_up.text;
+        let ua = this.ui.txt_ua.text;
+        let up = this.ui.txt_up.text;
 
 
-        console.log('zh:ua font' + this.ui.n19.txt_ua.font);
+        console.log('zh:ua font' + this.ui.txt_ua.font);
         if (ua && up) {
             // xGame.uiMgr.Show(UIMsg, "Request in progress..")
             let reqData = JSON.stringify({

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