dzduole 1 bulan lalu
induk
melakukan
0735a6fad0

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

@@ -5,11 +5,16 @@
       "locked": true,
       "hidden": true
     },
+    "n44_ixm4": {
+      "collapsed": true
+    },
     "n84_jpsz": {
       "hidden": true
     },
     "n77_vhzh": {
-      "locked": true
+      "collapsed": true,
+      "locked": true,
+      "hidden": true
     },
     "n48_hxtr": {
       "locked": true,

+ 4 - 14
art/fgui/.objs/workspace.json

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

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

@@ -10,11 +10,11 @@
     <loader id="n13_ixm4" name="secretary" xy="134,81" size="626,951" scale="0.7,0.7" url="ui://isxx5ak7wehi3ut" clearOnPublish="true">
       <relation target="n10_ixm4" sidePair="left-right,bottom-bottom%"/>
     </loader>
-    <image id="n33_ixm4" name="n33" src="n43d3x0" fileName="UIMain/asset/zjm_db6.png" xy="-1,659" size="1335,90">
+    <image id="n33_ixm4" name="n33" src="n43d3x0" fileName="UIMain/asset/zjm_db6.png" xy="0,660" size="1335,90">
       <relation target="n10_ixm4" sidePair="bottom-bottom"/>
       <relation target="" sidePair="width-width"/>
     </image>
-    <component id="n15_ixm4" name="shopBtn" src="n43d3vn" fileName="UIMain/component/dh_zy_sc_guang.xml" xy="1229,671" size="105,79">
+    <component id="n15_ixm4" name="shopBtn" src="n43d3vn" fileName="UIMain/component/dh_zy_sc_guang.xml" xy="1153,662" size="110,85">
       <relation target="" sidePair="right-right"/>
       <relation target="n10_ixm4" sidePair="bottom-bottom"/>
     </component>
@@ -36,12 +36,14 @@
     <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="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"/>
+    <component id="n27_ixm4" name="secretaryBtn" src="ixm43xw" fileName="UIMain/component/Component13.xml" xy="876,662" size="45,85" group="n46_ixm4"/>
+    <component id="n28_ixm4" name="rankBtn" src="ixm43xz" fileName="UIMain/component/Component16.xml" xy="1051,708" size="0,1" group="n46_ixm4"/>
+    <group id="n46_ixm4" name="n46" xy="876,662" size="110,85" advanced="true">
+      <relation target="n86_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="n86_r4l5" name="ganFaMoShiBtn" src="r4l5v577" fileName="UIMain/component/Component1302.xml" xy="1016,662" size="110,85">
+      <relation target="n15_ixm4" sidePair="right-right"/>
+    </component>
     <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>

+ 5 - 5
art/fgui/assets/game/UISecretary/component/Component118.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="291,64" pivot="0.5,0.5" extention="Button" designImageLayer="1">
-  <controller name="c1" alias="按钮" exported="true" pages="0,钻石购买,1,使用中,2,点击使用" selected="2"/>
+  <controller name="c1" alias="按钮" exported="true" pages="0,钻石购买,1,使用中,2,点击使用" selected="0"/>
   <displayList>
     <image id="n14_wcn5" name="n14" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="0,63" size="291,70" scale="1,-0.9">
       <gearDisplay controller="c1" pages="0,2"/>
@@ -9,16 +9,16 @@
       <gearDisplay controller="c1" pages="1"/>
     </image>
     <image id="n10_u8ei" name="n10" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="82,14" pivot="0.5,0.5" size="42,34" group="n13_u8ei" aspect="true"/>
-    <text id="n11_u8ei" name="diamondTxt" xy="132,11" size="76,42" group="n13_u8ei" fontSize="30" color="#ffffff" align="center" vAlign="middle" text="3000">
+    <text id="n11_u8ei" name="diamondTxt" xy="132,10" size="76,42" group="n13_u8ei" font="Arial" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="3000">
       <relation target="n10_u8ei" sidePair="left-left"/>
     </text>
-    <group id="n13_u8ei" name="n13" xy="82,11" size="126,42" advanced="true">
+    <group id="n13_u8ei" name="n13" xy="82,10" size="126,42" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="n9_u8ei" sidePair="center-center"/>
     </group>
-    <text id="n15_wcn5" name="n15" xy="51,10" pivot="0.5,0.5" size="188,42" fontSize="30" color="#ffffff" align="center" vAlign="middle" letterSpacing="1" bold="true" text="Click to use">
+    <text id="n15_wcn5" name="n15" xy="98,10" pivot="0.5,0.5" size="94,42" font="Arial" fontSize="30" color="#ffffff" align="center" vAlign="middle" bold="true" text="已拥有">
       <gearDisplay controller="c1" pages="1,2"/>
-      <gearText controller="c1" pages="1,2" values="in use|Click to use" default="已拥有"/>
+      <gearText controller="c1" pages="1,2" values="In use|Click to use" default="已拥有"/>
     </text>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.02"/>

TEMPAT SAMPAH
client/laya/bin/asset/fgui/game.obj


+ 2 - 2
client/laya/bin/js/bundle.js

@@ -4237,7 +4237,7 @@
                 case this.ui.xyNode.btnNo:
                     this.ysxyNum--;
                     if (this.ysxyNum > 0)
-                        this.showMsg("再次拒绝退出游戏");
+                        this.showMsg("Refuse to quit the game once again");
                     else {
                         Moyu.userAgree(false);
                         Moyu.exit();
@@ -17007,7 +17007,7 @@
                 case this.ui.xyNode.btnNo:
                     this.ysxyNum--;
                     if (this.ysxyNum > 0)
-                        this.showMsg("再次拒绝退出游戏");
+                        this.showMsg("Refuse to quit the game once again");
                     else {
                         Moyu.userAgree(false);
                         Moyu.exit();

File diff ditekan karena terlalu besar
+ 0 - 0
client/laya/bin/js/bundle.js.map


+ 1 - 1
client/laya/src/ui/item/MoyuMgr.ts

@@ -145,7 +145,7 @@ class MoyuView {
             case this.ui.xyNode.btnNo:
                 this.ysxyNum--;
                 if (this.ysxyNum > 0)
-                    this.showMsg("再次拒绝退出游戏")
+                    this.showMsg("Refuse to quit the game once again")//再次拒绝退出游戏
                 else {
                     Moyu.userAgree(false);
                     Moyu.exit();

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini