瀏覽代碼

換圖片

dzduole 1 天之前
父節點
當前提交
c12c9401e7
共有 56 個文件被更改,包括 275 次插入175 次删除
  1. 6 1
      art/fgui/.objs/fonts.json
  2. 1 1
      art/fgui/.objs/metas/isxx5ak7/bobav57u.info
  3. 1 13
      art/fgui/.objs/metas/isxx5ak7/bobav57v.info
  4. 9 9
      art/fgui/.objs/workspace.json
  5. 2 2
      art/fgui/assets/game/UILevelProp/component/Component86.xml
  6. 0 0
      art/fgui/assets/game/UISecretary/UIShop/asset/component/BallRodDisplay.xml
  7. 0 0
      art/fgui/assets/game/UISecretary/UIShop/asset/component/Component101.xml
  8. 0 0
      art/fgui/assets/game/UISecretary/UIShop/asset/component/Component26.xml
  9. 0 0
      art/fgui/assets/game/UISecretary/UIShop/asset/component/Component28_1.xml
  10. 0 0
      art/fgui/assets/game/UISecretary/UIShop/asset/component/Component28_11.xml
  11. 0 0
      art/fgui/assets/game/UISecretary/UIShop/asset/component/Component57.xml
  12. 0 0
      art/fgui/assets/game/UISecretary/UIShop/asset/component/Component58_1.xml
  13. 0 0
      art/fgui/assets/game/UISecretary/UIShop/asset/component/Component58_11.xml
  14. 0 0
      art/fgui/assets/game/UISecretary/UIShop/asset/component/Component64.xml
  15. 0 0
      art/fgui/assets/game/UISecretary/UIShop/asset/component/Component98_1.xml
  16. 0 0
      art/fgui/assets/game/UISecretary/UIShop/asset/component/Component98_2.xml
  17. 0 0
      art/fgui/assets/game/UISecretary/UIShop/asset/component/Component98_3.xml
  18. 0 0
      art/fgui/assets/game/UISecretary/UIShop/asset/component/btn_buy.xml
  19. 0 0
      art/fgui/assets/game/UISecretary/UIShop/asset/component/daoJuDisplay.xml
  20. 16 0
      art/fgui/assets/game/UIUser/Component1305_logo.xml
  21. 5 17
      art/fgui/assets/game/UIUser/UILogin.xml
  22. 9 18
      art/fgui/assets/game/UIUser/UIReg.xml
  23. 二進制
      art/fgui/assets/game/UIUser/asset/Login.png
  24. 二進制
      art/fgui/assets/game/UIUser/asset/Signup.png
  25. 二進制
      art/fgui/assets/game/UIUser/asset/bg.png
  26. 二進制
      art/fgui/assets/game/UIUser/asset/logo_bj.png
  27. 二進制
      art/fgui/assets/game/UIUser/asset/pqms_gb.png
  28. 二進制
      art/fgui/assets/game/UIUser/asset/reg_bj1.png
  29. 二進制
      art/fgui/assets/game/UIUser/asset/ty_an1.png
  30. 二進制
      art/fgui/assets/game/UIUser/asset/ty_an2.png
  31. 2 3
      art/fgui/assets/game/UIUser/component/Button_login.xml
  32. 1 2
      art/fgui/assets/game/UIUser/component/Button_reg.xml
  33. 二進制
      art/fgui/assets/game/font/25829
  34. 二進制
      art/fgui/assets/game/font/big-john-woff2-2.ttf
  35. 二進制
      art/fgui/assets/game/n19.png
  36. 22 15
      art/fgui/assets/game/package.xml
  37. 二進制
      client/laya/bin/asset/fgui/game.obj
  38. 二進制
      client/laya/bin/asset/fgui/game_atlas0.png
  39. 二進制
      client/laya/bin/asset/fgui/game_atlas0_1.png
  40. 二進制
      client/laya/bin/asset/fgui/game_atlas0_2.png
  41. 二進制
      client/laya/bin/asset/fgui/game_atlas0_3.png
  42. 二進制
      client/laya/bin/asset/fgui/game_atlas0_4.png
  43. 二進制
      client/laya/bin/asset/fgui/game_atlas0_5.png
  44. 二進制
      client/laya/bin/font/BIG JOHN.otf
  45. 二進制
      client/laya/bin/font/big-john-woff2-2.ttf
  46. 114 35
      client/laya/bin/js/bundle.js
  47. 0 0
      client/laya/bin/js/bundle.js.map
  48. 2 0
      client/laya/src/fgui/res/game/gameBinder.ts
  49. 0 2
      client/laya/src/fgui/res/game/ui_Button_login.ts
  50. 0 2
      client/laya/src/fgui/res/game/ui_Button_reg.ts
  51. 29 0
      client/laya/src/fgui/res/game/ui_Component1305_logo.ts
  52. 3 25
      client/laya/src/fgui/res/game/ui_UILogin.ts
  53. 2 16
      client/laya/src/fgui/res/game/ui_UIReg.ts
  54. 1 1
      client/laya/src/ui/UIFuli1.ts
  55. 28 8
      client/laya/src/ui/UILogin.ts
  56. 22 5
      client/laya/src/ui/UIReg.ts

+ 6 - 1
art/fgui/.objs/fonts.json

@@ -1,4 +1,9 @@
-ui://isxx5ak7d33kv57a
 ui://isxx5ak7m0q7v4ic
 ui://isxx5ak7p4tr42d
+ui://isxx5ak7wss0v5a7
+ui://isxx5ak7wss0v5a8
+ui://isxx5ak7wss0v5a9
+ui://isxx5ak7wss0v5aa
+ui://isxx5ak7wss0v5ab
+ui://isxx5ak7veupv5aq
 ui://37nctnhw83s7v4eo

+ 1 - 1
art/fgui/.objs/metas/isxx5ak7/bobav57u.info

@@ -1,3 +1,3 @@
 {
-  "adaptiveTest": true
+  "fitScreen": "FitHeightAndSetCenter"
 }

+ 1 - 13
art/fgui/.objs/metas/isxx5ak7/bobav57v.info

@@ -1,13 +1 @@
-{
-  "objectStatus": {
-    "n47_so7l": {
-      "collapsed": true
-    },
-    "n46_so7l": {
-      "collapsed": true
-    },
-    "n48_so7l": {
-      "collapsed": true
-    }
-  }
-}
+{}

+ 9 - 9
art/fgui/.objs/workspace.json

@@ -8,24 +8,24 @@
   ],
   "libview.iconScale": 0,
   "doc.openedDocs": [
-    "ui://isxx5ak7im8nv59g"
+    "ui://isxx5ak7bobav57u",
+    "ui://isxx5ak7a1zav5ao",
+    "ui://isxx5ak7bobav57v"
   ],
-  "test.device": "Huawei Mate20 Pro",
+  "test.device": "iPhone 8 Plus",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://isxx5ak7im8nv59g",
+  "doc.activeDoc": "ui://isxx5ak7a1zav5ao",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "isxx5ak7",
     "/",
     "isxx5ak7",
-    "/UISecretary/",
+    "/UIUser/",
     "isxx5ak7",
-    "/UISecretary/UIFuli/",
-    "isxx5ak7",
-    "/UISecretary/UIFuli/asset/",
-    "isxx5ak7",
-    "/UISecretary/UIFuli/component/"
+    "/font/",
+    "37nctnhw",
+    "/"
   ],
   "auxline1": true,
   "snapToGrid": true,

+ 2 - 2
art/fgui/assets/game/UILevelProp/component/Component86.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="50,50" pivot="0.5,0.5" extention="Button">
+<component size="56,55" pivot="0.5,0.5" extention="Button">
   <displayList>
-    <image id="n15_xs1r" name="n15" src="s46iv4f2" fileName="UILevelProp/asset/pqms_gb.png" xy="8,11" pivot="0.5,0.5"/>
+    <image id="n15_xs1r" name="n15" src="s46iv4f2" fileName="UILevelProp/asset/pqms_gb.png" xy="0,0" pivot="0.5,0.5" size="56,55"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.06"/>
   <transition name="t0" autoPlay="true">

+ 0 - 0
art/fgui/assets/game/UISecretary/UIShop/component/BallRodDisplay.xml → art/fgui/assets/game/UISecretary/UIShop/asset/component/BallRodDisplay.xml


+ 0 - 0
art/fgui/assets/game/UISecretary/UIShop/component/Component101.xml → art/fgui/assets/game/UISecretary/UIShop/asset/component/Component101.xml


+ 0 - 0
art/fgui/assets/game/UISecretary/UIShop/component/Component26.xml → art/fgui/assets/game/UISecretary/UIShop/asset/component/Component26.xml


+ 0 - 0
art/fgui/assets/game/UISecretary/UIShop/component/Component28_1.xml → art/fgui/assets/game/UISecretary/UIShop/asset/component/Component28_1.xml


+ 0 - 0
art/fgui/assets/game/UISecretary/UIShop/component/Component28_11.xml → art/fgui/assets/game/UISecretary/UIShop/asset/component/Component28_11.xml


+ 0 - 0
art/fgui/assets/game/UISecretary/UIShop/component/Component57.xml → art/fgui/assets/game/UISecretary/UIShop/asset/component/Component57.xml


+ 0 - 0
art/fgui/assets/game/UISecretary/UIShop/component/Component58_1.xml → art/fgui/assets/game/UISecretary/UIShop/asset/component/Component58_1.xml


+ 0 - 0
art/fgui/assets/game/UISecretary/UIShop/component/Component58_11.xml → art/fgui/assets/game/UISecretary/UIShop/asset/component/Component58_11.xml


+ 0 - 0
art/fgui/assets/game/UISecretary/UIShop/component/Component64.xml → art/fgui/assets/game/UISecretary/UIShop/asset/component/Component64.xml


+ 0 - 0
art/fgui/assets/game/UISecretary/UIShop/component/Component98_1.xml → art/fgui/assets/game/UISecretary/UIShop/asset/component/Component98_1.xml


+ 0 - 0
art/fgui/assets/game/UISecretary/UIShop/component/Component98_2.xml → art/fgui/assets/game/UISecretary/UIShop/asset/component/Component98_2.xml


+ 0 - 0
art/fgui/assets/game/UISecretary/UIShop/component/Component98_3.xml → art/fgui/assets/game/UISecretary/UIShop/asset/component/Component98_3.xml


+ 0 - 0
art/fgui/assets/game/UISecretary/UIShop/component/btn_buy.xml → art/fgui/assets/game/UISecretary/UIShop/asset/component/btn_buy.xml


+ 0 - 0
art/fgui/assets/game/UISecretary/UIShop/component/daoJuDisplay.xml → art/fgui/assets/game/UISecretary/UIShop/asset/component/daoJuDisplay.xml


+ 16 - 0
art/fgui/assets/game/UIUser/Component1305_logo.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="945,582">
+  <displayList>
+    <image id="n7_nnz5" name="n7" src="hgftv582" fileName="UIUser/asset/bg.png" xy="0,0" size="945,582" group="n41_a1za">
+      <relation target="" sidePair=""/>
+    </image>
+    <component id="n17_p8p3" name="closeBtn" src="xs1r483" fileName="UILevelProp/component/Component86.xml" xy="926,25" size="56,55" group="n41_a1za"/>
+    <text id="n35_so7l" name="txt_ua" xy="412,189" size="301,66" group="n41_a1za" font="ui://isxx5ak7veupv5aq" fontSize="40" color="#3e3e3e" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" autoClearText="true" text="123abcABC" input="true" maxLength="20"/>
+    <component id="n37_so7l" name="btn_gotoReg" src="bobav57y" fileName="UIUser/component/Button_reg.xml" xy="474,448" size="321,82" group="n41_a1za">
+      <Button titleColor="#000000"/>
+    </component>
+    <component id="n3_nnz5" name="btn_login" src="nnz5v587" fileName="UIUser/component/Button_login.xml" xy="132,448" size="321,82" group="n41_a1za"/>
+    <text id="n42_wnhg" name="txt_up" xy="411,294" size="300,54" group="n41_a1za" font="ui://isxx5ak7veupv5aq" fontSize="40" color="#3e3e3e" align="center" vAlign="middle" autoSize="none" bold="true" autoClearText="true" text="123abcABC" input="true"/>
+    <group id="n41_a1za" name="n41" xy="0,0" size="982,582"/>
+  </displayList>
+</component>

+ 5 - 17
art/fgui/assets/game/UIUser/UILogin.xml

@@ -1,22 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1700,750" designImageLayer="1" bgColor="#006699">
+<component size="1700,750" designImageLayer="1">
   <controller name="c1" pages="" selected="-1"/>
   <displayList>
-    <graph id="n18_p8p3" name="n18" xy="0,0" size="1700,750" alpha="0.6" type="rect" fillColor="#ff000000"/>
-    <image id="n7_nnz5" name="n7" src="hgftv582" fileName="UIUser/asset/bg.png" xy="417,67" size="866,615"/>
-    <text id="n5_nnz5" name="n5" xy="531,240" size="171,39" fontSize="28" color="#ffffff" align="right" autoSize="none" bold="true" text="Account"/>
-    <text id="n6_nnz5" name="n6" xy="517,353" size="185,39" fontSize="28" color="#ffffff" align="right" autoSize="none" bold="true" text="Password"/>
-    <component id="n17_p8p3" name="closeBtn" src="xs1r483" fileName="UILevelProp/component/Component86.xml" xy="1212,85"/>
-    <component id="n37_so7l" name="btn_gotoReg" src="bobav57y" fileName="UIUser/component/Button_reg.xml" xy="895,565">
-      <Button titleColor="#000000"/>
-    </component>
-    <component id="n3_nnz5" name="btn_login" src="nnz5v587" fileName="UIUser/component/Button_login.xml" xy="586,565"/>
-    <image id="n31_so7l" name="n31" src="so7lv58r" fileName="UIUser/asset/输入框.png" xy="823,344" group="n38_so7l"/>
-    <text id="n36_so7l" name="txt_up" xy="827,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="823,344" size="309,59"/>
-    <image id="n32_so7l" name="n32" src="so7lv58r" fileName="UIUser/asset/输入框.png" xy="819,234" group="n39_so7l"/>
-    <text id="n35_so7l" name="txt_ua" xy="823,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="819,234" size="309,59"/>
-    <image id="n40_wss0" name="n40" src="wss0v5a1" fileName="UIUser/asset/denglu1.png" xy="787,88"/>
+    <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"/>
   </displayList>
 </component>

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

@@ -2,23 +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="n9_hgft" name="n9" src="hgftv582" fileName="UIUser/asset/bg.png" xy="417,67" size="866,615"/>
-    <text id="n14_nnz5" name="n14" xy="575,232" size="220,42" fontSize="30" color="#ffffff" align="right" autoSize="none" bold="true" text="Account"/>
-    <text id="n15_nnz5" name="n15" xy="575,347" size="220,42" fontSize="30" color="#ffffff" align="right" autoSize="none" bold="true" text="Password"/>
-    <text id="n34_nnz5" name="n34" xy="479,443" size="316,42" fontSize="30" color="#ffffff" align="right" autoSize="none" bold="true" text="Confirm password"/>
-    <component id="n37_d6k9" name="closeBtn" src="xs1r483" fileName="UILevelProp/component/Component86.xml" xy="1212,85"/>
-    <text id="n35_nnz5" name="lab_tip" xy="518,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="841,224" group="n46_so7l"/>
-    <text id="n28_nnz5" name="txt_ua" xy="846,229" size="300,50" group="n46_so7l" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="" input="true"/>
-    <group id="n46_so7l" name="n46" xy="841,224" size="309,59"/>
-    <image id="n44_so7l" name="n44" src="so7lv58y" fileName="UIUser/asset/reg/输入框.png" xy="844,337" group="n47_so7l"/>
-    <text id="n30_nnz5" name="txt_up1" xy="849,342" size="300,50" group="n47_so7l" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="" input="true"/>
-    <group id="n47_so7l" name="n47" xy="844,337" size="309,59"/>
-    <image id="n45_so7l" name="n45" src="so7lv58y" fileName="UIUser/asset/reg/输入框.png" xy="845,432" group="n48_so7l"/>
-    <text id="n33_nnz5" name="txt_up2" xy="850,437" size="300,50" group="n48_so7l" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="" input="true"/>
-    <group id="n48_so7l" name="n48" xy="845,432" size="309,59"/>
-    <component id="n49_so7l" name="btn_gotoLogin" src="nnz5v587" fileName="UIUser/component/Button_login.xml" xy="913,565"/>
-    <component id="n13_hgft" name="btn_reg" src="bobav57y" fileName="UIUser/component/Button_reg.xml" xy="574,565" size="241,75"/>
-    <image id="n50_so7l" name="n50" src="so7lv58u" fileName="UIUser/asset/reg/sign up.png" xy="782,87"/>
+    <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"/>
   </displayList>
 </component>

二進制
art/fgui/assets/game/UIUser/asset/Login.png


二進制
art/fgui/assets/game/UIUser/asset/Signup.png


二進制
art/fgui/assets/game/UIUser/asset/bg.png


二進制
art/fgui/assets/game/UIUser/asset/logo_bj.png


二進制
art/fgui/assets/game/UIUser/asset/pqms_gb.png


二進制
art/fgui/assets/game/UIUser/asset/reg_bj1.png


二進制
art/fgui/assets/game/UIUser/asset/ty_an1.png


二進制
art/fgui/assets/game/UIUser/asset/ty_an2.png


+ 2 - 3
art/fgui/assets/game/UIUser/component/Button_login.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="241,75" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+<component size="321,82" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="2"/>
   <displayList>
     <image id="n5_so7l" name="n5" src="so7lv58p" fileName="UIUser/asset/ty_an2.png" xy="0,0"/>
-    <text id="n3_nnz5" name="n3" xy="2,-1" size="241,75" fontSize="32" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="Sign in"/>
   </displayList>
   <Button/>
 </component>

+ 1 - 2
art/fgui/assets/game/UIUser/component/Button_reg.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="241,75" extention="Button" bgColor="#660099">
+<component size="321,82" extention="Button" bgColor="#660099">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <image id="n6_so7l" name="n6" src="so7lv58o" fileName="UIUser/asset/ty_an1.png" xy="0,0"/>
-    <text id="n4_hgft" name="n4" xy="0,0" size="241,75" font="Arial" fontSize="32" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="Sign up"/>
   </displayList>
   <Button/>
 </component>

二進制
art/fgui/assets/game/font/25829


二進制
art/fgui/assets/game/font/big-john-woff2-2.ttf


二進制
art/fgui/assets/game/n19.png


+ 22 - 15
art/fgui/assets/game/package.xml

@@ -559,11 +559,11 @@
     <component id="g1giv4ea" name="Component96.xml" path="/UIGameEnd/component/"/>
     <component id="g1giv4eb" name="Component97.xml" path="/UIGameEnd/component/"/>
     <component id="g1giv4ed" name="Component98.xml" path="/UISkill/component/"/>
-    <component id="g1giv4ef" name="Component26.xml" path="/UISecretary/UIShop/component/"/>
-    <component id="g1giv4eh" name="Component28_11.xml" path="/UISecretary/UIShop/component/" favorite="true"/>
-    <component id="g1giv4ek" name="Component57.xml" path="/UISecretary/UIShop/component/"/>
-    <component id="g1giv4el" name="Component58_11.xml" path="/UISecretary/UIShop/component/" exported="true"/>
-    <component id="g1giv4em" name="Component64.xml" path="/UISecretary/UIShop/component/"/>
+    <component id="g1giv4ef" name="Component26.xml" path="/UISecretary/UIShop/asset/component/"/>
+    <component id="g1giv4eh" name="Component28_11.xml" path="/UISecretary/UIShop/asset/component/" favorite="true"/>
+    <component id="g1giv4ek" name="Component57.xml" path="/UISecretary/UIShop/asset/component/"/>
+    <component id="g1giv4el" name="Component58_11.xml" path="/UISecretary/UIShop/asset/component/" exported="true"/>
+    <component id="g1giv4em" name="Component64.xml" path="/UISecretary/UIShop/asset/component/"/>
     <component id="g1giv4ep" name="UIShop.xml" path="/UISecretary/UIShop/" exported="true"/>
     <image id="g1giv4eq" name="qg_bq2.png" path="/UISecretary/UIShop/asset/"/>
     <image id="g1giv4es" name="qg_bq1.png" path="/UISecretary/UIShop/asset/"/>
@@ -571,8 +571,8 @@
     <image id="g1giv4ev" name="yxz_dhk1.png" path="/UIGame/asset/"/>
     <image id="g1giv4ew" name="yxz_dhk2.png" path="/UIGame/asset/" scale="9grid" scale9grid="12,13,24,26"/>
     <component id="g1giv4ex" name="Component100.xml" path="/UIGame/component/"/>
-    <component id="g1giv4ey" name="Component101.xml" path="/UISecretary/UIShop/component/"/>
-    <component id="s46iv4f0" name="Component98_1.xml" path="/UISecretary/UIShop/component/"/>
+    <component id="g1giv4ey" name="Component101.xml" path="/UISecretary/UIShop/asset/component/"/>
+    <component id="s46iv4f0" name="Component98_1.xml" path="/UISecretary/UIShop/asset/component/"/>
     <component id="s46iv4f1" name="UISecretary.xml" path="/UISecretary/" exported="true"/>
     <image id="s46iv4f2" name="pqms_gb.png" path="/UILevelProp/asset/"/>
     <image id="s46iv4f3" name="pqms_rwbg.png" path="/UISecretary/asset/" scale="9grid" scale9grid="0,0,10,368"/>
@@ -693,7 +693,7 @@
     <image id="m0q7v4iy" name="xsyd_guangquan.png" path="/UISecretary/UIShop/asset/"/>
     <image id="m0q7v4j0" name="qq_dtd2.png" path="/UISkill/"/>
     <image id="m0q7v4j1" name="杆法模式.png" path="/UISkill/"/>
-    <component id="lp3lv4j2" name="Component98_3.xml" path="/UISecretary/UIShop/component/"/>
+    <component id="lp3lv4j2" name="Component98_3.xml" path="/UISecretary/UIShop/asset/component/"/>
     <image id="i7rdv4j8" name="icon_100.png" path="/UIWordsList/UIVideoShare/asset/"/>
     <image id="i7rdv4j9" name="icon_101.png" path="/UIWordsList/UIVideoShare/asset/"/>
     <component id="i7rdv4ja" name="Component123.xml" path="/UIWordsList/UIVideoShare/component/"/>
@@ -763,10 +763,10 @@
     <component id="uqohv4lo" name="SecretaryDisplay.xml" path="/UISecretary/" exported="true"/>
     <image id="uqohv4lp" name="xiaoning.png" path="/UISecretary/asset/" exported="true"/>
     <image id="uqohv4lq" name="xiaoting.png" path="/UISecretary/asset/" exported="true"/>
-    <component id="uqohv4lr" name="BallRodDisplay.xml" path="/UISecretary/UIShop/component/" favorite="true"/>
-    <component id="uqohv4ls" name="Component28_1.xml" path="/UISecretary/UIShop/component/"/>
-    <component id="uqohv4lt" name="Component58_1.xml" path="/UISecretary/UIShop/component/"/>
-    <component id="uqohv4lu" name="Component98_2.xml" path="/UISecretary/UIShop/component/"/>
+    <component id="uqohv4lr" name="BallRodDisplay.xml" path="/UISecretary/UIShop/asset/component/" favorite="true"/>
+    <component id="uqohv4ls" name="Component28_1.xml" path="/UISecretary/UIShop/asset/component/"/>
+    <component id="uqohv4lt" name="Component58_1.xml" path="/UISecretary/UIShop/asset/component/"/>
+    <component id="uqohv4lu" name="Component98_2.xml" path="/UISecretary/UIShop/asset/component/"/>
     <component id="uqohv4m3" name="skillItem_1.xml" path="/UISkill/component/"/>
     <image id="yjr4v4m5" name="zy_sztb_5.png" path="/UIMain/asset/"/>
     <component id="yjr4v4m6" name="Component127.xml" path="/UIMain/component/"/>
@@ -1308,7 +1308,7 @@
     <image id="p8p3v58j" name="主界面1.png" path="/__示意图/"/>
     <image id="p8p3v58k" name="结算界面1.png" path="/__示意图/"/>
     <image id="d6k9v58l" name="input.png" path="/UIMoyu/asset/" scale="9grid" scale9grid="11,16,22,32"/>
-    <component id="uel8v58m" name="daoJuDisplay.xml" path="/UISecretary/UIShop/component/"/>
+    <component id="uel8v58m" name="daoJuDisplay.xml" path="/UISecretary/UIShop/asset/component/"/>
     <image id="so7lv58n" name="pqms_gb.png" path="/UIUser/asset/"/>
     <image id="so7lv58o" name="ty_an1.png" path="/UIUser/asset/"/>
     <image id="so7lv58p" name="ty_an2.png" path="/UIUser/asset/"/>
@@ -1324,7 +1324,7 @@
     <image id="so7lv58z" name="DIAMOND.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"/>
-    <component id="so7lv596" name="btn_buy.xml" path="/UISecretary/UIShop/component/"/>
+    <component id="so7lv596" name="btn_buy.xml" path="/UISecretary/UIShop/asset/component/"/>
     <image id="83s7v59a" name="sp_zs1.png" path="/UISecretary/UIShop/asset/daoju/"/>
     <image id="83s7v59b" name="sp_zs2.png" path="/UISecretary/UIShop/asset/daoju/"/>
     <image id="83s7v59c" name="sp_zs3.png" path="/UISecretary/UIShop/asset/daoju/"/>
@@ -1352,7 +1352,6 @@
     <image id="wss0v5a1" name="denglu1.png" path="/UIUser/asset/"/>
     <image id="wss0v5a2" name="logout.png" path="/UIMain/asset/"/>
     <image id="wss0v5a3" name="qd_bg.jpg" path="/UIMain/asset/new2025/yasuoDir/"/>
-    <image id="wss0v5a4" name="Login.png" path="/UIUser/asset/"/>
     <image id="wss0v5a6" name="signin.png" path="/UIUser/asset/"/>
     <font id="wss0v5a7" name="arial.ttf" path="/font/" exported="true" renderMode="" samplePointSize="16"/>
     <font id="wss0v5a8" name="arialbd.ttf" path="/font/" exported="true" renderMode="" samplePointSize="16"/>
@@ -1366,6 +1365,14 @@
     <image id="a1zav5ah" name="fuli1.png" path="/UISecretary/UIFuli/asset/"/>
     <image id="a1zav5ai" name="login2.png" path="/UIMain/asset/"/>
     <image id="a1zav5aj" name="Logout2.png" path="/UIMain/asset/"/>
+    <image id="a1zav5ak" name="Login.png" path="/UIUser/asset/"/>
+    <image id="a1zav5al" name="Signup.png" path="/UIUser/asset/"/>
+    <image id="a1zav5am" name="logo_bj.png" path="/UIUser/asset/"/>
+    <image id="a1zav5an" name="reg_bj1.png" path="/UIUser/asset/"/>
+    <component id="a1zav5ao" name="Component1305_logo.xml" path="/UIUser/"/>
+    <misc id="veupv5ap" name="25829" path="/font/"/>
+    <font id="veupv5aq" name="big-john-woff2-2.ttf" path="/font/" exported="true" renderMode="" samplePointSize="16"/>
+    <image id="ftmmv5ar" name="n19.png" path="/"/>
   </resources>
   <publish name="game" path="..\..\client\laya\bin\asset\fgui" packageCount="2" genCode="true" codePath="..\..\client\laya\src\fgui\res"/>
 </packageDescription>

二進制
client/laya/bin/asset/fgui/game.obj


二進制
client/laya/bin/asset/fgui/game_atlas0.png


二進制
client/laya/bin/asset/fgui/game_atlas0_1.png


二進制
client/laya/bin/asset/fgui/game_atlas0_2.png


二進制
client/laya/bin/asset/fgui/game_atlas0_3.png


二進制
client/laya/bin/asset/fgui/game_atlas0_4.png


二進制
client/laya/bin/asset/fgui/game_atlas0_5.png


二進制
client/laya/bin/font/BIG JOHN.otf


二進制
client/laya/bin/font/big-john-woff2-2.ttf


+ 114 - 35
client/laya/bin/js/bundle.js

@@ -7001,21 +7001,14 @@
         }
         onConstruct() {
             this.n38 = (this.getChild("n38"));
-            this.n9 = (this.getChild("n9"));
-            this.n14 = (this.getChild("n14"));
-            this.n15 = (this.getChild("n15"));
-            this.n34 = (this.getChild("n34"));
+            this.n51 = (this.getChild("n51"));
             this.closeBtn = (this.getChild("closeBtn"));
             this.lab_tip = (this.getChild("lab_tip"));
-            this.n43 = (this.getChild("n43"));
             this.txt_ua = (this.getChild("txt_ua"));
-            this.n44 = (this.getChild("n44"));
             this.txt_up1 = (this.getChild("txt_up1"));
-            this.n45 = (this.getChild("n45"));
             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";
@@ -7027,17 +7020,7 @@
         onConstruct() {
             this.c1 = this.getController("c1");
             this.n18 = (this.getChild("n18"));
-            this.n7 = (this.getChild("n7"));
-            this.n5 = (this.getChild("n5"));
-            this.n6 = (this.getChild("n6"));
-            this.closeBtn = (this.getChild("closeBtn"));
-            this.btn_gotoReg = (this.getChild("btn_gotoReg"));
-            this.btn_login = (this.getChild("btn_login"));
-            this.n31 = (this.getChild("n31"));
-            this.txt_up = (this.getChild("txt_up"));
-            this.n32 = (this.getChild("n32"));
-            this.txt_ua = (this.getChild("txt_ua"));
-            this.n40 = (this.getChild("n40"));
+            this.n19 = (this.getChild("n19"));
         }
     }
     ui_UILogin.URL = "ui://isxx5ak7bobav57u";
