1

art/fgui/.objs/workspace.json

@@ -1,5 +1,5 @@
 {
-  "libview.firstColumnWidth": 265,
+  "libview.firstColumnWidth": 270,
   "expanded_nodes": [
     "isxx5ak7",
     "/",
@@ -7,24 +7,29 @@
     "/"
   ],
   "libview.iconScale": 0,
-  "doc.openedDocs": [],
+  "doc.openedDocs": [
+    "ui://isxx5ak7hkrz3qu"
+  ],
   "test.device": "iPhone Xs Max",
   "canvasColor": 10066329,
   "auxline2": true,
+  "doc.activeDoc": "ui://isxx5ak7hkrz3qu",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "isxx5ak7",
     "/",
     "isxx5ak7",
-    "/UILevelSelect/",
+    "/UIGame/",
+    "isxx5ak7",
+    "/UIGame/component/",
     "isxx5ak7",
-    "/UIMain/",
+    "/UISecretary/",
     "isxx5ak7",
-    "/UIMain/component/",
+    "/UISecretary/UIShop/",
     "isxx5ak7",
-    "/UIModeSelection/",
+    "/UISecretary/UIShop/component/",
     "isxx5ak7",
-    "/UIModeSelection/component/",
+    "/UISecretary/component/",
     "isxx5ak7",
     "/windows/"
   ],

art/fgui/assets/game/UIGame/component/Component45.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="83,102">
-  <controller name="c1" alias="游戏顶部显示" exported="true" pages="0,金币,1,分数" selected="1"/>
+  <controller name="c1" alias="游戏顶部显示" exported="true" pages="0,金币,1,分数" selected="0"/>
   <displayList>
     <image id="n40_iveg" name="n40" src="hkrz3ri" fileName="UIGame/asset/yy_szk.png" xy="3,0"/>
     <image id="n41_iveg" name="n41" src="wehi3ui" fileName="UIMoney/asset/ty_jb.png" xy="17,6">
@@ -12,7 +12,7 @@
     <image id="n42_iveg" name="n42" src="hkrz3rj" fileName="UIGame/asset/yy_szk2.png" xy="5,53" size="73,23">
       <gearDisplay controller="c1" pages="0"/>
     </image>
-    <text id="n43_iveg" name="awardTxt" xy="5,55" size="72,26" font="Arial" fontSize="18" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" text="1000">
+    <text id="n43_iveg" name="awardTxt" xy="5,52" size="72,26" font="Arial" fontSize="18" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" text="1000">
       <gearDisplay controller="c1" pages="0"/>
     </text>
     <image id="n44_i4k2" name="n44" src="i4k2437" fileName="UIGame/asset/yy_zs13_1.png" xy="0,82">

art/fgui/assets/game/UIGame/component/topNode.xml

@@ -32,9 +32,9 @@
       <item/>
       <item/>
     </list>
-    <component id="n40_iveg" name="middleNode" src="i4k2438" fileName="UIGame/component/Component45.xml" xy="625,6" controller="c1,1"/>
-    <text id="n36_mbwf" name="selfScoreTxt" xy="591,29" pivot="0.5,0.5" size="34,35" group="n39_mbwf" fontSize="25" color="#ffffff" align="center" vAlign="middle" bold="true" text="50"/>
-    <text id="n37_mbwf" name="aiScoreTxt" xy="708,29" pivot="0.5,0.5" size="34,35" group="n39_mbwf" fontSize="25" color="#ffffff" align="center" vAlign="middle" bold="true" text="50"/>
+    <component id="n40_iveg" name="middleNode" src="i4k2438" fileName="UIGame/component/Component45.xml" xy="625,5" controller="c1,1"/>
+    <text id="n36_mbwf" name="selfScoreTxt" xy="592,29" pivot="0.5,0.5" size="32,35" group="n39_mbwf" fontSize="25" color="#ffffff" align="center" vAlign="middle" bold="true" text="50"/>
+    <text id="n37_mbwf" name="aiScoreTxt" xy="709,29" pivot="0.5,0.5" size="32,35" group="n39_mbwf" fontSize="25" color="#ffffff" align="center" vAlign="middle" bold="true" text="50"/>
     <group id="n39_mbwf" name="scoreNode" xy="591,29" size="151,35" advanced="true"/>
     <image id="n47_xs1r" name="selfTips" src="d1pb47j" fileName="UIGame/asset/yxz_wz_wdhh1.png" xy="511,91" pivot="0.5,0.5" size="66,19" aspect="true"/>
     <image id="n48_xs1r" name="aiTips" src="d1pb47i" fileName="UIGame/asset/yxz_wz_wdhh2.png" xy="756,91" pivot="0.5,0.5" size="64,19" aspect="true"/>

art/fgui/assets/game/UISecretary/UIShop/component/Component28_1.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="132,41" pivot="0.5,0.5" extention="Button">
   <displayList>
-    <image id="n12_qlo0" name="n12" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="-43,-14" pivot="0.5,0.5" size="218,68" aspect="true" scale="0.6,0.6">
+    <image id="n12_qlo0" name="n12" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="-42,-14" pivot="0.5,0.5" size="217,68" aspect="true" scale="0.6,0.6">
       <relation target="n15_s46i" sidePair="width-width"/>
     </image>
     <image id="n13_s46i" name="n13" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="21,8" pivot="0.5,0.5" size="33,27" group="n15_s46i" aspect="true"/>
-    <text id="n14_s46i" name="n14" xy="59,5" pivot="0.5,0.5" size="56,32" group="n15_s46i" fontSize="22" color="#ffffff" align="center" vAlign="middle" text="3000">
+    <text id="n14_s46i" name="n14" xy="61,4" pivot="0.5,0.5" size="52,32" group="n15_s46i" fontSize="22" color="#ffffff" align="center" vAlign="middle" text="3000">
       <relation target="n13_s46i" sidePair="left-left"/>
     </text>
-    <group id="n15_s46i" name="n15" xy="21,5" size="93,32" advanced="true">
+    <group id="n15_s46i" name="n15" xy="21,4" size="92,32" advanced="true">
       <relation target="n12_qlo0" sidePair="center-center"/>
     </group>
   </displayList>

art/fgui/assets/game/UISecretary/UIShop/component/Component28_11.xml

@@ -1,25 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="132,41" pivot="0.5,0.5" extention="Button">
-  <controller name="c1" alias="按钮" exported="true" pages="0,使用中,1,点击使用,2,钻石购买" selected="2"/>
+  <controller name="c1" alias="按钮" exported="true" pages="0,使用中,1,点击使用,2,钻石购买" selected="1"/>
   <displayList>
-    <image id="n12_qlo0" name="n12" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="-54,-17" pivot="0.5,0.5" size="240,74" aspect="true" scale="0.6,0.6">
+    <image id="n12_qlo0" name="n12" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="-49,-16" pivot="0.5,0.5" size="231,74" aspect="true" scale="0.6,0.6">
       <gearDisplay controller="c1" pages="1,2"/>
       <relation target="n15_s46i" sidePair="width-width"/>
     </image>
     <image id="n17_wcn5" name="n17" src="hkrz3ta" fileName="_shareasset/ty_an1.png" xy="-54,-17" pivot="0.5,0.5" size="240,74" aspect="true" scale="0.6,0.6">
       <gearDisplay controller="c1" pages="0"/>
     </image>
-    <image id="n13_s46i" name="n13" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="21,7" pivot="0.5,0.5" size="33,27" group="n15_s46i" aspect="true"/>
-    <text id="n14_s46i" name="diamondTxt" xy="61,4" pivot="0.5,0.5" size="52,32" group="n15_s46i" fontSize="22" color="#ffffff" align="center" vAlign="middle" strokeColor="#000000" text="3000">
-      <relation target="n13_s46i" sidePair="left-left"/>
-    </text>
-    <group id="n15_s46i" name="n15" xy="21,4" size="93,32" advanced="true">
+    <image id="n13_s46i" name="n13" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="24,7" pivot="0.5,0.5" size="33,27" group="n15_s46i" aspect="true" scale="0.8,0.8"/>
+    <text id="n14_s46i" name="diamondTxt" xy="56,5" pivot="0.5,0.5" size="52,30" group="n15_s46i" fontSize="21" color="#ffffff" vAlign="middle" leading="0" autoSize="none" strokeColor="#000000" text="3000"/>
+    <group id="n15_s46i" name="n15" xy="24,5" size="84,30" advanced="true">
       <gearDisplay controller="c1" pages="2"/>
       <relation target="n12_qlo0" sidePair="center-center"/>
     </group>
-    <text id="n16_wcn5" name="n16" xy="32,5" pivot="0.5,0.5" size="67,30" fontSize="21" color="#ffffff" bold="true" strokeColor="#000000" text="使用中">
+    <text id="n16_wcn5" name="n16" xy="44,5" pivot="0.5,0.5" size="43,30" fontSize="21" color="#ffffff" leading="0" bold="true" strokeColor="#000000" text="Use">
       <gearDisplay controller="c1" pages="0,1"/>
-      <gearText controller="c1" pages="0,1" values="In use|Click to use" default="使用中"/>
+      <gearText controller="c1" pages="0,1" values="In use|Use" default="使用中"/>
     </text>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.04"/>

art/fgui/assets/game/package.xml

@@ -564,7 +564,7 @@
     <component id="g1giv4eb" name="Component97.xml" path="/UIGameEnd/component/"/>
     <component id="g1giv4ed" name="Component98.xml" path="/UISkill/component/"/>
     <component id="g1giv4ef" name="Component26.xml" path="/UISecretary/UIShop/component/"/>
-    <component id="g1giv4eh" name="Component28_11.xml" path="/UISecretary/UIShop/component/"/>
+    <component id="g1giv4eh" name="Component28_11.xml" path="/UISecretary/UIShop/component/" favorite="true"/>
     <component id="g1giv4ek" name="Component57.xml" path="/UISecretary/UIShop/component/"/>
     <component id="g1giv4el" name="Component58_11.xml" path="/UISecretary/UIShop/component/"/>
     <component id="g1giv4em" name="Component64.xml" path="/UISecretary/UIShop/component/"/>
@@ -1275,6 +1275,7 @@
     <movieclip id="qj9yv578" name="aaaaa.jta" path="/__示意图/"/>
     <image id="h498v579" name="234_2025.png" path="/UIRepentProp/asset/"/>
     <font id="d33kv57a" name="arial.ttf" path="/" renderMode="" samplePointSize="16"/>
+    <component id="q5n8v57b" name="Component1303.xml" path="/UIGame/component/"/>
   </resources>
   <publish name="game" path="..\..\client\laya\bin\asset\fgui" packageCount="2" genCode="true" codePath="..\..\client\laya\src\fgui\res"/>
 </packageDescription>