dzduole 1 month ago
parent
commit
7aac6d6491

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

@@ -7,16 +7,49 @@
     "/"
     "/"
   ],
   ],
   "libview.iconScale": 0,
   "libview.iconScale": 0,
-  "doc.openedDocs": [],
+  "doc.openedDocs": [
+    "ui://isxx5ak7kt443qc",
+    "ui://isxx5ak7ixm43xh",
+    "ui://isxx5ak7ixm43xi"
+  ],
   "test.device": "iPhone Xs Max",
   "test.device": "iPhone Xs Max",
   "canvasColor": 10066329,
   "canvasColor": 10066329,
   "auxline2": true,
   "auxline2": true,
+  "doc.activeDoc": "ui://isxx5ak7ixm43xi",
   "libview.twoColumn": false,
   "libview.twoColumn": false,
   "libview.expandedNodes": [
   "libview.expandedNodes": [
     "isxx5ak7",
     "isxx5ak7",
     "/",
     "/",
     "isxx5ak7",
     "isxx5ak7",
-    "/UIDraw/",
+    "/UIMain/",
+    "isxx5ak7",
+    "/UIRepentProp/",
+    "isxx5ak7",
+    "/UIRepentProp/component/",
+    "isxx5ak7",
+    "/UIRodMethod/",
+    "isxx5ak7",
+    "/UIRodMethod/component/",
+    "isxx5ak7",
+    "/UISecretary/",
+    "isxx5ak7",
+    "/UISign/",
+    "isxx5ak7",
+    "/UISign/component/",
+    "isxx5ak7",
+    "/UISkill/",
+    "isxx5ak7",
+    "/UISkill/component/",
+    "isxx5ak7",
+    "/UITips/",
+    "isxx5ak7",
+    "/UITips/component/",
+    "isxx5ak7",
+    "/UIWordsList/",
+    "isxx5ak7",
+    "/_exportasset/",
+    "isxx5ak7",
+    "/_sharecomponent/",
     "isxx5ak7",
     "isxx5ak7",
     "/windows/"
     "/windows/"
   ],
   ],

BIN
art/fgui/assets/game/UIMain/asset/zjm_tx.png


BIN
art/fgui/assets/game/UIMain/asset/zjm_tx1.png


BIN
art/fgui/assets/game/UIMain/asset/zjm_tx2.png


+ 4 - 4
art/fgui/assets/game/UIMain/component/Component3.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <component size="262,69">
 <component size="262,69">
   <displayList>
   <displayList>
-    <image id="n26_ixm4" name="n26" src="n43d3vv" fileName="UIMain/asset/zjm_tx2.png" xy="62,18" size="200,41"/>
-    <image id="n24_ixm4" name="n24" src="n43d3vt" fileName="UIMain/asset/zjm_tx.png" xy="0,0" size="68,69"/>
-    <text id="n45_ixm4" name="nameTxt" xy="82,24" size="63,29" fontSize="20" color="#ffffff" vAlign="bottom" leading="0" singleLine="true" text="player"/>
-    <component id="n46_ixm4" name="headRoot" src="ixm43xi" fileName="UIMain/component/Component4.xml" xy="2,1" size="64,66" aspect="true"/>
+    <image id="n26_ixm4" name="n26" src="n43d3vv" fileName="UIMain/asset/zjm_tx2.png" xy="1,-2" size="264,76"/>
+    <image id="n24_ixm4" name="n24" src="n43d3vt" fileName="UIMain/asset/zjm_tx.png" xy="0,-5" size="81,81"/>
+    <text id="n45_ixm4" name="nameTxt" xy="83,20" size="63,29" fontSize="20" color="#ffffff" vAlign="bottom" leading="0" singleLine="true" text="player"/>
+    <component id="n46_ixm4" name="headRoot" src="ixm43xi" fileName="UIMain/component/Component4.xml" xy="4,-2" size="70,70" aspect="true"/>
   </displayList>
   </displayList>
 </component>
 </component>

+ 2 - 3
art/fgui/assets/game/UIMain/component/Component4.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="64,65" mask="n44_ixm4">
+<component size="75,75">
   <displayList>
   <displayList>
-    <image id="n44_ixm4" name="n44" src="n43d3vu" fileName="UIMain/asset/zjm_tx1.png" xy="0,0" size="64,65"/>
-    <loader id="n48_ixm4" name="headImg" xy="-2,0" size="107,107" aspect="true" scale="0.64,0.64" url="ui://isxx5ak7ixm43xl" fill="scaleMatchHeight" clearOnPublish="true"/>
+    <loader id="n48_ixm4" name="headImg" xy="2,2" size="70,70" url="ui://isxx5ak7ixm43xl" fill="scale" shrinkOnly="true" useResize="true"/>
   </displayList>
   </displayList>
 </component>
 </component>

BIN
art/fgui/assets/game/UIMatching/asset/ty_touxiang.png


+ 1 - 1
art/fgui/assets/game/package.xml

@@ -221,7 +221,7 @@
     <component id="ixm43xh" name="Component3.xml" path="/UIMain/component/"/>
     <component id="ixm43xh" name="Component3.xml" path="/UIMain/component/"/>
     <component id="ixm43xi" name="Component4.xml" path="/UIMain/component/"/>
     <component id="ixm43xi" name="Component4.xml" path="/UIMain/component/"/>
     <image id="ixm43xk" name="ty_touxiang.png" path="/UIMain/asset/"/>
     <image id="ixm43xk" name="ty_touxiang.png" path="/UIMain/asset/"/>
-    <image id="ixm43xl" name="ty_touxiang.png" path="/UIMatching/asset/" exported="true"/>
+    <image id="ixm43xl" name="ty_touxiang.png" path="/UIMatching/asset/" exported="true" scale9grid="18,18,36,36"/>
     <component id="ixm43xm" name="Component5.xml" path="/UIMain/component/"/>
     <component id="ixm43xm" name="Component5.xml" path="/UIMain/component/"/>
     <component id="ixm43xn" name="Component6.xml" path="/UIMain/component/"/>
     <component id="ixm43xn" name="Component6.xml" path="/UIMain/component/"/>
     <image id="ixm43xp" name="zy_djqy.png" path="/UIMain/asset/"/>
     <image id="ixm43xp" name="zy_djqy.png" path="/UIMain/asset/"/>

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


BIN
client/laya/bin/asset/fgui/game_atlas0.png


BIN
client/laya/bin/asset/fgui/game_atlas0_1.png


BIN
client/laya/bin/asset/fgui/game_atlas0_2.png


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

@@ -12425,7 +12425,6 @@
             return (fgui.UIPackage.createObject("game", "Component4"));
             return (fgui.UIPackage.createObject("game", "Component4"));
         }
         }
         onConstruct() {
         onConstruct() {
-            this.n44 = (this.getChild("n44"));
             this.headImg = (this.getChild("headImg"));
             this.headImg = (this.getChild("headImg"));
         }
         }
     }
     }

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


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

@@ -2,7 +2,6 @@
 
 
 export default class ui_Component4 extends fgui.GComponent {
 export default class ui_Component4 extends fgui.GComponent {
 
 
-	public n44:fgui.GImage;
 	public headImg:fgui.GLoader;
 	public headImg:fgui.GLoader;
 	public static URL:string = "ui://isxx5ak7ixm43xi";
 	public static URL:string = "ui://isxx5ak7ixm43xi";
 
 
@@ -11,7 +10,6 @@ export default class ui_Component4 extends fgui.GComponent {
 	}
 	}
 
 
 	protected onConstruct():void {
 	protected onConstruct():void {
-		this.n44 = <fgui.GImage>(this.getChild("n44"));
 		this.headImg = <fgui.GLoader>(this.getChild("headImg"));
 		this.headImg = <fgui.GLoader>(this.getChild("headImg"));
 	}
 	}
 }
 }

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