dzduole 3 周之前
父節點
當前提交
f4a667416b

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

@@ -8,24 +8,27 @@
   ],
   "libview.iconScale": 0,
   "doc.openedDocs": [
-    "ui://isxx5ak7jaakv51j"
+    "ui://isxx5ak7g1giv4ep",
+    "ui://isxx5ak7s46iv4f1",
+    "ui://isxx5ak7pf2sv4ic",
+    "ui://isxx5ak7uqohv4lo"
   ],
   "test.device": "iPhone Xs Max",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://isxx5ak7jaakv51j",
+  "doc.activeDoc": "ui://isxx5ak7uqohv4lo",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "isxx5ak7",
     "/",
     "isxx5ak7",
-    "/UILevelProp/",
+    "/UIAddProp/",
     "isxx5ak7",
-    "/UILevelProp/component/",
+    "/UISecretary/",
     "isxx5ak7",
-    "/UISkill/",
+    "/UISecretary/UIShop/",
     "isxx5ak7",
-    "/UISkill/component/",
+    "/UISecretary/UIShop/component/",
     "isxx5ak7",
     "/windows/"
   ],

+ 7 - 5
art/fgui/assets/game/UISecretary/SecretaryDisplay.xml

@@ -3,22 +3,24 @@
   <displayList>
     <image id="n2_s46i" name="n2" src="xs1r47m" fileName="UILevelProp/asset/gq3.png" xy="0,0" size="899,569"/>
     <text id="n3_s46i" name="levelTxt" xy="232,20" pivot="0.5,0.5" size="436,54" font="Arial" fontSize="40" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="Hire a secretary"/>
-    <image id="n4_s46i" name="n4" src="s46iv4f3" fileName="UISecretary/asset/pqms_rwbg.png" xy="27,101" size="291,368"/>
-    <loader id="n6_s46i" name="secretary" xy="58,117" size="626,951" scale="0.37,0.37" url="ui://isxx5ak7wehi3ut" clearOnPublish="true"/>
+    <image id="n4_s46i" name="n4" src="s46iv4f3" fileName="UISecretary/asset/pqms_rwbg.png" xy="27,101" pivot="0.5,0.5" size="291,433"/>
+    <loader id="n6_s46i" name="secretary" xy="-37,33" pivot="0.5,0.5" size="419,719" aspect="true" scale="0.4,0.4" url="ui://isxx5ak7wehi3ut" align="center" vAlign="middle" clearOnPublish="true">
+      <relation target="n4_s46i" sidePair="bottom-bottom"/>
+    </loader>
     <component id="n9_u8ei" name="purchaseBtn" src="u8eiv4i2" fileName="UISecretary/component/Component118.xml" xy="27,467" size="291,63"/>
     <image id="n16_j979" name="n16" src="s46iv4f4" fileName="UISecretary/asset/pqms_zs1.png" xy="368,162" size="3,38"/>
     <image id="n37_j979" name="n37" src="s46iv4f5" fileName="UISecretary/asset/pqms_zs2.png" xy="368,264" size="3,38"/>
     <image id="n41_j979" name="n41" src="s46iv4f6" fileName="UISecretary/asset/pqms_zs3.png" xy="368,363" size="3,38"/>
     <image id="n14_j979" name="n14" src="j979v4i5" fileName="UISecretary/asset/pqms_btk.png" xy="374,162" size="501,38" group="n46_j979"/>
-    <text id="n17_j979" name="n17" xy="380,163" pivot="0,0.5" size="79,32" group="n46_j979" fontSize="22" color="#ffffff" vAlign="middle" text="height "/>
+    <text id="n17_j979" name="n17" xy="380,163" pivot="0,0.5" size="69,32" group="n46_j979" fontSize="22" color="#ffffff" vAlign="middle" text="height "/>
     <text id="n18_j979" name="heightTxt" xy="366,203" pivot="0,0.5" size="67,32" group="n46_j979" font="Arial" fontSize="22" color="#8494aa" vAlign="middle" text="Secret"/>
     <group id="n46_j979" name="n46" xy="366,162" size="509,73" advanced="true"/>
     <image id="n36_j979" name="n36" src="j979v4i5" fileName="UISecretary/asset/pqms_btk.png" xy="374,264" size="501,38" group="n47_j979"/>
-    <text id="n38_j979" name="n38" xy="380,265" pivot="0,0.5" size="141,32" group="n47_j979" fontSize="22" color="#ffffff" vAlign="middle" text="favorite food"/>
+    <text id="n38_j979" name="n38" xy="380,265" pivot="0,0.5" size="123,32" group="n47_j979" fontSize="22" color="#ffffff" vAlign="middle" text="favorite food"/>
     <text id="n39_j979" name="foodTxt" xy="366,305" pivot="0,0.5" size="67,32" group="n47_j979" font="Arial" fontSize="22" color="#8494aa" vAlign="middle" text="Secret"/>
     <group id="n47_j979" name="n47" xy="366,264" size="509,73" advanced="true"/>
     <image id="n40_j979" name="n40" src="j979v4i5" fileName="UISecretary/asset/pqms_btk.png" xy="374,363" size="501,38" group="n48_j979"/>
-    <text id="n42_j979" name="n42" xy="380,364" pivot="0,0.5" size="112,32" group="n48_j979" fontSize="22" color="#ffffff" vAlign="middle" text="back story"/>
+    <text id="n42_j979" name="n42" xy="380,364" pivot="0,0.5" size="103,32" group="n48_j979" fontSize="22" color="#ffffff" vAlign="middle" text="back story"/>
     <text id="n43_j979" name="historyTxt" xy="368,411" size="509,123" group="n48_j979" fontSize="22" color="#8494aa" autoSize="none" text="策划后期表格配置策划后期表格配置策划后期表格配置策划后期表格配置策划后期表格配置策划后期表格配置策划后期表格配置策划后期表格配置策划后期表格配置策划后期表格配置策划后期表格配置策划后期表格配置"/>
     <group id="n48_j979" name="n48" xy="368,363" size="509,171" advanced="true"/>
     <loader id="n50_olmj" name="nameImg" xy="375,115" size="87,38" group="n49_j979" url="ui://isxx5ak7udj0v4jz" autoSize="true"/>

二進制
client/laya/bin/asset/fgui/game.obj


+ 1 - 1
client/laya/bin/fileconfig.json

@@ -1 +1 @@
-{"spine/nvmishu.json":["spine/nvmishu/",[]]}
+{"spine/dianji.json":["spine/dianji/",[]],"spine/nvmishu.json":["spine/nvmishu/",[]]}