dzduole 1 month ago
parent
commit
c00f407ebc

+ 5 - 8
art/fgui/.objs/metas/isxx5ak7/kt443qc.info

@@ -5,23 +5,20 @@
       "locked": true,
       "hidden": true
     },
+    "n84_jpsz": {
+      "hidden": true
+    },
     "n44_ixm4": {
       "collapsed": true
     },
-    "n84_jpsz": {
+    "n48_hxtr": {
+      "locked": true,
       "hidden": true
     },
     "n77_vhzh": {
       "collapsed": true,
       "locked": true,
       "hidden": true
-    },
-    "n48_hxtr": {
-      "locked": true,
-      "hidden": true
-    },
-    "n45_ixm4": {
-      "collapsed": true
     }
   },
   "fitScreen": "FitSize",

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

@@ -15,10 +15,8 @@
   "libview.expandedNodes": [
     "isxx5ak7",
     "/",
-    "isxx5ak7",
-    "/UIDraw/",
-    "isxx5ak7",
-    "/UIWordsList/"
+    "37nctnhw",
+    "/"
   ],
   "auxline1": true,
   "snapToGrid": true,

+ 6 - 6
art/fgui/assets/game/UIMain/component/UISetting.xml

@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="244,96">
-  <controller name="c1" alias="设置" exported="true" pages="0,关闭,1,打开" selected="0"/>
+  <controller name="c1" alias="设置" exported="true" pages="0,关闭,1,打开" selected="1"/>
   <displayList>
-    <image id="n4_mnrs" name="n4" src="mnrs42u" fileName="UIMain/asset/zy_sztb_4(1).png" xy="0,3" size="6,39">
+    <image id="n4_mnrs" name="n4" src="mnrs42u" fileName="UIMain/asset/zy_sztb_4(1).png" xy="0,3" size="153,39">
       <gearDisplay controller="c1" pages="1"/>
-      <gearSize controller="c1" pages="1" values="244,39,1,1" default="6,39,1,1" tween="true"/>
+      <gearSize controller="c1" pages="1" values="153,39,1,1" default="6,39,1,1" tween="true"/>
     </image>
-    <component id="n1_mnrs" name="soundBtn" src="mnrs42s" fileName="UIMain/component/Component37.xml" xy="50,6" alpha="0" controller="c1,1">
+    <component id="n1_mnrs" name="soundBtn" src="mnrs42s" fileName="UIMain/component/Component37.xml" xy="96,6" controller="c1,1">
       <gearDisplay controller="c1" pages="1"/>
       <gearXY controller="c1" pages="0,1" values="50,6|96,6" tween="true"/>
       <gearLook controller="c1" pages="0" values="0,0,0,1" default="1,0,0,1" tween="true"/>
     </component>
-    <component id="n2_mnrs" name="shakeBtn" src="mnrs42r" fileName="UIMain/component/Component36.xml" xy="101,6" alpha="0" controller="c1,0">
+    <component id="n2_mnrs" name="shakeBtn" src="mnrs42r" fileName="UIMain/component/Component36.xml" xy="147,6" controller="c1,0">
       <gearDisplay controller="c1" pages="0,1"/>
       <gearXY controller="c1" pages="0,1" values="101,6|147,6" tween="true"/>
       <gearLook controller="c1" pages="0" values="0,0,0,1" default="1,0,0,1" tween="true"/>
     </component>
     <component id="n3_mnrs" name="clickNode" src="ixm43xt" fileName="UIMain/component/Component10.xml" xy="0,0"/>
-    <component id="n5_yjr4" name="xyBtn" src="yjr4v4m6" fileName="UIMain/component/Component127.xml" xy="161,8" alpha="0">
+    <component id="n5_yjr4" name="xyBtn" src="yjr4v4m6" fileName="UIMain/component/Component127.xml" xy="204,8">
       <gearDisplay controller="c1" pages="1"/>
       <gearXY controller="c1" pages="0,1" values="161,8|204,8" tween="true"/>
       <gearLook controller="c1" pages="0" values="0,0,0,1" default="1,0,0,1" tween="true"/>

+ 1 - 1
art/fgui/assets/loading/UILoading.xml

@@ -11,7 +11,7 @@
     <image id="n13_hkrz" name="n13" src="hkrz1s" fileName="assets/logo.png" xy="419,89" size="496,200" group="n18_ghnw">
       <relation target="" sidePair="center-center,top-top%"/>
     </image>
-    <text id="n4_g4jo" name="txtLoad" xy="292,599" size="750,36" group="n18_ghnw" font="Arial" fontSize="26" color="#ffffff" align="center" letterSpacing="6" autoSize="none" bold="true" strokeColor="#000000" text="Loading...">
+    <text id="n4_g4jo" name="txtLoad" xy="292,599" size="750,42" group="n18_ghnw" font="Arial" fontSize="26" color="#ffffff" align="center" letterSpacing="3" autoSize="none" bold="true" strokeColor="#000000" text="Loading...">
       <relation target="" sidePair="center-center"/>
       <relation target="n13_hkrz" sidePair=""/>
     </text>

BIN
art/fgui/assets/loading/assets/logo.png


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


BIN
client/laya/bin/fgui/loading.obj


BIN
client/laya/bin/fgui/loading_atlas0.png


+ 4 - 0
client/laya/bin/js/bundle.js

@@ -4447,6 +4447,8 @@
             this.ui.xyBtn.onClick(this, this.onXy);
             this.ui.clickNode.onClick(this, this.changeSetting);
             this.ui.xyBtn.visible = Moyu.isVivo || Moyu.isOppo || Moyu.isOPApk || Moyu.isVVApk;
+            this.ui.xyBtn.visible = false;
+            this.ui.shakeBtn.visible = false;
         }
         changeSetting() {
             xGame.soundMgr.playSound(xGame.common.btnClickStr);
@@ -19540,6 +19542,8 @@
             this.ui.xyBtn.onClick(this, this.onXy);
             this.ui.clickNode.onClick(this, this.changeSetting);
             this.ui.xyBtn.visible = Moyu.isVivo || Moyu.isOppo || Moyu.isOPApk || Moyu.isVVApk;
+            this.ui.xyBtn.visible = false;
+            this.ui.shakeBtn.visible = false;
         }
         changeSetting() {
             xGame.soundMgr.playSound(xGame.common.btnClickStr);

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


+ 2 - 0
client/laya/src/ui/item/SettingNode.ts

@@ -16,6 +16,8 @@ export default class SettingNode {
         this.ui.xyBtn.onClick(this, this.onXy);
         this.ui.clickNode.onClick(this, this.changeSetting);
         this.ui.xyBtn.visible=Moyu.isVivo||Moyu.isOppo||Moyu.isOPApk||Moyu.isVVApk;
+         this.ui.xyBtn.visible=false;//zh 
+         this.ui.shakeBtn.visible  =false;//zh 震动隐藏
     }
     //
     changeSetting() {

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