1

art/fgui/.objs/metas/isxx5ak7/uqohv4lr.info

@@ -0,0 +1 @@
+{}

art/fgui/assets/game/UISecretary/UIShop/component/Component58_11.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="616,637" designImageLayer="1">
-  <controller name="c1" alias="qiuGan" pages="0,球杆,1,道具" selected="0"/>
+  <controller name="c1" alias="qiuGan" pages="0,球杆,1,道具" selected="1"/>
   <displayList>
     <image id="n23_qlo0" name="n23" src="qlo041k" fileName="UISkill/asset/qq_dtd.png" xy="0,0" size="616,637"/>
     <image id="n41_9d32" name="n41" src="qlo041j" fileName="UISkill/asset/qq_dtd2.png" xy="560,0" size="56,636" alpha="0.4">
@@ -17,9 +17,14 @@
     </list>
     <component id="n45_lp3l" name="n_qiuGan" src="lp3lv4j2" fileName="UISecretary/UIShop/component/Component98_3.xml" xy="560,1" controller="c1,0"/>
     <component id="n44_s46i" name="n_daoju" src="s46iv4f0" fileName="UISecretary/UIShop/component/Component98_1.xml" xy="560,132" controller="c1,1"/>
-    <list id="n47_so7l" name="djList" xy="176,17" size="375,610" overflow="scroll">
+    <list id="n47_so7l" name="djList" xy="9,8" size="541,615" overflow="scroll" defaultItem="ui://isxx5ak7uel8v58m">
       <gearDisplay controller="c1" pages="1"/>
-      <item url="ui://isxx5ak7uel8v58m"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
     </list>
   </displayList>
   <transition name="t0" autoPlay="true">

art/fgui/assets/game/UISecretary/UIShop/component/daoJuDisplay.xml

@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="543,200" bgColorEnabled="true">
   <displayList>
-    <graph id="n1_uel8" name="n1" xy="6,5" size="530,188" type="rect" fillColor="#ff666666"/>
-    <text id="n0_uel8" name="n0" xy="26,15" size="60,42" fontSize="30" text="test "/>
+    <image id="n6_so7l" name="n6" src="so7lv594" fileName="UISecretary/UIShop/asset/daoju/gf_k1.png" xy="1,0" size="543,200"/>
+    <image id="n2_so7l" name="n2" src="so7lv590" fileName="UISecretary/UIShop/asset/daoju/钻石1.png" xy="6,39"/>
+    <image id="n3_so7l" name="n3" src="so7lv593" fileName="UISecretary/UIShop/asset/daoju/btn_byg.png" xy="286,92" group="n5_so7l"/>
+    <text id="n4_so7l" name="n4" xy="299,104" size="215,52" group="n5_so7l" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" text="Buy"/>
+    <group id="n5_so7l" name="btn_buy" xy="286,92" size="241,75"/>
+    <text id="n7_so7l" name="n_jiaGe" xy="377,46" size="63,42" fontSize="30" color="#ffff00" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="0.99"/>
+    <text id="n8_so7l" name="n_zuanShi" xy="164,85" size="58,42" fontSize="30" color="#ffffff" align="center" bold="true" strokeColor="#000000" text="X50"/>
+    <loader id="n9_so7l" name="eftZuanShi" xy="0,0" size="543,200"/>
   </displayList>
 </component>

art/fgui/assets/game/UIUser/UILogin.xml

@@ -3,20 +3,20 @@
   <controller name="c1" pages="" selected="-1"/>
   <displayList>
     <graph id="n18_p8p3" name="n18" xy="0,0" size="1334,750" alpha="0.6" type="rect" fillColor="#ff000000"/>
-    <image id="n7_nnz5" name="n7" src="hgftv582" fileName="UIUser/asset/bg.png" xy="234,84" size="866,615" alpha="0.63"/>
-    <text id="n5_nnz5" name="n5" xy="398,268" size="144,39" fontSize="28" color="#ffffff" align="center" bold="true" text="Account："/>
-    <text id="n6_nnz5" name="n6" xy="392,391" size="147,39" fontSize="28" color="#ffffff" align="center" bold="true" text="Password:"/>
-    <component id="n17_p8p3" name="closeBtn" src="xs1r483" fileName="UILevelProp/component/Component86.xml" xy="1036,97"/>
-    <component id="n37_so7l" name="btn_gotoReg" src="bobav57y" fileName="UIUser/component/Button_reg.xml" xy="695,561">
+    <image id="n7_nnz5" name="n7" src="hgftv582" fileName="UIUser/asset/bg.png" xy="234,67" size="866,615"/>
+    <text id="n5_nnz5" name="n5" xy="398,240" size="116,39" fontSize="28" color="#ffffff" align="center" bold="true" text="Account"/>
+    <text id="n6_nnz5" name="n6" xy="398,353" size="138,39" fontSize="28" color="#ffffff" align="center" bold="true" text="Password"/>
+    <component id="n17_p8p3" name="closeBtn" src="xs1r483" fileName="UILevelProp/component/Component86.xml" xy="1027,87"/>
+    <component id="n37_so7l" name="btn_gotoReg" src="bobav57y" fileName="UIUser/component/Button_reg.xml" xy="701,565">
       <Button titleColor="#000000"/>
     </component>
-    <component id="n3_nnz5" name="btn_login" src="nnz5v587" fileName="UIUser/component/Button_login.xml" xy="392,561"/>
-    <image id="n30_so7l" name="n30" src="so7lv58s" fileName="UIUser/asset/log in.png" xy="613,103"/>
-    <image id="n31_so7l" name="n31" src="so7lv58r" fileName="UIUser/asset/输入框.png" xy="628,386" group="n38_so7l"/>
-    <text id="n36_so7l" name="txt_up" xy="632,395" size="300,42" group="n38_so7l" blend="screen" fontSize="30" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="height" bold="true" text="" input="true" maxLength="20"/>
-    <group id="n38_so7l" name="n38" xy="628,386" size="309,59"/>
-    <image id="n32_so7l" name="n32" src="so7lv58r" fileName="UIUser/asset/输入框.png" xy="631,268" group="n39_so7l"/>
-    <text id="n35_so7l" name="txt_ua" xy="635,276" size="300,44" group="n39_so7l" fontSize="30" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" text="" input="true" maxLength="20"/>
-    <group id="n39_so7l" name="n39" xy="631,268" size="309,59"/>
+    <component id="n3_nnz5" name="btn_login" src="nnz5v587" fileName="UIUser/component/Button_login.xml" xy="392,565"/>
+    <image id="n30_so7l" name="n30" src="so7lv58s" fileName="UIUser/asset/log in.png" xy="613,87"/>
+    <image id="n31_so7l" name="n31" src="so7lv58r" fileName="UIUser/asset/输入框.png" xy="635,344" group="n38_so7l"/>
+    <text id="n36_so7l" name="txt_up" xy="639,353" size="300,42" group="n38_so7l" blend="screen" fontSize="30" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="height" bold="true" text="" input="true" maxLength="20"/>
+    <group id="n38_so7l" name="n38" xy="635,344" size="309,59"/>
+    <image id="n32_so7l" name="n32" src="so7lv58r" fileName="UIUser/asset/输入框.png" xy="631,234" group="n39_so7l"/>
+    <text id="n35_so7l" name="txt_ua" xy="635,242" size="300,44" group="n39_so7l" fontSize="30" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" text="" input="true" maxLength="20"/>
+    <group id="n39_so7l" name="n39" xy="631,234" size="309,59"/>
   </displayList>
 </component>

art/fgui/assets/game/UIUser/UIReg.xml

@@ -2,11 +2,11 @@
 <component size="1334,750" designImageLayer="1">
   <displayList>
     <graph id="n38_d6k9" name="n38" xy="0,0" size="1334,750" alpha="0.6" type="rect" fillColor="#ff000000"/>
-    <image id="n9_hgft" name="n9" src="hgftv582" fileName="UIUser/asset/bg.png" xy="255,97" size="830,584"/>
-    <text id="n14_nnz5" name="n14" xy="362,232" size="220,42" fontSize="30" color="#cccccc" autoSize="none" bold="true" text="Account"/>
+    <image id="n9_hgft" name="n9" src="hgftv582" fileName="UIUser/asset/bg.png" xy="234,67" size="866,615"/>
+    <text id="n14_nnz5" name="n14" xy="362,232" size="220,42" fontSize="30" color="#ffffff" autoSize="none" bold="true" text="Account"/>
     <text id="n15_nnz5" name="n15" xy="360,347" size="220,42" fontSize="30" color="#ffffff" autoSize="none" bold="true" text="Password"/>
     <text id="n34_nnz5" name="n34" xy="360,443" size="272,42" fontSize="30" color="#ffffff" autoSize="none" bold="true" text="Confirm password"/>
-    <component id="n37_d6k9" name="closeBtn" src="xs1r483" fileName="UILevelProp/component/Component86.xml" xy="1022,110"/>
+    <component id="n37_d6k9" name="closeBtn" src="xs1r483" fileName="UILevelProp/component/Component86.xml" xy="1027,87"/>
     <text id="n35_nnz5" name="lab_tip" xy="335,507" size="663,42" visible="false" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="Registration successful！"/>
     <image id="n43_so7l" name="n43" src="so7lv58y" fileName="UIUser/asset/reg/输入框.png" xy="629,224" group="n46_so7l"/>
     <text id="n28_nnz5" name="txt_ua" xy="634,229" size="300,50" group="n46_so7l" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="" input="true"/>
@@ -19,6 +19,6 @@
     <group id="n48_so7l" name="n48" xy="633,432" size="309,59"/>
     <component id="n49_so7l" name="btn_gotoLogin" src="nnz5v587" fileName="UIUser/component/Button_login.xml" xy="701,565"/>
     <component id="n13_hgft" name="btn_reg" src="bobav57y" fileName="UIUser/component/Button_reg.xml" xy="362,565" size="241,75"/>
-    <image id="n50_so7l" name="n50" src="so7lv58u" fileName="UIUser/asset/reg/sign up.png" xy="599,116"/>
+    <image id="n50_so7l" name="n50" src="so7lv58u" fileName="UIUser/asset/reg/sign up.png" xy="599,87"/>
   </displayList>
 </component>

art/fgui/assets/game/package.xml

@@ -1322,6 +1322,12 @@
     <image id="so7lv58w" name="ty_an2.png" path="/UIUser/asset/reg/"/>
     <image id="so7lv58x" name="底.png" path="/UIUser/asset/reg/"/>
     <image id="so7lv58y" name="输入框.png" path="/UIUser/asset/reg/"/>
+    <image id="so7lv58z" name="DIAMOND.png" path="/UISecretary/UIShop/asset/daoju/"/>
+    <image id="so7lv590" name="钻石1.png" path="/UISecretary/UIShop/asset/daoju/"/>
+    <image id="so7lv591" name="钻石2.png" path="/UISecretary/UIShop/asset/daoju/"/>
+    <image id="so7lv592" name="钻石3.png" path="/UISecretary/UIShop/asset/daoju/"/>
+    <image id="so7lv593" name="btn_byg.png" path="/UISecretary/UIShop/asset/daoju/"/>
+    <image id="so7lv594" name="gf_k1.png" path="/UISecretary/UIShop/asset/daoju/" scale="9grid" scale9grid="115,38,3,16"/>
   </resources>
   <publish name="game" path="..\..\client\laya\bin\asset\fgui" packageCount="2" genCode="true" codePath="..\..\client\laya\src\fgui\res"/>
 </packageDescription>

client/laya/bin/js/bundle.js

@@ -6573,7 +6573,6 @@
             this.n15 = (this.getChild("n15"));
             this.n34 = (this.getChild("n34"));
             this.closeBtn = (this.getChild("closeBtn"));
-            this.n39 = (this.getChild("n39"));
             this.lab_tip = (this.getChild("lab_tip"));
             this.n43 = (this.getChild("n43"));
             this.txt_ua = (this.getChild("txt_ua"));
@@ -6583,6 +6582,7 @@
             this.txt_up2 = (this.getChild("txt_up2"));
             this.btn_gotoLogin = (this.getChild("btn_gotoLogin"));
             this.btn_reg = (this.getChild("btn_reg"));
+            this.n50 = (this.getChild("n50"));
         }
     }
     ui_UIReg.URL = "ui://isxx5ak7bobav57v";
@@ -6633,7 +6633,6 @@
             let ua = this.ui.txt_ua.text;
             let up = this.ui.txt_up.text;
             if (ua && up) {
-                xGame.uiMgr.Show(UIMsg, "Request in progress..");
                 let reqData = JSON.stringify({
                     username: ua.trim(),
                     password: up.trim(),
@@ -6644,7 +6643,6 @@
                         console.log('zh:res = ' + JSON.stringify(res));
                         let code = res.code;
                         let msg = res.msg;
-                        xGame.uiMgr.Show(UIMsg, msg);
                         if (code == 200) {
                             let keyStr = 'userInfo';
                             let jsonStr = {
@@ -6652,8 +6650,11 @@
                                 "token": res.token
                             };
                             LocalStorageManager.setItem(keyStr, jsonStr);
+                            xGame.uiMgr.Show(UIMsg, msg);
+                            this.closeSelf();
                         }
                         else {
+                            xGame.uiMgr.Show(UIMsg, msg);
                         }
                     }
                     catch (error) {
@@ -6701,7 +6702,6 @@
             let up1 = this.ui.txt_up1.text;
             let up2 = this.ui.txt_up2.text;
             if (ua && up1 && up2 && up1 == up2) {
-                xGame.uiMgr.Show(UIMsg, "Request in progress..");
                 let reqData = JSON.stringify({
                     username: ua.trim(),
                     password: up1.trim(),
@@ -6709,17 +6709,18 @@
                 });
                 xGame.httpMgr.sendPost2025('registerForApp', reqData, (res) => {
                     try {
-                        this.ui.lab_tip.visible = true;
                         console.log('zh:res = ' + JSON.stringify(res));
                         let code = res.code;
                         let msg = res.msg;
-                        this.ui.lab_tip.text = msg;
                         xGame.uiMgr.Show(UIMsg, msg);
                         if (code == 200) {
                             this.ui.lab_tip.color = "#FFFFFF";
+                            xGame.uiMgr.Show(UIMsg, msg);
+                            this.closeSelf();
                         }
                         else {
                             this.ui.lab_tip.color = "#FF0000";
+                            xGame.uiMgr.Show(UIMsg, msg);
                         }
                     }
                     catch (error) {
@@ -15123,8 +15124,13 @@
             return (fgui.UIPackage.createObject("game", "daoJuDisplay"));
         }
         onConstruct() {
-            this.n1 = (this.getChild("n1"));
-            this.n0 = (this.getChild("n0"));
+            this.n6 = (this.getChild("n6"));
+            this.n2 = (this.getChild("n2"));
+            this.n3 = (this.getChild("n3"));
+            this.n4 = (this.getChild("n4"));
+            this.n_jiaGe = (this.getChild("n_jiaGe"));
+            this.n_zuanShi = (this.getChild("n_zuanShi"));
+            this.eftZuanShi = (this.getChild("eftZuanShi"));
         }
     }
     ui_daoJuDisplay.URL = "ui://isxx5ak7uel8v58m";
@@ -22580,7 +22586,6 @@
             let ua = this.ui.txt_ua.text;
             let up = this.ui.txt_up.text;
             if (ua && up) {
-                xGame.uiMgr.Show(UIMsg$1, "Request in progress..");
                 let reqData = JSON.stringify({
                     username: ua.trim(),
                     password: up.trim(),
@@ -22591,7 +22596,6 @@
                         console.log('zh:res = ' + JSON.stringify(res));
                         let code = res.code;
                         let msg = res.msg;
-                        xGame.uiMgr.Show(UIMsg$1, msg);
                         if (code == 200) {
                             let keyStr = 'userInfo';
                             let jsonStr = {
@@ -22599,8 +22603,11 @@
                                 "token": res.token
                             };
                             LocalStorageManager.setItem(keyStr, jsonStr);
+                            xGame.uiMgr.Show(UIMsg$1, msg);
+                            this.closeSelf();
                         }
                         else {
+                            xGame.uiMgr.Show(UIMsg$1, msg);
                         }
                     }
                     catch (error) {
@@ -22648,7 +22655,6 @@
             let up1 = this.ui.txt_up1.text;
             let up2 = this.ui.txt_up2.text;
             if (ua && up1 && up2 && up1 == up2) {
-                xGame.uiMgr.Show(UIMsg$1, "Request in progress..");
                 let reqData = JSON.stringify({
                     username: ua.trim(),
                     password: up1.trim(),
@@ -22656,17 +22662,18 @@
                 });
                 xGame.httpMgr.sendPost2025('registerForApp', reqData, (res) => {
                     try {
-                        this.ui.lab_tip.visible = true;
                         console.log('zh:res = ' + JSON.stringify(res));
                         let code = res.code;
                         let msg = res.msg;
-                        this.ui.lab_tip.text = msg;
                         xGame.uiMgr.Show(UIMsg$1, msg);
                         if (code == 200) {
                             this.ui.lab_tip.color = "#FFFFFF";
+                            xGame.uiMgr.Show(UIMsg$1, msg);
+                            this.closeSelf();
                         }
                         else {
                             this.ui.lab_tip.color = "#FF0000";
+                            xGame.uiMgr.Show(UIMsg$1, msg);
                         }
                     }
                     catch (error) {

client/laya/src/fgui/res/game/ui_daoJuDisplay.ts

@@ -2,8 +2,13 @@
 
 export default class ui_daoJuDisplay extends fgui.GComponent {
 
-	public n1:fgui.GGraph;
-	public n0:fgui.GTextField;
+	public n6:fgui.GImage;
+	public n2:fgui.GImage;
+	public n3:fgui.GImage;
+	public n4:fgui.GTextField;
+	public n_jiaGe:fgui.GTextField;
+	public n_zuanShi:fgui.GTextField;
+	public eftZuanShi:fgui.GLoader;
 	public static URL:string = "ui://isxx5ak7uel8v58m";
 
 	public static createInstance():ui_daoJuDisplay {
@@ -11,7 +16,12 @@ export default class ui_daoJuDisplay extends fgui.GComponent {
 	}
 
 	protected onConstruct():void {
-		this.n1 = <fgui.GGraph>(this.getChild("n1"));
-		this.n0 = <fgui.GTextField>(this.getChild("n0"));
+		this.n6 = <fgui.GImage>(this.getChild("n6"));
+		this.n2 = <fgui.GImage>(this.getChild("n2"));
+		this.n3 = <fgui.GImage>(this.getChild("n3"));
+		this.n4 = <fgui.GTextField>(this.getChild("n4"));
+		this.n_jiaGe = <fgui.GTextField>(this.getChild("n_jiaGe"));
+		this.n_zuanShi = <fgui.GTextField>(this.getChild("n_zuanShi"));
+		this.eftZuanShi = <fgui.GLoader>(this.getChild("eftZuanShi"));
 	}
 }

client/laya/src/ui/UILogin.ts

@@ -37,12 +37,12 @@ export default class UILogin extends UIBase {
         this.hide();
     }
     userLogin() {
-       
+
         let ua = this.ui.txt_ua.text;
         let up = this.ui.txt_up.text;
         // console.log('ua'+ua);
         if (ua && up) {
-            xGame.uiMgr.Show(UIMsg, "Request in progress..")
+           // xGame.uiMgr.Show(UIMsg, "Request in progress..")
             let reqData = JSON.stringify({
                 username: ua.trim(),
                 password: up.trim(),
@@ -50,12 +50,10 @@ export default class UILogin extends UIBase {
             });
             xGame.httpMgr.sendPost2025('loginForApp', reqData, (res) => {
                 try {
-                   
+                    
                     console.log('zh:res = ' + JSON.stringify(res))
                     let code = res.code;
                     let msg = res.msg;
-                   
-                    xGame.uiMgr.Show(UIMsg, msg);
                     if (code == 200) {
                         //console.log('zh:登录成功')
                         let keyStr = 'userInfo';
@@ -64,9 +62,10 @@ export default class UILogin extends UIBase {
                             "token": res.token
                         }
                         LocalStorageManager.setItem(keyStr, jsonStr);
-                       
+                        xGame.uiMgr.Show(UIMsg, msg)
+                        this.closeSelf();
                     } else {
-                       
+                        xGame.uiMgr.Show(UIMsg, msg);
                     }
                 } catch (error) {
                     console.log('error=' + error);

client/laya/src/ui/UIReg.ts

@@ -35,11 +35,7 @@ export default class UIReg extends UIBase {
         let ua = this.ui.txt_ua.text;
         let up1 = this.ui.txt_up1.text;
         let up2 = this.ui.txt_up2.text;
-        // console.log('ua'+ua);
         if (ua && up1 && up2 && up1 == up2) {
-           // this.ui.closeBtn.visible = false;
-            xGame.uiMgr.Show(UIMsg, "Request in progress..")
-
             let reqData = JSON.stringify({
                 username: ua.trim(),
                 password: up1.trim(),
@@ -47,16 +43,19 @@ export default class UIReg extends UIBase {
             });
             xGame.httpMgr.sendPost2025('registerForApp', reqData, (res) => {
                 try {
-                    this.ui.lab_tip.visible = true;
                     console.log('zh:res = ' + JSON.stringify(res))
                     let code = res.code;
                     let msg = res.msg;
-                    this.ui.lab_tip.text = msg;
+                   // this.ui.lab_tip.text = msg;
                     xGame.uiMgr.Show(UIMsg, msg);
                     if (code == 200) {
                         this.ui.lab_tip.color = "#FFFFFF";
+                        xGame.uiMgr.Show(UIMsg, msg)
+                        this.closeSelf();
                     } else {
+                       // this.ui.lab_tip.visible = true;
                         this.ui.lab_tip.color = "#FF0000";
+                        xGame.uiMgr.Show(UIMsg, msg)
                     }
                 } catch (error) {
                     console.log('error=' + error);