1
0
dzduole 1 сар өмнө
parent
commit
7bf41b25f6

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

@@ -1,23 +1,15 @@
 {
   "objectStatus": {
-    "n87_r4l5": {
-      "collapsed": true
-    },
     "n76_vhzh": {
       "collapsed": true,
       "locked": true,
       "hidden": true
     },
-    "n44_ixm4": {
-      "collapsed": true
-    },
     "n84_jpsz": {
       "hidden": true
     },
     "n77_vhzh": {
-      "collapsed": true,
-      "locked": true,
-      "hidden": true
+      "locked": true
     },
     "n48_hxtr": {
       "locked": true,

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

@@ -7,48 +7,30 @@
     "/"
   ],
   "libview.iconScale": 0,
-  "doc.openedDocs": [],
+  "doc.openedDocs": [
+    "ui://isxx5ak7kt443qc",
+    "ui://isxx5ak7ixm43xz"
+  ],
   "test.device": "iPhone Xs Max",
   "canvasColor": 10066329,
   "auxline2": true,
+  "doc.activeDoc": "ui://isxx5ak7ixm43xz",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "isxx5ak7",
     "/",
     "isxx5ak7",
-    "/UIAddProp/",
-    "isxx5ak7",
-    "/UIAddProp/component/",
-    "isxx5ak7",
-    "/UIBox/",
-    "isxx5ak7",
-    "/UIBox/component/",
-    "isxx5ak7",
-    "/UIGetAward/",
-    "isxx5ak7",
-    "/UIInvitation/",
+    "/UIGame/",
     "isxx5ak7",
-    "/UIPower/",
+    "/UIGame/ani/",
     "isxx5ak7",
-    "/UIPower/component/",
+    "/UIGame/component/",
     "isxx5ak7",
-    "/UIRepentProp/",
-    "isxx5ak7",
-    "/UIRepentProp/component/",
-    "isxx5ak7",
-    "/UIRodMethod/",
-    "isxx5ak7",
-    "/UIRodMethod/component/",
-    "isxx5ak7",
-    "/UISecretary/",
-    "isxx5ak7",
-    "/UISign/",
+    "/UIMain/",
     "isxx5ak7",
     "/UISkill/",
     "isxx5ak7",
-    "/UITips/",
-    "isxx5ak7",
-    "/UITips/component/",
+    "/UISkill/component/",
     "isxx5ak7",
     "/__示意图/"
   ],

+ 15 - 21
art/fgui/assets/game/UIMain/UIMain.xml

@@ -22,12 +22,12 @@
       <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="-161,475" 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="166,476" size="340,138" group="n44_ixm4" aspect="true"/>
-    <component id="n17_ixm4" name="classicBtn" src="ixm43xq" fileName="UIMain/component/Component7.xml" xy="495,475" size="340,138" group="n44_ixm4" aspect="true"/>
-    <component id="n18_ixm4" name="weeklyBtn" src="ixm43xs" fileName="UIMain/component/Component9.xml" xy="824,476" size="340,138" group="n44_ixm4" aspect="true"/>
-    <component id="n19_ixm4" name="globalBtn" src="ixm43xr" fileName="UIMain/component/Component8.xml" xy="1154,476" size="341,138" group="n44_ixm4" aspect="true"/>
-    <group id="n44_ixm4" name="n44" xy="-161,475" size="1656,139" advanced="true">
+    <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">
       <relation target="n10_ixm4" sidePair="width-width,center-center"/>
     </group>
     <component id="n34_ixm4" name="signBtn" src="ixm43xu" fileName="UIMain/component/Component11.xml" xy="1227,121" size="107,96" group="n45_ixm4"/>
@@ -36,12 +36,12 @@
     <group id="n45_ixm4" name="n45" xy="923,121" size="411,96" advanced="true">
       <relation target="n10_ixm4" sidePair="left-right%"/>
     </group>
-    <component id="n27_ixm4" name="secretaryBtn" src="ixm43xw" fileName="UIMain/component/Component13.xml" xy="942,662" size="110,85" group="n46_ixm4"/>
-    <component id="n28_ixm4" name="rankBtn" src="ixm43xz" fileName="UIMain/component/Component16.xml" xy="1018,709" size="1,1" group="n46_ixm4"/>
-    <group id="n46_ixm4" name="n46" xy="942,662" size="110,85" advanced="true">
+    <component id="n27_ixm4" name="secretaryBtn" src="ixm43xw" fileName="UIMain/component/Component13.xml" xy="875,662" size="110,85" group="n46_ixm4"/>
+    <component id="n28_ixm4" name="rankBtn" src="ixm43xz" fileName="UIMain/component/Component16.xml" xy="1050,708" size="1,1" group="n46_ixm4"/>
+    <group id="n46_ixm4" name="n46" xy="875,662" size="175,85" advanced="true">
       <relation target="n10_ixm4" sidePair="bottom-bottom"/>
-      <relation target="n87_r4l5" sidePair="right-right"/>
     </group>
+    <component id="n86_r4l5" name="ganFaMoShiBtn" src="r4l5v577" fileName="UIMain/component/Component1302.xml" xy="1092,662" size="110,85"/>
     <component id="n70_vhzh" name="liucheng1" src="vhzhv4hk" fileName="UIMain/asset/Component111_11.xml" xy="0,0" group="n76_vhzh">
       <relation target="n10_ixm4" sidePair="center-center,middle-middle"/>
     </component>
@@ -52,16 +52,14 @@
       <relation target="n74_vhzh" sidePair="left-left,top-top"/>
     </component>
     <group id="n76_vhzh" name="secretaryGuide" xy="0,0" size="1334,750" visible="false" advanced="true"/>
-    <component id="n72_vhzh" name="liucheng2" src="vhzhv4ho" fileName="UIMain/asset/Component112.xml" xy="0,0" group="n77_vhzh">
+    <component id="n72_vhzh" name="liucheng2" src="vhzhv4ho" fileName="UIMain/asset/Component112.xml" xy="-1,0" group="n77_vhzh">
       <relation target="" sidePair="width-width"/>
       <relation target="n10_ixm4" sidePair="height-height,middle-middle"/>
     </component>
-    <loader id="n80_lp3l" name="guideBtn" xy="139,414" size="398,257" group="n77_vhzh" fill="scaleFree" clearOnPublish="true"/>
-    <component id="n73_vhzh" name="n73" src="wp26456" fileName="UISkill/component/Component64.xml" xy="-1,546" group="n77_vhzh">
-      <relation target="n14_ixm4" sidePair="left-left"/>
-    </component>
-    <component id="n79_vhzh" name="wordsNode" src="llhd44g" fileName="UIMain/component/Component60.xml" xy="589,157" group="n77_vhzh" controller="c1,1"/>
-    <group id="n77_vhzh" name="enterGuide" xy="-1,0" size="1335,750" visible="false" advanced="true"/>
+    <loader id="n80_lp3l" name="guideBtn" xy="753,374" size="398,275" 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"/>
+    <component id="n79_vhzh" name="wordsNode" src="llhd44g" fileName="UIMain/component/Component60.xml" xy="557,295" group="n77_vhzh" controller="c1,1"/>
+    <group id="n77_vhzh" name="enterGuide" xy="-1,0" size="1334,750" visible="false" advanced="true"/>
     <component id="n48_hxtr" name="talkNode" src="llhd44g" fileName="UIMain/component/Component60.xml" xy="415,97">
       <relation target="n13_ixm4" sidePair="left-left,top-top"/>
     </component>
@@ -69,9 +67,5 @@
     <component id="n84_jpsz" name="n84" src="jpszv4ni" fileName="_sharecomponent/Component141.xml" xy="953,132" scale="0.8,0.8" visible="false">
       <relation target="n45_ixm4" sidePair="middle-middle,left-left"/>
     </component>
-    <component id="n86_r4l5" name="ganFaMoShiBtn" src="r4l5v577" fileName="UIMain/component/Component1302.xml" xy="1092,662" size="110,85" group="n87_r4l5"/>
-    <group id="n87_r4l5" name="n87" xy="1092,662" size="110,85" advanced="true">
-      <relation target="n10_ixm4" sidePair="right-right,bottom-bottom"/>
-    </group>
   </displayList>
 </component>

+ 1 - 1
art/fgui/assets/game/UIMain/asset/Component111_11.xml

@@ -4,7 +4,7 @@
     <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>
-    <image id="n69_vhzh" name="n69" src="vhzhv4hm" fileName="UISkill/asset/zhezhao.png" xy="192,81" size="330,562">
+    <image id="n69_vhzh" name="n69" src="vhzhv4hm" fileName="UISkill/asset/zhezhao.png" xy="192,81" size="330,400">
       <relation target="" sidePair=""/>
     </image>
   </displayList>

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

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

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="57,67" pivot="0.5,0.5" extention="Button">
+<component size="1,1" pivot="0.5,0.5" extention="Button" initName="paihangbang" designImageAlpha="1">
   <displayList/>
   <Button downEffect="scale" downEffectValue="0.96"/>
 </component>

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


+ 7 - 6
client/laya/bin/js/bundle.js

@@ -4086,6 +4086,7 @@
             this.secretaryBtn = (this.getChild("secretaryBtn"));
             this.rankBtn = (this.getChild("rankBtn"));
             this.n46 = (this.getChild("n46"));
+            this.ganFaMoShiBtn = (this.getChild("ganFaMoShiBtn"));
             this.liucheng1 = (this.getChild("liucheng1"));
             this.rightBtn = (this.getChild("rightBtn"));
             this.n75 = (this.getChild("n75"));
@@ -4098,8 +4099,6 @@
             this.talkNode = (this.getChild("talkNode"));
             this.n83 = (this.getChild("n83"));
             this.n84 = (this.getChild("n84"));
-            this.ganFaMoShiBtn = (this.getChild("ganFaMoShiBtn"));
-            this.n87 = (this.getChild("n87"));
         }
     }
     ui_UIMain.URL = "ui://isxx5ak7kt443qc";
@@ -6186,6 +6185,7 @@
             }
         }
         ensureSecretary() {
+            console.log('zh: ensureSecretary   ensureSecretaryensureSecretaryensureSecretaryensureSecretaryensureSecretary');
             this.ui.secretaryGuide.visible = false;
             this.ui.enterGuide.visible = true;
             this.ui.wordsNode.t0.play();
@@ -6250,10 +6250,10 @@
             });
         }
         startGlobal() {
-            xGame.uiMgr.Show(UIMsg, "Coming Soon~");
+            xGame.uiMgr.Show(UIMsg, "Coming Soon");
         }
         startWeekly() {
-            xGame.uiMgr.Show(UIMsg, "Coming Soon~");
+            xGame.uiMgr.Show(UIMsg, "Coming Soon");
         }
         startPlaceBall() {
             xGame.uiMgr.Show(UILevelDisplay);
@@ -20581,6 +20581,7 @@
             }
         }
         ensureSecretary() {
+            console.log('zh: ensureSecretary   ensureSecretaryensureSecretaryensureSecretaryensureSecretaryensureSecretary');
             this.ui.secretaryGuide.visible = false;
             this.ui.enterGuide.visible = true;
             this.ui.wordsNode.t0.play();
@@ -20645,10 +20646,10 @@
             });
         }
         startGlobal() {
-            xGame.uiMgr.Show(UIMsg$1, "Coming Soon~");
+            xGame.uiMgr.Show(UIMsg$1, "Coming Soon");
         }
         startWeekly() {
-            xGame.uiMgr.Show(UIMsg$1, "Coming Soon~");
+            xGame.uiMgr.Show(UIMsg$1, "Coming Soon");
         }
         startPlaceBall() {
             xGame.uiMgr.Show(UILevelDisplay$1);

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
client/laya/bin/js/bundle.js.map


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

@@ -13,6 +13,7 @@ import ui_Component12 from "./ui_Component12";
 import ui_UISetting from "./ui_UISetting";
 import ui_Component13 from "./ui_Component13";
 import ui_Component16 from "./ui_Component16";
+import ui_Component1302 from "./ui_Component1302";
 import ui_Component111_11 from "./ui_Component111_11";
 import ui_shareBtn2 from "./ui_shareBtn2";
 import ui_Component64 from "./ui_Component64";
@@ -20,7 +21,6 @@ import ui_Component112 from "./ui_Component112";
 import ui_Component60 from "./ui_Component60";
 import ui_dh_zuanshi from "./ui_dh_zuanshi";
 import ui_Component141 from "./ui_Component141";
-import ui_Component1302 from "./ui_Component1302";
 
 export default class ui_UIMain extends fgui.GComponent {
 
@@ -44,6 +44,7 @@ export default class ui_UIMain extends fgui.GComponent {
 	public secretaryBtn:ui_Component13;
 	public rankBtn:ui_Component16;
 	public n46:fgui.GGroup;
+	public ganFaMoShiBtn:ui_Component1302;
 	public liucheng1:ui_Component111_11;
 	public rightBtn:ui_shareBtn2;
 	public n75:ui_Component64;
@@ -56,8 +57,6 @@ export default class ui_UIMain extends fgui.GComponent {
 	public talkNode:ui_Component60;
 	public n83:ui_dh_zuanshi;
 	public n84:ui_Component141;
-	public ganFaMoShiBtn:ui_Component1302;
-	public n87:fgui.GGroup;
 	public static URL:string = "ui://isxx5ak7kt443qc";
 
 	public static createInstance():ui_UIMain {
@@ -85,6 +84,7 @@ export default class ui_UIMain extends fgui.GComponent {
 		this.secretaryBtn = <ui_Component13>(this.getChild("secretaryBtn"));
 		this.rankBtn = <ui_Component16>(this.getChild("rankBtn"));
 		this.n46 = <fgui.GGroup>(this.getChild("n46"));
+		this.ganFaMoShiBtn = <ui_Component1302>(this.getChild("ganFaMoShiBtn"));
 		this.liucheng1 = <ui_Component111_11>(this.getChild("liucheng1"));
 		this.rightBtn = <ui_shareBtn2>(this.getChild("rightBtn"));
 		this.n75 = <ui_Component64>(this.getChild("n75"));
@@ -97,7 +97,5 @@ export default class ui_UIMain extends fgui.GComponent {
 		this.talkNode = <ui_Component60>(this.getChild("talkNode"));
 		this.n83 = <ui_dh_zuanshi>(this.getChild("n83"));
 		this.n84 = <ui_Component141>(this.getChild("n84"));
-		this.ganFaMoShiBtn = <ui_Component1302>(this.getChild("ganFaMoShiBtn"));
-		this.n87 = <fgui.GGroup>(this.getChild("n87"));
 	}
 }

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

@@ -165,6 +165,7 @@ export default class UIMain extends UIBase {
         }
     }
     ensureSecretary() {
+        console.log('zh: ensureSecretary   ensureSecretaryensureSecretaryensureSecretaryensureSecretaryensureSecretary')
         this.ui.secretaryGuide.visible = false;
         this.ui.enterGuide.visible = true;
         this.ui.wordsNode.t0.play();

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно