Merge remote-tracking branch 'remotes/origin/zhaoyang' into guodong

# Conflicts:
#	GameClient/Assets/Game/HotUpdate/Controller/BonusController.cs
#	GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryController.cs
#	GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs
#	GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes

FGUIProject/assets/ClothingFoster/SuitFosterFinishUI.xml

@@ -1,6 +1,53 @@
 <?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" visible="false" fontSize="36" color="#d1bc8d" autoSize="none" text="本套装的换新已可用"/>
+    <group id="n8_l4ui" name="grpRenew" xy="115,1138" size="850,60" visible="false" advanced="true"/>
+    <component id="n9_l4ui" name="comProperty0" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="155,635" pivot="0,0.5" size="0,58"/>
+    <component id="n10_l4ui" name="comProperty1" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="355,635" pivot="0,0.5" size="0,58"/>
+    <component id="n11_l4ui" name="comProperty2" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="555,635" pivot="0,0.5" size="0,58"/>
+    <component id="n12_l4ui" name="comProperty3" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="755,635" pivot="0,0.5" size="0,58"/>
+    <image id="n18_l4ui" name="n18" src="bd1c1v" fileName="images/fzyc_wcyh_2.png" xy="504,756" size="72,56" fillMethod="vt"/>
+    <component id="n14_l4ui" name="comAddProperty0" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="155,851" pivot="0,0.5" size="0,58"/>
+    <component id="n15_l4ui" name="n15comAddProperty1" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="355,851" pivot="0,0.5" size="0,58"/>
+    <component id="n16_l4ui" name="comAddProperty2" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="555,851" pivot="0,0.5" size="0,58"/>
+    <component id="n17_l4ui" name="comAddProperty3" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="755,851" pivot="0,0.5" size="0,58"/>
   </displayList>
+  <transition name="t0">
+    <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="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="Size" target="n18_l4ui" tween="true" startValue="72,56" endValue="72,56" duration="5" ease="Linear"/>
+  </transition>
+  <transition name="t2">
+    <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="Size" target="n14_l4ui" tween="true" startValue="0,58" endValue="170,58" duration="8" ease="Linear"/>
+    <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="ojlz61" fileName="components/ComConsumeCurrency.xml" pkg="eg2y0ldp" xy="328,778"/>
   </displayList>
 </component>

FGUIProject/assets/ClothingFoster/SuitListUI.xml

@@ -17,7 +17,7 @@
     <component id="n5_py5g" name="btnHaveGot" src="py5g1" fileName="components/Button2.xml" xy="372,207">
       <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">
+    <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="bottomext-bottom"/>
       <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" lineGap="20" 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

@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <text id="n1_nk8d" name="txtProperty" xy="438,744" size="204,42" fontSize="30" text="套装属性+30%"/>
+    <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

@@ -3,61 +3,80 @@
   <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="btnTabFoster" src="py5gm" fileName="components/Button5.xml" xy="382,1178">
-      <Button controller="c1" page="0"/>
     </component>
-    <component id="n13_py5g" name="btnTabRenew" src="py5gm" fileName="components/Button5.xml" xy="565,1182">
-      <Button checked="true" 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="n19_nk8d" name="comFosterReward" src="nk8d13" fileName="components/ComFosterReward.xml" xy="945,1070" group="n21_nk8d"/>
-    <component id="n16_py5g" name="btnPropertyShow" src="py5gn" fileName="components/Button6.xml" xy="990,1442" group="n21_nk8d"/>
-    <list id="n11_py5g" name="listProperty" xy="145,1424" size="819,68" group="n21_nk8d" 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>
-    <list id="n15_py5g" name="listFoster" xy="211,1681" size="716,42" group="n21_nk8d" layout="row" overflow="scroll" defaultItem="ui://uicwtr5bj5a512" align="center"/>
     <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="145,746" size="900,977" advanced="true">
+    <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="391,1264" size="322,42" group="n29_nk8d" fontSize="30" text="套装所有部件属性+10%"/>
-    <component id="n23_nk8d" name="comRenewReward" src="nk8d14" fileName="components/ComRenewReward.xml" xy="878,1292" group="n29_nk8d"/>
-    <list id="n25_nk8d" name="listRenewMaterial" xy="0,1470" size="654,202" group="n29_nk8d" layout="row" colGap="20" defaultItem="ui://uicwtr5bpy5gu">
-      <item/>
+    <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>
-    <component id="n26_nk8d" name="comRenewCost" src="ojlz61" fileName="components/ComConsumeCurrency.xml" pkg="eg2y0ldp" xy="656,1421" group="n29_nk8d"/>
-    <component id="n27_nk8d" name="btnRenew" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="624,1498" group="n29_nk8d"/>
-    <text id="n28_nk8d" name="txtRenewTips" xy="694,1650" size="182,42" group="n29_nk8d" fontSize="30" text="完成养护阶段"/>
-    <group id="n29_nk8d" name="grpRenew" xy="0,1264" size="1030,427" advanced="true">
+    <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="480,1372" size="152,42" group="n34_nk8d" fontSize="30" text="已完成换新"/>
-    <text id="n31_nk8d" name="txtRenewShow" xy="379,1466" size="322,42" group="n34_nk8d" fontSize="30" text="套装所有部件属性+10%"/>
-    <component id="n32_nk8d" name="comRenewRewardGet" src="nk8d15" fileName="components/ComRenewRewardGet.xml" xy="497,1594" group="n34_nk8d"/>
-    <group id="n34_nk8d" name="grpRenewFinish" xy="379,1372" size="322,322" advanced="true">
+    <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

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="100,100">
+<component size="178,178">
   <controller name="c1" pages="0,,1,,2," selected="0"/>
   <displayList>
-    <loader id="n19_nk8d" name="loaReward" xy="0,0" size="100,100" fill="scale"/>
-    <image id="n20_nk8d" name="imgRed" src="py5g4" fileName="images/tujian_xzdg_1.png" xy="64,-12">
+    <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="py5g3" fileName="images/tujian_xzdg.png" xy="29,29">
+    <image id="n21_nk8d" name="n21" src="l4ui25" fileName="images/fzyc_dgogo.png" xy="2,2">
       <gearDisplay controller="c1" pages="2"/>
     </image>
   </displayList>

FGUIProject/assets/ClothingFoster/components/ComRenewReward.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="152,119">
+<component size="300,300">
   <displayList>
-    <loader id="n23_nk8d" name="loaReward" xy="27,0" pivot="0.5,0.5" size="100,100"/>
-    <text id="n24_nk8d" name="n24" xy="0,77" size="152,41" fontSize="30" text="换新后获得"/>
+    <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

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="100,100">
+<component size="300,300">
   <displayList>
-    <loader id="n32_nk8d" name="loaReward" xy="0,0" size="100,100" fill="scale"/>
-    <image id="n33_nk8d" name="n33" src="py5g3" fileName="images/tujian_xzdg.png" xy="28,32"/>
+    <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,15 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="42,42">
+<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">
-      <gearDisplay controller="finish" pages="1"/>
+    <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="py5g6" fileName="images/tujian_zkanniu.png" xy="0,-5">
-      <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">
-      <gearDisplay controller="finish" pages="3"/>
+    <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>
 </component>

FGUIProject/assets/ClothingFoster/components/ListMaterialsItem.xml

@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="200,200">
+<component size="192,192">
   <displayList>
