Merge branch 'master' of http://10.108.64.190:3000/gfg/client

FGUIProject/assets/Card/CardFilterUI.xml

@@ -4,6 +4,8 @@
     <component id="n0_pq5x" name="n0" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,938">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
+    <component id="n12_pq5x" name="btnChoose" src="pq5x66" fileName="components/btnChoose.xml" xy="685,75"/>
+    <component id="n11_pq5x" name="btnGo" src="pq5x6f" fileName="components/Button8.xml" pkg="eg2y0ldp" xy="317,810"/>
     <component id="n1_pq5x" name="n1" src="ih7596" fileName="components/ComFilterType.xml" pkg="eg2y0ldp" xy="45,72" group="n4_pq5x">
       <property target="txtName" propertyId="0" value="人物"/>
     </component>
@@ -13,28 +15,27 @@
       <item/>
       <item/>
     </list>
-    <group id="n4_pq5x" name="grp0" xy="45,72" size="815,206"/>
-    <component id="n5_pq5x" name="n5" src="ih7596" fileName="components/ComFilterType.xml" pkg="eg2y0ldp" xy="48,315" group="n7_pq5x">
+    <group id="n4_pq5x" name="grp0" xy="45,72" size="815,206" group="n14_ysx9" visible="false" advanced="true"/>
+    <component id="n5_pq5x" name="n5" src="ih7596" fileName="components/ComFilterType.xml" pkg="eg2y0ldp" xy="48,72" group="n7_pq5x">
       <property target="txtName" propertyId="0" value="稀有度"/>
     </component>
-    <list id="n6_pq5x" name="list1" xy="82,375" size="781,146" group="n7_pq5x" layout="flow_hz" selectionMode="multipleSingleClick" lineGap="21" colGap="20" defaultItem="ui://eg2y0ldppq5x6e" autoClearItems="true">
+    <list id="n6_pq5x" name="list1" xy="82,132" size="781,146" group="n7_pq5x" layout="flow_hz" selectionMode="multipleSingleClick" lineGap="21" colGap="20" defaultItem="ui://eg2y0ldppq5x6e" autoClearItems="true">
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <group id="n7_pq5x" name="grp1" xy="48,315" size="815,206"/>
-    <component id="n8_pq5x" name="n8" src="ih7596" fileName="components/ComFilterType.xml" pkg="eg2y0ldp" xy="48,558" group="n10_pq5x">
+    <group id="n7_pq5x" name="grp1" xy="48,72" size="815,206" group="n14_ysx9"/>
+    <component id="n8_pq5x" name="n8" src="ih7596" fileName="components/ComFilterType.xml" pkg="eg2y0ldp" xy="48,303" group="n10_pq5x">
       <property target="txtName" propertyId="0" value="进化"/>
     </component>
-    <list id="n9_pq5x" name="list2" xy="82,618" size="781,146" group="n10_pq5x" layout="flow_hz" selectionMode="multipleSingleClick" lineGap="21" colGap="20" defaultItem="ui://eg2y0ldppq5x6e" autoClearItems="true">
+    <list id="n9_pq5x" name="list2" xy="82,363" size="781,146" group="n10_pq5x" layout="flow_hz" selectionMode="multipleSingleClick" lineGap="21" colGap="20" defaultItem="ui://eg2y0ldppq5x6e" autoClearItems="true">
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <group id="n10_pq5x" name="grp2" xy="48,558" size="815,206"/>
-    <component id="n12_pq5x" name="btnChoose" src="pq5x66" fileName="components/btnChoose.xml" xy="685,75"/>
-    <component id="n11_pq5x" name="btnGo" src="pq5x6f" fileName="components/Button8.xml" pkg="eg2y0ldp" xy="317,810"/>
+    <group id="n10_pq5x" name="grp2" xy="48,303" size="815,206" group="n14_ysx9"/>
+    <group id="n14_ysx9" name="n14" xy="48,72" size="815,437" advanced="true" layout="vt" lineGap="25" excludeInvisibles="true"/>
   </displayList>
 </component>

FGUIProject/assets/Card/components/ComFosterBottom.xml

@@ -2,21 +2,21 @@
 <component size="1080,1709" overflow="hidden" opaque="false">
   <controller name="ctrlFullStar" pages="0,,1," selected="0"/>
   <controller name="ctrlFullLv" pages="0,,1," selected="0"/>
-  <controller name="ctrlTab" exported="true" pages="0,,1,,2," selected="0"/>
+  <controller name="ctrlTab" exported="true" pages="0,,1,,2," selected="1"/>
   <displayList>
     <image id="n70_lc71" name="n70" src="842s6e" fileName="images/kp_bj_2.png" xy="0,209"/>
     <component id="n67_lc71" name="btnStory" src="ojlzl" fileName="components/btnStory.xml" xy="791,621"/>
-    <text id="n27_842s" name="txtName" xy="540,902" pivot="0.5,0" anchor="true" size="244,79" group="n30_842s" fontSize="60" color="#fdfbf3" text="许墨萌牙"/>
+    <text id="n27_842s" name="txtName" xy="540,902" pivot="0.5,0" anchor="true" size="240,79" group="n30_842s" fontSize="60" color="#fdfbf3" autoClearText="true" text="许墨萌牙"/>
     <image id="n28_842s" name="n28" src="842s6j" fileName="images/kp_xiantiao.png" xy="731,948" size="341,10" group="n30_842s"/>
     <image id="n29_842s" name="n29" src="842s6j" fileName="images/kp_xiantiao.png" xy="13,948" size="341,10" group="n30_842s" flip="hz"/>
     <group id="n30_842s" name="grpName" xy="13,902" size="1059,79"/>
     <loader id="n73_lc1j" name="n73" xy="30,1008" size="1020,673" url="ui://7l6lvkay842s6h" fill="scaleFree"/>
     <component id="n17_ojlz" name="btnLv" src="ojlzr" fileName="components/btnTab.xml" xy="136,1044" group="n22_842s">
-      <Button checked="true" controller="ctrlTab" page="0"/>
+      <Button controller="ctrlTab" page="0"/>
       <property target="title" propertyId="0" value="升级"/>
     </component>
     <component id="n18_ojlz" name="btnStar" src="ojlzr" fileName="components/btnTab.xml" xy="422,1044" group="n22_842s">
-      <Button controller="ctrlTab" page="1"/>
+      <Button checked="true" controller="ctrlTab" page="1"/>
       <property target="title" propertyId="0" value="升星"/>
     </component>
     <component id="n19_ojlz" name="btnSkill" src="ojlzr" fileName="components/btnTab.xml" xy="708,1044" group="n22_842s">
@@ -33,23 +33,23 @@
     <component id="n36_842s" name="barLv" src="842s6q" fileName="components/ProgressBar1.xml" xy="251,1254" group="n38_842s">
       <ProgressBar value="100" max="100"/>
     </component>
-    <text id="n46_wr9a" name="n46" xy="358,1413" size="364,54" group="n38_842s" fontSize="40" color="#736b64" text="当前等级已达到上限">
+    <text id="n46_wr9a" name="n46" xy="358,1413" size="358,54" group="n38_842s" fontSize="40" color="#736b64" text="当前等级已达到上限">
       <gearDisplay controller="ctrlFullLv" pages="1"/>
     </text>
     <text id="n37_842s" name="txtCurLv" xy="117,1240" pivot="1,0" size="72,44" group="n38_842s" fontSize="32" color="#7d6956" align="right" ubb="true" autoSize="none" text="100">
       <relation target="n41_wr9a" sidePair="right-left,top-top"/>
     </text>
-    <text id="n41_wr9a" name="n41" xy="191,1239" pivot="0.5,0" anchor="true" size="23,44" group="n38_842s" fontSize="32" color="#7d6956" text="/"/>
-    <text id="n42_wr9a" name="txtMaxLv" xy="195,1239" size="64,44" group="n38_842s" fontSize="32" color="#7d6956" text="500">
+    <text id="n41_wr9a" name="n41" xy="191,1239" pivot="0.5,0" anchor="true" size="20,44" group="n38_842s" fontSize="32" color="#7d6956" text="/"/>
+    <text id="n42_wr9a" name="txtMaxLv" xy="195,1239" size="59,44" group="n38_842s" fontSize="32" color="#7d6956" text="500">
       <relation target="n41_wr9a" sidePair="left-right,top-top"/>
     </text>
-    <text id="n39_a713" name="txtCurExp" xy="913,1224" pivot="1,0" size="34,34" group="n58_l2by" fontSize="24" color="#7d6956" text="30">
+    <text id="n39_a713" name="txtCurExp" xy="915,1224" pivot="1,0" size="32,34" group="n58_l2by" fontSize="24" color="#7d6956" text="30">
       <relation target="n44_wr9a" sidePair="right-left,top-top"/>
     </text>
-    <text id="n44_wr9a" name="n44" xy="950,1224" pivot="0.5,0" anchor="true" size="18,34" group="n58_l2by" fontSize="24" color="#7d6956" text="/">
+    <text id="n44_wr9a" name="n44" xy="950,1224" pivot="0.5,0" anchor="true" size="16,34" group="n58_l2by" fontSize="24" color="#7d6956" text="/">
       <relation target="" sidePair="right-right"/>
     </text>
-    <text id="n45_wr9a" name="txtMaxExp" xy="953,1224" size="64,34" group="n58_l2by" fontSize="24" color="#94897e" text="5000">
+    <text id="n45_wr9a" name="txtMaxExp" xy="953,1224" size="59,34" group="n58_l2by" fontSize="24" color="#94897e" text="5000">
       <relation target="n44_wr9a" sidePair="left-right,top-top"/>
     </text>
     <list id="n13_ojlz" name="listLvConsume" xy="127,1307" size="876,196" group="n58_l2by" layout="row" colGap="166" defaultItem="ui://7l6lvkay842s6n">
@@ -57,14 +57,14 @@
       <item/>
       <item/>
     </list>
-    <component id="n14_ojlz" name="ComLvConsumeGold" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="415,1506" group="n58_l2by"/>
+    <component id="n14_ojlz" name="ComLvConsumeGold" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="415,1506" size="237,46" group="n58_l2by"/>
     <component id="n24_842s" name="btnAll" src="842s6q" fileName="components/Button9.xml" pkg="eg2y0ldp" xy="237,1573" size="270,74" group="n58_l2by">
       <Button title="自动选择"/>
     </component>
     <component id="n25_842s" name="btnUpLv" src="842s6q" fileName="components/Button9.xml" pkg="eg2y0ldp" xy="597,1573" size="270,74" group="n58_l2by">
       <Button title="升级"/>
     </component>
-    <group id="n58_l2by" name="n58" xy="127,1224" size="890,423" group="n38_842s" advanced="true">
+    <group id="n58_l2by" name="n58" xy="127,1224" size="885,423" group="n38_842s" advanced="true">
       <gearDisplay controller="ctrlFullLv" pages="0"/>
     </group>
     <group id="n38_842s" name="grpLv" xy="117,1224" size="902,423" advanced="true">
@@ -72,7 +72,7 @@
     </group>
     <image id="n48_wr9a" name="n48" src="a7137b" fileName="images/kp_dikuang_7.png" xy="78,1221" size="924,72" group="n55_l2by"/>
     <component id="n50_wr9a" name="comStar" src="wr9a85" fileName="components/ComBigStar.xml" xy="339,1226" group="n55_l2by"/>
-    <text id="n59_l2by" name="n59" xy="540,1325" pivot="0.5,0" anchor="true" size="324,54" group="n55_l2by" fontSize="40" color="#736b64" text="已提升至最高等级">
+    <text id="n59_l2by" name="n59" xy="540,1325" pivot="0.5,0" anchor="true" size="319,54" group="n55_l2by" fontSize="40" color="#736b64" text="已提升至最高等级">
       <gearDisplay controller="ctrlFullStar" pages="1"/>
     </text>
     <list id="n47_wr9a" name="listStarConsume" xy="102,1307" size="876,196" group="n57_l2by" layout="row" colGap="166" defaultItem="ui://7l6lvkaywr9a82" align="center">

FGUIProject/assets/ClothingFoster/ClothingFosterFinishUI.xml

@@ -5,23 +5,23 @@
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <image id="n5_l4ui" name="n5" src="bd1c1x" fileName="images/fzyc_wcyh_1.png" xy="0,300"/>
-    <text id="n7_l4ui" name="n7" xy="430,1822" size="220,49" fontSize="36" color="#958163" text="点击屏幕继续">
+    <text id="n7_l4ui" name="n7" xy="430,1822" size="217,49" fontSize="36" color="#958163" text="点击屏幕继续">
       <relation target="" sidePair="bottom-bottom"/>
     </text>
     <image id="n6_l4ui" name="n6" src="bd1c1w" fileName="images/fzyc_wcyh_3.png" xy="115,1138" pivot="0.5,0" group="n8_l4ui"/>
     <text id="n3_bd1c" name="txtRenewTips" xy="376,1140" pivot="0.5,0" size="328,49" group="n8_l4ui" fontSize="36" color="#d1bc8d" autoSize="none" text="本套装的换新已可用"/>
     <group id="n8_l4ui" name="grpRenew" xy="115,1138" size="850,60" visible="false" advanced="true"/>
     <image id="n18_l4ui" name="img" src="bd1c1v" fileName="images/fzyc_wcyh_2.png" xy="504,724" size="72,56" fillMethod="vt"/>
-    <component id="n9_l4ui" name="comProperty0" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="155,592" pivot="0.5,0" size="170,58" group="n20_l4ui"/>
-    <component id="n10_l4ui" name="comProperty1" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="355,592" pivot="0.5,0" size="170,58" group="n20_l4ui"/>
-    <component id="n11_l4ui" name="comProperty2" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="555,592" pivot="0.5,0" size="170,58" group="n20_l4ui"/>
-    <component id="n12_l4ui" name="comProperty3" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="755,592" pivot="0.5,0" size="170,58" group="n20_l4ui"/>
-    <group id="n20_l4ui" name="grpProperty" xy="155,592" size="770,58" visible="false" advanced="true"/>
-    <component id="n14_l4ui" name="comAddProperty0" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="155,851" pivot="0.5,0" size="170,58" group="n21_l4ui"/>
-    <component id="n15_l4ui" name="comAddProperty1" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="355,851" pivot="0.5,0" size="170,58" group="n21_l4ui"/>
-    <component id="n16_l4ui" name="comAddProperty2" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="555,851" pivot="0.5,0" size="170,58" group="n21_l4ui"/>
-    <component id="n17_l4ui" name="comAddProperty3" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="755,851" pivot="0.5,0" size="170,58" group="n21_l4ui"/>
-    <group id="n21_l4ui" name="grpAddProperty" xy="155,851" size="770,58" visible="false" advanced="true"/>
+    <component id="n9_l4ui" name="comProperty0" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="197,592" pivot="0.5,0" size="170,58" group="n20_l4ui"/>
+    <component id="n10_l4ui" name="comProperty1" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="397,592" pivot="0.5,0" size="170,58" group="n20_l4ui"/>
+    <component id="n11_l4ui" name="comProperty2" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="597,592" pivot="0.5,0" size="170,58" group="n20_l4ui"/>
+    <component id="n12_l4ui" name="comProperty3" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="797,592" pivot="0.5,0" size="170,58" group="n20_l4ui"/>
+    <group id="n20_l4ui" name="grpProperty" xy="197,592" size="770,58" visible="false" advanced="true"/>
+    <component id="n14_l4ui" name="comAddProperty0" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="197,851" pivot="0.5,0" size="170,58" group="n21_l4ui"/>
+    <component id="n15_l4ui" name="comAddProperty1" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="397,851" pivot="0.5,0" size="170,58" group="n21_l4ui"/>
+    <component id="n16_l4ui" name="comAddProperty2" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="597,851" pivot="0.5,0" size="170,58" group="n21_l4ui"/>
+    <component id="n17_l4ui" name="comAddProperty3" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="797,851" pivot="0.5,0" size="170,58" group="n21_l4ui"/>
+    <group id="n21_l4ui" name="grpAddProperty" xy="197,851" size="770,58" visible="false" advanced="true"/>
   </displayList>
   <transition name="t0" autoPlay="true">
     <item time="0" type="Size" target="n10_l4ui" tween="true" startValue="170,0" endValue="170,58" duration="8" ease="Linear"/>

FGUIProject/assets/ClothingFoster/ClothingListUI.xml

@@ -4,26 +4,28 @@
     <loader id="n12_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n2_py5g" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">
+    <image id="n14_ysx9" name="n14" src="ysx92p" fileName="images/tujian_ditup.png" xy="0,240">
+      <relation target="" sidePair="top-top,bottomext-bottom"/>
+    </image>
+    <component id="n2_py5g" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
+      <Button icon="ui://uicwtr5bweok2q"/>
+    </component>
+    <component id="n4_py5g" name="btnNotGet" src="py5g1" fileName="components/Button2.xml" xy="137,280" group="n10_rbxq">
+      <Button checked="true" title="未获得"/>
+    </component>
+    <component id="n5_py5g" name="btnHaveGot" src="py5g1" fileName="components/Button2.xml" xy="424,280" group="n10_rbxq">
+      <Button title="已获得"/>
     </component>
-    <component id="n3_py5g" name="comBoxSort" src="j5a5x" fileName="components/ComboBox1.xml" xy="555,207" group="n10_rbxq">
+    <component id="n3_py5g" name="comBoxSort" src="j5a5x" fileName="components/ComboBox1.xml" xy="657,280" group="n10_rbxq">
       <ComboBox title="默认排序" visibleItemCount="10" autoClearItems="true">
         <item title="1"/>
         <item title="2"/>
         <item title="3"/>
       </ComboBox>
     </component>
-    <component id="n4_py5g" name="btnNotGet" src="py5g1" fileName="components/Button2.xml" xy="124,207" group="n10_rbxq">
-      <Button checked="true" title="未获得"/>
-    </component>
-    <component id="n5_py5g" name="btnHaveGot" src="py5g1" fileName="components/Button2.xml" xy="372,207" group="n10_rbxq">
-      <Button title="已获得"/>
-    </component>
-    <group id="n10_rbxq" name="n10" xy="124,207" size="773,70" advanced="true">
-      <relation target="" sidePair="left-left,top-top"/>
-    </group>
-    <list id="n9_py5g" name="listSuit" xy="36,377" size="1007,1537" layout="flow_hz" overflow="scroll" lineGap="48" colGap="26" defaultItem="ui://uicwtr5bpy5g8" autoClearItems="true">
+    <group id="n10_rbxq" name="n10" xy="137,280" size="862,72" advanced="true"/>
+    <list id="n9_py5g" name="listSuit" xy="24,431" size="1032,1489" layout="flow_hz" overflow="scroll" lineGap="32" colGap="12" defaultItem="ui://uicwtr5bpy5g8" autoClearItems="true">
       <relation target="" sidePair="top-top,bottomext-bottom"/>
       <item/>
       <item/>

FGUIProject/assets/ClothingFoster/components/Button2.xml

@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="210,56" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+<component size="232,71" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <image id="n0_pjip" name="n0" src="py5g2" fileName="images/tujian_anniu_1.png" xy="0,0" size="210,56">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n1_pjip" name="title" xy="0,0" size="141,56" fontSize="30" color="#fff8df" align="center" vAlign="middle" autoSize="none" singleLine="true" autoClearText="true" text="abc">
-      <relation target="" sidePair="width-width,height-height"/>
+    <loader id="n4_ysx9" name="icon" xy="0,0" size="232,76" url="ui://uicwtr5bpy5g2" autoSize="true">
+      <gearIcon controller="button" pages="1" values="ui://uicwtr5bysx92o" default="ui://uicwtr5bpy5g2"/>
+    </loader>
+    <text id="n1_pjip" name="title" xy="81,10" pivot="0.5,0" size="69,52" fontSize="38" color="#b19771" align="center" vAlign="middle" singleLine="true" autoClearText="true" text="abc">
+      <gearColor controller="button" pages="1" values="#d47c76,#000000" default="#b19771,#000000"/>
+      <relation target="" sidePair="center-center"/>
     </text>
-    <image id="n2_pjip" name="n2" src="py5g3" fileName="images/tujian_xzdg.png" xy="146,9">
-      <gearDisplay controller="button" pages="1,3"/>
-    </image>
-    <image id="n3_pjip" name="n3" src="py5g4" fileName="images/tujian_xzdg_1.png" xy="146,9">
-      <gearDisplay controller="button" pages="0,2"/>
-    </image>
   </displayList>
   <Button mode="Check"/>
 </component>

FGUIProject/assets/ClothingFoster/components/Button3.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="210,56" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <image id="n2_pjip" name="n2" src="py5g2" fileName="images/tujian_anniu_1.png" xy="0,0" size="210,56">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n3_pjip" name="title" xy="0,0" size="160,56" fontSize="30" color="#fff8df" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
-      <relation target="" sidePair="width-width,height-height"/>
-    </text>
-    <image id="n4_pjip" name="n4" src="py5g6" fileName="images/tujian_zkanniu.png" xy="157,2"/>
-  </displayList>
-  <Button/>
-</component>

FGUIProject/assets/ClothingFoster/components/ComboBox1.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="342,70" extention="ComboBox">
+<component size="342,72" extention="ComboBox">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_pjip" name="n0" src="j5a5y" fileName="images/tujian_anniu_1(1).png" xy="66,0" size="210,56" group="n3_rc07"/>
-    <text id="n1_pjip" name="title" xy="73,0" size="152,56" group="n3_rc07" fontSize="30" color="#fff8df" align="center" vAlign="middle" autoSize="none" singleLine="true" text="默认分类"/>
-    <image id="n2_pjip" name="n2" src="py5g6" fileName="images/tujian_zkanniu.png" xy="221,2" group="n3_rc07"/>
-    <group id="n3_rc07" name="n3" xy="66,0" size="210,56"/>
+    <image id="n4_ysx9" name="n4" src="py5g2" fileName="images/tujian_anniu_1.png" xy="55,0" group="n7_ysx9"/>
+    <text id="n5_ysx9" name="title" xy="75,-2" size="160,76" group="n7_ysx9" font="ui://eg2y0ldpwonotja" fontSize="38" color="#c2a676" align="center" vAlign="middle" autoSize="none" singleLine="true" text="默认分类"/>
+    <image id="n6_ysx9" name="n6" src="py5g6" fileName="images/tujian_zkanniu.png" xy="240,22" group="n7_ysx9"/>
+    <group id="n7_ysx9" name="n7" xy="55,-2" size="232,78"/>
   </displayList>
   <ComboBox dropdown="ui://uicwtr5bj5a510"/>
 </component>

FGUIProject/assets/ClothingFoster/components/ComboBox1_item.xml

@@ -2,7 +2,7 @@
 <component size="280,58" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <text id="n2_pjip" name="title" xy="68,0" pivot="0.5,0" size="144,39" fontSize="28" color="#fddeb6" align="center" vAlign="middle" singleLine="true" text="自定义套装"/>
+    <text id="n2_pjip" name="title" xy="68,0" pivot="0.5,0" size="144,39" fontSize="28" color="#b79155" align="center" vAlign="middle" singleLine="true" text="自定义套装"/>
     <image id="n3_pjip" name="imgLine" src="q08xp" fileName="imagesExport/hz_tzkuang.png" pkg="eg2y0ldp" xy="0,56"/>
   </displayList>
   <Button mode="Radio"/>

FGUIProject/assets/ClothingFoster/components/ListSuitItem.xml

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="316,505">
+<component size="336,535">
   <displayList>
-    <loader id="n11_pjip" name="bg" xy="0,0" size="316,505" url="ui://uicwtr5bpy5g9"/>
-    <loader id="n12_pjip" name="loaderPic" xy="12,11" size="292,396" touchable="false" fill="scaleFree"/>
-    <text id="n13_pjip" name="txtName" xy="39,420" size="238,41" fontSize="30" color="#986a41" align="center" autoSize="height" autoClearText="true" text="示例"/>
-    <component id="n15_pjip" name="progBar" src="py5ga" fileName="images/ProgressBar1.xml" xy="8,483" touchable="false">
+    <loader id="n11_pjip" name="bg" xy="0,0" size="336,535" url="ui://uicwtr5bysx92i" autoSize="true"/>
+    <loader id="n12_pjip" name="loaderPic" xy="22,24" pivot="0.5,0.5" size="292,396" scale="1.08,1.08" touchable="false" url="ui://uicwtr5bysx92m" fill="scaleFree" autoSize="true"/>
+    <image id="n19_ysx9" name="n19" src="ysx92l" fileName="images/fzyc_zikua.png" xy="33,369"/>
+    <text id="n13_pjip" name="txtName" xy="134,374" pivot="0.5,0" size="68,44" font="ui://eg2y0ldpk1kha2" fontSize="32" color="#986a41" align="center" autoClearText="true" text="示例"/>
+    <component id="n15_pjip" name="progBar" src="py5ga" fileName="images/ProgressBar1.xml" xy="25,466" touchable="false">
       <ProgressBar value="10" max="10"/>
     </component>
-    <loader id="n16_pjip" name="rarity" xy="265,10" size="44,94" touchable="false" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
-    <image id="n17_pjip" name="imgLockBg" src="py5gd" fileName="images/tujian_suoan.png" xy="0,1"/>
-    <image id="n18_pjip" name="imgLock" src="py5ge" fileName="images/zhuxian_shuoto.png" xy="122,232"/>
+    <loader id="n16_pjip" name="rarity" xy="285,8" size="44,94" touchable="false" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
+    <image id="n17_pjip" name="imgLockBg" src="ysx92h" fileName="images/fzsj_andi.png" xy="0,1"/>
+    <image id="n18_pjip" name="imgLock" src="py5ge" fileName="images/zhuxian_shuoto.png" xy="132,204"/>
   </displayList>
 </component>

FGUIProject/assets/ClothingFoster/images/ProgressBar1.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="232,6" extention="ProgressBar">
+<component size="286,10" extention="ProgressBar">
   <displayList>
-    <image id="n0_pjip" name="n0" src="py5gb" fileName="images/tujian_jdt_1.png" xy="0,0">
+    <image id="n0_pjip" name="n0" src="ysx92j" fileName="images/fzyc_jdt_1.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_pjip" name="bar" src="py5gc" fileName="images/tujian_jdt_2.png" xy="0,0"/>
-    <text id="n2_pjip" name="title" xy="245,-11" size="10,29" visible="false" fontSize="20" color="#b3805e" vAlign="middle" autoClearText="true" text=""/>
+    <image id="n1_pjip" name="bar" src="ysx92k" fileName="images/fzyc_jdt_2.png" xy="1,1"/>
+    <text id="n2_pjip" name="title" xy="0,10" size="78,34" visible="false" fontSize="24" color="#a88858" vAlign="middle" autoClearText="true" text="10/10"/>
   </displayList>
   <ProgressBar titleType="valueAndmax"/>
 </component>

FGUIProject/assets/ClothingFoster/package.xml

@@ -4,17 +4,9 @@
     <component id="py5g0" name="ClothingListUI.xml" path="/" exported="true"/>
     <component id="py5g1" name="Button2.xml" path="/components/"/>
     <image id="py5g2" name="tujian_anniu_1.png" path="/images/" scale="9grid" scale9grid="53,15,106,30"/>
-    <image id="py5g3" name="tujian_xzdg.png" path="/images/"/>
-    <image id="py5g4" name="tujian_xzdg_1.png" path="/images/"/>
-    <component id="py5g5" name="Button3.xml" path="/components/"/>
     <image id="py5g6" name="tujian_zkanniu.png" path="/images/"/>
-    <image id="py5g7" name="tujian_diban_2.png" path="/images/"/>
     <component id="py5g8" name="ListSuitItem.xml" path="/components/"/>
-    <image id="py5g9" name="tujian_diban_1.png" path="/images/"/>
     <component id="py5ga" name="ProgressBar1.xml" path="/images/"/>
-    <image id="py5gb" name="tujian_jdt_1.png" path="/images/"/>
-    <image id="py5gc" name="tujian_jdt_2.png" path="/images/" scale="tile"/>
-    <image id="py5gd" name="tujian_suoan.png" path="/images/"/>
     <image id="py5ge" name="zhuxian_shuoto.png" path="/images/"/>
     <component id="py5gf" name="ClothingUI.xml" path="/" exported="true"/>
     <image id="py5gg" name="sc_bjtu.png" path="/images/images/" atlas="alone_npot"/>
@@ -35,7 +27,6 @@
     <component id="py5gv" name="ListPropertyShowItem.xml" path="/components/"/>
     <component id="py5gw" name="ListRewardItem.xml" path="/components/"/>
     <component id="j5a5x" name="ComboBox1.xml" path="/components/"/>
-    <image id="j5a5y" name="tujian_anniu_1(1).png" path="/images/" scale="9grid" scale9grid="53,15,106,30"/>
     <component id="j5a510" name="ComboBox1_popup.xml" path="/components/"/>
     <component id="j5a511" name="ComboBox1_item.xml" path="/components/"/>
     <component id="j5a512" name="ListFosterItem.xml" path="/components/"/>
@@ -83,6 +74,15 @@
     <component id="qr4e28" name="Component4.xml" path="/components/"/>
     <image id="qr4e29" name="sjsd_ss_2.png" path="/images/"/>
     <image id="qr4e2a" name="sjsd_ss_3.png" path="/images/"/>
+    <image id="ysx92h" name="fzsj_andi.png" path="/images/"/>
+    <image id="ysx92i" name="fzyc_diban_1.png" path="/images/"/>
+    <image id="ysx92j" name="fzyc_jdt_1.png" path="/images/"/>
+    <image id="ysx92k" name="fzyc_jdt_2.png" path="/images/"/>
+    <image id="ysx92l" name="fzyc_zikua.png" path="/images/"/>
+    <image id="ysx92m" name="tz_dengyingly.png" path="/images/"/>
+    <image id="ysx92o" name="tujian_anniu_3.png" path="/images/"/>
+    <image id="ysx92p" name="tujian_ditup.png" path="/images/"/>
+    <image id="weok2q" name="fzyh_fzyh.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingFoster" packageCount="2" genCode="true"/>
 </packageDescription>

FGUIProject/assets/ClothingShop/components/CompItemInfo.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="462,825">
-  <controller name="c1" pages="1,,2,,6,,7,,10," selected="4">
+  <controller name="c1" pages="1,,2,,6,,7,,10," selected="0">
     <remark page="1" value="服装店"/>
     <remark page="2" value="落星商店"/>
     <remark page="3" value="活动商店"/>
@@ -8,20 +8,20 @@
   </controller>
   <displayList>
     <image id="n7_hinb" name="n7" src="hinb3" fileName="images/fzd_diban_1.png" xy="0,0"/>
-    <text id="n8_hinb" name="txtName" xy="62,41" size="186,62" font="ui://eg2y0ldpwonotja" fontSize="46" color="#b59158" text="衣服名字"/>
+    <text id="n8_hinb" name="txtName" xy="57,41" size="323,61" font="ui://eg2y0ldpwonotja" fontSize="46" color="#b59158" text="衣服名字·名字"/>
     <text id="n30_hinb" name="txtDesc" xy="64,143" size="336,39" fontSize="28" color="#af9a7d" autoSize="height" autoClearText="true" text="赵钱孙李周吴郑王"/>
-    <loader id="n43_hinb" name="rarity" xy="360,23" size="44,94" visible="false" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
-    <text id="n32_hinb" name="txtOwned" xy="170,610" size="122,36" fontSize="26" color="#c97f7a" align="center" ubb="true" vars="true" text="[color=#B39B75]已拥有：[/color]{v1=0}"/>
-    <component id="n20_hinb" name="btnBuy" src="r9ritjq" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="83,652">
+    <loader id="n43_hinb" name="rarity" xy="379,20" size="44,94" visible="false" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
+    <text id="n32_hinb" name="txtOwned" xy="170,610" size="119,36" fontSize="26" color="#c97f7a" align="center" ubb="true" vars="true" text="[color=#B39B75]已拥有：[/color]{v1=0}"/>
+    <component id="n20_hinb" name="btnBuy" src="r9ritjq" fileName="components/Button15.xml" pkg="mk0fwx0x" xy="83,652">
       <Button title=" "/>
     </component>
     <loader id="n47_ugdz" name="iconPrice" xy="182,674" size="34,34" group="n46_hinb" touchable="false" url="ui://eg2y0ldpq08x3" fill="scale">
       <gearDisplay controller="c1" pages="0,1,2"/>
     </loader>
-    <text id="n48_ugdz" name="txtPrice" xy="226,667" size="103,44" group="n46_hinb" fontSize="32" color="#fcf2f2" strokeColor="#d89291" strokeSize="2" autoClearText="true" text="99999">
+    <text id="n48_ugdz" name="txtPrice" xy="226,667" size="96,44" group="n46_hinb" fontSize="32" color="#fcf2f2" strokeColor="#d89291" strokeSize="2" autoClearText="true" text="99999">
       <gearDisplay controller="c1" pages="0,1,2"/>
     </text>
-    <text id="n45_hinb" name="txtBtnBuy" xy="182,662" size="76,49" group="n46_hinb" fontSize="36" color="#fcf2f2" strokeColor="#d89291" strokeSize="2" text="兑换">
+    <text id="n45_hinb" name="txtBtnBuy" xy="182,662" size="75,49" group="n46_hinb" fontSize="36" color="#fcf2f2" strokeColor="#d89291" strokeSize="2" text="购买">
       <gearText controller="c1" pages="6,7,10" values="兑换|兑换|兑换" default="购买"/>
     </text>
     <group id="n46_hinb" name="n46" xy="182,662" size="76,49" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">
@@ -33,16 +33,16 @@
       <item/>
       <item/>
     </list>
-    <image id="n54_v95q" name="n54" src="9cth60" fileName="images/fzd_xiant_1.png" xy="43,127"/>
+    <image id="n54_v95q" name="n54" src="9cth60" fileName="images/fzd_xiant_1.png" xy="43,117"/>
     <image id="n55_v95q" name="n55" src="v95qek" fileName="images/fzd_kuangdidi.png" xy="42,353"/>
     <image id="n33_hinb" name="n33" src="842s6h" fileName="imagesExport/kp_sx_1.png" pkg="eg2y0ldp" xy="53,363" size="36,36" group="n56_v95q" aspect="true"/>
     <image id="n34_hinb" name="n34" src="842s6i" fileName="imagesExport/kp_sx_2.png" pkg="eg2y0ldp" xy="173,363" size="36,36" group="n56_v95q" aspect="true"/>
     <image id="n35_hinb" name="n35" src="842s6j" fileName="imagesExport/kp_sx_3.png" pkg="eg2y0ldp" xy="286,363" size="36,36" group="n56_v95q" aspect="true"/>
     <image id="n36_hinb" name="n36" src="842s6k" fileName="imagesExport/kp_sx_4.png" pkg="eg2y0ldp" xy="53,418" size="36,36" group="n56_v95q" aspect="true"/>
-    <text id="n38_hinb" name="txtGong" xy="99,364" size="58,32" group="n56_v95q" fontSize="22" color="#968778" autoClearText="true" text="5000"/>
-    <text id="n40_hinb" name="txtShang" xy="221,364" size="58,32" group="n56_v95q" fontSize="22" color="#968778" autoClearText="true" text="5000"/>
-    <text id="n42_hinb" name="txtJue" xy="333,365" size="58,32" group="n56_v95q" fontSize="22" color="#968778" autoClearText="true" text="5000"/>
-    <text id="n39_hinb" name="txtZhi" xy="100,420" size="58,32" group="n56_v95q" fontSize="22" color="#968778" autoClearText="true" text="5000"/>
+    <text id="n38_hinb" name="txtGong" xy="99,364" size="54,31" group="n56_v95q" fontSize="22" color="#968778" autoClearText="true" text="5000"/>
+    <text id="n40_hinb" name="txtShang" xy="221,364" size="54,31" group="n56_v95q" fontSize="22" color="#968778" autoClearText="true" text="5000"/>
+    <text id="n42_hinb" name="txtJue" xy="333,365" size="54,31" group="n56_v95q" fontSize="22" color="#968778" autoClearText="true" text="5000"/>
+    <text id="n39_hinb" name="txtZhi" xy="100,420" size="54,31" group="n56_v95q" fontSize="22" color="#968778" autoClearText="true" text="5000"/>
     <group id="n56_v95q" name="n56" xy="53,363" size="338,91"/>
   </displayList>
 </component>

FGUIProject/assets/ClothingShop/components/ShopListItemRender.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="250,321">
-  <controller name="c1" pages="0,,1," selected="1"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n22_hinb" name="n22" src="hinb19" fileName="images/fzd_diban_4.png" xy="9,16"/>
     <loader id="n24_hinb" name="rarity" xy="198,16" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
     <loader id="n35_v95q" name="loaMainScore" xy="197,110" size="40,40" url="ui://eg2y0ldp842s6h" fill="scale"/>
-    <text id="n26_hinb" name="txtName" xy="25,214" size="200,49" font="ui://eg2y0ldpk1kha2" fontSize="36" color="#da8082" align="center" autoSize="none" text="名字">
+    <text id="n26_hinb" name="txtName" xy="87,214" pivot="0.5,0" size="76,49" font="ui://eg2y0ldpk1kha2" fontSize="36" color="#a88553" align="center" text="名字">
       <gearColor controller="c1" pages="0" values="#a88553,#000000" default="#da8082,#000000"/>
     </text>
     <loader id="n27_hinb" name="icon" xy="45,41" size="160,160" aspect="true" url="ui://e5hnfx8ahinb1a" fill="scale"/>
     <image id="n28_hinb" name="imgOwned" src="v95qtju" fileName="images/hc_yyy.png" pkg="eg2y0ldp" xy="5,175"/>
     <loader id="n31_ugdz" name="iconPrice" xy="18,288" size="32,32" group="n33_ugdz" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
-    <text id="n32_ugdz" name="txtPrice" xy="61,279" size="171,46" group="n33_ugdz" fontSize="34" color="#916d35" ubb="true" autoClearText="true" text="99900099"/>
+    <text id="n32_ugdz" name="txtPrice" xy="61,279" size="159,46" group="n33_ugdz" fontSize="34" color="#916d35" ubb="true" autoClearText="true" text="99900099"/>
     <group id="n33_ugdz" name="n33" xy="18,279" size="214,46" advanced="true" layout="hz" colGap="11">
       <relation target="" sidePair="center-center"/>
     </group>

FGUIProject/assets/ClothingShop/package.xml

@@ -2,7 +2,7 @@
 <packageDescription id="e5hnfx8a">
   <resources>
     <component id="hinb0" name="ClothingShopUI.xml" path="/" exported="true"/>
-    <image id="hinb3" name="fzd_diban_1.png" path="/images/"/>
+    <image id="hinb3" name="fzd_diban_1.png" path="/images/" scale9grid="115,206,230,412"/>
     <image id="hinb5" name="fzd_diban_3.png" path="/images/" scale="tile"/>
     <image id="hinba" name="fzd_wxtb_1.png" path="/images/"/>
     <image id="hinbb" name="fzd_wxtb_2.png" path="/images/"/>
@@ -73,5 +73,5 @@
     <image id="v95qek" name="fzd_kuangdidi.png" path="/images/"/>
     <image id="v95qel" name="fzd_xiant_2.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingShop" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingShop" packageCount="2" genCode="true"/>
 </packageDescription>

FGUIProject/assets/ClothingSynthetic/ClothingSyntheticListUI.xml

@@ -4,17 +4,17 @@
     <loader id="n16_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n0_j539" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <list id="n4_j539" name="listMenu" xy="31,218" size="1017,80" layout="flow_hz" colGap="-18" autoItemSize="true" align="center" foldInvisibleItems="true">
+    <component id="n0_j539" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
+      <Button icon="ui://4f294tdkweok2i"/>
+    </component>
+    <image id="n18_weok" name="n18" src="weok2j" fileName="images/jbhc_btbandi.png" xy="246,201"/>
+    <list id="n4_j539" name="listMenu" xy="31,201" size="1017,80" layout="row" align="center" foldInvisibleItems="true">
       <relation target="" sidePair="center-center"/>
       <item url="ui://4f294tdkj539f"/>
       <item url="ui://4f294tdkj539h"/>
       <item url="ui://4f294tdkkqeb25"/>
     </list>
-    <image id="n7_j539" name="n7" src="j539a" fileName="images/jbhc_diban_2.png" xy="28,332" size="1024,1588">
-      <relation target="" sidePair="bottomext-bottom"/>
-    </image>
-    <list id="n14_j539" name="listSuit" xy="53,358" size="977,1562" layout="flow_hz" overflow="scroll" colGap="42" defaultItem="ui://4f294tdkj539k" autoClearItems="true">
+    <list id="n14_j539" name="listSuit" xy="25,363" size="1030,1557" layout="flow_hz" overflow="scroll" lineGap="47" colGap="2" defaultItem="ui://4f294tdkj539k" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>

FGUIProject/assets/ClothingSynthetic/components/Button1.xml

@@ -1,20 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="298,79" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+<component size="296,83" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
   <displayList>
-    <image id="n0_j539" name="n0" src="j5393" fileName="images/jbhc_btban_2.png" xy="0,0">
-      <gearDisplay controller="button" pages="0,2"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
     <image id="n1_j539" name="n1" src="j5392" fileName="images/jbhc_btban_1.png" xy="0,0">
-      <gearDisplay controller="button" pages="1,3"/>
+      <gearDisplay controller="button" pages="1"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n5_j539" name="n5" src="j5395" fileName="images/jbhc_btzi_1.png" xy="68,12">
-      <gearDisplay controller="button" pages="1,3"/>
-    </image>
-    <image id="n6_j539" name="n6" src="j5398" fileName="images/jbhc_btzi_4.png" xy="68,12">
-      <gearDisplay controller="button" pages="0,2"/>
+    <image id="n7_weok" name="n7" src="j5395" fileName="images/jbhc_btzi_1.png" xy="63,20">
+      <gearDisplay controller="button" pages="0"/>
     </image>
   </displayList>
   <Button mode="Radio"/>

FGUIProject/assets/ClothingSynthetic/components/Button2.xml

@@ -1,20 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="298,79" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+<component size="296,83" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <image id="n0_j539" name="n0" src="j5393" fileName="images/jbhc_btban_2.png" xy="0,0">
-      <gearDisplay controller="button" pages="0,2"/>
-      <relation target="" sidePair="width-width,height-height"/>
+    <image id="n7_weok" name="n7" src="weok2k" fileName="images/jbhc_btban_3.png" xy="0,0">
+      <gearDisplay controller="button" pages="1"/>
     </image>
-    <image id="n1_j539" name="n1" src="j5392" fileName="images/jbhc_btban_1.png" xy="0,0">
-      <gearDisplay controller="button" pages="1,3"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <image id="n5_j539" name="n5" src="j5396" fileName="images/jbhc_btzi_2.png" xy="68,12">
-      <gearDisplay controller="button" pages="1,3"/>
-    </image>
-    <image id="n6_j539" name="n6" src="j5397" fileName="images/jbhc_btzi_3.png" xy="68,12">
-      <gearDisplay controller="button" pages="0,2"/>
+    <image id="n8_weok" name="n8" src="j5397" fileName="images/jbhc_btzi_3.png" xy="62,20">
+      <gearDisplay controller="button" pages="0"/>
     </image>
   </displayList>
   <Button mode="Radio"/>

FGUIProject/assets/ClothingSynthetic/components/Button4.xml

@@ -1,20 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="298,79" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+<component size="296,83" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <image id="n0_j539" name="n0" src="j5393" fileName="images/jbhc_btban_2.png" xy="0,0">
-      <gearDisplay controller="button" pages="0,2"/>
-      <relation target="" sidePair="width-width,height-height"/>
+    <image id="n7_weok" name="n7" src="j5393" fileName="images/jbhc_btban_2.png" xy="0,0">
+      <gearDisplay controller="button" pages="1"/>
     </image>
-    <image id="n1_j539" name="n1" src="j5392" fileName="images/jbhc_btban_1.png" xy="0,0">
-      <gearDisplay controller="button" pages="1,3"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <image id="n5_j539" name="n5" src="j83027" fileName="images/jbhc_btzi_5.png" xy="69,12">
-      <gearDisplay controller="button" pages="1,3"/>
-    </image>
-    <image id="n6_j539" name="n6" src="j83026" fileName="images/jbhc_btzi_6.png" xy="78,22">
-      <gearDisplay controller="button" pages="0,2"/>
+    <image id="n8_weok" name="n8" src="j5396" fileName="images/jbhc_btzi_2.png" xy="63,20">
+      <gearDisplay controller="button" pages="0"/>
     </image>
   </displayList>
   <Button mode="Radio"/>

FGUIProject/assets/ClothingSynthetic/components/ProgressBar1.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="340,10" extention="ProgressBar">
+<component size="342,10" extention="ProgressBar">
   <displayList>
-    <image id="n0_j539" name="n0" src="j539c" fileName="images/jbhc_jdut_2.png" xy="0,0" size="340,10"/>
-    <image id="n1_j539" name="bar" src="j539b" fileName="images/jbhc_jdut_1.png" xy="1,2"/>
-    <text id="n2_j539" name="title" xy="0,12" size="46,29" fontSize="20" color="#b3805e" vAlign="middle" text="0/10"/>
+    <image id="n0_j539" name="n0" src="j539c" fileName="images/jbhc_jdut_2.png" xy="0,0"/>
+    <image id="n1_j539" name="bar" src="j539b" fileName="images/jbhc_jdut_1.png" xy="1,1"/>
+    <text id="n2_j539" name="title" xy="0,12" size="63,34" fontSize="24" color="#a68669" vAlign="middle" text="0/10"/>
   </displayList>
   <ProgressBar titleType="valueAndmax"/>
 </component>

FGUIProject/assets/ClothingSynthetic/components/SuitListItem.xml

@@ -1,22 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="466,804">
+<component size="512,783">
   <displayList>
-    <loader id="n5_j539" name="bg" xy="0,0" size="466,767" url="ui://4f294tdkj5399"/>
-    <loader id="n8_j539" name="loaderPic" xy="21,20" size="424,574" touchable="false" fill="scale"/>
-    <text id="n9_j539" name="txtName" xy="151,612" size="164,54" fontSize="40" color="#986a41" autoClearText="true" text="套装名字">
+    <loader id="n5_j539" name="bg" xy="0,0" size="512,783" url="ui://4f294tdkj5399" autoSize="true"/>
+    <loader id="n8_j539" name="loaderPic" xy="113,126" pivot="0.5,0.5" size="292,396" scale="1.525,1.525" touchable="false" url="ui://4f294tdkweok2h" fill="scale" autoSize="true"/>
+    <text id="n9_j539" name="txtName" xy="182,639" pivot="0.5,0" size="148,49" font="ui://eg2y0ldpwonotja" fontSize="36" color="#986a41" align="center" autoClearText="true" text="套装名字">
       <relation target="n5_j539" sidePair="center-center"/>
     </text>
-    <loader id="n10_j539" name="loaderBonusBox" xy="380,676" size="60,67" url="ui://4f294tdkj539d"/>
-    <image id="n11_j539" name="iconGot" src="j539e" fileName="images/jbhc_lhlh_2.png" xy="361,696"/>
-    <component id="n13_j539" name="progBar" src="j539j" fileName="components/ProgressBar1.xml" xy="21,704" touchable="false">
+    <component id="n13_j539" name="progBar" src="j539j" fileName="components/ProgressBar1.xml" xy="40,711" touchable="false">
       <ProgressBar value="100" max="100"/>
     </component>
-    <loader id="n14_j539" name="rarity" xy="401,3" size="53,121" touchable="false" url="ui://eg2y0ldpd4iw52"/>
-    <image id="n16_j539" name="imgLockBg" src="j539m" fileName="images/jbhc_diban_3.png" xy="0,0" size="466,804" group="n18_j539"/>
-    <image id="n15_j539" name="imgLock" src="j539l" fileName="images/zhuxian_shuoto.png" xy="197,288" group="n18_j539"/>
-    <text id="n17_j539" name="txtLockDesc" xy="123,360" size="220,49" group="n18_j539" fontSize="36" color="#f1e6d9" autoClearText="true" text="解锁条件说明">
+    <loader id="n14_j539" name="rarity" xy="447,8" size="44,94" visible="false" touchable="false" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
+    <image id="n20_weok" name="n20" src="weok2g" fileName="images/jbhc_lhlh_didi.png" xy="405,675" group="n21_weok"/>
+    <loader id="n10_j539" name="loaderBonusBox" xy="418,685" size="52,58" group="n21_weok" url="ui://4f294tdkj539d" autoSize="true"/>
+    <image id="n11_j539" name="iconGot" src="j539e" fileName="images/jbhc_lhlh_2.png" xy="389,698" group="n21_weok"/>
+    <group id="n21_weok" name="n21" xy="389,675" size="110,78"/>
+    <image id="n16_j539" name="imgLockBg" src="j539m" fileName="images/jbhc_diban_3.png" xy="0,0" group="n18_j539"/>
+    <image id="n15_j539" name="imgLock" src="j539l" fileName="images/zhuxian_shuoto.png" xy="220,307" group="n18_j539"/>
+    <image id="n19_weok" name="n19" src="weok2f" fileName="images/jbhc_diban_4.png" xy="31,368" pivot="0.5,0.5" size="449,46" group="n18_j539">
+      <relation target="n17_j539" sidePair="width-width"/>
+    </image>
+    <text id="n17_j539" name="txtLockDesc" xy="166,369" pivot="0.5,0" size="179,42" group="n18_j539" font="ui://eg2y0ldpweoktkb" fontSize="30" color="#f1e6d9" align="center" autoClearText="true" text="解锁条件说明">
       <relation target="" sidePair="center-center"/>
     </text>
-    <group id="n18_j539" name="groupLock" xy="0,0" size="466,804" advanced="true"/>
+    <group id="n18_j539" name="groupLock" xy="0,0" size="508,781" advanced="true"/>
   </displayList>
 </component>

FGUIProject/assets/ClothingSynthetic/package.xml

@@ -54,6 +54,12 @@
     <image id="v95q2b" name="hc_xtxtx.png" path="/images/"/>
     <image id="v95q2c" name="hc_zzjsdi.png" path="/images/"/>
     <component id="v95q2e" name="ClothingListItem.xml" path="/components/"/>
+    <image id="weok2f" name="jbhc_diban_4.png" path="/images/" scale="9grid" scale9grid="67,11,134,22"/>
+    <image id="weok2g" name="jbhc_lhlh_didi.png" path="/images/"/>
+    <image id="weok2h" name="tz_benyue.png" path="/images/"/>
+    <image id="weok2i" name="tzhc_tzhc.png" path="/images/"/>
+    <image id="weok2j" name="jbhc_btbandi.png" path="/images/"/>
+    <image id="weok2k" name="jbhc_btban_3.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingSynthetic" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Common/LogUI.xml

@@ -3,7 +3,7 @@
   <controller name="c1" pages="0,,1,,2," selected="0"/>
   <displayList>
     <loader id="n0_g926" name="bg" xy="0,0" size="1080,1250" url="ui://mk0fwx0xg92653" fill="scaleFree"/>
-    <list id="n3_g926" name="listLog" xy="70,196" size="940,905" overflow="scroll" lineGap="10" defaultItem="ui://mk0fwx0xg9264x" align="center">
+    <list id="n3_g926" name="listLog" xy="70,196" size="940,905" overflow="scroll" lineGap="40" defaultItem="ui://mk0fwx0xg9264x" align="center">
       <item/>
       <item/>
       <item/>
@@ -17,7 +17,7 @@
       <Button title="关闭"/>
     </component>
     <component id="n8_g926" name="btnAll" src="g9264z" fileName="components/Button7.xml" xy="68,66" size="215,79">
-      <Button title="全部" controller="c1" page="0"/>
+      <Button checked="true" title="全部" controller="c1" page="0"/>
     </component>
     <component id="n9_g926" name="btnLog" src="g9264z" fileName="components/Button7.xml" xy="294,66" size="215,79">
       <Button title="日志" controller="c1" page="1"/>

FGUIProject/assets/Common/ModalStatusUI.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <graph id="n3_ityj" name="n3" xy="0,0" size="1080,1920" alpha="0" type="rect" lineSize="0" fillColor="#ff000000">
+    <graph id="n3_ityj" name="n3" xy="0,0" size="1080,1920" alpha="0.2" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
     <graph id="n1_d4iw" name="n1" xy="390,20" size="300,40" visible="false" alpha="0.5" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
-    <text id="n2_d4iw" name="txtMessage" xy="290,976" size="500,42" fontSize="30" color="#876e54" align="center" autoSize="none" autoClearText="true" text="这是一个提示"/>
+    <image id="n5_pac9" name="n5" src="qp4l4q" fileName="imagesExport/zx_jq_rwbszik_normal.png" xy="20,962" visible="false" color="#e8dbb3"/>
+    <text id="n2_d4iw" name="txtMessage" xy="290,976" size="500,44" fontSize="32" color="#ebe4ce" align="center" autoSize="none" autoClearText="true" text="这是一个提示"/>
     <graph id="n4_t6aj" name="holder" xy="539,959" size="1,1"/>
   </displayList>
 </component>

FGUIProject/assets/Common/components/ListLogItem.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="940,80">
+<component size="940,96">
   <displayList>
-    <text id="n2_g926" name="txtLog" xy="0,0" size="940,80" fontSize="30" color="#8f6129" ubb="true" autoSize="height" text="Mathf.MoveTowards方法的功能是返回一个浮点数，其值为current向target靠近的一个"/>
+    <text id="n2_g926" name="txtLog" xy="0,0" size="940,96" fontSize="36" color="#8f6129" ubb="true" autoSize="height" text="Mathf.MoveTowards方法的功能是返回一个浮点数，其值为current向target靠近的一个"/>
   </displayList>
   <relation target="n2_g926" sidePair="height-height"/>
 </component>

FGUIProject/assets/CommonGame/components/Button7.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="246,60" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="button" pages="0,up,1,down" selected="1"/>
   <displayList>
     <image id="n0_pq5x" name="n0" src="pq5x6b" fileName="images/kp_anniu_3.png" xy="0,0">
       <gearDisplay controller="button" pages="0,2"/>
@@ -13,6 +13,9 @@
     <text id="n2_pq5x" name="title" xy="123,28" pivot="0.5,0.5" anchor="true" size="38,46" fontSize="34" color="#8f6129" align="center" vAlign="middle" text="天">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
+    <image id="n3_ysx9" name="n3" src="ysx9tk7" fileName="images/kp_anniu_5.png" xy="206,23">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
   </displayList>
   <Button mode="Check"/>
 </component>

FGUIProject/assets/CommonGame/components/ComHead.xml

@@ -4,7 +4,7 @@
     <graph id="n39_r9ri" name="n39" xy="23,33" pivot="0.5,0.5" size="166,166" group="n41_r9ri" aspect="true" type="eclipse" lineSize="0" fillColor="#ffeed5be"/>
     <loader id="n40_r9ri" name="loaIcon" xy="24,34" size="166,164" group="n41_r9ri" url="ui://374k3dwvr9ri1z" fill="scale"/>
     <image id="n35_r9ri" name="n35" src="r9ritjs" fileName="images/grxx_zytxtx.png" xy="21,31" size="170,171" group="n41_r9ri" aspect="true"/>
-    <loader id="n37_r9ri" name="loaBorder" xy="0,11" pivot="0.5,0.5" size="230,203" group="n41_r9ri" touchable="false" url="ui://374k3dwvr9ri20"/>
-    <group id="n41_r9ri" name="n41" xy="0,11" size="230,203"/>
+    <loader id="n37_r9ri" name="loaBorder" xy="-7,-4" pivot="0.5,0.5" size="230,230" group="n41_r9ri" touchable="false" url="ui://374k3dwvysx9ge" autoSize="true"/>
+    <group id="n41_r9ri" name="n41" xy="-7,-4" size="230,230"/>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/package.xml

@@ -51,7 +51,6 @@
     <component id="9xlo8" name="ButtonBack1.xml" path="/components/" exported="true"/>
     <image id="lwri5v" name="hc_anniu_2.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="75,0,150,70"/>
     <image id="lwri5x" name="hc_btkuang_1.png" path="/images/" exported="true"/>
-    <font id="kst18" name="STZHONGS.TTF" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
     <component id="r9gf5z" name="ButtonInValueBar.xml" path="/components/"/>
     <component id="qp4l60" name="ButtonHome.xml" path="/components/" exported="true"/>
     <image id="pq5x64" name="kp_xingx.png" path="/imagesExport/" exported="true"/>
@@ -221,6 +220,10 @@
     <image id="ysx9tk4" name="hqtjtbtb.png" path="/images/"/>
     <image id="ysx9tk5" name="lianyiqun_ys.png" path="/imgItemIcon/" exported="true"/>
     <image id="ysx9tk6" name="xc_bto_1.png" path="/imagesExport/"/>
+    <image id="ysx9tk7" name="kp_anniu_5.png" path="/images/"/>
+    <image id="ysx9tka" name="dangance.png" path="/imgItemIcon/" exported="true"/>
+    <image id="uyuxzx" name="xc_xzdik.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="137,19,274,38"/>
+    <font id="weoktkb" name="ALIBABAPUHUITI-2-55-REGULAR.ttf" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DressUp/PhotographUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" overflow="hidden" scroll="both">
-  <controller name="c1" pages="0,,1," selected="0"/>
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
     <loader id="n8_g3xa" name="btnBg" xy="0,0" size="1080,1136">
       <relation target="" sidePair="height-height"/>
@@ -28,9 +28,9 @@
       <relation target="" sidePair="bottom-bottom"/>
       <Button title="确认上传" icon="ui://mk0fwx0xr9ritjd"/>
     </component>
-    <image id="n19_r9ri" name="n19" src="r9riek" fileName="images/hl_ciskuang.png" xy="480,1834" group="n21_r9ri"/>
-    <text id="n20_r9ri" name="txtCount" xy="501,1831" pivot="0.5,0" size="77,41" group="n21_r9ri" fontSize="30" color="#e3d3ae" text="3/10"/>
-    <group id="n21_r9ri" name="n21" xy="480,1831" size="120,42" advanced="true">
+    <image id="n19_r9ri" name="n19" src="r9riek" fileName="images/hl_ciskuang.png" xy="480,1835" group="n21_r9ri"/>
+    <text id="n20_r9ri" name="txtCount" xy="505,1832" pivot="0.5,0" size="70,41" group="n21_r9ri" fontSize="30" color="#f9f1e1" text="3/10"/>
+    <group id="n21_r9ri" name="n21" xy="480,1832" size="120,41" advanced="true">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="bottom-bottom"/>
     </group>

FGUIProject/assets/DressUp/package.xml

@@ -107,7 +107,6 @@
     <image id="rc0743" name="hz_yingc.png" path="/images/"/>
     <image id="rc0744" name="hz_xianshi.png" path="/images/"/>
     <image id="oq7r45" name="hz_kuangxian.png" path="/images/"/>
-    <image id="oq7r46" name="hz_tzkuang.png" path="/images/"/>
     <image id="oq7r47" name="hz_tzkuang_1.png" path="/images/"/>
     <component id="be944a" name="PhotographUI.xml" path="/" exported="true"/>
     <image id="7dea4b" name="kp_dikuang_6.png" path="/images/" scale="9grid" scale9grid="43,41,33,37"/>

FGUIProject/assets/FieldGuide/SuitGuideUI.xml

@@ -8,10 +8,13 @@
     <component id="n1_pjip" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <Button icon="ui://vqq9h9h4ysx93g"/>
     </component>
-    <image id="n7_pjip" name="n7" src="pjipk" fileName="images/tujian_diban_2.png" xy="48,376">
+    <image id="n20_ysx9" name="n20" src="ysx93t" fileName="images/tujian_ditup.png" xy="0,240">
+      <relation target="" sidePair="top-top,bottomext-bottom"/>
+    </image>
+    <image id="n7_pjip" name="n7" src="ysx93s" fileName="images/tujian_cebian.png" xy="20,391">
       <gearDisplay controller="c1" pages="0"/>
     </image>
-    <list id="n10_pjip" name="listType" xy="33,376" size="290,1544" overflow="scroll" defaultItem="ui://vqq9h9h4pjip12" autoClearItems="true">
+    <list id="n10_pjip" name="listType" xy="22,406" size="290,1514" overflow="scroll" lineGap="-1" defaultItem="ui://vqq9h9h4pjip12" autoClearItems="true">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
@@ -20,9 +23,9 @@
       <item/>
       <item/>
     </list>
-    <list id="n16_pjip" name="listSuit" xy="360,376" size="700,1544" layout="flow_hz" overflow="scroll" lineGap="48" colGap="40" defaultItem="ui://vqq9h9h4pjip14" autoClearItems="true">
-      <gearXY controller="c1" pages="1" values="25,260" default="360,376"/>
-      <gearSize controller="c1" pages="1" values="1030,1660,1,1" default="700,1544,1,1"/>
+    <list id="n16_pjip" name="listSuit" xy="343,436" size="711,1484" layout="flow_hz" overflow="scroll" lineGap="30" colGap="20" defaultItem="ui://vqq9h9h4pjip14" autoClearItems="true">
+      <gearXY controller="c1" pages="0,1" values="343,436|25,260"/>
+      <gearSize controller="c1" pages="0,1" values="711,1484,1,1|1030,1660,1,1"/>
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
@@ -33,24 +36,25 @@
       <item/>
       <item/>
     </list>
-    <component id="n5_pjip" name="comBoxSort" src="pjipy" fileName="components/ComboBox1.xml" xy="494,262" group="n19_s61p">
+    <component id="n3_pjip" name="btnNotGet" src="pjipu" fileName="components/Button2.xml" xy="28,280" group="n19_s61p">
+      <Button checked="true" title="未获得"/>
+    </component>
+    <component id="n4_pjip" name="btnHaveGot" src="pjipu" fileName="components/Button2.xml" xy="292,280" group="n19_s61p">
+      <Button title="已获得"/>
+    </component>
+    <component id="n5_pjip" name="comBoxSort" src="pjipy" fileName="components/ComboBox1.xml" xy="502,279" group="n19_s61p">
       <ComboBox title="默认排序" visibleItemCount="10" autoClearItems="true">
         <item title="1"/>
         <item title="2"/>
         <item title="3"/>
       </ComboBox>
     </component>
-    <component id="n3_pjip" name="btnNotGet" src="pjipu" fileName="components/Button2.xml" xy="63,262" group="n19_s61p">
-      <Button checked="true" title="未获得"/>
-    </component>
-    <component id="n4_pjip" name="btnHaveGot" src="pjipu" fileName="components/Button2.xml" xy="311,262" group="n19_s61p">
-      <Button title="已获得"/>
-    </component>
-    <component id="n6_pjip" name="btnSwitch" src="pjipz" fileName="components/Button3.xml" xy="807,262" group="n19_s61p">
+    <component id="n6_pjip" name="btnSwitch" src="pjipz" fileName="components/Button3.xml" xy="820,280" group="n19_s61p">
       <Button title="切换分类"/>
     </component>
-    <group id="n19_s61p" name="n19" xy="63,262" size="954,70" advanced="true">
+    <group id="n19_s61p" name="n19" xy="28,279" size="1024,77" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
+      <relation target="" sidePair="top-top"/>
     </group>
   </displayList>
 </component>

FGUIProject/assets/FieldGuide/components/Button2.xml

@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="210,56" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+<component size="232,76" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
   <displayList>
-    <image id="n0_pjip" name="n0" src="pjiph" fileName="images/tujian_anniu_1.png" xy="0,0" size="210,56">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n1_pjip" name="title" xy="0,0" size="141,56" fontSize="30" color="#fff8df" align="center" vAlign="middle" autoSize="none" singleLine="true" autoClearText="true" text="abc">
+    <loader id="n4_ysx9" name="icon" xy="0,0" size="232,76" url="ui://vqq9h9h4ysx93r" autoSize="true">
+      <gearIcon controller="button" pages="1" values="ui://vqq9h9h4ysx93r" default="ui://vqq9h9h4pjiph"/>
+    </loader>
+    <text id="n1_pjip" name="title" xy="34,-2" size="163,76" font="ui://eg2y0ldpwonotja" fontSize="38" color="#d47c76" align="center" vAlign="middle" autoSize="none" singleLine="true" autoClearText="true" text="未获得">
+      <gearColor controller="button" pages="0,1" values="#b19771,#000000|#d47c76,#000000"/>
       <relation target="" sidePair="width-width,height-height"/>
     </text>
-    <image id="n2_pjip" name="n2" src="pjips" fileName="images/tujian_xzdg.png" xy="146,9">
-      <gearDisplay controller="button" pages="1,3"/>
-    </image>
-    <image id="n3_pjip" name="n3" src="pjip10" fileName="images/tujian_xzdg_1.png" xy="146,9">
-      <gearDisplay controller="button" pages="0,2"/>
-    </image>
   </displayList>
   <Button mode="Check"/>
 </component>

FGUIProject/assets/FieldGuide/components/Button3.xml

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="210,56" extention="Button">
+<component size="232,76" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n2_pjip" name="n2" src="pjiph" fileName="images/tujian_anniu_1.png" xy="0,0" size="210,56">
+    <image id="n2_pjip" name="n2" src="pjiph" fileName="images/tujian_anniu_1.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n3_pjip" name="title" xy="0,0" size="160,56" fontSize="30" color="#fff8df" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
-      <relation target="" sidePair="width-width,height-height"/>
-    </text>
-    <image id="n4_pjip" name="n4" src="pjipt" fileName="images/tujian_zkanniu.png" xy="157,2"/>
+    <text id="n5_ysx9" name="title" xy="20,-2" size="160,76" group="n7_ysx9" font="ui://eg2y0ldpwonotja" fontSize="38" color="#c2a676" align="center" vAlign="middle" autoSize="none" singleLine="true" text="默认分类"/>
+    <image id="n6_ysx9" name="n6" src="pjipt" fileName="images/tujian_zkanniu.png" xy="185,22" group="n7_ysx9"/>
+    <group id="n7_ysx9" name="n7" xy="20,-2" size="185,76"/>
   </displayList>
   <Button/>
 </component>

FGUIProject/assets/FieldGuide/components/ButtonSuitType.xml

@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="290,99" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="0"/>
+<component size="290,100" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
   <displayList>
-    <image id="n0_pjip" name="img1" src="pjipi" fileName="images/tujian_anniu_2.png" xy="0,0">
+    <image id="n3_pjip" name="imgLine" src="pjipq" fileName="images/tujian_xiant_1.png" xy="16,94">
+      <gearDisplay controller="button" pages="0"/>
+    </image>
+    <image id="n0_pjip" name="img1" src="pjipi" fileName="images/tujian_anniu_2.png" xy="-11,0" group="n4_ysx9">
       <gearDisplay controller="button" pages="1,3"/>
-      <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_pjip" name="title" xy="0,0" size="290,99" aspect="true" fontSize="36" color="#fff8df" align="center" vAlign="middle" autoSize="none" singleLine="true" autoClearText="true" text="示例">
-      <gearColor controller="button" pages="0,1" values="#fff8df,#000000|#a97747,#000000"/>
-      <relation target="" sidePair="width-width,height-height"/>
+    <text id="n1_pjip" name="title" xy="101,20" pivot="0.5,0" size="87,56" group="n4_ysx9" aspect="true" font="ui://eg2y0ldpwonotja" fontSize="42" color="#d47c76" align="center" vAlign="middle" singleLine="true" autoClearText="true" text="示例">
+      <gearColor controller="button" pages="0,1" values="#c7b7a2,#000000|#d47c76,#000000"/>
     </text>
-    <image id="n3_pjip" name="imgLine" src="pjipq" fileName="images/tujian_xiant_1.png" xy="45,97"/>
+    <group id="n4_ysx9" name="n4" xy="-11,0" size="312,100"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

FGUIProject/assets/FieldGuide/components/ComboBox1.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="342,70" extention="ComboBox">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="1"/>
+<component size="342,76" extention="ComboBox">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_pjip" name="n0" src="pjiph" fileName="images/tujian_anniu_1.png" xy="66,0" size="210,56" group="n3_rc07"/>
-    <text id="n1_pjip" name="title" xy="73,0" size="152,56" group="n3_rc07" fontSize="30" color="#fff8df" align="center" vAlign="middle" autoSize="none" singleLine="true" text="默认分类"/>
-    <image id="n2_pjip" name="n2" src="pjipt" fileName="images/tujian_zkanniu.png" xy="221,2" group="n3_rc07"/>
-    <group id="n3_rc07" name="n3" xy="66,0" size="210,56"/>
+    <image id="n0_pjip" name="n0" src="pjiph" fileName="images/tujian_anniu_1.png" xy="55,0" group="n3_rc07"/>
+    <text id="n1_pjip" name="title" xy="75,-2" size="160,76" group="n3_rc07" font="ui://eg2y0ldpwonotja" fontSize="38" color="#c2a676" align="center" vAlign="middle" autoSize="none" singleLine="true" text="默认分类"/>
+    <image id="n2_pjip" name="n2" src="pjipt" fileName="images/tujian_zkanniu.png" xy="240,22" group="n3_rc07"/>
+    <group id="n3_rc07" name="n3" xy="55,-2" size="232,78"/>
   </displayList>
   <ComboBox dropdown="ui://vqq9h9h4pjipx"/>
 </component>

FGUIProject/assets/FieldGuide/components/ComboBox1_item.xml

@@ -2,7 +2,7 @@
 <component size="280,58" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <text id="n2_pjip" name="title" xy="68,0" pivot="0.5,0" size="144,39" fontSize="28" color="#fddeb6" align="center" vAlign="middle" singleLine="true" text="自定义套装"/>
+    <text id="n2_pjip" name="title" xy="68,0" pivot="0.5,0" size="144,39" fontSize="28" color="#b79155" align="center" vAlign="middle" singleLine="true" text="自定义套装"/>
     <image id="n3_pjip" name="imgLine" src="q08xp" fileName="imagesExport/hz_tzkuang.png" pkg="eg2y0ldp" xy="0,56"/>
   </displayList>
   <Button mode="Radio"/>

FGUIProject/assets/FieldGuide/components/ComboBox1_popup.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="342,348">
   <displayList>
-    <image id="n0_pjip" name="n0" src="q08xq" fileName="imagesExport/hz_tzkuang_1.png" pkg="eg2y0ldp" xy="0,0" size="342,348">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
+    <image id="n0_pjip" name="n0" src="q08xq" fileName="imagesExport/hz_tzkuang_1.png" pkg="eg2y0ldp" xy="0,0" size="342,348"/>
     <list id="n1_pjip" name="list" xy="29,24" size="284,297" overflow="scroll" scrollBarFlags="128" defaultItem="ui://vqq9h9h4pjipw" align="center">
+      <relation target="" sidePair="center-center"/>
       <item/>
       <item/>
       <item/>

FGUIProject/assets/FieldGuide/components/CompSuitItem.xml

@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="316,505">
+<component size="342,541">
   <displayList>
-    <loader id="n11_pjip" name="bg" xy="0,0" size="316,505" url="ui://vqq9h9h4pjipj"/>
-    <loader id="n12_pjip" name="loaderPic" xy="12,11" size="292,396" touchable="false" fill="scaleFree"/>
-    <text id="n13_pjip" name="txtName" xy="39,420" size="238,41" fontSize="30" color="#986a41" align="center" autoSize="height" autoClearText="true" text="示例"/>
-    <loader id="n14_pjip" name="loaderBonusBox" xy="257,417" size="50,51" url="ui://vqq9h9h4pjipo"/>
-    <component id="n15_pjip" name="progBar" src="pjip13" fileName="components/ProgressBar1.xml" xy="8,483" touchable="false">
+    <loader id="n11_pjip" name="bg" xy="0,0" size="342,541" url="ui://vqq9h9h4pjipj" autoSize="true"/>
+    <loader id="n12_pjip" name="loaderPic" xy="25,27" pivot="0.5,0.5" size="292,396" scale="1.09,1.09" touchable="false" url="ui://vqq9h9h4ysx93x" fill="scaleFree" autoSize="true"/>
+    <loader id="n14_pjip" name="loaderBonusBox" xy="260,457" size="64,64" url="ui://vqq9h9h4ysx93u" autoSize="true"/>
+    <image id="n19_ysx9" name="n19" src="ysx93w" fileName="images/tujian_zikua.png" xy="36,377"/>
+    <text id="n13_pjip" name="txtName" xy="137,383" pivot="0.5,0" size="68,44" font="ui://eg2y0ldpk1kha2" fontSize="32" color="#b28d59" align="center" autoClearText="true" text="示例"/>
+    <component id="n15_pjip" name="progBar" src="pjip13" fileName="components/ProgressBar1.xml" xy="20,469" touchable="false">
       <ProgressBar value="10" max="10"/>
     </component>
-    <loader id="n16_pjip" name="rarity" xy="265,10" size="44,94" touchable="false" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
+    <loader id="n16_pjip" name="rarity" xy="291,8" size="44,94" touchable="false" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
     <image id="n17_pjip" name="imgLockBg" src="pjip1k" fileName="images/tujian_suoan.png" xy="0,1"/>
-    <image id="n18_pjip" name="imgLock" src="pjip1l" fileName="images/zhuxian_shuoto.png" xy="122,232"/>
+    <image id="n18_pjip" name="imgLock" src="pjip1l" fileName="images/zhuxian_shuoto.png" xy="135,214"/>
   </displayList>
 </component>

FGUIProject/assets/FieldGuide/components/ProgressBar1.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="232,6" extention="ProgressBar">
+<component size="218,10" extention="ProgressBar">
   <displayList>
     <image id="n0_pjip" name="n0" src="pjipm" fileName="images/tujian_jdt_1.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_pjip" name="bar" src="pjipn" fileName="images/tujian_jdt_2.png" xy="0,0"/>
-    <text id="n2_pjip" name="title" xy="245,-11" size="66,29" fontSize="20" color="#b3805e" vAlign="middle" autoClearText="true" text="00/10"/>
+    <image id="n1_pjip" name="bar" src="pjipn" fileName="images/tujian_jdt_2.png" xy="0,1"/>
+    <text id="n2_pjip" name="title" xy="0,11" size="78,34" fontSize="24" color="#a88858" vAlign="middle" autoClearText="true" text="00/10"/>
   </displayList>
   <ProgressBar titleType="valueAndmax"/>
 </component>

FGUIProject/assets/FieldGuide/package.xml

@@ -21,8 +21,6 @@
     <image id="pjipk" name="tujian_diban_2.png" path="/images/"/>
     <image id="pjipm" name="tujian_jdt_1.png" path="/images/"/>
     <image id="pjipn" name="tujian_jdt_2.png" path="/images/" scale="tile"/>
-    <image id="pjipo" name="tujian_lw_1.png" path="/imagesExport/" exported="true"/>
-    <image id="pjipp" name="tujian_lw_2.png" path="/imagesExport/" exported="true"/>
     <image id="pjipq" name="tujian_xiant_1.png" path="/images/"/>
     <image id="pjipr" name="tujian_xiant_2.png" path="/images/"/>
     <image id="pjips" name="tujian_xzdg.png" path="/images/"/>
@@ -99,6 +97,13 @@
     <image id="ysx93n" name="xqfs_dd_sb.png" path="/travelGuideExport/" exported="true"/>
     <image id="ysx93o" name="xqfs_dd_xy.png" path="/travelGuideExport/" exported="true"/>
     <image id="ysx93q" name="xqfs_dtdt.png" path="/travelGuideExport/"/>
+    <image id="ysx93r" name="tujian_anniu_3.png" path="/images/"/>
+    <image id="ysx93s" name="tujian_cebian.png" path="/images/"/>
+    <image id="ysx93t" name="tujian_ditup.png" path="/images/" scale="9grid" scale9grid="270,420,540,840"/>
+    <image id="ysx93u" name="tujian_lw_1.png" path="/imagesExport/" exported="true"/>
+    <image id="ysx93v" name="tujian_lw_2.png" path="/imagesExport/" exported="true"/>
+    <image id="ysx93w" name="tujian_zikua.png" path="/images/"/>
+    <image id="ysx93x" name="tz_dengyingly.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\FieldGuide" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>