Merge branch 'master' of https://e.coding.net/shenyou-gfg/gfgclient/client

FGUIProject/assets/Card/CardMoodUI.xml

@@ -20,7 +20,7 @@
     <component id="n2_lc71" name="btnPlay" src="lc718j" fileName="components/btnPlay.xml" xy="485,1771">
       <relation target="" sidePair="bottom-bottom"/>
     </component>
-    <component id="n4_lc71" name="comProgress" src="lc718l" fileName="components/ComProgress.xml" xy="540,2560">
+    <component id="n4_lc71" name="comProgress" src="lc718l" fileName="components/ComProgress.xml" xy="540,2560" touchable="false">
       <relation target="" sidePair="bottom-bottom"/>
     </component>
   </displayList>

FGUIProject/assets/Card/CardUpUI.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="936,550">
-  <controller name="c1" pages="0,,1," selected="1"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n10_lc1j" name="n10" src="lwri5u" fileName="images/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,550"/>
+    <image id="n10_lc1j" name="n10" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,550"/>
     <image id="n11_lc1j" name="n11" src="lc1j8y" fileName="images/sj_xian.png" xy="13,79"/>
-    <text id="n12_lc1j" name="txtTitle" xy="367,50" pivot="0.5,0" size="212,69" fontSize="52" color="#876e54" text="恭喜升星">
+    <text id="n12_lc1j" name="txtTitle" xy="367,50" pivot="0.5,0" size="212,69" fontSize="52" color="#876e54" text="恭喜升级">
       <gearText controller="c1" pages="1" values="恭喜升星" default="恭喜升级"/>
     </text>
     <text id="n4_jzrr" name="txtLast" xy="402,230" pivot="1,0" anchor="true" size="117,64" group="n7_jzrr" fontSize="48" color="#876e54" text="Lv10"/>
     <text id="n5_jzrr" name="txtNow" xy="534,230" size="117,64" group="n7_jzrr" fontSize="48" color="#d27869" text="Lv20"/>
     <text id="n6_jzrr" name="n6" xy="466,231" pivot="0.5,0" anchor="true" size="62,64" group="n7_jzrr" fontSize="48" color="#949494" text="&gt;&gt;"/>
     <group id="n7_jzrr" name="n7" xy="285,230" size="366,65"/>
-    <list id="n8_jzrr" name="listProperty" xy="59,389" size="860,68" layout="row" defaultItem="ui://eg2y0ldpojlzk">
+    <list id="n8_jzrr" name="listProperty" xy="59,389" size="860,68" layout="row" defaultItem="ui://eg2y0ldpojlzk" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/Card/components/ComConsumeCurrency.xml

@@ -3,7 +3,7 @@
   <displayList>
     <image id="n4_a713" name="n4" src="a71377" fileName="imagesExport/kp_dikuang_3.png" pkg="eg2y0ldp" xy="60,3"/>
     <text id="n2_ojlz" name="n2" xy="0,0" size="65,42" fontSize="30" color="#7d634a" autoSize="none" text="消耗"/>
-    <loader id="n1_ojlz" name="loaIcon" xy="70,-6" size="54,54" url="ui://eg2y0ldpq08x3" autoSize="true"/>
-    <text id="n3_ojlz" name="txtCount" xy="120,0" size="160,42" fontSize="28" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="999/55555"/>
+    <loader id="n1_ojlz" name="loaIcon" xy="70,-6" size="60,60" url="ui://eg2y0ldpq08x3" autoSize="true"/>
+    <text id="n3_ojlz" name="txtCount" xy="120,1" size="160,39" fontSize="28" color="#ffffff" align="center" vAlign="middle" text="999/55555"/>
   </displayList>
 </component>

FGUIProject/assets/Card/components/ComFosterBottom.xml

@@ -2,7 +2,7 @@
 <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="2"/>
+  <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"/>
@@ -17,11 +17,11 @@
       <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">
-      <Button checked="true" controller="ctrlTab" page="2"/>
+      <Button controller="ctrlTab" page="2"/>
       <property target="title" propertyId="0" value="技能"/>
     </component>
     <group id="n22_842s" name="grpTab" xy="136,1044" size="808,66" advanced="true" layout="hz" colGap="50" excludeInvisibles="true"/>
@@ -76,17 +76,17 @@
     <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="已提升至最高等级">
       <gearDisplay controller="ctrlFullStar" pages="1"/>
     </text>
-    <list id="n47_wr9a" name="listStarConsume" xy="127,1307" size="876,196" group="n57_l2by" layout="row" colGap="166" defaultItem="ui://7l6lvkaywr9a82" align="center">
+    <list id="n47_wr9a" name="listStarConsume" xy="102,1307" size="876,196" group="n57_l2by" layout="row" colGap="166" defaultItem="ui://7l6lvkaywr9a82" align="center">
       <item/>
       <item/>
       <item/>
     </list>
-    <component id="n51_l2by" name="comStarCousumeGold" src="ojlz61" fileName="components/ComConsumeCurrency.xml" xy="415,1506" group="n57_l2by"/>
-    <component id="n52_l2by" name="btnUpStar" src="842s6q" fileName="components/Button9.xml" pkg="eg2y0ldp" xy="398,1573" size="270,74" group="n57_l2by">
+    <component id="n51_l2by" name="comStarCousumeGold" src="ojlz61" fileName="components/ComConsumeCurrency.xml" xy="395,1506" size="289,42" group="n57_l2by"/>
+    <component id="n52_l2by" name="btnUpStar" src="842s6q" fileName="components/Button9.xml" pkg="eg2y0ldp" xy="405,1573" size="270,74" group="n57_l2by">
       <Button title="升星"/>
     </component>
     <component id="n56_l2by" name="comTips" src="l2by86" fileName="components/ComTips.xml" pkg="eg2y0ldp" xy="622,1546" group="n57_l2by"/>
-    <group id="n57_l2by" name="n57" xy="127,1307" size="876,340" group="n55_l2by" advanced="true">
+    <group id="n57_l2by" name="n57" xy="102,1307" size="876,340" group="n55_l2by" advanced="true">
       <gearDisplay controller="ctrlFullStar" pages="0"/>
     </group>
     <list id="n64_l2by" name="listShowCard" xy="11,1382" size="1056,274" group="n55_l2by" layout="row" colGap="100" defaultItem="ui://7l6lvkayl2by89" align="center">

FGUIProject/assets/ClothingFoster/SuitFosterFinishUI.xml

@@ -1,6 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <list id="n0_py5g" name="listPrppertyLast" xy="508,570" size="200,300" overflow="scroll"/>
+    <loader id="n4_l4ui" name="bg" xy="0,-240" size="1080,2400" url="ui://eg2y0ldpm9wm8t" autoSize="true"/>
+    <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="点击屏幕继续">
+      <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,756" size="72,56" fillMethod="vt" fillAmount=""/>
+    <component id="n9_l4ui" name="comProperty0" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="155,635" pivot="0,0.5" size="0,58" group="n20_l4ui"/>
+    <component id="n10_l4ui" name="comProperty1" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="355,635" pivot="0,0.5" size="0,58" group="n20_l4ui"/>
+    <component id="n11_l4ui" name="comProperty2" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="555,635" pivot="0,0.5" size="0,58" group="n20_l4ui"/>
+    <component id="n12_l4ui" name="comProperty3" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="755,635" pivot="0,0.5" size="0,58" group="n20_l4ui"/>
+    <group id="n20_l4ui" name="grpProperty" xy="155,635" size="600,58" visible="false" advanced="true"/>
+    <component id="n14_l4ui" name="comAddProperty0" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="155,851" pivot="0,0.5" size="0,58" group="n21_l4ui"/>
+    <component id="n15_l4ui" name="comAddProperty1" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="355,851" pivot="0,0.5" size="0,58" group="n21_l4ui"/>
+    <component id="n16_l4ui" name="comAddProperty2" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="555,851" pivot="0,0.5" size="0,58" group="n21_l4ui"/>
+    <component id="n17_l4ui" name="comAddProperty3" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="755,851" pivot="0,0.5" size="0,58" group="n21_l4ui"/>
+    <group id="n21_l4ui" name="grpAddProperty" xy="155,851" size="600,58" visible="false" advanced="true"/>
   </displayList>
+  <transition name="t0">
+    <item time="0" type="Scale" target="n10_l4ui" value="1.2,1.2"/>
+    <item time="0" type="Scale" target="n11_l4ui" value="1.2,1.2"/>
+    <item time="0" type="Scale" target="n12_l4ui" value="1.2,1.2"/>
+    <item time="0" type="Scale" target="n9_l4ui" tween="true" startValue="1,1" endValue="1.2,1.2" duration="4" ease="Linear"/>
+    <item time="0" type="Size" target="n10_l4ui" value="0,58"/>
+    <item time="0" type="Size" target="n11_l4ui" value="0,58"/>
+    <item time="0" type="Size" target="n12_l4ui" value="0,58"/>
+    <item time="0" type="Size" target="n9_l4ui" tween="true" startValue="0,58" endValue="170,58" duration="8" ease="Linear"/>
+    <item time="4" type="Scale" target="n9_l4ui" tween="true" startValue="1.2,1.2" endValue="1,1" duration="4" ease="Linear"/>
+    <item time="8" type="Scale" target="n10_l4ui" tween="true" startValue="1,1" endValue="1.2,1.2" duration="3" ease="Linear"/>
+    <item time="8" type="Size" target="n10_l4ui" tween="true" startValue="0,58" endValue="170,58" duration="7" ease="Linear"/>
+    <item time="11" type="Scale" target="n10_l4ui" tween="true" startValue="1.2,1.2" endValue="1,1" duration="4" ease="Linear"/>
+    <item time="15" type="Scale" target="n11_l4ui" tween="true" startValue="1,1" endValue="1.2,1.2" duration="4" ease="Linear"/>
+    <item time="15" type="Size" target="n11_l4ui" tween="true" startValue="0,58" endValue="170,58" duration="8" ease="Linear"/>
+    <item time="19" type="Scale" target="n11_l4ui" tween="true" startValue="1.2,1.2" endValue="1,1" duration="4" ease="Linear"/>
+    <item time="23" type="Scale" target="n12_l4ui" tween="true" startValue="1,1" endValue="1.2,1.2" duration="4" ease="Linear"/>
+    <item time="23" type="Size" target="n12_l4ui" tween="true" startValue="0,58" endValue="170,58" duration="8" ease="Linear"/>
+    <item time="27" type="Scale" target="n12_l4ui" tween="true" startValue="1.2,1.2" endValue="1,1" duration="4" ease="Linear"/>
+  </transition>
+  <transition name="t1">
+    <item time="0" type="Scale" target="n14_l4ui" tween="true" startValue="1,1" endValue="1.2,1.2" duration="4" ease="Linear"/>
+    <item time="0" type="Scale" target="n15_l4ui" value="1.2,1.2"/>
+    <item time="0" type="Scale" target="n16_l4ui" value="1.2,1.2"/>
+    <item time="0" type="Scale" target="n17_l4ui" value="1.2,1.2"/>
+    <item time="0" type="Size" target="n14_l4ui" tween="true" startValue="0,58" endValue="170,58" duration="8" ease="Linear"/>
+    <item time="0" type="Size" target="n15_l4ui" value="0,58"/>
+    <item time="0" type="Size" target="n16_l4ui" value="0,58"/>
+    <item time="0" type="Size" target="n17_l4ui" value="0,58"/>
+    <item time="4" type="Scale" target="n14_l4ui" tween="true" startValue="1.2,1.2" endValue="1,1" duration="4" ease="Linear"/>
+    <item time="8" type="Scale" target="n15_l4ui" tween="true" startValue="1,1" endValue="1.2,1.2" duration="3" ease="Linear"/>
+    <item time="8" type="Size" target="n15_l4ui" tween="true" startValue="0,58" endValue="170,58" duration="7" ease="Linear"/>
+    <item time="11" type="Scale" target="n15_l4ui" tween="true" startValue="1.2,1.2" endValue="1,1" duration="4" ease="Linear"/>
+    <item time="15" type="Scale" target="n16_l4ui" tween="true" startValue="1,1" endValue="1.2,1.2" duration="4" ease="Linear"/>
+    <item time="15" type="Size" target="n16_l4ui" tween="true" startValue="0,58" endValue="170,58" duration="8" ease="Linear"/>
+    <item time="19" type="Scale" target="n16_l4ui" tween="true" startValue="1.2,1.2" endValue="1,1" duration="4" ease="Linear"/>
+    <item time="23" type="Scale" target="n17_l4ui" tween="true" startValue="1,1" endValue="1.2,1.2" duration="4" ease="Linear"/>
+    <item time="23" type="Size" target="n17_l4ui" tween="true" startValue="0,58" endValue="170,58" duration="8" ease="Linear"/>
+    <item time="27" type="Scale" target="n17_l4ui" tween="true" startValue="1.2,1.2" endValue="1,1" duration="4" ease="Linear"/>
+  </transition>
 </component>

FGUIProject/assets/ClothingFoster/SuitFosterUI.xml

@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
+<component size="936,998">
   <displayList>
-    <text id="n0_py5g" name="txtTitle" xy="479,589" size="122,41" fontSize="30" text="服装养护"/>
-    <text id="n1_py5g" name="txtDiscribe" xy="455,689" size="359,41" fontSize="30" text="浆洗浆洗浆洗浆洗浆洗浆洗"/>
-    <list id="n4_py5g" name="listPropertyAdd" xy="197,843" size="721,169" layout="row" colGap="20" defaultItem="ui://uicwtr5bpy5gt" align="center">
+    <image id="n11_bd1c" name="n11" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,998"/>
+    <text id="n12_bd1c" name="n12" xy="322,50" size="292,64" fontSize="48" color="#9b7853" text="属性提高比例"/>
+    <image id="n13_bd1c" name="n13" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="44,120"/>
+    <text id="n1_py5g" name="txtDiscribe" xy="67,179" size="254,56" fontSize="42" color="#9b7853" text="完成套装浆洗"/>
+    <list id="n4_py5g" name="listPropertyAdd" xy="32,287" size="871,126" layout="row" colGap="20" defaultItem="ui://uicwtr5bpy5gt" align="center">
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <list id="n8_py5g" name="listMaterials" xy="178,1047" size="821,289" layout="row" defaultItem="ui://uicwtr5bpy5gu" align="center">
+    <list id="n8_py5g" name="listMaterials" xy="63,491" size="821,289" layout="row" colGap="32" defaultItem="ui://uicwtr5bpy5gu" align="center">
       <item/>
       <item/>
       <item/>
     </list>
-    <component id="n9_py5g" name="btnFoster" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="356,1450"/>
-    <component id="n10_j5a5" name="ComConsume" src="ojlz61" fileName="components/ComConsumeCurrency.xml" pkg="eg2y0ldp" xy="416,1378"/>
+    <component id="n9_py5g" name="btnFoster" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="278,849"/>
+    <component id="n10_j5a5" name="ComConsume" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="328,778"/>
   </displayList>
 </component>

FGUIProject/assets/ClothingFoster/SuitListUI.xml

@@ -1,24 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <image id="n0_py5g" name="n0" src="vxw539" fileName="bgimg/zhangjie_bg.jpg" pkg="eg2y0ldp" xy="0,-240"/>
-    <component id="n1_py5g" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="156,73"/>
-    <component id="n2_py5g" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="33,43"/>
-    <component id="n3_py5g" name="comBoxSort" src="j5a5x" fileName="components/ComboBox1.xml" xy="555,207">
+    <image id="n0_py5g" name="n0" src="vxw539" fileName="bgimg/zhangjie_bg.jpg" pkg="eg2y0ldp" xy="0,-240">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </image>
+    <component id="n1_py5g" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="156,105">
+      <relation target="" sidePair="right-right,top-top"/>
+    </component>
+    <component id="n2_py5g" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">
+      <relation target="" sidePair="left-left,top-top"/>
+    </component>
+    <component id="n3_py5g" name="comBoxSort" src="j5a5x" fileName="components/ComboBox1.xml" xy="555,207" 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">
+    <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">
+    <component id="n5_py5g" name="btnHaveGot" src="py5g1" fileName="components/Button2.xml" xy="372,207" group="n10_rbxq">
       <Button title="已获得"/>
     </component>
-    <list id="n9_py5g" name="listSuit" xy="168,332" size="722,1544" layout="flow_hz" overflow="scroll" lineGap="48" colGap="55" defaultItem="ui://uicwtr5bpy5g8" autoClearItems="true">
-      <relation target="" sidePair="bottomext-bottom"/>
+    <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="31,377" size="1016,1537" layout="flow_hz" overflow="scroll" lineGap="48" colGap="26" defaultItem="ui://uicwtr5bpy5g8" align="center" autoClearItems="true">
+      <relation target="" sidePair="top-top,bottomext-bottom"/>
       <item/>
       <item/>
       <item/>

FGUIProject/assets/ClothingFoster/SuitPropertyShowUI.xml

@@ -1,7 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
+<component size="936,621">
   <displayList>
-    <list id="n1_py5g" name="listPropertyShow" xy="234,608" size="621,568" defaultItem="ui://uicwtr5bpy5gv">
+    <image id="n2_bd1c" name="n2" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,621"/>
+    <text id="n3_bd1c" name="n3" xy="322,50" size="292,64" fontSize="48" color="#9b7853" text="属性提高比例"/>
+    <image id="n4_bd1c" name="n4" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="44,120"/>
+    <list id="n1_py5g" name="listPropertyShow" xy="-10,166" size="956,409" layout="flow_vt" lineGap="20" colGap="30" defaultItem="ui://uicwtr5bpy5gv" align="center">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
       <item/>
       <item/>
       <item/>

FGUIProject/assets/ClothingFoster/SuitRenewFinishUI.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <loader id="n3_bd1c" name="bg" xy="0,-240" size="1080,2400" url="ui://eg2y0ldpm9wm8t" autoSize="true"/>
+    <image id="n4_bd1c" name="n4" src="bd1c1t" fileName="images/fzyc_hxbtbt.png" xy="0,300" group="n7_bd1c"/>
+    <image id="n5_bd1c" name="n5" src="bd1c1s" fileName="images/fzyc_hxcgk.png" xy="207,689" group="n7_bd1c"/>
+    <text id="n1_nk8d" name="txtProperty" xy="442,692" size="257,52" group="n7_bd1c" fontSize="38" color="#73592d" ubb="true" text="套装属性+30%"/>
+    <image id="n6_bd1c" name="n6" src="bd1c1u" fileName="images/fzyc_hxcg.png" xy="385,709" group="n7_bd1c"/>
+    <group id="n7_bd1c" name="n7" xy="0,300" size="1080,451" advanced="true">
+      <relation target="" sidePair="top-top"/>
+    </group>
+    <text id="n2_bd1c" name="n2" xy="430,1822" size="220,49" fontSize="36" color="#958163" text="点击屏幕继续">
+      <relation target="" sidePair="bottom-bottom"/>
+    </text>
+  </displayList>
+</component>

FGUIProject/assets/ClothingFoster/SuitRewardUI.xml

@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
+<component size="936,1098">
   <displayList>
-    <list id="n2_py5g" name="listReward" xy="232,461" size="616,998" overflow="scroll" defaultItem="ui://uicwtr5bpy5gw">
+    <image id="n3_bd1c" name="n3" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,1098"/>
+    <list id="n2_py5g" name="listReward" xy="30,162" size="875,899" overflow="scroll" lineGap="30" defaultItem="ui://uicwtr5bpy5gw" align="center">
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
+    <text id="n4_bd1c" name="n4" xy="370,50" size="196,64" fontSize="48" color="#9b7853" text="奖励领取"/>
+    <image id="n5_bd1c" name="n5" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="44,120"/>
   </displayList>
 </component>

FGUIProject/assets/ClothingFoster/SuitUI.xml

@@ -1,37 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1," selected="0"/>
+  <controller name="c1" pages="0,,1," selected="1"/>
+  <controller name="c2" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n0_pjip" name="bg" xy="0,-240" size="1080,2400" url="ui://eg2y0ldpj539i"/>
+    <loader id="n0_pjip" name="bg" xy="-610,-390" size="2300,2700" url="ui://eg2y0ldpbd1ca0" fill="scaleFree" autoSize="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
     <graph id="n1_pjip" name="holder" xy="389,623" pivot="0.5,0.5" size="394,268" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
     <component id="n9_pjip" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <image id="n4_pjip" name="n4" src="py5gi" fileName="images/images/tujian_tzk_1.png" xy="373,125">
-      <relation target="n3_pjip" sidePair="center-center,middle-middle"/>
+    <image id="n4_pjip" name="n4" src="bd1c1a" fileName="images/fzyc_mzkuang.png" xy="347,80"/>
+    <text id="n3_pjip" name="txtName" xy="346,94" size="387,52" fontSize="38" color="#9d824e" align="center" autoSize="none" text="分类名称">
+      <relation target="n4_pjip" sidePair="center-center,middle-middle"/>
+    </text>
+    <loader id="n18_py5g" name="loaRarity" xy="940,124" size="57,224" url="ui://eg2y0ldpqdrt15" autoSize="true"/>
+    <image id="n37_l4ui" name="n37" src="l4ui26" fileName="images/fzyc_yhditu_2.png" xy="0,1336">
+      <relation target="" sidePair="bottom-bottom"/>
     </image>
-    <text id="n3_pjip" name="txtName" xy="360,154" size="387,52" fontSize="38" color="#a17472" align="center" autoSize="none" text="分类名称"/>
-    <loader id="n18_py5g" name="loaRarity" xy="963,295" size="50,50"/>
-    <loader id="n7_pjip" name="btnRight" xy="969,912" size="72,95" url="ui://uicwtr5bpy5gk">
+    <component id="n7_pjip" name="btnRight" src="ly9g1e" fileName="components/Button13.xml" pkg="eg2y0ldp" xy="957,732">
       <relation target="" sidePair="center-center,middle-middle"/>
-    </loader>
-    <loader id="n8_pjip" name="btnLeft" xy="49,912" pivot="0.5,0.5" size="72,95" scale="-1,1" url="ui://uicwtr5bpy5gk">
+    </component>
+    <component id="n8_pjip" name="btnLeft" src="ly9g1e" fileName="components/Button13.xml" pkg="eg2y0ldp" xy="25,732" pivot="0.5,0.5" scale="-1,1">
       <relation target="" sidePair="center-center,middle-middle"/>
-    </loader>
-    <component id="n12_py5g" name="btnFoster" src="py5gm" fileName="components/Button5.xml" xy="382,1178">
-      <Button checked="true" controller="c1" page="0"/>
     </component>
-    <component id="n13_py5g" name="btnRenew" src="py5gm" fileName="components/Button5.xml" xy="565,1182">
-      <Button controller="c1" page="1"/>
+    <component id="n12_py5g" name="btnTabFoster" src="py5gm" fileName="components/Button5.xml" xy="243,1259">
+      <relation target="" sidePair="bottom-bottom"/>
+      <Button icon="ui://uicwtr5bbd1c1i" selectedIcon="ui://uicwtr5bbd1c1h" controller="c1" page="0"/>
+    </component>
+    <component id="n13_py5g" name="btnTabRenew" src="py5gm" fileName="components/Button5.xml" xy="561,1259">
+      <relation target="" sidePair="bottom-bottom"/>
+      <Button checked="true" icon="ui://uicwtr5bbd1c18" selectedIcon="ui://uicwtr5bbd1c1j" controller="c1" page="1"/>
     </component>
-    <component id="n17_py5g" name="btnReward" src="py5go" fileName="components/Button7.xml" xy="898,1221"/>
-    <component id="n16_py5g" name="btnPropertyShow" src="py5gn" fileName="components/Button6.xml" xy="990,1442"/>
-    <list id="n11_py5g" name="listProperty" xy="145,1424" size="819,68" layout="row" colGap="10" defaultItem="ui://eg2y0ldpojlzk" align="center" autoClearItems="true">
+    <image id="n36_bd1c" name="n36" src="bd1c1g" fileName="images/fzyc_yhditu_3.png" xy="0,1419" group="n21_nk8d"/>
+    <component id="n19_nk8d" name="comFosterReward" src="nk8d13" fileName="components/ComFosterReward.xml" xy="854,1143" group="n21_nk8d"/>
+    <component id="n16_py5g" name="btnPropertyShow" src="py5gn" fileName="components/Button6.xml" xy="983,1435" group="n21_nk8d"/>
+    <list id="n11_py5g" name="listProperty" xy="118,1435" size="844,58" group="n21_nk8d" layout="row" colGap="10" defaultItem="ui://eg2y0ldpojlzk" align="center" autoClearItems="true">
+      <item/>
+      <item/>
       <item/>
       <item/>
+    </list>
+    <list id="n15_py5g" name="listFoster" xy="44,1592" size="992,255" group="n21_nk8d" layout="row" overflow="scroll" colGap="64" defaultItem="ui://uicwtr5bj5a512" align="center">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n35_nk8d" name="comFosterAni" src="nk8d17" fileName="components/comFosterAni.xml" xy="424,746" group="n21_nk8d" visible="false"/>
+    <group id="n21_nk8d" name="grpFoster" xy="0,746" size="1080,1101" advanced="true">
+      <gearDisplay controller="c1" pages="0"/>
+      <relation target="" sidePair="bottom-bottom"/>
+    </group>
+    <text id="n22_nk8d" name="txtRenewProperty" xy="357,1375" size="365,46" group="n29_nk8d" fontSize="34" color="#aa9063" text="套装所有部件属性+10%"/>
+    <component id="n26_nk8d" name="comRenewCost" src="ojlz61" fileName="components/ComConsumeCurrency.xml" pkg="eg2y0ldp" xy="400,1706" group="n29_nk8d"/>
+    <component id="n27_nk8d" name="btnRenew" src="bd1c1r" fileName="components/Button8.xml" xy="368,1755" group="n29_nk8d"/>
+    <text id="n28_nk8d" name="txtRenewTips" xy="442,1840" size="196,44" group="n29_nk8d" fontSize="32" color="#bbafa3" text="完成养护阶段"/>
+    <component id="n23_nk8d" name="comRenewReward" src="nk8d14" fileName="components/ComRenewReward.xml" xy="68,1400" size="300,300" group="n39_l4ui"/>
+    <list id="n25_nk8d" name="listRenewMaterial" xy="428,1457" size="584,216" group="n39_l4ui" layout="row" colGap="36" defaultItem="ui://uicwtr5bpy5gu" align="center">
       <item/>
       <item/>
     </list>
-    <list id="n15_py5g" name="listFoster" xy="211,1681" size="716,42" layout="row" overflow="scroll" defaultItem="ui://uicwtr5bj5a512" align="center"/>
+    <group id="n39_l4ui" name="n39" xy="68,1400" size="944,300" group="n29_nk8d" advanced="true" layout="hz" colGap="60" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
+    <group id="n29_nk8d" name="grpRenew" xy="68,1375" size="944,509" advanced="true">
+      <gearDisplay controller="c1" pages="1"/>
+      <gearDisplay2 controller="c2" pages="0" condition="0"/>
+      <relation target="" sidePair="bottom-bottom"/>
+    </group>
+    <text id="n30_nk8d" name="n30" xy="414,1410" size="252,66" group="n34_nk8d" fontSize="50" color="#aa9063" text="已完成换新"/>
+    <text id="n31_nk8d" name="txtRenewShow" xy="336,1506" size="408,51" group="n34_nk8d" fontSize="38" color="#aa9063" text="套装所有部件属性+10%"/>
+    <component id="n32_nk8d" name="comRenewRewardGet" src="nk8d15" fileName="components/ComRenewRewardGet.xml" xy="390,1578" group="n34_nk8d"/>
+    <group id="n34_nk8d" name="grpRenewFinish" xy="336,1410" size="408,468" advanced="true">
+      <gearDisplay controller="c1" pages="1"/>
+      <gearDisplay2 controller="c2" pages="1" condition="0"/>
+      <relation target="" sidePair="bottom-bottom"/>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/ClothingFoster/components/Button5.xml

@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="100,40" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="1"/>
+<component size="276,77" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <image id="n4_py5g" name="n4" src="py5g4" fileName="images/tujian_xzdg_1.png" xy="29,-1">
-      <gearDisplay controller="button" pages="0"/>
-    </image>
-    <image id="n3_py5g" name="n3" src="py5g3" fileName="images/tujian_xzdg.png" xy="29,-1">
-      <gearDisplay controller="button" pages="1"/>
-    </image>
+    <loader id="n5_bd1c" name="icon" xy="0,0" size="276,77" url="ui://uicwtr5bbd1c1i" autoSize="true"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

FGUIProject/assets/ClothingFoster/components/Button6.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="40,40" extention="Button">
+<component size="55,55" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n3_py5g" name="n3" src="py5g4" fileName="images/tujian_xzdg_1.png" xy="-1,-1"/>
+    <image id="n3_py5g" name="n3" src="bd1c1c" fileName="images/fzyc_tsts.png" xy="0,0"/>
   </displayList>
   <Button/>
 </component>

FGUIProject/assets/ClothingFoster/components/Button8.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="343,87" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_bd1c" src="bd1c1l" name="n0" xy="0,0">
+      <relation target="" sidePair="width,height"/>
+    </image>
+  </displayList>
+</component>

FGUIProject/assets/ClothingFoster/components/ComFosterReward.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="178,178">
+  <controller name="c1" pages="0,,1,,2," selected="0"/>
+  <displayList>
+    <image id="n22_bd1c" name="n22" src="bd1c1b" fileName="images/fzyc_tbku.png" xy="0,-1"/>
+    <loader id="n19_nk8d" name="loaReward" xy="29,29" size="120,120" fill="scale"/>
+    <image id="n20_nk8d" name="imgRed" src="oq7r9k" fileName="imagesExport/zx_hogndian.png" pkg="eg2y0ldp" xy="134,15">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
+    <image id="n21_nk8d" name="n21" src="l4ui25" fileName="images/fzyc_dgogo.png" xy="2,2">
+      <gearDisplay controller="c1" pages="2"/>
+    </image>
+  </displayList>
+</component>

FGUIProject/assets/ClothingFoster/components/ComRenewReward.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="300,300">
+  <displayList>
+    <image id="n25_bd1c" name="n25" src="bd1c1m" fileName="images/fzyc_hxk_1.png" xy="0,0"/>
+    <loader id="n23_nk8d" name="loaReward" xy="50,50" size="200,200" fill="scale"/>
+    <image id="n26_bd1c" name="n26" src="bd1c1k" fileName="images/fzyc_hxts.png" xy="243,0"/>
+  </displayList>
+</component>

FGUIProject/assets/ClothingFoster/components/ComRenewRewardGet.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="300,300">
+  <displayList>
+    <loader id="n32_nk8d" name="loaReward" xy="51,51" size="200,200" aspect="true" fill="scale"/>
+    <image id="n34_bd1c" name="n34" src="bd1c1q" fileName="images/fzyc_hxkan_1.png" xy="0,0"/>
+    <image id="n33_nk8d" name="n33" src="bd1c1p" fileName="images/fzyc_hxkan_2.png" xy="109,114"/>
+  </displayList>
+</component>

FGUIProject/assets/ClothingFoster/components/ComReward.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="150,150">
+  <displayList>
+    <image id="n3_bd1c" name="n3" src="j48o99" fileName="images/kp_sjsj_di_3.png" pkg="eg2y0ldp" xy="0,0" size="150,150" aspect="true"/>
+    <loader id="n6_bd1c" name="loaIcon" xy="15,15" size="120,120" fill="scale"/>
+    <image id="n5_bd1c" name="n5" src="bd1c22" fileName="images/fzjl_dik_4.png" xy="15,120"/>
+    <image id="n4_bd1c" name="imgGot" src="bd1c1z" fileName="images/fzjl_dik_5.png" xy="0,0"/>
+    <text id="n7_bd1c" name="txtNum" xy="51,116" pivot="0.5,0" size="47,34" fontSize="24" color="#fff8ea" text="x20"/>
+  </displayList>
+</component>

FGUIProject/assets/ClothingFoster/components/ComboBox1.xml

@@ -1,10 +1,10 @@
 <?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"/>
+  <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.png" xy="66,0" size="210,56" group="n3_rc07"/>
+    <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="j5a5z" fileName="images/tujian_zkanniu.png" xy="221,2" group="n3_rc07"/>
+    <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"/>
   </displayList>
   <ComboBox dropdown="ui://uicwtr5bj5a510"/>

FGUIProject/assets/ClothingFoster/components/ListFosterItem.xml

@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="42,42">
-  <controller name="finish" pages="1,未开始,2,进行中,3,已完成" selected="2"/>
+<component size="144,257">
+  <controller name="finish" pages="1,已完成,2,进行中,3,未开始" selected="0"/>
   <displayList>
-    <image id="n3_py5g" name="n3" src="py5g3" fileName="images/tujian_xzdg.png" xy="0,0">
+    <image id="n5_py5g" name="n5" src="bd1c1e" fileName="images/fzyc_yhanniu_2.png" xy="-32,-12">
       <gearDisplay controller="finish" pages="3"/>
     </image>
-    <image id="n4_py5g" name="n4" src="py5g4" fileName="images/tujian_xzdg_1.png" xy="0,0">
-      <gearDisplay controller="finish" pages="2"/>
+    <image id="n4_py5g" name="n4" src="bd1c1d" fileName="images/fzyc_yhanniu_1.png" xy="-32,-15">
+      <gearDisplay controller="finish" pages="1,2"/>
     </image>
-    <image id="n5_py5g" name="n5" src="py5g4" fileName="images/tujian_xzdg_1.png" xy="0,0">
+    <image id="n3_py5g" name="n3" src="bd1c1f" fileName="images/fzyc_yhanniu_3.png" xy="0,0">
+      <gearDisplay controller="finish" pages="1"/>
+    </image>
+    <text id="n7_bd1c" name="txtName" xy="16,92" size="111,71" fontSize="54" color="#946e31" text="浆洗">
+      <gearColor controller="finish" pages="1,2,3" values="#946e31,#000000|#946e31,#000000|#b09e73,#000000"/>
+    </text>
+    <image id="n6_bd1c" name="n6" src="bd1c19" fileName="images/fzyc_dgo.png" xy="31,93">
       <gearDisplay controller="finish" pages="1"/>
     </image>
   </displayList>

FGUIProject/assets/ClothingFoster/components/ListMaterialsItem.xml

@@ -1,8 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="100,122">
+<component size="192,192">
   <displayList>
-    <loader id="n5_py5g" name="loaIcon" xy="7,0" size="80,80" aspect="true" fill="scale"/>
-    <text id="n7_py5g" name="txtNeed" xy="0,77" size="10,42" fontSize="30" ubb="true" text=""/>
-    <text id="n6_py5g" name="txtHas" xy="60,80" size="10,42" fontSize="30" ubb="true" text=""/>
+    <image id="n9_bd1c" name="n9" src="bd1c1n" fileName="images/fzyc_hxk_2.png" xy="0,0"/>
+    <loader id="n5_py5g" name="loaIcon" xy="21,21" size="150,150" aspect="true" url="ui://uicwtr5bpy5ge" fill="scale"/>
+    <image id="n11_l4ui" name="n11" src="bd1c1o" fileName="images/fzyc_hxk_3.png" xy="29,158"/>
+    <text id="n7_py5g" name="txtNeed" xy="57,157" pivot="1,0.5" size="34,34" group="n10_l4ui" fontSize="24" color="#fff8ea" align="right" ubb="true" text="10">
+      <relation target="n8_nk8d" sidePair="right-left,top-top"/>
+    </text>
+    <text id="n8_nk8d" name="n8" xy="91,158" pivot="0.5,0.5" size="18,34" group="n10_l4ui" fontSize="24" color="#fff8ea" ubb="true" text="/"/>
+    <text id="n6_py5g" name="txtHas" xy="109,158" pivot="0,0.5" size="34,34" group="n10_l4ui" fontSize="24" color="#fff8ea" ubb="true" text="11">
+      <relation target="n8_nk8d" sidePair="left-right,top-top"/>
+    </text>
+    <group id="n10_l4ui" name="n10" xy="57,157" size="86,35" advanced="true" layout="hz" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/ClothingFoster/components/ListPropertyAddItem.xml

@@ -2,6 +2,7 @@
 <component size="170,105">
   <displayList>
     <component id="n2_py5g" name="comProperty" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="0,0"/>
-    <text id="n3_py5g" name="txtAdd" xy="56,63" size="58,42" fontSize="30" text="+20"/>
+    <image id="n4_bd1c" name="n4" src="bd1c23" fileName="images/fzyh_kdkd.png" xy="47,71"/>
+    <text id="n3_py5g" name="txtAdd" xy="61,71" pivot="0.5,0" size="48,34" fontSize="24" color="#fbf2d6" text="+20"/>
   </displayList>
 </component>

FGUIProject/assets/ClothingFoster/components/ListPropertyShowItem.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="40,19">
+<component size="305,50">
   <displayList>
-    <text id="n0_py5g" name="txtShow" xy="0,0" size="40,19" fontSize="12" text=""/>
+    <text id="n0_py5g" name="txtShow" xy="30,-3" size="254,56" fontSize="42" color="#aa865f" ubb="true" text="衣服 20.00%"/>
+    <image id="n1_bd1c" name="n1" src="bd1c1y" fileName="images/fzyc_bjbj.png" xy="0,13"/>
   </displayList>
 </component>

FGUIProject/assets/ClothingFoster/components/ListRewardItem.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="456,241">
+<component size="874,172">
   <displayList>
-    <text id="n0_py5g" name="txtDiscribe" xy="0,72" size="63,41" fontSize="30" text="完成"/>
-    <component id="n1_py5g" name="ComReward" src="j48o98" fileName="components/ComItem.xml" pkg="eg2y0ldp" xy="264,0" size="192,243"/>
+    <image id="n2_bd1c" name="n2" src="bd1c20" fileName="images/fzjl_dik_2.png" xy="0,0"/>
+    <text id="n0_py5g" name="txtDiscribe" xy="49,45" size="87,56" fontSize="42" color="#9b7853" text="完成"/>
+    <component id="n3_bd1c" name="ComReward" src="bd1c24" fileName="components/ComReward.xml" xy="670,11"/>
   </displayList>
 </component>

FGUIProject/assets/ClothingFoster/components/comFosterAni.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="232,114">
+  <displayList>
+    <image id="n35_nk8d" name="n35" src="py5ge" fileName="images/zhuxian_shuoto.png" xy="80,0"/>
+    <component id="n36_nk8d" name="proFoster" src="py5ga" fileName="images/ProgressBar1.xml" xy="0,108">
+      <ProgressBar max="100"/>
+    </component>
+    <text id="n37_bd1c" name="txtContent" xy="8,179" size="209,42" fontSize="30" text="服装浆洗中......"/>
+  </displayList>
+</component>

FGUIProject/assets/ClothingFoster/images/ProgressBar1.xml

@@ -5,7 +5,7 @@
       <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="66,29" fontSize="20" color="#b3805e" vAlign="middle" autoClearText="true" text="00/10"/>
+    <text id="n2_pjip" name="title" xy="245,-11" size="10,29" visible="false" fontSize="20" color="#b3805e" vAlign="middle" autoClearText="true" text=""/>
   </displayList>
   <ProgressBar titleType="valueAndmax"/>
 </component>

FGUIProject/assets/ClothingFoster/package.xml

@@ -34,12 +34,51 @@
     <component id="py5gu" name="ListMaterialsItem.xml" path="/components/"/>
     <component id="py5gv" name="ListPropertyShowItem.xml" path="/components/"/>
     <component id="py5gw" name="ListRewardItem.xml" path="/components/"/>
-    <component id="j5a5x" name="ComboBox1.xml" path="/components/" exported="true"/>
+    <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"/>
-    <image id="j5a5z" name="tujian_zkanniu(1).png" path="/images/"/>
     <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/"/>
+    <component id="nk8d13" name="ComFosterReward.xml" path="/components/"/>
+    <component id="nk8d14" name="ComRenewReward.xml" path="/components/"/>
+    <component id="nk8d15" name="ComRenewRewardGet.xml" path="/components/"/>
+    <component id="nk8d16" name="SuitRenewFinishUI.xml" path="/" exported="true"/>
+    <component id="nk8d17" name="comFosterAni.xml" path="/components/"/>
+    <image id="bd1c18" name="fzyc_yjanniu_4.png" path="/images/"/>
+    <image id="bd1c19" name="fzyc_dgo.png" path="/images/"/>
+    <image id="bd1c1a" name="fzyc_mzkuang.png" path="/images/"/>
+    <image id="bd1c1b" name="fzyc_tbku.png" path="/images/"/>
+    <image id="bd1c1c" name="fzyc_tsts.png" path="/images/"/>
+    <image id="bd1c1d" name="fzyc_yhanniu_1.png" path="/images/"/>
+    <image id="bd1c1e" name="fzyc_yhanniu_2.png" path="/images/"/>
+    <image id="bd1c1f" name="fzyc_yhanniu_3.png" path="/images/"/>
+    <image id="bd1c1g" name="fzyc_yhditu_3.png" path="/images/"/>
+    <image id="bd1c1h" name="fzyc_yjanniu_1.png" path="/images/"/>
+    <image id="bd1c1i" name="fzyc_yjanniu_2.png" path="/images/"/>
+    <image id="bd1c1j" name="fzyc_yjanniu_3.png" path="/images/"/>
+    <image id="bd1c1k" name="fzyc_hxts.png" path="/images/"/>
+    <image id="bd1c1l" name="fzyc_anniu_1.png" path="/images/"/>
+    <image id="bd1c1m" name="fzyc_hxk_1.png" path="/images/"/>
+    <image id="bd1c1n" name="fzyc_hxk_2.png" path="/images/"/>
+    <image id="bd1c1o" name="fzyc_hxk_3.png" path="/images/"/>
+    <image id="bd1c1p" name="fzyc_hxkan_2.png" path="/images/"/>
+    <image id="bd1c1q" name="fzyc_hxkan_1.png" path="/images/"/>
+    <component id="bd1c1r" name="Button8.xml" path="/components/"/>
+    <image id="bd1c1s" name="fzyc_hxcgk.png" path="/images/"/>
+    <image id="bd1c1t" name="fzyc_hxbtbt.png" path="/images/"/>
+    <image id="bd1c1u" name="fzyc_hxcg.png" path="/images/"/>
+    <image id="bd1c1v" name="fzyc_wcyh_2.png" path="/images/"/>
+    <image id="bd1c1w" name="fzyc_wcyh_3.png" path="/images/"/>
+    <image id="bd1c1x" name="fzyc_wcyh_1.png" path="/images/"/>
+    <image id="bd1c1y" name="fzyc_bjbj.png" path="/images/"/>
+    <image id="bd1c1z" name="fzjl_dik_5.png" path="/images/"/>
+    <image id="bd1c20" name="fzjl_dik_2.png" path="/images/"/>
+    <image id="bd1c21" name="fzjl_dik_3.png" path="/images/"/>
+    <image id="bd1c22" name="fzjl_dik_4.png" path="/images/"/>
+    <image id="bd1c23" name="fzyh_kdkd.png" path="/images/"/>
+    <component id="bd1c24" name="ComReward.xml" path="/components/"/>
+    <image id="l4ui25" name="fzyc_dgogo.png" path="/images/"/>
+    <image id="l4ui26" name="fzyc_yhditu_2.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingFoster" packageCount="2" genCode="true"/>
 </packageDescription>

FGUIProject/assets/ClothingShop/ClothingShopUI.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,2,,3,,4,,5," selected="4">
-    <remark page="2" value="服装店"/>
-    <remark page="3" value="落星商店"/>
-    <remark page="4" value="活动商店"/>
+  <controller name="c1" pages="2,,3,,4,,5," selected="2">
+    <remark page="1" value="服装店"/>
+    <remark page="2" value="落星商店"/>
+    <remark page="3" value="活动商店"/>
   </controller>
   <displayList>
     <loader id="n48_f5bl" name="bg" xy="0,-240" size="1080,2400" url="ui://eg2y0ldpj539i" autoSize="true">
@@ -77,18 +77,18 @@
     </list>
     <loader id="n45_ugdz" name="n45" xy="0,0" size="1080,199" url="ui://e5hnfx8augdz1i" fill="scaleFree"/>
     <component id="n2_hinb" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,107">
-      <gearXY controller="c1" pages="0,2,3,4,5" values="159,90|159,90|159,90|159,107|159,107"/>
+      <gearXY controller="c1" pages="2,3,4,5" values="159,90|159,90|159,107|159,107"/>
     </component>
     <component id="n47_ugdz" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <image id="n49_f5bl" name="n49" src="lwri5x" fileName="images/hc_btkuang_1.png" pkg="eg2y0ldp" xy="282,103" group="n51_f5bl"/>
-    <text id="n50_f5bl" name="txtTitle" xy="540,98" pivot="0.5,0" anchor="true" size="154,51" group="n51_f5bl" fontSize="38" color="#fdf4e3" text="活动商店">
+    <text id="n50_f5bl" name="txtTitle" xy="540,98" pivot="0.5,0" anchor="true" size="154,51" group="n51_f5bl" fontSize="38" color="#fdf4e3" text="落星商店">
       <gearText controller="c1" pages="4" values="落星商店" default="活动商店"/>
     </text>
     <group id="n51_f5bl" name="grpTop" xy="282,98" size="516,60" advanced="true">
       <gearDisplay controller="c1" pages="4,5"/>
     </group>
     <image id="n52_iakb" name="n52" src="iakb5z" fileName="images/fzd_lxsdt.png" xy="431,1140" group="n53_iakb"/>
-    <text id="n54_iakb" name="txtTips" xy="476,1162" size="325,39" group="n59_iakb" fontSize="28" color="#fffbf0" text="100星屑自动合成1落星石"/>
+    <text id="n54_iakb" name="txtTips" xy="476,1162" size="308,39" group="n59_iakb" fontSize="28" color="#fffbf0" text="50星屑自动合成1落星石"/>
     <loader id="n55_iakb" name="loaIcon0" xy="821,1162" size="42,42" group="n60_iakb" url="ui://eg2y0ldply9g8m" autoSize="true"/>
     <text id="n56_iakb" name="txtCount0" xy="865,1162" size="56,39" group="n60_iakb" fontSize="28" color="#fffbf0" text="100"/>
     <group id="n60_iakb" name="n60" xy="821,1162" size="100,42" group="n59_iakb"/>

FGUIProject/assets/ClothingShop/components/CompItemInfo.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="412,952">
-  <controller name="c1" pages="0,,1,,2,,6,,7," selected="0">
-    <remark page="2" value="服装店"/>
-    <remark page="3" value="落星商店"/>
-    <remark page="4" value="活动商店"/>
+  <controller name="c1" pages="1,,2,,6,,7," selected="1">
+    <remark page="1" value="服装店"/>
+    <remark page="2" value="落星商店"/>
+    <remark page="3" value="活动商店"/>
   </controller>
   <displayList>
-    <image id="n7_hinb" name="n7" src="hinb3" fileName="images/fzd_diban_1.png" xy="0,0"/>
+    <image id="n7_hinb" name="n7" src="hinb3" fileName="images/fzd_diban_1.png" xy="0,1"/>
     <text id="n8_hinb" name="txtName" xy="62,41" size="164,54" fontSize="40" color="#ffffff" text="衣服名字"/>
     <text id="n30_hinb" name="txtDesc" xy="38,127" size="336,34" fontSize="24" color="#af9574" autoSize="none" autoClearText="true" text="赵钱孙李周吴郑王"/>
     <loader id="n43_hinb" name="rarity" xy="360,23" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
@@ -25,13 +25,13 @@
     <loader id="n47_ugdz" name="iconPrice" xy="102,702" 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="136,698" size="97,41" group="n46_hinb" fontSize="30" color="#f2efff" autoClearText="true" text="99999">
+    <text id="n48_ugdz" name="txtPrice" xy="136,698" size="96,41" group="n46_hinb" fontSize="30" color="#f2efff" autoClearText="true" text="99999">
       <gearDisplay controller="c1" pages="0,1,2"/>
     </text>
-    <text id="n45_hinb" name="txtBtnBuy" xy="233,690" size="76,49" group="n46_hinb" fontSize="36" color="#fff7e4" strokeColor="#ac904e" strokeSize="2" text="购买">
+    <text id="n45_hinb" name="txtBtnBuy" xy="232,690" size="76,49" group="n46_hinb" fontSize="36" color="#fff7e4" strokeColor="#ac904e" strokeSize="2" text="购买">
       <gearText controller="c1" pages="6,7" values="兑换|兑换" default="购买"/>
     </text>
-    <group id="n46_hinb" name="n46" xy="102,690" size="207,49" advanced="true" layout="hz" excludeInvisibles="true">
+    <group id="n46_hinb" name="n46" xy="102,690" size="206,49" advanced="true" layout="hz" excludeInvisibles="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
     <list id="n53_ih75" name="listTag" xy="41,490" size="333,130" layout="flow_hz" lineGap="12" colGap="22" defaultItem="ui://eg2y0ldpih7566" autoClearItems="true">

FGUIProject/assets/Common/FloatingTextPromptErrUI.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="354,40" opaque="false">
+<component size="376,70" opaque="false">
   <displayList>
-    <image id="n2_s2cc" name="n2" src="s2cc4l" fileName="imagesExport/zx_jq_rwbszik.png" xy="0,0" size="354,40">
+    <image id="n2_s2cc" name="n2" src="s2cc4l" fileName="imagesExport/zx_jq_rwbszik.png" xy="0,15">
       <relation target="n4_s2cc" sidePair="width-width"/>
     </image>
-    <text id="n4_s2cc" name="txtMessage" xy="85,-1" size="184,41" fontSize="30" color="#ffffff" align="center" singleLine="true" autoClearText="true" text="这是一个提示">
+    <text id="n4_s2cc" name="txtMessage" xy="96,13" size="182,42" fontSize="30" color="#ffffff" align="center" singleLine="true" autoClearText="true" text="这是一个提示">
       <relation target="n2_s2cc" sidePair="center-center"/>
     </text>
   </displayList>

FGUIProject/assets/Common/FloatingTextPromptNarmalUI.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="354,40" opaque="false">
+<component size="1040,70" pivot="0.5,0.5" anchor="true" opaque="false">
   <displayList>
-    <image id="n2_s2cc" name="n2" src="qp4l4q" fileName="imagesExport/zx_jq_rwbszik_normal.png" xy="0,0" size="354,40">
-      <relation target="n4_s2cc" sidePair="width-width"/>
+    <image id="n2_s2cc" name="n2" src="qp4l4q" fileName="imagesExport/zx_jq_rwbszik_normal.png" xy="520,35" pivot="0.5,0.5" anchor="true">
+      <relation target="" sidePair="center-center"/>
     </image>
-    <text id="n4_s2cc" name="txtMessage" xy="85,-1" size="184,41" fontSize="30" color="#ffffff" align="center" singleLine="true" autoClearText="true" text="这是一个提示">
+    <text id="n4_s2cc" name="txtMessage" xy="520,35" pivot="0.5,0.5" anchor="true" size="324,44" fontSize="32" color="#e8dbb3" align="center" singleLine="true" autoClearText="true" text="今日购买次数已达上限">
       <relation target="n2_s2cc" sidePair="center-center"/>
     </text>
   </displayList>

FGUIProject/assets/Common/components/Button12.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="324,105" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_ih75" name="icon" src="ih7592" fileName="imagesExport/tctc_anniu_1.png" xy="0,0" size="324,105">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_ih75" name="title" xy="0,0" size="324,105" fontSize="46" color="#fff7e4" align="center" vAlign="middle" letterSpacing="2" autoSize="none" strokeColor="#ac904e" singleLine="true" text="确定">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/Common/package.xml

@@ -4,7 +4,7 @@
     <component id="q08x7" name="Button2.xml" path="/components/" exported="true"/>
     <component id="q08x6" name="Button1.xml" path="/components/" exported="true"/>
     <component id="s2cc4k" name="FloatingTextPromptErrUI.xml" path="/" exported="true"/>
-    <image id="s2cc4l" name="zx_jq_rwbszik.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="197,10,6,20"/>
+    <image id="s2cc4l" name="zx_jq_rwbszik.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="153,7,76,19"/>
     <component id="d4iw4m" name="ModalStatusUI.xml" path="/" exported="true"/>
     <image id="q08xo" name="ANNIU_3.png" path="/imagesExport/" exported="true"/>
     <component id="q08xu" name="Button3.xml" path="/components/" exported="true"/>
@@ -35,6 +35,9 @@
     <image id="ih7592" name="tctc_anniu_1.png" path="/imagesExport/"/>
     <image id="ih7591" name="tctc_anniu_2.png" path="/imagesExport/"/>
     <component id="pf2696" name="ComHolder.xml" path="/components/" exported="true"/>
+    <component id="axdi97" name="Button12.xml" path="/components/" exported="true"/>
+    <image id="axdi98" name="grxx_anniu_2.png" path="/imagesExport/"/>
+    <image id="axdi99" name="grxx_anniu_1.png" path="/imagesExport/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Common" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/CommonGame/RewardUI.xml

@@ -6,14 +6,17 @@
     <image id="n1_m9wm" name="imgTitle" src="m9wm8r" fileName="images/gxhd_btbt.png" xy="0,300" group="n8_m9wm">
       <relation target="" sidePair="center-center"/>
     </image>
-    <list id="n6_m9wm" name="listReward" xy="91,730" size="898,248" group="n8_m9wm" layout="row" overflow="scroll" scroll="horizontal" colGap="91" defaultItem="ui://eg2y0ldpm9wm8u" align="center">
+    <list id="n6_m9wm" name="listReward" xy="95,730" size="889,580" group="n8_m9wm" layout="flow_hz" overflow="scroll" lineGap="60" colGap="91" defaultItem="ui://eg2y0ldpm9wm8u" align="center">
       <relation target="" sidePair="center-center"/>
       <item/>
       <item/>
       <item/>
       <item/>
+      <item/>
+      <item/>
+      <item/>
     </list>
-    <group id="n8_m9wm" name="grp" xy="0,300" size="1080,816" advanced="true"/>
+    <group id="n8_m9wm" name="grp" xy="0,300" size="1080,1010" advanced="true"/>
     <text id="n7_m9wm" name="n7" xy="430,1822" size="220,49" fontSize="36" color="#958163" text="点击屏幕继续">
       <relation target="" sidePair="bottom-bottom"/>
     </text>

FGUIProject/assets/CommonGame/components/ComConsumeCurrency.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="250,42">
-  <displayList>
-    <image id="n4_a713" name="n4" src="a71377" fileName="imagesExport/kp_dikuang_3.png" xy="60,3"/>
-    <text id="n2_ojlz" name="n2" xy="0,0" size="65,42" fontSize="30" color="#7d634a" autoSize="none" text="消耗"/>
-    <loader id="n1_ojlz" name="loaIcon" xy="70,-9" size="60,60" url="ui://eg2y0ldpq08x3" autoSize="true"/>
-    <text id="n6_j5a5" name="txtNeed" xy="130,0" size="73,39" fontSize="28" color="#ffffff" align="center" vAlign="middle" ubb="true" text="9993"/>
-    <text id="n7_j5a5" name="txtHas" xy="219,0" size="39,39" fontSize="28" color="#ffffff" align="center" vAlign="middle" ubb="true" text="99">
-      <relation target="n8_j5a5" sidePair="left-right"/>
-    </text>
-    <text id="n8_j5a5" name="n8" xy="201,0" size="21,39" fontSize="28" color="#ffffff" text="/">
-      <relation target="n6_j5a5" sidePair="left-right"/>
-    </text>
-  </displayList>
-</component>

FGUIProject/assets/CommonGame/components/ComCostCurrency.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="285,42">
+  <displayList>
+    <image id="n4_a713" name="n4" src="a71377" fileName="imagesExport/kp_dikuang_3.png" xy="60,3"/>
+    <text id="n2_ojlz" name="n2" xy="0,0" size="65,42" fontSize="30" color="#7d634a" autoSize="none" text="消耗"/>
+    <loader id="n1_ojlz" name="loaIcon" xy="70,-9" size="60,60" url="ui://eg2y0ldpq08x3" autoSize="true"/>
+    <text id="n6_j5a5" name="txtNeed" xy="165,1" pivot="0.5,0" size="73,39" fontSize="28" color="#ffffff" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9993"/>
+  </displayList>
+</component>

FGUIProject/assets/CommonGame/components/ComCostCurrencyWithHas.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="280,42">
+  <displayList>
+    <image id="n4_a713" name="n4" src="a71377" fileName="imagesExport/kp_dikuang_3.png" xy="60,3"/>
+    <text id="n2_ojlz" name="n2" xy="0,0" size="65,42" fontSize="30" color="#7d634a" autoSize="none" text="消耗"/>
+    <loader id="n1_ojlz" name="loaIcon" xy="70,-9" size="60,60" url="ui://eg2y0ldpq08x3" autoSize="true"/>
+    <text id="n6_j5a5" name="txtNeed" xy="142,1" size="73,39" group="n9_l4ui" fontSize="28" color="#ffffff" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9993"/>
+    <text id="n8_j5a5" name="txtLine" xy="215,1" size="21,39" group="n9_l4ui" fontSize="28" color="#ffffff" text="/"/>
+    <text id="n7_j5a5" name="txtHas" xy="236,1" size="39,39" group="n9_l4ui" fontSize="28" color="#ffffff" align="center" vAlign="middle" ubb="true" autoClearText="true" text="99"/>
+    <group id="n9_l4ui" name="n9" xy="142,1" size="133,39" advanced="true" layout="hz" excludeInvisibles="true"/>
+  </displayList>
+</component>

FGUIProject/assets/CommonGame/components/ListPropertyItem.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="170,58">
+<component size="170,58" overflow="hidden">
   <displayList>
-    <text id="n5_ojlz" name="txtProperty" xy="59,7" size="103,44" fontSize="32" color="#7d6956" text="66666"/>
+    <text id="n5_ojlz" name="txtProperty" xy="59,7" size="103,44" fontSize="32" color="#7d6956" ubb="true" text="66666"/>
     <loader id="n6_ojlz" name="loaIcon" xy="0,0" size="58,58" url="ui://eg2y0ldp842s6h" autoSize="true"/>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/package.xml

@@ -70,7 +70,7 @@
     <image id="lwri5x" name="hc_btkuang_1.png" path="/images/" exported="true"/>
     <component id="lwri5y" name="ButtonApproach.xml" path="/components/" exported="true"/>
     <image id="j53916" name="zjm_gnk.png" path="/images/"/>
-    <font id="kst18" name="STZHONGS.TTF" path="/" renderMode="" samplePointSize="16"/>
+    <font id="kst18" name="STZHONGS.TTF" path="/" 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="pq5x62" name="kp_sxing_x_1.png" path="/imagesExport/" exported="true"/>
@@ -122,7 +122,7 @@
     <image id="m9wm8v" name="ts_canghaiym.png" path="/images/"/>
     <image id="m9wm8w" name="ts_jiyuet.png" path="/images/"/>
     <image id="ighs8x" name="hd_suanc.png" path="/imagesExport/" exported="true"/>
-    <image id="9cth8y" name="tctc_xiant_1.png" path="/imagesExport/"/>
+    <image id="9cth8y" name="tctc_xiant_1.png" path="/imagesExport/" exported="true"/>
     <image id="9cth8z" name="cj_hd_kdi.png" path="/imagesExport/"/>
     <image id="9cth90" name="cj_hd_zik.png" path="/imagesExport/"/>
     <component id="ojlzk" name="ListPropertyItem.xml" path="/components/" exported="true"/>
@@ -158,7 +158,6 @@
     <image id="uo1t9o" name="tctc_anniu_2.png" path="/images/"/>
     <component id="ojlzh" name="ComStar.xml" path="/components/" exported="true"/>
     <image id="pzq19p" name="cj_hd_xin.png" path="/imagesExport/"/>
-    <image id="nz0ts" name="sc_anniu_1(1).png" path="/imagesExport/"/>
     <image id="g3nf9q" name="jinbi_1.png" path="/imagesExport/"/>
     <component id="g3nf9r" name="FunctionOpenUI.xml" path="/" exported="true"/>
     <image id="g3nf9t" name="js_icon_.png" path="/imgFunIcon/" exported="true"/>
@@ -167,7 +166,16 @@
     <image id="tt1q9x" name="xjs_ditu_2.png" path="/images/"/>
     <image id="tt1q9y" name="xjs_ditu_3.png" path="/images/"/>
     <image id="tc539z" name="zx_jqgka_stjl.png" path="/images/"/>
-    <component id="ojlz61" name="ComConsumeCurrency.xml" path="/components/" exported="true"/>
+    <component id="ojlz61" name="ComCostCurrencyWithHas.xml" path="/components/" exported="true"/>
+    <image id="ly9g1d" name="cj_xhua.png" path="/imagesExport/" exported="true"/>
+    <component id="ly9g1e" name="Button13.xml" path="/components/" exported="true"/>
+    <image id="qdrt15" name="hd_sxicon_1.png" path="/imagesExport/" exported="true"/>
+    <image id="qdrt16" name="hd_sxicon_2.png" path="/imagesExport/" exported="true"/>
+    <image id="qdrt17" name="hd_sxicon_3.png" path="/imagesExport/" exported="true"/>
+    <image id="qdrt18" name="hd_sxicon_4.png" path="/imagesExport/" exported="true"/>
+    <image id="bd1ca0" name="jingzhongh_bg.jpg" path="/bgimg/" exported="true" atlas="alone_npot"/>
+    <component id="n3xha1" name="ComCostCurrency.xml" path="/components/" exported="true"/>
+    <font id="k1kha2" name="SIMKAI.TTF" path="/" exported="true" renderMode="" samplePointSize="16"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DressUp/DressUpFightUI.xml

@@ -34,6 +34,9 @@
     <component id="n10_qsvd" name="partsList" src="k6he1v" fileName="components/PartsList.xml" xy="1081,80" size="222,1828" group="n38_8lqj">
       <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
     </component>
+    <component id="n40_afs6" name="partsList2" src="k6he1v" fileName="components/PartsList.xml" xy="1080,80" size="222,1828" group="n38_8lqj">
+      <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
+    </component>
     <component id="n15_vxw5" name="btnHint" src="f4xv3o" fileName="components/Button6.xml" xy="27,895" size="116,106" group="n38_8lqj">
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <Button title="任务提示" titleColor="#ffffff" titleFontSize="42" icon="ui://mbo439wb8xpg2q"/>

FGUIProject/assets/DressUp/DressUpUI.xml

@@ -32,6 +32,9 @@
     <component id="n17_k6he" name="partsList" src="k6he1v" fileName="components/PartsList.xml" xy="1081,80" size="222,1828" group="n30_8lqj">
       <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
     </component>
+    <component id="n32_afs6" name="partsList2" src="k6he1v" fileName="components/PartsList.xml" xy="1081,80" size="222,1828" group="n30_8lqj">
+      <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
+    </component>
     <component id="n27_j48o" name="btnAction" src="f4xv3o" fileName="components/Button6.xml" xy="27,735" size="116,106" group="n30_8lqj">
       <Button icon="ui://mbo439wbj48o3x"/>
     </component>

FGUIProject/assets/Guide/GuideUI.xml

@@ -4,8 +4,9 @@
     <component id="n0" name="mask" src="tu96e" fileName="components/Component2.xml" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <component id="n15_tu96" name="rectFrame" src="tu96f" fileName="components/Component3.xml" xy="404,798" touchable="false"/>
+    <component id="n15_tu96" name="rectFrame" src="tu96f" fileName="components/Component3.xml" xy="404,798" visible="false" touchable="false"/>
     <component id="n17_tu96" name="compTxt" src="tu96d" fileName="components/Component1.xml" xy="261,1099" touchable="false"/>
-    <image id="n18_a5x3" name="rectFrameTemp" src="tu96c" fileName="images/yd_tykuang_2.png" xy="272,822"/>
+    <image id="n18_a5x3" name="rectFrameTemp" src="tu96c" fileName="images/yd_tykuang_2.png" xy="272,822" visible="false"/>
+    <component id="n19_bd1c" name="comHolder" src="axdii" fileName="components/ComHolder.xml" xy="400,1285" touchable="false"/>
   </displayList>
 </component>

FGUIProject/assets/Guide/components/ComHolder.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="100,100">
+  <displayList>
+    <graph id="n19_bd1c" name="holder" xy="0,0" pivot="0.5,0.5" size="100,100" touchable="false">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+  </displayList>
+</component>

FGUIProject/assets/Guide/package.xml

@@ -11,6 +11,7 @@
     <component id="tu96e" name="Component2.xml" path="/components/"/>
     <component id="tu96f" name="Component3.xml" path="/components/"/>
     <image id="o139g" name="yd_tykuang_3.png" path="/images/"/>
+    <component id="axdii" name="ComHolder.xml" path="/components/"/>
   </resources>
   <publish name="Guide" path="..\GameClient\Assets\ResIn\UI\Guide" packageCount="2" genCode="true" extractAlpha="true">
     <atlas name="默认" index="0"/>

FGUIProject/assets/LuckyBox/LuckyBoxStarUI.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="ctrlBuyType" alias="购买类型" pages="0,,1," selected="1">
+  <controller name="ctrlBuyType" alias="购买类型" pages="0,,1," selected="0">
     <remark page="0" value="买一次"/>
     <remark page="1" value="买十次"/>
   </controller>
-  <controller name="ctrlRewardsType" alias="奖池类型" pages="0,,1,,2," selected="1"/>
+  <controller name="ctrlRewardsType" alias="奖池类型" pages="0,,1,,2," selected="2"/>
   <displayList>
-    <loader id="n0_l5nz" name="bg" xy="0,-240" size="1080,2400" url="ui://drx9d1uso1391i" autoSize="true">
+    <loader id="n0_l5nz" name="bg" xy="0,-240" size="1080,2400" url="ui://drx9d1uso1391g" autoSize="true">
       <gearIcon controller="ctrlRewardsType" pages="0,1,2" values="ui://drx9d1uso1391h|ui://drx9d1uso1391i|ui://drx9d1uso1391g"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
-    <component id="n9_l5nz" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="72,76" visible="false"/>
+    <component id="n9_l5nz" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="72,76"/>
     <component id="n20_f5bl" name="comStar0_0_0" src="l5nzq" fileName="components/ComStar.xml" xy="513,889">
       <gearDisplay controller="ctrlBuyType" pages="0"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="0" condition="0"/>

FGUIProject/assets/LuckyBox/LuckyBoxUI.xml

@@ -39,7 +39,7 @@
     <group id="n31_vek8" name="grpBottom" xy="91,1663" size="989,250" advanced="true">
       <relation target="" sidePair="bottom-bottom"/>
     </group>
-    <component id="n33_ly9g" name="btnLeft" src="ly9g1e" fileName="components/Button5.xml" xy="74,960" pivot="0.5,0.5" anchor="true" rotation="180"/>
-    <component id="n39_ly9g" name="btnRight" src="ly9g1e" fileName="components/Button5.xml" xy="1000,960" pivot="0.5,0.5" anchor="true"/>
+    <component id="n33_ly9g" name="btnLeft" src="ly9g1e" fileName="components/Button5.xml" xy="74,960" pivot="0.5,0.5" anchor="true" rotation="180" pkg="eg2y0ldp"/>
+    <component id="n39_ly9g" name="btnRight" src="ly9g1e" fileName="components/Button5.xml" xy="1000,960" pivot="0.5,0.5" anchor="true" pkg="eg2y0ldp"/>
   </displayList>
 </component>

FGUIProject/assets/LuckyBox/components/ComCard.xml

@@ -2,7 +2,7 @@
 <component size="948,970">
   <displayList>
     <loader id="n0_qdrt" name="bg" xy="0,0" size="948,970" url="ui://drx9d1usqdrt14" autoSize="true"/>
-    <loader id="n1_qdrt" name="loaType" xy="685,237" size="78,306" aspect="true" url="ui://drx9d1usqdrt15" fill="scaleMatchWidth"/>
+    <loader id="n1_qdrt" name="loaType" xy="685,237" size="78,306" aspect="true" url="ui://eg2y0ldpqdrt15" fill="scaleMatchWidth"/>
     <loader id="n2_qdrt" name="loaIcon" xy="287,206" size="374,374" aspect="true" url="ui://mfvz4q8kkubi7e" fill="scaleMatchWidth"/>
     <loader id="n3_qdrt" name="loaProperty" xy="248,231" size="60,60" aspect="true" url="ui://eg2y0ldp842s6k" fill="scaleMatchWidth"/>
     <text id="n4_qdrt" name="txtName" xy="474,75" pivot="0.5,0.5" anchor="true" size="100,64" fontSize="48" color="#feeac2" text="服装"/>