-    <loader id="n5_py5g" name="loaIcon" xy="10,10" size="180,180" aspect="true" url="ui://uicwtr5bpy5ge" fill="scale"/>
-    <text id="n7_py5g" name="txtNeed" xy="48,139" pivot="1,0.5" size="41,42" fontSize="30" align="right" ubb="true" text="10">
+    <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="89,138" size="22,42" fontSize="30" ubb="true" text="/"/>
-    <text id="n6_py5g" name="txtHas" xy="112,139" pivot="0,0.5" size="41,42" fontSize="30" ubb="true" text="11">
+    <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="200,50">
+<component size="305,50">
   <displayList>
-    <text id="n0_py5g" name="txtShow" xy="0,0" size="156,42" fontSize="30" text="衣服：20%"/>
+    <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

@@ -5,5 +5,6 @@
     <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/package.xml

@@ -36,7 +36,6 @@
     <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"/>
-    <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/"/>
@@ -45,6 +44,41 @@
     <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/CommonGame/components/ComConsumeCurrency.xml

@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="250,42">
+<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="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>
+    <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,5 +1,5 @@
 <?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"/>
     <loader id="n6_ojlz" name="loaIcon" xy="0,0" size="58,58" url="ui://eg2y0ldp842s6h" autoSize="true"/>

FGUIProject/assets/CommonGame/package.xml

@@ -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"/>
@@ -168,6 +167,13 @@
     <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"/>
+    <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"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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"/>
+    <graph id="n19_bd1c" name="holder" xy="400,1285" size="100,100" touchable="false"/>
   </displayList>
 </component>

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="服装"/>

FGUIProject/assets/LuckyBox/package.xml

@@ -41,8 +41,6 @@
     <component id="qdrt1a" name="ComCard.xml" path="/components/"/>
     <image id="qdrt1b" name="hd_tiaoguo.png" path="/images/"/>
     <component id="qdrt1c" name="Button4.xml" path="/components/"/>
-    <image id="ly9g1d" name="cj_xhua.png" path="/images/"/>
-    <component id="ly9g1e" name="Button5.xml" path="/components/"/>
     <image id="eshh1f" name="cj_bj_4.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
     <image id="o1391g" name="cj_tp_3.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
     <image id="o1391h" name="cj_tp_1.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>

GameClient/Assets/Game/HotUpdate/Controller/BonusController.cs

@@ -13,7 +13,7 @@ namespace GFGGame
             if (bonusInfos != null && bonusInfos.Length > 0)
             {
                 List<ItemData> bonusList = ItemUtil.CreateItemDataList(bonusInfos);
-                ViewManager.Show(ViewName.GET_BONUS_VIEW, bonusList);
+                ViewManager.Show<RewardView>(bonusList);
             }
         }
         public static void TryShowBonusList(List<ItemData> bonusList)

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -156,13 +156,8 @@ namespace GFGGame
                 }
             }
             Timers.inst.CallLater(AfterEnterGame);
-            SendGameProtocol();
-
-        }
-        private static void SendGameProtocol()
-        {
-            SuitFosterHelper.SendGetSuitInfos().Coroutine();
         }
+
         private static void AfterEnterGame(object param)
         {
             //GameProxy.ReqGetStoryScoreList();

GameClient/Assets/Game/HotUpdate/Data/SuitFosterDatamanager.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using ET;
@@ -17,7 +18,11 @@ namespace GFGGame
 
         public void InitServerData(SuitFosterData suitFosterData)
         {
-            _suitInfoBySuitIdDic.Add(suitFosterData.suitId, suitFosterData);
+            if (!_suitInfoBySuitIdDic.ContainsKey(suitFosterData.suitId))
+            {
+                _suitInfoBySuitIdDic.Add(suitFosterData.suitId, suitFosterData);
+            }
+            _suitInfoBySuitIdDic[suitFosterData.suitId] = suitFosterData;
         }
         public void SetMaintainSuit(int suitId, int maintainStep)
         {
@@ -42,94 +47,124 @@ namespace GFGGame
 
         public SuitFosterData GetSuitFosterData(int suitId)
         {
-
-            return _suitInfoBySuitIdDic.ContainsKey(suitId) ? _suitInfoBySuitIdDic[suitId] : new SuitFosterData() { suitId = suitId, maintainStep = 0, maintainBonusSteps = new List<int>(), makeNewState = 0 };
+            if (_suitInfoBySuitIdDic.ContainsKey(suitId))
+            {
+                return _suitInfoBySuitIdDic[suitId];
+            }
+            else
+            {
+                SuitFosterData suitFosterData = new SuitFosterData() { suitId = suitId, maintainStep = 0, maintainBonusSteps = new List<int>(), makeNewState = 0 };
+                InitServerData(suitFosterData);
+                return suitFosterData;
+            }
 
         }
 
         //加成属性服装占比
-        public List<KeyValuePair<string, int>> GetPropertyPercentData(int suitId, int index)
+        public List<KeyValuePair<int, string>> GetPropertyPercentData(int suitId, int index)
         {
-            SuitFosterCfg cfg = SuitFosterCfgArray.Instance.GetCfgs(suitId)[index];
-            Dictionary<string, int> _data = new Dictionary<string, int>();
-            int count = 0;
-            for (int i = 0; i < cfg.partsArr.Length; i++)
+            SuitFosterCfg[] cfgs = SuitFosterCfgArray.Instance.GetCfgs(suitId);
+            Dictionary<int, int> _data = new Dictionary<int, int>();
+
+            for (int i = 0; i < cfgs.Length; i++)
             {
-                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.partsArr[i][0]);
-                string type = ItemTypeCfgArray.Instance.GetCfg(itemCfg.subType).name;
-                int num = 0;
-                if (_data.ContainsKey(type))
+                int[][] partsArr = cfgs[i].partsArr;
+                for (int j = 0; j < partsArr.Length; j++)
                 {
-                    num = _data[type];
-                }
-                num = num + cfg.partsArr[i][1];
-                _data.Add(type, num);
+                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(partsArr[j][0]);
+                    // int id = ItemTypeCfgArray.Instance.GetCfg(itemCfg.subType).i;
+                    if (index < cfgs.Length && index == i || index >= cfgs.Length)
+                    {
+                        int num = 0;
+
+                        if (!_data.ContainsKey(itemCfg.id))
+                        {
+                            _data.Add(itemCfg.id, num);
+                        }
+
+                        num = _data[itemCfg.id];
+                        num = num + partsArr[j][1];
+                        _data[itemCfg.id] = num;
 
-                count += cfg.partsArr[i][1];
+                    }
+                }
             }
 
-            int percentCount = 0;
-            int dicIndex = 0;
             ICollection keys = _data.Keys;
-            Dictionary<string, int> _dataPercent = new Dictionary<string, int>();
-            foreach (string key in keys)
+            Dictionary<int, string> _dataPercent = new Dictionary<int, string>();
+            foreach (int key in keys)
             {
-                if (dicIndex == _data.Count - 1)
-                {
-                    _dataPercent.Add(key, 100 - percentCount);
-                }
-                else
-                {
-                    _dataPercent.Add(key, Mathf.FloorToInt(_data[key] * 100 / count));
-                }
-                percentCount += _dataPercent[key];
-                dicIndex++;
+
+                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(key);
+                float mainScore = ItemDataManager.GetItemScoreValue(key, itemCfg.mainScore);
+                float addScore = _data[key];
+                float percent = (addScore / mainScore * 100);
+                _dataPercent.Add(key, percent.ToString("0.00"));
+
             }
-            return new List<KeyValuePair<string, int>>(_dataPercent);
+            return new List<KeyValuePair<int, string>>(_dataPercent);
         }
 
         //获取当前阶段部件属性总值
         public void GetPropertyData(int suitId, int index, out SortedList _propertyData, out SortedList _addPropertyData)
         {
-            SortedList propertyData = new SortedList();
-            SortedList addPropertyData = new SortedList();
-            int[][] partsArr = SuitFosterCfgArray.Instance.GetCfgs(suitId)[index].partsArr;
-            for (int i = 0; i < partsArr.Length; i++)
+            _propertyData = new SortedList();
+            _addPropertyData = new SortedList();
+
+            int[] parts = SuitCfgArray.Instance.GetCfg(suitId).partsArr;
+            for (int i = 0; i < parts.Length; i++)
             {
-                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(partsArr[i][0]);
+                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(parts[i]);
+                // Debug.Log("zoya:" + itemCfg.id + "   " + ItemDataManager.GetScore(itemCfg.id, 1) + "  " + ItemDataManager.GetScore(itemCfg.id, 2) + "   " + ItemDataManager.GetScore(itemCfg.id, 3) + "   " + ItemDataManager.GetScore(itemCfg.id, 4));
                 for (int j = 0; j < ConstDressUpScoreType.scoreTypeList().Count; j++)
                 {
                     int score = j + 1;
                     int count = ItemDataManager.GetScore(itemCfg.id, score);
-                    if (propertyData.ContainsKey(score))
-                    {
-                        count = count + (int)propertyData[score];
-                        propertyData[score] = count;
-                    }
-                    else
-                    {
-                        propertyData.Add(score, count);
-                    }
 
-                    int addCount = 0;
-                    if (score == itemCfg.mainScore)
+                    if (_propertyData.ContainsKey(score))
                     {
-                        addCount = partsArr[i][1];
+                        count = count + (int)_propertyData[score];
+                        _propertyData[score] = count;
                     }
-                    if (addPropertyData.ContainsKey(score))
+                    else
                     {
-                        addCount = addCount + (int)addPropertyData[itemCfg.mainScore];
+                        _propertyData.Add(score, count);
                     }
-                    else
+                }
+            }
+            SuitFosterCfg[] cfgs = SuitFosterCfgArray.Instance.GetCfgs(suitId);
+            for (int i = 0; i < cfgs.Length; i++)
+            {
+                int[][] partsArr = cfgs[i].partsArr;
+                for (int j = 0; j < partsArr.Length; j++)
+                {
+                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(partsArr[j][0]);
+                    for (int k = 0; k < ConstDressUpScoreType.scoreTypeList().Count; k++)
                     {
-                        addPropertyData.Add(score, addCount);
+                        int score = k + 1;
+                        if (index < cfgs.Length && index == i || index >= cfgs.Length)
+                        {
+
+                            int addCount = 0;
+                            if (score == itemCfg.mainScore)
+                            {
+                                addCount = partsArr[j][1];
+                            }
+                            if (_addPropertyData.ContainsKey(score))
+                            {
+                                addCount = addCount + (int)_addPropertyData[score];
+                                _addPropertyData[score] = addCount;
+                            }
+                            else
+                            {
+                                _addPropertyData.Add(score, addCount);
+                            }
+                        }
+
                     }
                 }
             }
-            _propertyData = propertyData;
-            _addPropertyData = addPropertyData;
         }
-
         //0：已完成，1：养护中，2未养护
         public int GetFosterState(int suitId, int index)
         {
@@ -146,38 +181,39 @@ namespace GFGGame
             return 2;
         }
 
-        public SortedList GetSuitFosterRewards(int suitId)
+        public List<SuitFosterCfg> GetSuitFosterRewards(int suitId)
         {
-            SuitFosterCfg[] cfg = SuitFosterCfgArray.Instance.GetCfgs(suitId);
-            List<SuitFosterCfg> list = new List<SuitFosterCfg>(cfg);
-            list = SortRewardList(list, suitId);
-
-            SortedList sortedList = new SortedList();
-            for (int i = 0; i < list.Count; i++)
+            SuitFosterCfg[] cfgs = SuitFosterCfgArray.Instance.GetCfgs(suitId);
+            List<SuitFosterCfg> list = new List<SuitFosterCfg>(cfgs);
+            for (int i = list.Count - 1; i >= 0; i--)
             {
-                if (list[i].rewardsArr.Length > 0)
+                if (list[i].rewardsArr.Length == 0)
                 {
-                    sortedList.Add((i + 1), list[i]);
+                    list.RemoveAt(i);
                 }
             }
+            list = SortRewardList(list, suitId);
 
-            return sortedList;
+            return list;
         }
         private List<SuitFosterCfg> SortRewardList(List<SuitFosterCfg> list, int suitId)
         {
             SuitFosterData fosterData = GetSuitFosterData(suitId);
+            SuitFosterCfg[] cfgs = SuitFosterCfgArray.Instance.GetCfgs(suitId);
+
             list.Sort((SuitFosterCfg a, SuitFosterCfg b) =>
             {
-                int indexA = list.IndexOf(a) + 1;
-                int indexB = list.IndexOf(b) + 1;
+                int indexA = Array.IndexOf(cfgs, a) + 1;
+                int indexB = Array.IndexOf(cfgs, b) + 1;
                 if (fosterData.maintainBonusSteps.IndexOf(indexA) >= 0 && fosterData.maintainBonusSteps.IndexOf(indexB) < 0)
                 {
-                    return -1;
+                    return 1;
                 }
                 else if (fosterData.maintainBonusSteps.IndexOf(indexA) < 0 && fosterData.maintainBonusSteps.IndexOf(indexB) >= 0)
                 {
-                    return 1;
+                    return -1;
                 }
+
                 return 0;
             });
             return list;
@@ -188,7 +224,7 @@ namespace GFGGame
         {
             SuitFosterData fosterData = GetSuitFosterData(suitId);
 
-            return fosterData.maintainBonusSteps.IndexOf(step) > 0;
+            return fosterData.maintainBonusSteps.IndexOf(step) >= 0;
         }
         //当前奖励状态:state 0：未领1：不可领2：已完成
         //当前奖励Index

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ComReward.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ClothingFoster
+{
+    public partial class UI_ComReward
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public GImage m_imgGot;
+        public GTextField m_txtNum;
+        public const string URL = "ui://uicwtr5bbd1c24";
+        public const string PACKAGE_NAME = "ClothingFoster";
+        public const string RES_NAME = "ComReward";
+        private static UI_ComReward _proxy;
+
+        public static UI_ComReward Create(GObject gObject = null)
+        {
+            var ui = new UI_ComReward();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComReward Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComReward();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_imgGot = (GImage)comp.GetChild("imgGot");
+            m_txtNum = (GTextField)comp.GetChild("txtNum");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            m_imgGot = null;
+            m_txtNum = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ComReward.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2800476fa08ce9a4c8b6987c2953cf61
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListFosterItem.cs

@@ -8,6 +8,7 @@ namespace UI.ClothingFoster
     {
         public GComponent target;
         public Controller m_finish;
+        public GTextField m_txtName;
         public const string URL = "ui://uicwtr5bj5a512";
         public const string PACKAGE_NAME = "ClothingFoster";
         public const string RES_NAME = "ListFosterItem";
@@ -56,10 +57,12 @@ namespace UI.ClothingFoster
         private void Init(GComponent comp)
         {
             m_finish = comp.GetController("finish");
+            m_txtName = (GTextField)comp.GetChild("txtName");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_finish = null;
+            m_txtName = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListRewardItem.cs

@@ -8,7 +8,7 @@ namespace UI.ClothingFoster
     {
         public GComponent target;
         public GTextField m_txtDiscribe;
-        public GComponent m_ComReward;
+        public UI_ComReward m_ComReward;
         public const string URL = "ui://uicwtr5bpy5gw";
         public const string PACKAGE_NAME = "ClothingFoster";
         public const string RES_NAME = "ListRewardItem";
@@ -57,11 +57,12 @@ namespace UI.ClothingFoster
         private void Init(GComponent comp)
         {
             m_txtDiscribe = (GTextField)comp.GetChild("txtDiscribe");
-            m_ComReward = (GComponent)comp.GetChild("ComReward");
+            m_ComReward = (UI_ComReward)UI_ComReward.Create(comp.GetChild("ComReward"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_txtDiscribe = null;
+            m_ComReward.Dispose();
             m_ComReward = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitFosterFinishUI.cs

@@ -7,7 +7,20 @@ namespace UI.ClothingFoster
     public partial class UI_SuitFosterFinishUI
     {
         public GComponent target;
-        public GList m_listPrppertyLast;
+        public GLoader m_bg;
+        public GTextField m_txtRenewTips;
+        public GGroup m_grpRenew;
+        public GComponent m_comProperty0;
+        public GComponent m_comProperty1;
+        public GComponent m_comProperty2;
+        public GComponent m_comProperty3;
+        public GComponent m_comAddProperty0;
+        public GComponent m_n15comAddProperty1;
+        public GComponent m_comAddProperty2;
+        public GComponent m_comAddProperty3;
+        public Transition m_t0;
+        public Transition m_t1;
+        public Transition m_t2;
         public const string URL = "ui://uicwtr5bpy5gs";
         public const string PACKAGE_NAME = "ClothingFoster";
         public const string RES_NAME = "SuitFosterFinishUI";
@@ -55,11 +68,37 @@ namespace UI.ClothingFoster
 
         private void Init(GComponent comp)
         {
-            m_listPrppertyLast = (GList)comp.GetChild("listPrppertyLast");
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_txtRenewTips = (GTextField)comp.GetChild("txtRenewTips");
+            m_grpRenew = (GGroup)comp.GetChild("grpRenew");
+            m_comProperty0 = (GComponent)comp.GetChild("comProperty0");
+            m_comProperty1 = (GComponent)comp.GetChild("comProperty1");
+            m_comProperty2 = (GComponent)comp.GetChild("comProperty2");
+            m_comProperty3 = (GComponent)comp.GetChild("comProperty3");
+            m_comAddProperty0 = (GComponent)comp.GetChild("comAddProperty0");
+            m_n15comAddProperty1 = (GComponent)comp.GetChild("n15comAddProperty1");
+            m_comAddProperty2 = (GComponent)comp.GetChild("comAddProperty2");
+            m_comAddProperty3 = (GComponent)comp.GetChild("comAddProperty3");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
+            m_t2 = comp.GetTransition("t2");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_listPrppertyLast = null;
+            m_bg = null;
+            m_txtRenewTips = null;
+            m_grpRenew = null;
+            m_comProperty0 = null;
+            m_comProperty1 = null;
+            m_comProperty2 = null;
+            m_comProperty3 = null;
+            m_comAddProperty0 = null;
+            m_n15comAddProperty1 = null;
+            m_comAddProperty2 = null;
+            m_comAddProperty3 = null;
+            m_t0 = null;
+            m_t1 = null;
+            m_t2 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitFosterUI.cs

@@ -7,7 +7,6 @@ namespace UI.ClothingFoster
     public partial class UI_SuitFosterUI
     {
         public GComponent target;
-        public GTextField m_txtTitle;
         public GTextField m_txtDiscribe;
         public GList m_listPropertyAdd;
         public GList m_listMaterials;
@@ -60,7 +59,6 @@ namespace UI.ClothingFoster
 
         private void Init(GComponent comp)
         {
-            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_txtDiscribe = (GTextField)comp.GetChild("txtDiscribe");
             m_listPropertyAdd = (GList)comp.GetChild("listPropertyAdd");
             m_listMaterials = (GList)comp.GetChild("listMaterials");
@@ -69,7 +67,6 @@ namespace UI.ClothingFoster
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtTitle = null;
             m_txtDiscribe = null;
             m_listPropertyAdd = null;
             m_listMaterials = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitRenewFinishUI.cs

@@ -7,6 +7,7 @@ namespace UI.ClothingFoster
     public partial class UI_SuitRenewFinishUI
     {
         public GComponent target;
+        public GLoader m_bg;
         public GTextField m_txtProperty;
         public const string URL = "ui://uicwtr5bnk8d16";
         public const string PACKAGE_NAME = "ClothingFoster";
@@ -55,10 +56,12 @@ namespace UI.ClothingFoster
 
         private void Init(GComponent comp)
         {
+            m_bg = (GLoader)comp.GetChild("bg");
             m_txtProperty = (GTextField)comp.GetChild("txtProperty");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_bg = null;
             m_txtProperty = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitUI.cs

@@ -14,8 +14,8 @@ namespace UI.ClothingFoster
         public GButton m_btnBack;
         public GTextField m_txtName;
         public GLoader m_loaRarity;
-        public GLoader m_btnRight;
-        public GLoader m_btnLeft;
+        public GButton m_btnRight;
+        public GButton m_btnLeft;
         public GButton m_btnTabFoster;
         public GButton m_btnTabRenew;
         public UI_ComFosterReward m_comFosterReward;
@@ -25,11 +25,11 @@ namespace UI.ClothingFoster
         public UI_comFosterAni m_comFosterAni;
         public GGroup m_grpFoster;
         public GTextField m_txtRenewProperty;
-        public UI_ComRenewReward m_comRenewReward;
-        public GList m_listRenewMaterial;
         public GComponent m_comRenewCost;
         public GButton m_btnRenew;
         public GTextField m_txtRenewTips;
+        public UI_ComRenewReward m_comRenewReward;
+        public GList m_listRenewMaterial;
         public GGroup m_grpRenew;
         public GTextField m_txtRenewShow;
         public UI_ComRenewRewardGet m_comRenewRewardGet;
@@ -88,8 +88,8 @@ namespace UI.ClothingFoster
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
-            m_btnRight = (GLoader)comp.GetChild("btnRight");
-            m_btnLeft = (GLoader)comp.GetChild("btnLeft");
+            m_btnRight = (GButton)comp.GetChild("btnRight");
+            m_btnLeft = (GButton)comp.GetChild("btnLeft");
             m_btnTabFoster = (GButton)comp.GetChild("btnTabFoster");
             m_btnTabRenew = (GButton)comp.GetChild("btnTabRenew");
             m_comFosterReward = (UI_ComFosterReward)UI_ComFosterReward.Create(comp.GetChild("comFosterReward"));
@@ -99,11 +99,11 @@ namespace UI.ClothingFoster
             m_comFosterAni = (UI_comFosterAni)UI_comFosterAni.Create(comp.GetChild("comFosterAni"));
             m_grpFoster = (GGroup)comp.GetChild("grpFoster");
             m_txtRenewProperty = (GTextField)comp.GetChild("txtRenewProperty");
-            m_comRenewReward = (UI_ComRenewReward)UI_ComRenewReward.Create(comp.GetChild("comRenewReward"));
-            m_listRenewMaterial = (GList)comp.GetChild("listRenewMaterial");
             m_comRenewCost = (GComponent)comp.GetChild("comRenewCost");
             m_btnRenew = (GButton)comp.GetChild("btnRenew");
             m_txtRenewTips = (GTextField)comp.GetChild("txtRenewTips");
+            m_comRenewReward = (UI_ComRenewReward)UI_ComRenewReward.Create(comp.GetChild("comRenewReward"));
+            m_listRenewMaterial = (GList)comp.GetChild("listRenewMaterial");
             m_grpRenew = (GGroup)comp.GetChild("grpRenew");
             m_txtRenewShow = (GTextField)comp.GetChild("txtRenewShow");
             m_comRenewRewardGet = (UI_ComRenewRewardGet)UI_ComRenewRewardGet.Create(comp.GetChild("comRenewRewardGet"));
@@ -131,12 +131,12 @@ namespace UI.ClothingFoster
             m_comFosterAni = null;
             m_grpFoster = null;
             m_txtRenewProperty = null;
-            m_comRenewReward.Dispose();
-            m_comRenewReward = null;
-            m_listRenewMaterial = null;
             m_comRenewCost = null;
             m_btnRenew = null;
             m_txtRenewTips = null;
+            m_comRenewReward.Dispose();
+            m_comRenewReward = null;
+            m_listRenewMaterial = null;
             m_grpRenew = null;
             m_txtRenewShow = null;
             m_comRenewRewardGet.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_comFosterAni.cs

@@ -8,6 +8,7 @@ namespace UI.ClothingFoster
     {
         public GComponent target;
         public GProgressBar m_proFoster;
+        public GTextField m_txtContent;
         public const string URL = "ui://uicwtr5bnk8d17";
         public const string PACKAGE_NAME = "ClothingFoster";
         public const string RES_NAME = "comFosterAni";
@@ -56,10 +57,12 @@ namespace UI.ClothingFoster
         private void Init(GComponent comp)
         {
             m_proFoster = (GProgressBar)comp.GetChild("proFoster");
+            m_txtContent = (GTextField)comp.GetChild("txtContent");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_proFoster = null;
+            m_txtContent = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComConsumeCurrency.cs

@@ -9,6 +9,7 @@ namespace UI.CommonGame
         public GComponent target;
         public GLoader m_loaIcon;
         public GTextField m_txtNeed;
+        public GTextField m_txtLine;
         public GTextField m_txtHas;
         public const string URL = "ui://eg2y0ldpojlz61";
         public const string PACKAGE_NAME = "CommonGame";
@@ -59,12 +60,14 @@ namespace UI.CommonGame
         {
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtNeed = (GTextField)comp.GetChild("txtNeed");
+            m_txtLine = (GTextField)comp.GetChild("txtLine");
             m_txtHas = (GTextField)comp.GetChild("txtHas");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaIcon = null;
             m_txtNeed = null;
+            m_txtLine = null;
             m_txtHas = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Guide/UI_GuideUI.cs

@@ -11,6 +11,7 @@ namespace UI.Guide
         public UI_Component3 m_rectFrame;
         public UI_Component1 m_compTxt;
         public GImage m_rectFrameTemp;
+        public GGraph m_holder;
         public const string URL = "ui://vxxz0ya7rpol4";
         public const string PACKAGE_NAME = "Guide";
         public const string RES_NAME = "GuideUI";
@@ -62,6 +63,7 @@ namespace UI.Guide
             m_rectFrame = (UI_Component3)UI_Component3.Create(comp.GetChild("rectFrame"));
             m_compTxt = (UI_Component1)UI_Component1.Create(comp.GetChild("compTxt"));
             m_rectFrameTemp = (GImage)comp.GetChild("rectFrameTemp");
+            m_holder = (GGraph)comp.GetChild("holder");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -72,6 +74,7 @@ namespace UI.Guide
             m_compTxt.Dispose();
             m_compTxt = null;
             m_rectFrameTemp = null;
+            m_holder = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitFosterFinishView.cs

@@ -1,3 +1,4 @@
+using System.Collections;
 using FairyGUI;
 using UI.ClothingFoster;
 namespace GFGGame
@@ -5,7 +6,10 @@ namespace GFGGame
     public class SuitFosterFinishView : BaseWindow
     {
         private UI_SuitFosterFinishUI _ui;
-
+        private int _suitId;
+        private int _index;
+        private SortedList _propertyList;
+        private SortedList _curPropertyList;
         public override void Dispose()
         {
 
@@ -20,7 +24,7 @@ namespace GFGGame
             _ui = UI_SuitFosterFinishUI.Create();
             this.viewCom = _ui.target;
             this.viewCom.Center();
-            // this.modal = true;
+            this.modal = true;
             // viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
         }
@@ -28,7 +32,16 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            _suitId = (int)(this.viewData as object[])[0];
+            _index = (int)(this.viewData as object[])[1];
+
+            _propertyList = (this.viewData as object[])[1] as SortedList;
+            SuitFosterDataManager.Instance.GetPropertyData(_suitId, _index, out _curPropertyList, out SortedList _addPropertyList);
+
+            SuitFosterData data = SuitFosterDataManager.Instance.GetSuitFosterData(_suitId);
+            SuitFosterListCfg cfg = SuitFosterListCfgArray.Instance.GetCfg(_suitId);
 
+            _ui.m_txtRenewTips.visible = data.maintainStep >= cfg.renewOpenLv;
         }
 
         protected override void OnHide()

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitFosterView.cs

@@ -51,8 +51,8 @@ namespace GFGGame
             int has = ItemDataManager.GetItemNum(cfg.costId);
             int need = cfg.costNum;
             UI_ComConsumeCurrency comConsume = UI_ComConsumeCurrency.Proxy(_ui.m_ComConsume);
-            comConsume.m_txtHas.text = has.ToString();
-            comConsume.m_txtNeed.text = need.ToString();
+            comConsume.m_txtNeed.text = StringUtil.GetColorText(has.ToString(), has >= need ? "#FFF8EA" : "#C9F1A5");
+            comConsume.m_txtLine.text = "";
             if (_canFoster && has < need) _canFoster = false;
 
             _ui.m_listPropertyAdd.numItems = _propertyList.Count;
@@ -72,7 +72,8 @@ namespace GFGGame
             int has = ItemDataManager.GetItemNum(itemCfg.id);
             item.m_txtHas.text = has.ToString();
             int need = materialsArr[index][1];
-            item.m_txtNeed.text = StringUtil.GetColorText(need.ToString(), has >= need ? "#DD994A" : "#DD994A");
+            item.m_txtNeed.text = need.ToString();
+            item.m_txtHas.text = StringUtil.GetColorText(has.ToString(), has >= need ? "#F2DB96" : "#C9F1A5");
             if (_canFoster && has < need) _canFoster = false;
             item.target.data = materialsArr[index][0];
         }
@@ -80,6 +81,8 @@ namespace GFGGame
         {
             int itemId = (int)(context.data as GComponent).data;
             GoodsItemTipsController.ShowItemTips(itemId);
+            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { typeof(SuitFosterView).FullName, this.viewData } });
+
         }
 
         private void ListPropertyItemRender(int index, GObject obj)
@@ -91,7 +94,7 @@ namespace GFGGame
             comProperty.m_txtProperty.text = _propertyList[score].ToString();
             comProperty.m_loaIcon.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + (score));
 
-            item.m_txtAdd.text = _addPropertyList.GetByIndex(index).ToString();
+            item.m_txtAdd.text = "+" + _addPropertyList.GetByIndex(index);
         }
         private void OnClickBtnFoster()
         {
@@ -101,7 +104,7 @@ namespace GFGGame
                 return;
             }
             SuitFosterHelper.SendMaintainSuit(_suitId, _index + 1).Coroutine();
-
+            this.Hide();
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitListView.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using ET;
 using FairyGUI;
 using UI.ClothingFoster;
 namespace GFGGame
@@ -50,6 +51,7 @@ namespace GFGGame
             _ui.m_btnHaveGot.selected = true;
             _ui.m_btnNotGet.selected = true;
 
+            SuitFosterHelper.SendGetSuitInfos().Coroutine();
             UpdateListSuit();
             EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateSuitStatus);
         }

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitPropertyShowView.cs

@@ -13,7 +13,7 @@ namespace GFGGame
         private UI_SuitPropertyShowUI _ui;
         // private Dictionary<string, int> _data = new Dictionary<string, int>();
         // List<int> _dataList = new List<int>(); StudentDictionary.Values.ToList();
-        List<KeyValuePair<string, int>> _dataList;// = new List<KeyValuePair<string, int>>();
+        List<KeyValuePair<int, string>> _dataList;// = new List<KeyValuePair<string, int>>();
         public override void Dispose()
         {
 
@@ -48,8 +48,9 @@ namespace GFGGame
         private void ListPropertyShowItemRender(int index, GObject obj)
         {
             UI_ListPropertyShowItem item = UI_ListPropertyShowItem.Proxy(obj);
-
-            item.m_txtShow.text = string.Format("{0}:  {1}%", _dataList[index].Key, _dataList[index].Value);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_dataList[index].Key);
+            string type = ItemTypeCfgArray.Instance.GetCfg(itemCfg.subType).name;
+            item.m_txtShow.text = string.Format("{0} {1}%", type, StringUtil.GetColorText(_dataList[index].Value.ToString(), "#B66352"));
 
         }
         protected override void OnHide()

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitRenewFinishView.cs

@@ -31,7 +31,8 @@ namespace GFGGame
             _suitId = (int)this.viewData;
             int suitrarity = SuitCfgArray.Instance.GetCfg(_suitId).rarity;
             SuitRenewCfg renewCfg = SuitRenewCfgArray.Instance.GetCfg(suitrarity);
-            _ui.m_txtProperty.text = string.Format("套装所有部件属性+{0}%", renewCfg.addition * 100 / 10000);
+            string num = StringUtil.GetColorText(string.Format("+{0}", renewCfg.addition * 100 / 10000), "#BA4C36");
+            _ui.m_txtProperty.text = string.Format("套装属性{0}%", num);
         }
 
         protected override void OnHide()

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitRewardView.cs

@@ -1,4 +1,6 @@
+using System;
 using System.Collections;
+using System.Collections.Generic;
 using FairyGUI;
 using UI.ClothingFoster;
 namespace GFGGame
@@ -7,7 +9,7 @@ namespace GFGGame
     {
         private UI_SuitRewardUI _ui;
         private int _suitId;
-        private SortedList _rewardsList;
+        private List<SuitFosterCfg> _rewardsList;
 
         public override void Dispose()
         {
@@ -44,18 +46,18 @@ namespace GFGGame
         private void ListRewardRender(int index, GObject obj)
         {
             UI_ListRewardItem item = UI_ListRewardItem.Proxy(obj);
-            SuitFosterCfg cfg = (SuitFosterCfg)_rewardsList.GetByIndex(index);
-            int key = (int)_rewardsList.GetKey(index);
-            item.m_txtDiscribe.text = string.Format("完成套装{0}获得", SuitFosterDataManager.Instance.stepNames[key - 1]);
-            ItemData itemData = new ItemData();
-            itemData.id = cfg.rewardsArr[0][0];
-            itemData.num = cfg.rewardsArr[0][1];
-            if (obj.data == null)
+            SuitFosterCfg cfg = _rewardsList[index];
+            SuitFosterCfg[] cfgs = SuitFosterCfgArray.Instance.GetCfgs(_suitId);
+            int _index = Array.IndexOf(cfgs, cfg);
+            item.m_txtDiscribe.text = string.Format("完成套装{0}获得", SuitFosterDataManager.Instance.stepNames[_index]);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.rewardsArr[0][0]);
+            item.m_ComReward.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
+            item.m_ComReward.m_txtNum.text = string.Format("x{0}", cfg.rewardsArr[0][1]);
+            item.m_ComReward.m_imgGot.visible = SuitFosterDataManager.Instance.GetRewardState(_suitId, _index + 1);
+            if (item.m_ComReward.target.data == null)
             {
-                obj.data = new ItemView(item.m_ComReward);
+                item.m_ComReward.target.onClick.Add(() => { GoodsItemTipsController.ShowItemTips(cfg.rewardsArr[0][0]); });
             }
-            (obj.data as ItemView).SetData(itemData);
-            (obj.data as ItemView).ImgGotVisible = SuitFosterDataManager.Instance.GetRewardState(_suitId, key);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitView.cs

@@ -19,8 +19,8 @@ namespace GFGGame
         private bool _actionIsPic;
 
         private List<int> _suitIds;//已解锁套装列表
-        private SortedList _propertyList;
-        private SortedList _addPropertyList;
+        private SortedList _propertyList = new SortedList();
+        private SortedList _addPropertyList = new SortedList();
         private int _suitId;
         private int _index;
 
@@ -39,10 +39,9 @@ namespace GFGGame
             packageName = UI_SuitUI.PACKAGE_NAME;
             _ui = UI_SuitUI.Create();
             this.viewCom = _ui.target;
-            this.viewCom.Center();
-
+            // this.viewCom.Center();
             isfullScreen = true;
-            this.clickBlankToClose = false;
+            // this.clickBlankToClose = false;
 
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneDressUp"));
             _dressUpObjDataCache = new DressUpObjDataCache();
@@ -85,8 +84,12 @@ namespace GFGGame
                 }
             }
 
+            _index = SuitFosterDataManager.Instance.GetSuitFosterData(_suitId).maintainStep;
+            _ui.m_c1.selectedIndex = 0;
             UpdateView();
 
+            Debug.Log("养护奖励：" + ItemDataManager.GetItemNum(100169));
+            Debug.Log("换新奖励：" + ItemDataManager.GetItemNum(10370));
         }
 
         protected override void OnHide()
@@ -160,6 +163,7 @@ namespace GFGGame
             if (targetIndex >= 0 && direction == -1 || targetIndex < _suitIds.Count && direction == 1)
             {
                 _suitId = _suitIds[targetIndex];
+                _index = SuitFosterDataManager.Instance.GetSuitFosterData(_suitId).maintainStep;
                 UpdateView();
             }
         }
@@ -168,9 +172,12 @@ namespace GFGGame
         private void UpdateFoster()
         {
             UpdateFosterReward();
+            _propertyList.Clear();
+            _addPropertyList.Clear();
+            _ui.m_listFoster.numItems = SuitFosterCfgArray.Instance.GetCfgs(_suitId).Length;
+
             SuitFosterDataManager.Instance.GetPropertyData(_suitId, _index, out _propertyList, out _addPropertyList);
             _ui.m_listProperty.numItems = _propertyList.Count;
-            _ui.m_listFoster.numItems = SuitFosterCfgArray.Instance.GetCfgs(_suitId).Length;
         }
         private void UpdateFosterReward()
         {
@@ -186,10 +193,7 @@ namespace GFGGame
             UI_ListFosterItem item = UI_ListFosterItem.Proxy(obj);
             item.target.data = index;
             item.m_finish.selectedIndex = SuitFosterDataManager.Instance.GetFosterState(_suitId, index);
-            if (SuitFosterDataManager.Instance.GetSuitFosterData(_suitId).maintainStep == index)
-            {
-                _index = index;
-            }
+            item.m_txtName.text = SuitFosterDataManager.Instance.stepNames[index];
         }
 
         private void ListPropertyItemRender(int index, GObject obj)
@@ -216,7 +220,6 @@ namespace GFGGame
             {
                 PromptController.Instance.ShowFloatTextPrompt(string.Format("请完成{0}阶段", SuitFosterDataManager.Instance.stepNames[_index]));
             }
-            SuitFosterHelper.SendMaintainSuit(_suitId, index + 1).Coroutine();
         }
         private void OnClickComFosterReward()
         {
@@ -238,11 +241,12 @@ namespace GFGGame
         private void OnListenerFoster()
         {
             _ui.m_comFosterAni.target.visible = true;
+            _ui.m_comFosterAni.m_txtContent.text = string.Format("服装{0}中......", SuitFosterDataManager.Instance.stepNames[_index]);
             _ui.m_comFosterAni.m_proFoster.value = 0;
             _ui.m_comFosterAni.m_proFoster.TweenValue(100, 2f).OnComplete(() =>
              {
                  _ui.m_comFosterAni.target.visible = false;
-                 ViewManager.Show<SuitFosterFinishView>(_propertyList);
+                 ViewManager.Show<SuitFosterFinishView>(new object[] { _suitId, _index, _propertyList });
                  UpdateFoster();
              });
 
@@ -252,6 +256,8 @@ namespace GFGGame
             SuitFosterCfg cfg = SuitFosterCfgArray.Instance.GetCfgs(_suitId)[(int)(context.data) - 1];
             ViewManager.Show<RewardView>(ItemUtil.CreateItemDataList(cfg.rewardsArr));
             UpdateFosterReward();
+            Debug.Log("养护奖励：" + ItemDataManager.GetItemNum(100169));
+
         }
         /*************************************************换新************************************************/
         private void UpdateRenew()
@@ -273,10 +279,10 @@ namespace GFGGame
             int suitrarity = SuitCfgArray.Instance.GetCfg(_suitId).rarity;
             SuitRenewCfg renewCfg = SuitRenewCfgArray.Instance.GetCfg(suitrarity);
             SuitFosterListCfg cfg = SuitFosterListCfgArray.Instance.GetCfg(_suitId);
-            _ui.m_comRenewReward.m_loaReward.visible = false;
+            _ui.m_comRenewReward.target.visible = false;
             if (cfg.renewRewardsArr.Length > 0)
             {
-                _ui.m_comRenewReward.m_loaReward.visible = true;
+                _ui.m_comRenewReward.target.visible = true;
                 ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.renewRewardsArr[0][0]);
                 _ui.m_comRenewReward.m_loaReward.url = ResPathUtil.GetIconPath(itemCfg);
             }
@@ -288,8 +294,8 @@ namespace GFGGame
             UI_ComConsumeCurrency comConsumeCurrency = UI_ComConsumeCurrency.Proxy(_ui.m_comRenewCost);
             int has = ItemDataManager.GetItemNum(renewCfg.costId);
             int need = renewCfg.costNum;
-            // comConsumeCurrency.m_txtHas.text = has.ToString();
-            comConsumeCurrency.m_txtNeed.text = need.ToString();
+            comConsumeCurrency.m_txtNeed.text = StringUtil.GetColorText(need.ToString(), has >= need ? "#FFF8EA" : "#C9F1A5");
+            comConsumeCurrency.m_txtLine.text = "";
             if (_canRenew && has < need) _canRenew = false;
         }
         private void UpdateRenewFinish()
@@ -310,16 +316,17 @@ namespace GFGGame
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(materialsArr[index][0]);
             item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
             int has = ItemDataManager.GetItemNum(itemCfg.id);
-            item.m_txtHas.text = has.ToString();
             int need = materialsArr[index][1];
-            item.m_txtNeed.text = StringUtil.GetColorText(need.ToString(), has >= need ? "#DD994A" : "#DD994A");
+            item.m_txtHas.text = StringUtil.GetColorText(has.ToString(), has >= need ? "#F2DB96" : "#C9F1A5");
+            item.m_txtNeed.text = need.ToString();
             if (_canRenew && has < need) _canRenew = false;
             item.target.data = materialsArr[index][0];
         }
         private void OnListRenewMaterialsItem(EventContext context)
         {
             int itemId = (int)(context.data as GComponent).data;
-            GoodsItemTipsController.ShowItemTips(itemId);
+            // GoodsItemTipsController.ShowItemTips(itemId);
+            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { typeof(SuitView).FullName, this.viewData } });
         }
 
         private void OnClickBtnRenew()
@@ -330,11 +337,21 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("材料不足");
                 return;
             }
+            SuitFosterData data = SuitFosterDataManager.Instance.GetSuitFosterData(_suitId);
+            SuitFosterListCfg cfg = SuitFosterListCfgArray.Instance.GetCfg(_suitId);
+            if (data.maintainStep < cfg.renewOpenLv)
+            {
+                PromptController.Instance.ShowFloatTextPrompt(string.Format("完成{0}开启换新", SuitFosterDataManager.Instance.stepNames[cfg.renewOpenLv - 1]));
+                return;
+            }
+            SuitFosterHelper.SendMakeNewSuit(_suitId).Coroutine();
         }
         private void OnListenerRenew()
         {
             ViewManager.Show<SuitRenewFinishView>(_suitId);
             UpdateRenew();
+            Debug.Log("换新奖励：" + ItemDataManager.GetItemNum(10370));
+
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/CommonGame/RewardView.cs

@@ -11,7 +11,7 @@ namespace GFGGame
         private UI_RewardUI _ui;
         private List<ItemData> _listItemDatas;
 
-      
+
 
         public override void Dispose()
         {
@@ -38,13 +38,14 @@ namespace GFGGame
             _listItemDatas = this.viewData as List<ItemData>;
             _ui.m_listReward.numItems = _listItemDatas.Count;
         }
-        private void RenderListRewardItem(int index,GObject obj)
+        private void RenderListRewardItem(int index, GObject obj)
         {
             obj.data = _listItemDatas[index];
             UI_ListRewardItem item = UI_ListRewardItem.Proxy(obj);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_listItemDatas[index].id);
             item.m_txtName.text = itemCfg.name;
-            item.m_txtCount.text = _listItemDatas[index].num==1?"": string.Format("x{0}", _listItemDatas[index].num);
+            // item.m_txtCount.text = _listItemDatas[index].num==1?"": string.Format("x{0}", _listItemDatas[index].num);
+            item.m_txtCount.text = string.Format("x{0}", _listItemDatas[index].num);
             item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
         }
         private void OnClickListReward(EventContext context)
@@ -57,7 +58,7 @@ namespace GFGGame
         }
 
 
-        private bool _showTips=true;
+        private bool _showTips = true;
         /// <summary>
         /// 是否展示物品详情，默认展示
         /// </summary>

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -275,6 +275,8 @@ namespace GFGGame
         private void OnClickBtnDelete()
         {
             EquipDataCache.cacher.TakeOffAll();
+            _ui.m_partsList.m_list.numItems = _currentList3.Count;
+
         }
 
         private void OnClickBtnClose()

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -207,6 +207,8 @@ namespace GFGGame
         private void OnClickBtnDelete()
         {
             EquipDataCache.cacher.TakeOffAll();
+            _ui.m_partsList.m_list.numItems = _currentList3.Count;
+
         }
 
         private void OnClickBtnSave()

GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs

@@ -22,7 +22,9 @@ namespace GFGGame
         private GoWrapper _wrapper;
         public override void Dispose()
         {
+            SceneController.DestroyObjectFromView(_gameObject);
             base.Dispose();
+
         }
 
         protected override void OnInit()
@@ -43,6 +45,8 @@ namespace GFGGame
             {
                 if (isOptionalGuide) this.Hide();
             });
+            string resPath0 = ResPathUtil.GetViewEffectPath("ui_yd/ui_yd_y", "ui_yd_y");
+            SceneController.AddObjectToView(_gameObject, _wrapper, _ui.m_holder, resPath0, out _gameObject, out _wrapper);
         }
 
         protected override void OnShown()
@@ -56,6 +60,9 @@ namespace GFGGame
             isOptionalGuide = (bool)dataList[4];
             devWidth = (float)dataList[5];
             devHeight = (float)dataList[6];
+
+
+
             if (GuideController.useNewGuide)
             {
                 guideId = (int)dataList[7];
@@ -79,18 +86,18 @@ namespace GFGGame
                 _ui.m_compTxt.target.visible = false;
             }
 
-            _ui.m_rectFrameTemp.width = _ui.m_mask.target.width;
-            _ui.m_rectFrameTemp.height = _ui.m_mask.target.height;
-            _ui.m_rectFrameTemp.x = 0;
-            _ui.m_rectFrameTemp.y = 0;
+            // _ui.m_rectFrameTemp.width = _ui.m_mask.target.width;
+            // _ui.m_rectFrameTemp.height = _ui.m_mask.target.height;
+            // _ui.m_rectFrameTemp.x = 0;
+            // _ui.m_rectFrameTemp.y = 0;
             if (guideTarget != null)
             {
                 UpdateGuideRect();
-                _needUpdate = true;
-                if (_needUpdate)
-                {
-                    Timers.inst.AddUpdate(UpdateGuideRect);
-                }
+                // _needUpdate = true;
+                // if (_needUpdate)
+                // {
+                //     Timers.inst.AddUpdate(UpdateGuideRect);
+                // }
                 _ui.m_mask.target.visible = true;
 
                 if (GuideController.useNewGuide)
@@ -101,18 +108,20 @@ namespace GFGGame
             }
             else
             {
+
                 _ui.m_mask.target.visible = false;
                 _ui.m_compTxt.target.y = Math.Min(yTxt, GRoot.inst.height - _ui.m_compTxt.target.height - 3);
             }
             // _ui.m_rectFrame.target.visible = _ui.m_mask.target.visible;
             _ui.m_rectFrame.target.visible = false;
-            _ui.m_rectFrameTemp.visible = _ui.m_mask.target.visible;
+            // _ui.m_rectFrameTemp.visible = _ui.m_mask.target.visible;
         }
 
         protected override void OnHide()
         {
-            Timers.inst.Remove(UpdateGuideRect);
+            // Timers.inst.Remove(UpdateGuideRect);
             base.OnHide();
+            _ui.m_holder.visible = false;
             OnClickTarget();
             guideTarget = null;
 
@@ -126,6 +135,9 @@ namespace GFGGame
                 Rect rect = guideTarget.TransformRect(new Rect(0 + devWidth, devHeight, guideTarget.width, guideTarget.height), _ui.target);
                 _ui.m_mask.m_guideArea.size = new Vector2((int)rect.size.x, (int)rect.size.y);
                 _ui.m_mask.m_guideArea.position = new Vector2((int)rect.position.x, (int)rect.position.y);
+                float x = _ui.m_mask.m_guideArea.position.x + _ui.m_mask.m_guideArea.size.x * 0.5f;
+                float y = _ui.m_mask.m_guideArea.position.y + _ui.m_mask.m_guideArea.size.y * 0.5f;
+                _ui.m_holder.position = new Vector2(x, y);
                 int padding = 30;
                 bool atBottom = _ui.m_mask.m_guideArea.y + _ui.m_mask.m_guideArea.height + padding + _ui.m_compTxt.target.height + padding > GRoot.inst.height;
                 if (atBottom)
@@ -136,19 +148,20 @@ namespace GFGGame
                 {
                     _ui.m_compTxt.target.y = _ui.m_mask.m_guideArea.y + _ui.m_mask.m_guideArea.height + padding;
                 }
-                int targetWidth = 20;
-                if (Mathf.Abs(_ui.m_rectFrameTemp.width - _ui.m_rectFrame.target.width) > targetWidth && Mathf.Abs(_ui.m_rectFrameTemp.height - _ui.m_rectFrame.target.height) > targetWidth)
-                {
-                    _ui.m_rectFrameTemp.visible = true;
-                    float duration = 0.5f;
-                    _ui.m_rectFrameTemp.TweenResize(new Vector2(_ui.m_rectFrame.target.width, _ui.m_rectFrame.target.height), duration);
-                    _ui.m_rectFrameTemp.TweenMove(new Vector2(_ui.m_rectFrame.target.x, _ui.m_rectFrame.target.y), duration);
-                }
-                else
-                {
-                    _ui.m_rectFrameTemp.visible = false;
-                    _ui.m_rectFrame.target.visible = _ui.m_mask.target.visible;
-                }
+                // int targetWidth = 20;
+                // if (Mathf.Abs(_ui.m_rectFrameTemp.width - _ui.m_rectFrame.target.width) > targetWidth && Mathf.Abs(_ui.m_rectFrameTemp.height - _ui.m_rectFrame.target.height) > targetWidth)
+                // {
+                //     _ui.m_rectFrameTemp.visible = true;
+                //     float duration = 0.5f;
+                //     _ui.m_rectFrameTemp.TweenResize(new Vector2(_ui.m_rectFrame.target.width, _ui.m_rectFrame.target.height), duration);
+                //     _ui.m_rectFrameTemp.TweenMove(new Vector2(_ui.m_rectFrame.target.x, _ui.m_rectFrame.target.y), duration);
+                // }
+                // else
+                // {
+                _ui.m_rectFrameTemp.visible = false;
+                // _ui.m_rectFrame.target.visible = _ui.m_mask.target.visible;
+                _ui.m_holder.visible = _ui.m_mask.target.visible;
+                // }
             }
         }
         private void OnClickTarget()

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs

@@ -224,7 +224,9 @@ namespace GFGGame
                 List<ItemData> bonusList = StoryDataManager.GetChapterBonus(StoryDataManager.currentChapter, index);
                 if (bonusList != null && bonusList.Count > 0)
                 {
-                    ViewManager.Show(ViewName.GET_BONUS_VIEW, bonusList);
+                    // ViewManager.Show(ViewName.GET_BONUS_VIEW, bonusList);
+                    ViewManager.Show<RewardView>(bonusList);
+
                 }
                 UpdateBonusBoxStatus(bonusBox, index);
             }