@@ -7045,27 +7028,47 @@
     class UILogin extends UIBase {
         constructor() {
             super();
+            this.fontStr = 'big-john-woff2-2';
+            try {
+                Laya.loader.load("res/font/big-john-woff2-2.ttf", Laya.Handler.create(this, this.onFontLoaded));
+                console.log("zh: constructor加载arial字体成功");
+            }
+            catch (error) {
+                console.log("zh: constructor加载arial字体失败");
+            }
+        }
+        onFontLoaded() {
+            try {
+                Laya.Text.defaultFont = this.fontStr;
+                this.ui.n19.txt_ua.font = this.fontStr;
+                this.ui.n19.txt_up.font = this.fontStr;
+                console.log("zh: onFontLoaded 设置" + this.fontStr + "字体成功");
+            }
+            catch (error) {
+                console.log("zh: constructor onFontLoaded加载" + this.fontStr + "字体失败");
+            }
         }
         onConstructor() {
             this.ui = ui_UILogin.createInstance();
             this.contentPane = this.ui;
             this.isEject = false;
-            this.addUIClick(this.ui.closeBtn, this.closeSelf);
-            this.addUIClick(this.ui.btn_gotoReg, this.gotoRegPage);
-            this.addUIClick(this.ui.btn_login, this.userLogin);
+            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);
         }
         show() {
             super.show();
             this.x = (Laya.stage.width - this.width) / 2;
             this.y = (Laya.stage.height - this.height) / 2;
-            this.setGlobalFont(this.ui);
+            this.onFontLoaded();
         }
         closeSelf() {
             this.hide();
         }
         userLogin() {
-            let ua = this.ui.txt_ua.text;
-            let up = this.ui.txt_up.text;
+            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);
             if (ua && up) {
                 let reqData = JSON.stringify({
                     username: ua.trim(),
@@ -7121,6 +7124,26 @@
     class UIReg extends UIBase {
         constructor() {
             super();
+            this.fontStr = 'big-john-woff2-2';
+            try {
+                Laya.loader.load("res/font/big-john-woff2-2.ttf", Laya.Handler.create(this, this.onFontLoaded));
+                console.log("zh: constructor加载arial字体成功");
+            }
+            catch (error) {
+                console.log("zh: constructor加载arial字体失败");
+            }
+        }
+        onFontLoaded() {
+            try {
+                Laya.Text.defaultFont = this.fontStr;
+                this.ui.txt_ua.font = this.fontStr;
+                this.ui.txt_up1.font = this.fontStr;
+                this.ui.txt_up2.font = this.fontStr;
+                console.log("zh: onFontLoaded 设置" + this.fontStr + "字体成功");
+            }
+            catch (error) {
+                console.log("zh: constructor onFontLoaded加载" + this.fontStr + "字体失败");
+            }
         }
         onConstructor() {
             this.ui = ui_UIReg.createInstance();
@@ -7134,7 +7157,7 @@
             super.show();
             this.x = (Laya.stage.width - this.width) / 2;
             this.y = (Laya.stage.height - this.height) / 2;
-            this.setGlobalFont(this.ui);
+            this.onFontLoaded();
         }
         closeSelf() {
             this.hide();
@@ -7218,6 +7241,7 @@
             this.x = (Laya.stage.width - this.width) / 2;
             this.y = (Laya.stage.height - this.height) / 2;
             this.ui.n2.txt_price.text = "$" + this.jiage;
+            this.ui.n2.n_zzq_fl1.url = 'res/fuli1.png';
             this.setGlobalFont(this.ui);
         }
         closeSelf() {
@@ -13311,6 +13335,21 @@
     }
     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"));
@@ -13391,7 +13430,6 @@
         onConstruct() {
             this.button = this.getController("button");
             this.n6 = (this.getChild("n6"));
-            this.n4 = (this.getChild("n4"));
         }
     }
     ui_Button_reg.URL = "ui://isxx5ak7bobav57y";
@@ -15460,7 +15498,6 @@
         onConstruct() {
             this.button = this.getController("button");
             this.n5 = (this.getChild("n5"));
-            this.n3 = (this.getChild("n3"));
         }
     }
     ui_Button_login.URL = "ui://isxx5ak7nnz5v587";
@@ -16808,6 +16845,7 @@
             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);
@@ -24079,27 +24117,47 @@
     class UILogin$1 extends UIBase {
         constructor() {
             super();
+            this.fontStr = 'big-john-woff2-2';
+            try {
+                Laya.loader.load("res/font/big-john-woff2-2.ttf", Laya.Handler.create(this, this.onFontLoaded));
+                console.log("zh: constructor加载arial字体成功");
+            }
+            catch (error) {
+                console.log("zh: constructor加载arial字体失败");
+            }
+        }
+        onFontLoaded() {
+            try {
+                Laya.Text.defaultFont = this.fontStr;
+                this.ui.n19.txt_ua.font = this.fontStr;
+                this.ui.n19.txt_up.font = this.fontStr;
+                console.log("zh: onFontLoaded 设置" + this.fontStr + "字体成功");
+            }
+            catch (error) {
+                console.log("zh: constructor onFontLoaded加载" + this.fontStr + "字体失败");
+            }
         }
         onConstructor() {
             this.ui = ui_UILogin.createInstance();
             this.contentPane = this.ui;
             this.isEject = false;
-            this.addUIClick(this.ui.closeBtn, this.closeSelf);
-            this.addUIClick(this.ui.btn_gotoReg, this.gotoRegPage);
-            this.addUIClick(this.ui.btn_login, this.userLogin);
+            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);
         }
         show() {
             super.show();
             this.x = (Laya.stage.width - this.width) / 2;
             this.y = (Laya.stage.height - this.height) / 2;
-            this.setGlobalFont(this.ui);
+            this.onFontLoaded();
         }
         closeSelf() {
             this.hide();
         }
         userLogin() {
-            let ua = this.ui.txt_ua.text;
-            let up = this.ui.txt_up.text;
+            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);
             if (ua && up) {
                 let reqData = JSON.stringify({
                     username: ua.trim(),
@@ -24155,6 +24213,26 @@
     class UIReg$1 extends UIBase {
         constructor() {
             super();
+            this.fontStr = 'big-john-woff2-2';
+            try {
+                Laya.loader.load("res/font/big-john-woff2-2.ttf", Laya.Handler.create(this, this.onFontLoaded));
+                console.log("zh: constructor加载arial字体成功");
+            }
+            catch (error) {
+                console.log("zh: constructor加载arial字体失败");
+            }
+        }
+        onFontLoaded() {
+            try {
+                Laya.Text.defaultFont = this.fontStr;
+                this.ui.txt_ua.font = this.fontStr;
+                this.ui.txt_up1.font = this.fontStr;
+                this.ui.txt_up2.font = this.fontStr;
+                console.log("zh: onFontLoaded 设置" + this.fontStr + "字体成功");
+            }
+            catch (error) {
+                console.log("zh: constructor onFontLoaded加载" + this.fontStr + "字体失败");
+            }
         }
         onConstructor() {
             this.ui = ui_UIReg.createInstance();
@@ -24168,7 +24246,7 @@
             super.show();
             this.x = (Laya.stage.width - this.width) / 2;
             this.y = (Laya.stage.height - this.height) / 2;
-            this.setGlobalFont(this.ui);
+            this.onFontLoaded();
         }
         closeSelf() {
             this.hide();
@@ -24241,6 +24319,7 @@
             this.x = (Laya.stage.width - this.width) / 2;
             this.y = (Laya.stage.height - this.height) / 2;
             this.ui.n2.txt_price.text = "$" + this.jiage;
+            this.ui.n2.n_zzq_fl1.url = 'res/fuli1.png';
             this.setGlobalFont(this.ui);
         }
         closeSelf() {

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


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

@@ -5,6 +5,7 @@ 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";
@@ -283,6 +284,7 @@ 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 - 2
client/laya/src/fgui/res/game/ui_Button_login.ts

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

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

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

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

@@ -0,0 +1,29 @@
+/** 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"));
+	}
+}

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

@@ -1,24 +1,12 @@
 /** 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";
+import ui_Component1305_logo from "./ui_Component1305_logo";
 
 export default class ui_UILogin extends fgui.GComponent {
 
 	public c1:fgui.Controller;
 	public n18:fgui.GGraph;
-	public n7:fgui.GImage;
-	public n5:fgui.GTextField;
-	public n6:fgui.GTextField;
-	public closeBtn:ui_Component86;
-	public btn_gotoReg:ui_Button_reg;
-	public btn_login:ui_Button_login;
-	public n31:fgui.GImage;
-	public txt_up:fgui.GTextInput;
-	public n32:fgui.GImage;
-	public txt_ua:fgui.GTextInput;
-	public n40:fgui.GImage;
+	public n19:ui_Component1305_logo;
 	public static URL:string = "ui://isxx5ak7bobav57u";
 
 	public static createInstance():ui_UILogin {
@@ -28,16 +16,6 @@ export default class ui_UILogin extends fgui.GComponent {
 	protected onConstruct():void {
 		this.c1 = this.getController("c1");
 		this.n18 = <fgui.GGraph>(this.getChild("n18"));
-		this.n7 = <fgui.GImage>(this.getChild("n7"));
-		this.n5 = <fgui.GTextField>(this.getChild("n5"));
-		this.n6 = <fgui.GTextField>(this.getChild("n6"));
-		this.closeBtn = <ui_Component86>(this.getChild("closeBtn"));
-		this.btn_gotoReg = <ui_Button_reg>(this.getChild("btn_gotoReg"));
-		this.btn_login = <ui_Button_login>(this.getChild("btn_login"));
-		this.n31 = <fgui.GImage>(this.getChild("n31"));
-		this.txt_up = <fgui.GTextInput>(this.getChild("txt_up"));
-		this.n32 = <fgui.GImage>(this.getChild("n32"));
-		this.txt_ua = <fgui.GTextInput>(this.getChild("txt_ua"));
-		this.n40 = <fgui.GImage>(this.getChild("n40"));
+		this.n19 = <ui_Component1305_logo>(this.getChild("n19"));
 	}
 }

+ 2 - 16
client/laya/src/fgui/res/game/ui_UIReg.ts

@@ -7,21 +7,14 @@ import ui_Button_reg from "./ui_Button_reg";
 export default class ui_UIReg extends fgui.GComponent {
 
 	public n38:fgui.GGraph;
-	public n9:fgui.GImage;
-	public n14:fgui.GTextField;
-	public n15:fgui.GTextField;
-	public n34:fgui.GTextField;
+	public n51:fgui.GImage;
 	public closeBtn:ui_Component86;
 	public lab_tip:fgui.GTextField;
-	public n43:fgui.GImage;
 	public txt_ua:fgui.GTextInput;
-	public n44:fgui.GImage;
 	public txt_up1:fgui.GTextInput;
-	public n45:fgui.GImage;
 	public txt_up2:fgui.GTextInput;
 	public btn_gotoLogin:ui_Button_login;
 	public btn_reg:ui_Button_reg;
-	public n50:fgui.GImage;
 	public static URL:string = "ui://isxx5ak7bobav57v";
 
 	public static createInstance():ui_UIReg {
@@ -30,20 +23,13 @@ export default class ui_UIReg extends fgui.GComponent {
 
 	protected onConstruct():void {
 		this.n38 = <fgui.GGraph>(this.getChild("n38"));
-		this.n9 = <fgui.GImage>(this.getChild("n9"));
-		this.n14 = <fgui.GTextField>(this.getChild("n14"));
-		this.n15 = <fgui.GTextField>(this.getChild("n15"));
-		this.n34 = <fgui.GTextField>(this.getChild("n34"));
+		this.n51 = <fgui.GImage>(this.getChild("n51"));
 		this.closeBtn = <ui_Component86>(this.getChild("closeBtn"));
 		this.lab_tip = <fgui.GTextField>(this.getChild("lab_tip"));
-		this.n43 = <fgui.GImage>(this.getChild("n43"));
 		this.txt_ua = <fgui.GTextInput>(this.getChild("txt_ua"));
-		this.n44 = <fgui.GImage>(this.getChild("n44"));
 		this.txt_up1 = <fgui.GTextInput>(this.getChild("txt_up1"));
-		this.n45 = <fgui.GImage>(this.getChild("n45"));
 		this.txt_up2 = <fgui.GTextInput>(this.getChild("txt_up2"));
 		this.btn_gotoLogin = <ui_Button_login>(this.getChild("btn_gotoLogin"));
 		this.btn_reg = <ui_Button_reg>(this.getChild("btn_reg"));
-		this.n50 = <fgui.GImage>(this.getChild("n50"));
 	}
 }

+ 1 - 1
client/laya/src/ui/UIFuli1.ts

@@ -33,7 +33,7 @@ export default class UIFuli1 extends UIBase {
         this.x = (Laya.stage.width - this.width) / 2;
         this.y = (Laya.stage.height - this.height) / 2;
         this.ui.n2.txt_price.text = "$" + this.jiage;
-        //this.ui.bj1.resourceURL = 'res/fuli1.png';// xGame.common.getGameIconUrl("turntable_bj");
+       this.ui.n2.n_zzq_fl1.url = 'res/fuli1.png';// xGame.common.getGameIconUrl("turntable_bj");
          this.setGlobalFont(this.ui)
     }
 

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

@@ -9,17 +9,34 @@ import UIReg from "./UIReg";
 import DataMgr from "../data/DataMgr";
 export default class UILogin extends UIBase {
     protected ui: ui_UILogin;
-
+    protected fontStr: string = 'big-john-woff2-2';
     public constructor() {
         super();
+        try {
+            Laya.loader.load("res/font/big-john-woff2-2.ttf", Laya.Handler.create(this, this.onFontLoaded));
+            console.log("zh: constructor加载arial字体成功");
+        } catch (error) {
+            console.log("zh: constructor加载arial字体失败");
+        }
+
+    }
+    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;
+            console.log("zh: onFontLoaded 设置" + this.fontStr + "字体成功");
+        } catch (error) {
+            console.log("zh: constructor onFontLoaded加载" + this.fontStr + "字体失败");
+        }
     }
     protected onConstructor(): void {
         this.ui = ui_UILogin.createInstance();
         this.contentPane = this.ui;
         this.isEject = false;
-        this.addUIClick(this.ui.closeBtn, this.closeSelf);
-        this.addUIClick(this.ui.btn_gotoReg, this.gotoRegPage);
-        this.addUIClick(this.ui.btn_login, this.userLogin);
+        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);
 
 
     }
@@ -28,16 +45,19 @@ export default class UILogin extends UIBase {
         // 自定义居中逻辑
         this.x = (Laya.stage.width - this.width) / 2;
         this.y = (Laya.stage.height - this.height) / 2;
-        this.setGlobalFont(this.ui)
+        /// this.setGlobalFont(this.ui)
+        this.onFontLoaded();
     }
     closeSelf() {
         this.hide();
     }
     userLogin() {
 
-        let ua = this.ui.txt_ua.text;
-        let up = this.ui.txt_up.text;
-        // console.log('ua'+ua);
+        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);
         if (ua && up) {
             // xGame.uiMgr.Show(UIMsg, "Request in progress..")
             let reqData = JSON.stringify({

+ 22 - 5
client/laya/src/ui/UIReg.ts

@@ -8,10 +8,26 @@ import UILogin from "./UILogin";
 
 export default class UIReg extends UIBase {
     protected ui: ui_UIReg;
-
+    protected fontStr: string = 'big-john-woff2-2';
     public constructor() {
         super();
-
+        try {
+            Laya.loader.load("res/font/big-john-woff2-2.ttf", Laya.Handler.create(this, this.onFontLoaded));
+            console.log("zh: constructor加载arial字体成功");
+        } catch (error) {
+            console.log("zh: constructor加载arial字体失败");
+        }
+    }
+    private onFontLoaded(): void {
+        try {
+            Laya.Text.defaultFont = this.fontStr;//仅这样设置无效
+            this.ui.txt_ua.font = this.fontStr;
+            this.ui.txt_up1.font = this.fontStr;
+            this.ui.txt_up2.font = this.fontStr;
+            console.log("zh: onFontLoaded 设置" + this.fontStr + "字体成功");
+        } catch (error) {
+            console.log("zh: constructor onFontLoaded加载" + this.fontStr + "字体失败");
+        }
     }
     protected onConstructor(): void {
         this.ui = ui_UIReg.createInstance();
@@ -26,7 +42,8 @@ export default class UIReg extends UIBase {
         // 自定义居中逻辑
         this.x = (Laya.stage.width - this.width) / 2;
         this.y = (Laya.stage.height - this.height) / 2;
-         this.setGlobalFont(this.ui)
+        ///this.setGlobalFont(this.ui)
+        this.onFontLoaded();
     }
     closeSelf() {
         this.hide();
@@ -47,14 +64,14 @@ export default class UIReg extends UIBase {
                     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.visible = true;
                         this.ui.lab_tip.color = "#FF0000";
                         xGame.uiMgr.Show(UIMsg, msg)
                     }

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