Ver Fonte

点击空白关闭的问题

dzduole há 4 semanas atrás
pai
commit
cdd0f645be

+ 6 - 8
art/fgui/.objs/workspace.json

@@ -1,5 +1,5 @@
 {
-  "libview.firstColumnWidth": 292,
+  "libview.firstColumnWidth": 265,
   "expanded_nodes": [
     "isxx5ak7",
     "/",
@@ -8,22 +8,20 @@
   ],
   "libview.iconScale": 0,
   "doc.openedDocs": [
-    "ui://isxx5ak7wcn5v4ke"
+    "ui://isxx5ak7rz5r458",
+    "ui://isxx5ak7jaakv561",
+    "ui://isxx5ak7lrxgv50o"
   ],
   "test.device": "iPhone Xs Max",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://isxx5ak7wcn5v4ke",
+  "doc.activeDoc": "ui://isxx5ak7rz5r458",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "isxx5ak7",
     "/",
     "isxx5ak7",
-    "/UIDraw/",
-    "isxx5ak7",
-    "/UILevelProp/",
-    "isxx5ak7",
-    "/UILevelProp/component/",
+    "/UILevelSelect/",
     "isxx5ak7",
     "/UIMain/",
     "isxx5ak7",

+ 3 - 3
art/fgui/assets/game/UIModeSelection/UIModeSelection.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1334,750" designImageAlpha="100">
   <displayList>
-    <loader id="n23_jaak" name="closeBtn" xy="0,0" size="1334,750">
-      <relation target="" sidePair="width-width,height-height"/>
-    </loader>
     <graph id="n19_lrxg" name="n19" xy="0,0" size="1334,750" alpha="0.8" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
+    <loader id="n23_jaak" name="closeBtn" xy="1,0" size="1334,750">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
     <component id="n22_lrxg" name="myNode" src="jaakv561" fileName="UIModeSelection/component/ModeSelection_com123.xml" xy="159,177">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>

+ 1 - 1
art/fgui/assets/game/UIModeSelection/component/ModeSelection_com1.xml

@@ -14,7 +14,7 @@
       <relation target="" sidePair="center-center"/>
     </text>
     <image id="n27_lrxg" name="coinImg" src="wehi3ui" fileName="UIMoney/asset/ty_jb.png" xy="112,308" pivot="0.5,0.5" size="24,24" group="n35_lrxg" aspect="true"/>
-    <text id="n28_lrxg" name="need" xy="137,302" size="60,36" group="n35_lrxg" font="Arial" fontSize="26" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="2000">
+    <text id="n28_lrxg" name="need" xy="137,302" size="60,36" group="n35_lrxg" font="Arial" fontSize="26" color="#ffffff" vAlign="middle" bold="true" strokeColor="#000000" text="2000">
       <relation target="n27_lrxg" sidePair="left-right"/>
     </text>
     <group id="n35_lrxg" name="n35" xy="112,302" size="85,36" advanced="true">

+ 6 - 2
art/fgui/assets/game/UIModeSelection/component/ModeSelection_com123.xml

@@ -2,17 +2,21 @@
 <component size="1011,396" designImageLayer="1">
   <displayList>
     <component id="n22_lrxg" name="type1" src="lrxgv50m" fileName="UIModeSelection/component/ModeSelection_com1.xml" xy="0,-1"/>
-    <component id="n36_lrxg" name="type2" src="lrxgv50n" fileName="UIModeSelection/component/ModeSelection_com2.xml" xy="350,0"/>
+    <component id="n36_lrxg" name="type2" src="lrxgv50n" fileName="UIModeSelection/component/ModeSelection_com2.xml" xy="350,-1"/>
     <component id="n37_lrxg" name="type3" src="lrxgv50o" fileName="UIModeSelection/component/ModeSelection_com3.xml" xy="696,0"/>
-    <text id="n39_d33k" name="n39" xy="321,432" size="369,34" alpha="0.8" font="ui://isxx5ak7d33kv57a" fontSize="24" color="#ffffff" vAlign="middle" bold="true" text="Click on the blank area to close"/>
+    <text id="n38_lrxg" name="n38" xy="320,426" size="428,34" alpha="0.9" font="Arial" fontSize="24" color="#ffffff" align="center" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="Click on the blank area to close">
+      <relation target="n36_lrxg" sidePair="center-center,bottom-bottom"/>
+    </text>
   </displayList>
   <transition name="t0" autoPlay="true">
     <item time="0" type="Alpha" target="n22_lrxg" tween="true" startValue="0" endValue="1" duration="8"/>
     <item time="0" type="Alpha" target="n36_lrxg" value="0"/>
     <item time="0" type="Alpha" target="n37_lrxg" value="0"/>
+    <item time="0" type="Alpha" target="n38_lrxg" tween="true" startValue="0" endValue="0.6" duration="12"/>
     <item time="0" type="Scale" target="n22_lrxg" tween="true" startValue="0.5,0.5" endValue="1,1" duration="12"/>
     <item time="0" type="Scale" target="n36_lrxg" value="0.5,0.5"/>
     <item time="0" type="Scale" target="n37_lrxg" value="0.5,0.5"/>
+    <item time="0" type="XY" target="n38_lrxg" tween="true" startValue="417,539" endValue="417,415" duration="12"/>
     <item time="3" type="Alpha" target="n36_lrxg" tween="true" startValue="0" endValue="1" duration="8"/>
     <item time="3" type="Scale" target="n36_lrxg" tween="true" startValue="0.5,0.5" endValue="1,1" duration="12"/>
     <item time="6" type="Alpha" target="n37_lrxg" tween="true" startValue="0" endValue="1" duration="8"/>

+ 1 - 1
art/fgui/assets/game/UIModeSelection/component/ModeSelection_com2.xml

@@ -14,7 +14,7 @@
       <relation target="" sidePair="center-center"/>
     </text>
     <image id="n27_lrxg" name="coinImg" src="wehi3ui" fileName="UIMoney/asset/ty_jb.png" xy="114,311" pivot="0.5,0.5" size="24,24" group="n35_lrxg" aspect="true"/>
-    <text id="n28_lrxg" name="need" xy="138,305" size="60,36" group="n35_lrxg" font="Arial" fontSize="26" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="2000">
+    <text id="n28_lrxg" name="need" xy="138,305" size="60,36" group="n35_lrxg" font="Arial" fontSize="26" color="#ffffff" vAlign="middle" bold="true" strokeColor="#000000" text="2000">
       <relation target="n27_lrxg" sidePair="left-right"/>
     </text>
     <group id="n35_lrxg" name="n35" xy="114,305" size="84,36" advanced="true">

+ 3 - 3
art/fgui/assets/game/UIModeSelection/component/ModeSelection_com3.xml

@@ -13,11 +13,11 @@
     <text id="n33_lrxg" name="n33" xy="94,57" size="122,49" font="Arial" fontSize="36" color="#ffffff" align="center" vAlign="middle" bold="true" text="master">
       <relation target="" sidePair="center-center"/>
     </text>
-    <image id="n27_lrxg" name="coinImg" src="wehi3ui" fileName="UIMoney/asset/ty_jb.png" xy="112,312" pivot="0.5,0.5" size="24,24" group="n35_lrxg" aspect="true"/>
-    <text id="n28_lrxg" name="need" xy="137,306" size="60,36" group="n35_lrxg" font="Arial" fontSize="26" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="2000">
+    <image id="n27_lrxg" name="coinImg" src="wehi3ui" fileName="UIMoney/asset/ty_jb.png" xy="114,312" pivot="0.5,0.5" size="24,24" group="n35_lrxg" aspect="true"/>
+    <text id="n28_lrxg" name="need" xy="139,306" size="60,36" group="n35_lrxg" font="Arial" fontSize="26" color="#ffffff" vAlign="middle" bold="true" strokeColor="#000000" text="2000">
       <relation target="n27_lrxg" sidePair="left-right"/>
     </text>
-    <group id="n35_lrxg" name="n35" xy="112,306" size="85,36" advanced="true">
+    <group id="n35_lrxg" name="n35" xy="114,306" size="85,36" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
     <image id="n29_lrxg" name="n29" src="avag460" fileName="UIModeSelection/asset2/msxz1_16.png" xy="197,366">

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


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

@@ -6195,8 +6195,8 @@
             return (fgui.UIPackage.createObject("game", "UIModeSelection"));
         }
         onConstruct() {
-            this.closeBtn = (this.getChild("closeBtn"));
             this.n19 = (this.getChild("n19"));
+            this.closeBtn = (this.getChild("closeBtn"));
             this.myNode = (this.getChild("myNode"));
             this.t0 = this.getTransition("t0");
         }
@@ -13066,7 +13066,7 @@
             this.type1 = (this.getChild("type1"));
             this.type2 = (this.getChild("type2"));
             this.type3 = (this.getChild("type3"));
-            this.n39 = (this.getChild("n39"));
+            this.n38 = (this.getChild("n38"));
             this.t0 = this.getTransition("t0");
         }
     }

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
client/laya/bin/js/bundle.js.map


+ 1 - 1
client/laya/bin/js/cfgTable - 副本.js

@@ -837,7 +837,7 @@ cfgTable.secretaryData={
     },
     [16]:{
         id:16,
-        msg:'老板,您来啦,我是您的专232323属秘书小宁',
+        msg:'老板,您来啦,我是您的专属秘书小宁',
     },
 }
 //secretaryshop表数据

+ 1 - 1
client/laya/bin/js/cfgTable.js

@@ -848,7 +848,7 @@ cfgTable.secretaryshopData={
         name:'Luna',
         height:'164',
         food:'Pizza,Cake',
-        history:'Luna was born into a not wealthy family. She studied hard since childhood and wanted to bring a prosperous life to her family with her own hands. This was her first job.',
+        history:'Luna is a smart, clever, and caring secretary. She is diligent and responsible at work, hoping to achieve a happy life through her own efforts. Everyone likes her very much.',
         price:2000,
         nameImg:'xiaoning',
         spine:'mishu',

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

@@ -9,7 +9,7 @@ export default class ui_ModeSelection_com123 extends fgui.GComponent {
 	public type1:ui_ModeSelection_com1;
 	public type2:ui_ModeSelection_com2;
 	public type3:ui_ModeSelection_com3;
-	public n39:fgui.GTextField;
+	public n38:fgui.GTextField;
 	public t0:fgui.Transition;
 	public static URL:string = "ui://isxx5ak7jaakv561";
 
@@ -21,7 +21,7 @@ export default class ui_ModeSelection_com123 extends fgui.GComponent {
 		this.type1 = <ui_ModeSelection_com1>(this.getChild("type1"));
 		this.type2 = <ui_ModeSelection_com2>(this.getChild("type2"));
 		this.type3 = <ui_ModeSelection_com3>(this.getChild("type3"));
-		this.n39 = <fgui.GTextField>(this.getChild("n39"));
+		this.n38 = <fgui.GTextField>(this.getChild("n38"));
 		this.t0 = this.getTransition("t0");
 	}
 }

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

@@ -4,8 +4,8 @@ import ui_ModeSelection_com123 from "./ui_ModeSelection_com123";
 
 export default class ui_UIModeSelection extends fgui.GComponent {
 
-	public closeBtn:fgui.GLoader;
 	public n19:fgui.GGraph;
+	public closeBtn:fgui.GLoader;
 	public myNode:ui_ModeSelection_com123;
 	public t0:fgui.Transition;
 	public static URL:string = "ui://isxx5ak7rz5r458";
@@ -15,8 +15,8 @@ export default class ui_UIModeSelection extends fgui.GComponent {
 	}
 
 	protected onConstruct():void {
-		this.closeBtn = <fgui.GLoader>(this.getChild("closeBtn"));
 		this.n19 = <fgui.GGraph>(this.getChild("n19"));
+		this.closeBtn = <fgui.GLoader>(this.getChild("closeBtn"));
 		this.myNode = <ui_ModeSelection_com123>(this.getChild("myNode"));
 		this.t0 = this.getTransition("t0");
 	}

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff