套装培养UI逻辑

FGUIProject/assets/ClothingFoster/SuitFosterUI.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <text id="n0_py5g" name="txtTitle" xy="479,589" size="122,42" fontSize="30" text="服装养护"/>
-    <text id="n1_py5g" name="txtDiscribe" xy="455,689" size="359,42" fontSize="30" text="浆洗浆洗浆洗浆洗浆洗浆洗"/>
+    <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">
       <item/>
       <item/>
@@ -15,5 +15,6 @@
       <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"/>
   </displayList>
 </component>

FGUIProject/assets/ClothingFoster/SuitListUI.xml

@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <image id="n0_py5g" name="n0" src="vxw539" fileName="bgimg/zhangjie_bg.jpg" pkg="eg2y0ldp" xy="0,-240">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </image>
+    <image id="n0_py5g" name="n0" src="vxw539" fileName="bgimg/zhangjie_bg.jpg" pkg="eg2y0ldp" xy="0,-240"/>
     <component id="n1_py5g" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="156,73"/>
     <component id="n2_py5g" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="33,43"/>
     <component id="n3_py5g" name="comBoxSort" src="j5a5x" fileName="components/ComboBox1.xml" xy="555,207">

FGUIProject/assets/ClothingFoster/SuitRewardUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <list id="n2_py5g" name="listReward" xy="305,555" size="616,998" overflow="scroll" defaultItem="ui://uicwtr5bpy5gw">
+    <list id="n2_py5g" name="listReward" xy="232,461" size="616,998" overflow="scroll" defaultItem="ui://uicwtr5bpy5gw">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/ClothingFoster/SuitUI.xml

@@ -2,13 +2,11 @@
 <component size="1080,1920">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n0_pjip" name="bg" xy="0,-240" size="1080,2400" url="ui://eg2y0ldpj539i">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </loader>
-    <component id="n9_pjip" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <graph id="n1_pjip" name="holder" xy="393,783" pivot="0.5,0.5" size="394,268" touchable="false">
+    <loader id="n0_pjip" name="bg" xy="0,-240" size="1080,2400" url="ui://eg2y0ldpj539i"/>
+    <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>
@@ -26,7 +24,7 @@
     <component id="n13_py5g" name="btnRenew" src="py5gm" fileName="components/Button5.xml" xy="565,1182">
       <Button controller="c1" page="1"/>
     </component>
-    <component id="n17_py5g" name="btnGet" src="py5go" fileName="components/Button7.xml" xy="898,1221"/>
+    <component id="n17_py5g" name="btnReward" src="py5go" fileName="components/Button7.xml" xy="898,1221"/>
     <component id="n16_py5g" name="btnPropertyShow" src="py5gn" fileName="components/Button6.xml" xy="990,1442"/>
     <list id="n11_py5g" name="listProperty" xy="145,1424" size="819,68" layout="row" colGap="10" defaultItem="ui://eg2y0ldpojlzk" align="center" autoClearItems="true">
       <item/>
@@ -34,12 +32,6 @@
       <item/>
       <item/>
     </list>
-    <list id="n15_py5g" name="listFoster" xy="211,1681" size="716,42" layout="row" overflow="scroll" align="center">
-      <item url="ui://uicwtr5bpy5gl"/>
-      <item url="ui://uicwtr5bpy5gl"/>
-      <item url="ui://uicwtr5bpy5gl"/>
-      <item url="ui://uicwtr5bpy5gl"/>
-      <item url="ui://uicwtr5bpy5gl"/>
-    </list>
+    <list id="n15_py5g" name="listFoster" xy="211,1681" size="716,42" layout="row" overflow="scroll" defaultItem="ui://uicwtr5bj5a512" align="center"/>
   </displayList>
 </component>

FGUIProject/assets/ClothingFoster/components/Button4.xml

@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="100,40" extention="Button">
-  <controller name="finish" pages="1,未开始,2,进行中,3,已完成" selected="0"/>
+  <controller name="finish" pages="1,未开始,2,进行中,3,已完成" selected="2"/>
   <displayList>
-    <image id="n3_py5g" name="n3" src="py5g3" fileName="images/tujian_xzdg.png" xy="29,-1">
-      <gearDisplay controller="finish" pages="3"/>
-    </image>
-    <image id="n4_py5g" name="n4" src="py5g4" fileName="images/tujian_xzdg_1.png" xy="29,-1">
-      <gearDisplay controller="finish" pages="2"/>
-    </image>
-    <image id="n5_py5g" name="n5" src="py5g4" fileName="images/tujian_xzdg_1.png" xy="29,-1">
-      <gearDisplay controller="finish" pages="1"/>
-    </image>
+    <component id="n3_py5g" name="n3" src="j5a512" fileName="components/ListFosterItem.xml" xy="29,-1"/>
   </displayList>
   <Button/>
 </component>

FGUIProject/assets/ClothingFoster/components/ListFosterItem.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="42,42">
+  <controller name="finish" pages="1,未开始,2,进行中,3,已完成" selected="2"/>
+  <displayList>
+    <image id="n3_py5g" name="n3" src="py5g3" fileName="images/tujian_xzdg.png" xy="0,0">
+      <gearDisplay controller="finish" pages="3"/>
+    </image>
+    <image id="n4_py5g" name="n4" src="py5g4" fileName="images/tujian_xzdg_1.png" xy="0,0">
+      <gearDisplay controller="finish" pages="2"/>
+    </image>
+    <image id="n5_py5g" name="n5" src="py5g4" fileName="images/tujian_xzdg_1.png" xy="0,0">
+      <gearDisplay controller="finish" pages="1"/>
+    </image>
+  </displayList>
+</component>

FGUIProject/assets/ClothingFoster/components/ListMaterialsItem.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="100,122">
   <displayList>
-    <loader id="n5_py5g" name="loaIcon" xy="7,0" size="50,50"/>
-    <text id="n7_py5g" name="txtNeed" xy="0,77" size="40,42" fontSize="30" text=""/>
-    <text id="n6_py5g" name="txtHas" xy="60,80" size="40,42" fontSize="30" text=""/>
+    <loader id="n5_py5g" name="loaIcon" xy="7,0" size="80,80" aspect="true" fill="scale"/>
+    <text id="n7_py5g" name="txtNeed" xy="0,77" size="10,42" fontSize="30" ubb="true" text=""/>
+    <text id="n6_py5g" name="txtHas" xy="60,80" size="10,42" fontSize="30" ubb="true" text=""/>
   </displayList>
 </component>

FGUIProject/assets/ClothingFoster/components/ListRewardItem.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="456,241">
   <displayList>
-    <text id="n0_py5g" name="txtDiscribe" xy="0,72" size="63,42" fontSize="30" text="完成"/>
-    <component id="n1_py5g" name="ComReward" src="c21g9j" fileName="components/ListRewardItem1.xml" pkg="eg2y0ldp" xy="264,0" size="192,241"/>
+    <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"/>
   </displayList>
 </component>

FGUIProject/assets/ClothingFoster/components/ListSuitItem.xml

@@ -4,8 +4,7 @@
     <loader id="n11_pjip" name="bg" xy="0,0" size="316,505" url="ui://uicwtr5bpy5g9"/>
     <loader id="n12_pjip" name="loaderPic" xy="12,11" size="292,396" touchable="false" fill="scaleFree"/>
     <text id="n13_pjip" name="txtName" xy="39,420" size="238,41" fontSize="30" color="#986a41" align="center" autoSize="height" autoClearText="true" text="示例"/>
-    <loader id="n14_pjip" name="loaderBonusBox" xy="257,417" size="50,51" url="ui://vqq9h9h4pjipo"/>
-    <component id="n15_pjip" name="progBar" src="py5ga" fileName="components/ProgressBar1.xml" xy="8,483" touchable="false">
+    <component id="n15_pjip" name="progBar" src="py5ga" fileName="images/ProgressBar1.xml" xy="8,483" touchable="false">
       <ProgressBar value="10" max="10"/>
     </component>
     <loader id="n16_pjip" name="rarity" xy="265,10" size="44,94" touchable="false" url="ui://eg2y0ldpd4iw52" autoSize="true"/>

FGUIProject/assets/ClothingFoster/package.xml

@@ -32,13 +32,14 @@
     <component id="py5gs" name="SuitFosterFinishUI.xml" path="/" exported="true"/>
     <component id="py5gt" name="ListPropertyAddItem.xml" path="/components/"/>
     <component id="py5gu" name="ListMaterialsItem.xml" path="/components/"/>
-    <component id="py5gv" name="ListPropertyIShowItem.xml" path="/components/"/>
+    <component id="py5gv" name="ListPropertyShowItem.xml" path="/components/"/>
     <component id="py5gw" name="ListRewardItem.xml" path="/components/"/>
     <component id="j5a5x" name="ComboBox1.xml" path="/components/" exported="true"/>
     <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/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingFoster" packageCount="2" genCode="true"/>
 </packageDescription>

FGUIProject/assets/CommonGame/components/ComConsumeCurrency.xml

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

FGUIProject/assets/CommonGame/package.xml

@@ -167,6 +167,7 @@
     <image id="tt1q9x" name="xjs_ditu_2.png" path="/images/"/>
     <image id="tt1q9y" name="xjs_ditu_3.png" path="/images/"/>
     <image id="tc539z" name="zx_jqgka_stjl.png" path="/images/"/>
+    <component id="ojlz61" name="ComConsumeCurrency.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -4,37 +4,37 @@ using FairyGUI;
 
 namespace UI.ClothingFoster
 {
-    public partial class UI_Button4
+    public partial class UI_ListFosterItem
     {
-        public GButton target;
+        public GComponent target;
         public Controller m_finish;
-        public const string URL = "ui://uicwtr5bpy5gl";
+        public const string URL = "ui://uicwtr5bj5a512";
         public const string PACKAGE_NAME = "ClothingFoster";
-        public const string RES_NAME = "Button4";
-        private static UI_Button4 _proxy;
+        public const string RES_NAME = "ListFosterItem";
+        private static UI_ListFosterItem _proxy;
 
-        public static UI_Button4 Create(GObject gObject = null)
+        public static UI_ListFosterItem Create(GObject gObject = null)
         {
-            var ui = new UI_Button4();
+            var ui = new UI_ListFosterItem();
             if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GButton)gObject;
+            	ui.target =  (GComponent)gObject;
             ui.Init(ui.target);
             return ui;
         }
 
-        public static UI_Button4 Proxy(GObject gObject = null)
+        public static UI_ListFosterItem Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_Button4();
+                _proxy = new UI_ListFosterItem();
             }
             var ui = _proxy;
             if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GButton)gObject;
+            	ui.target =  (GComponent)gObject;
             ui.Init(ui.target);
             return ui;
         }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListPropertyIShowItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListFosterItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: de6eb4b2d75d0b04e95f5199f2efc351
+guid: 02b1e49536a19274caf80abfb2f595be
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListPropertyIShowItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListPropertyShowItem.cs

@@ -4,18 +4,18 @@ using FairyGUI;
 
 namespace UI.ClothingFoster
 {
-    public partial class UI_ListPropertyIShowItem
+    public partial class UI_ListPropertyShowItem
     {
         public GComponent target;
         public GTextField m_txtShow;
         public const string URL = "ui://uicwtr5bpy5gv";
         public const string PACKAGE_NAME = "ClothingFoster";
-        public const string RES_NAME = "ListPropertyIShowItem";
-        private static UI_ListPropertyIShowItem _proxy;
+        public const string RES_NAME = "ListPropertyShowItem";
+        private static UI_ListPropertyShowItem _proxy;
 
-        public static UI_ListPropertyIShowItem Create(GObject gObject = null)
+        public static UI_ListPropertyShowItem Create(GObject gObject = null)
         {
-            var ui = new UI_ListPropertyIShowItem();
+            var ui = new UI_ListPropertyShowItem();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +24,11 @@ namespace UI.ClothingFoster
             return ui;
         }
 
-        public static UI_ListPropertyIShowItem Proxy(GObject gObject = null)
+        public static UI_ListPropertyShowItem Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ListPropertyIShowItem();
+                _proxy = new UI_ListPropertyShowItem();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_Button4.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListPropertyShowItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 350ce1764dee26e4a95313b69e0575df
+guid: 2c44a1a04b39f304da28d701fc3d936b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -10,7 +10,6 @@ namespace UI.ClothingFoster
         public GLoader m_bg;
         public GLoader m_loaderPic;
         public GTextField m_txtName;
-        public GLoader m_loaderBonusBox;
         public GProgressBar m_progBar;
         public GLoader m_rarity;
         public GImage m_imgLockBg;
@@ -65,7 +64,6 @@ namespace UI.ClothingFoster
             m_bg = (GLoader)comp.GetChild("bg");
             m_loaderPic = (GLoader)comp.GetChild("loaderPic");
             m_txtName = (GTextField)comp.GetChild("txtName");
-            m_loaderBonusBox = (GLoader)comp.GetChild("loaderBonusBox");
             m_progBar = (GProgressBar)comp.GetChild("progBar");
             m_rarity = (GLoader)comp.GetChild("rarity");
             m_imgLockBg = (GImage)comp.GetChild("imgLockBg");
@@ -76,7 +74,6 @@ namespace UI.ClothingFoster
             m_bg = null;
             m_loaderPic = null;
             m_txtName = null;
-            m_loaderBonusBox = null;
             m_progBar = null;
             m_rarity = null;
             m_imgLockBg = null;

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

@@ -12,6 +12,7 @@ namespace UI.ClothingFoster
         public GList m_listPropertyAdd;
         public GList m_listMaterials;
         public GButton m_btnFoster;
+        public GComponent m_ComConsume;
         public const string URL = "ui://uicwtr5bpy5gp";
         public const string PACKAGE_NAME = "ClothingFoster";
         public const string RES_NAME = "SuitFosterUI";
@@ -64,6 +65,7 @@ namespace UI.ClothingFoster
             m_listPropertyAdd = (GList)comp.GetChild("listPropertyAdd");
             m_listMaterials = (GList)comp.GetChild("listMaterials");
             m_btnFoster = (GButton)comp.GetChild("btnFoster");
+            m_ComConsume = (GComponent)comp.GetChild("ComConsume");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -72,6 +74,7 @@ namespace UI.ClothingFoster
             m_listPropertyAdd = null;
             m_listMaterials = null;
             m_btnFoster = null;
+            m_ComConsume = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -9,15 +9,15 @@ namespace UI.ClothingFoster
         public GComponent target;
         public Controller m_c1;
         public GLoader m_bg;
-        public GButton m_btnBack;
         public GGraph m_holder;
+        public GButton m_btnBack;
         public GTextField m_txtName;
         public GLoader m_loaRarity;
         public GLoader m_btnRight;
         public GLoader m_btnLeft;
         public GButton m_btnFoster;
         public GButton m_btnRenew;
-        public UI_Button7 m_btnGet;
+        public UI_Button7 m_btnReward;
         public GButton m_btnPropertyShow;
         public GList m_listProperty;
         public GList m_listFoster;
@@ -70,15 +70,15 @@ namespace UI.ClothingFoster
         {
             m_c1 = comp.GetController("c1");
             m_bg = (GLoader)comp.GetChild("bg");
-            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_holder = (GGraph)comp.GetChild("holder");
+            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_btnFoster = (GButton)comp.GetChild("btnFoster");
             m_btnRenew = (GButton)comp.GetChild("btnRenew");
-            m_btnGet = (UI_Button7)UI_Button7.Create(comp.GetChild("btnGet"));
+            m_btnReward = (UI_Button7)UI_Button7.Create(comp.GetChild("btnReward"));
             m_btnPropertyShow = (GButton)comp.GetChild("btnPropertyShow");
             m_listProperty = (GList)comp.GetChild("listProperty");
             m_listFoster = (GList)comp.GetChild("listFoster");
@@ -87,16 +87,16 @@ namespace UI.ClothingFoster
         {
             m_c1 = null;
             m_bg = null;
-            m_btnBack = null;
             m_holder = null;
+            m_btnBack = null;
             m_txtName = null;
             m_loaRarity = null;
             m_btnRight = null;
             m_btnLeft = null;
             m_btnFoster = null;
             m_btnRenew = null;
-            m_btnGet.Dispose();
-            m_btnGet = null;
+            m_btnReward.Dispose();
+            m_btnReward = null;
             m_btnPropertyShow = null;
             m_listProperty = null;
             m_listFoster = null;

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

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ComConsumeCurrency
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public GTextField m_txtNeed;
+        public GTextField m_txtHas;
+        public const string URL = "ui://eg2y0ldpojlz61";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComConsumeCurrency";
+        private static UI_ComConsumeCurrency _proxy;
+
+        public static UI_ComConsumeCurrency Create(GObject gObject = null)
+        {
+            var ui = new UI_ComConsumeCurrency();
+            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_ComConsumeCurrency Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComConsumeCurrency();
+            }
+            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_txtNeed = (GTextField)comp.GetChild("txtNeed");
+            m_txtHas = (GTextField)comp.GetChild("txtHas");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            m_txtNeed = null;
+            m_txtHas = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/Utils/SuitUtil.cs

@@ -168,6 +168,54 @@ namespace GFGGame
             });
             return arrayList;
         }
+        public static List<int> GetClothingFosterSuitIdList(bool notGet, bool haveGot, int sortIndex)
+        {
+            List<int> result = new List<int>();
+            void CheckToAdd(int targetId)
+            {
+                if (result.IndexOf(targetId) >= 0) return;
+
+                if (notGet && haveGot)
+                {
+                    result.Add(targetId);
+                }
+                else if (notGet && !DressUpMenuSuitDataManager.CheckHaveSuit(targetId))
+                {
+                    result.Add(targetId);
+                }
+                else if (haveGot && DressUpMenuSuitDataManager.CheckHaveSuit(targetId))
+                {
+                    result.Add(targetId);
+                }
+            }
+
+            SuitFosterCfg[] dataArray = SuitFosterCfgArray.Instance.dataArray;
+            foreach (SuitFosterCfg suitCfg in dataArray)
+            {
+                CheckToAdd(suitCfg.suitId);
+            }
+
+            //{"默认排序", "稀有度高", "稀有度低", "收集度高", "收集度低"}
+            switch (sortIndex)
+            {
+                case 0:
+                    SortSuitListByDefaultPriority(result);
+                    break;
+                case 1:
+                    SortSuitListByHighRarity(result);
+                    break;
+                case 2:
+                    SortSuitListByLowRarity(result);
+                    break;
+                case 3:
+                    SortSuitListByHighProgress(result);
+                    break;
+                case 4:
+                    SortSuitListByLowProgress(result);
+                    break;
+            }
+            return result;
+        }
 
         public static List<int> GetSuitIdList(bool notGet, bool haveGot, int typeId, int sortIndex)
         {

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

@@ -1,11 +1,15 @@
 using FairyGUI;
 using UI.ClothingFoster;
+using UI.CommonGame;
 namespace GFGGame
 {
     public class SuitFosterView : BaseWindow
     {
         private UI_SuitFosterUI _ui;
 
+        private int _suitId;
+        private int _index;
+        private bool _canFoster;
         public override void Dispose()
         {
 
@@ -23,18 +27,58 @@ namespace GFGGame
             // this.modal = true;
             // viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
+            _ui.m_listMaterials.itemRenderer = ListMaterialItemRender;
+            _ui.m_listPropertyAdd.itemRenderer = ListPropertyItemRender;
+            _ui.m_btnFoster.onClick.Add(OnClickBtnFoster);
         }
 
         protected override void OnShown()
         {
             base.OnShown();
+            _suitId = (int)(this.viewData as object[])[0];
+            _index = (int)(this.viewData as object[])[1];
+
+            _canFoster = true;
+
+            SuitFosterCfg cfg = SuitFosterCfgArray.Instance.GetCfgs(_suitId)[_index];
+            _ui.m_listMaterials.numItems = cfg.materialsArr.Length;
+            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();
+            if (_canFoster && has < need) _canFoster = false;
 
         }
 
         protected override void OnHide()
         {
             base.OnHide();
+        }
 
+        private void ListMaterialItemRender(int index, GObject obj)
+        {
+            UI_ListMaterialsItem item = UI_ListMaterialsItem.Proxy(obj);
+            int[][] materialsArr = SuitFosterCfgArray.Instance.GetCfgs(_suitId)[_index].materialsArr;
+            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");
+            if (_canFoster && has < need) _canFoster = false;
+        }
+        private void ListPropertyItemRender(int index, GObject obj)
+        {
+            UI_ListPropertyAddItem item = UI_ListPropertyAddItem.Proxy(obj);
+        }
+        private void OnClickBtnFoster()
+        {
+            if (!_canFoster)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("材料不足");
+                return;
+            }
         }
     }
 }

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

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using FairyGUI;
 using UI.ClothingFoster;
 namespace GFGGame
@@ -5,6 +6,10 @@ namespace GFGGame
     public class SuitListView : BaseWindow
     {
         private UI_SuitListUI _ui;
+        private ValueBarController _valueBarController;
+        private int _menuType = ConstSuitGuideTypeId.TYPE_1;
+        private int[] _menuTypeDataArray;
+        private List<int> _suitIds;
 
         public override void Dispose()
         {
@@ -20,22 +25,40 @@ namespace GFGGame
             _ui = UI_SuitListUI.Create();
             this.viewCom = _ui.target;
             this.viewCom.Center();
+            isfullScreen = true;
+
             // this.modal = true;
             // viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
+
+            _valueBarController = new ValueBarController(_ui.m_valueBar);
+
+            _ui.m_listSuit.itemRenderer = ListSuitItemRenderer;
+            _ui.m_comBoxSort.items = new string[] { "默认排序", "稀有度高", "稀有度低", "收集度高", "收集度低" };
+
+
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_comBoxSort.onChanged.Add(OnComboBoxSortChanged);
+            _ui.m_btnHaveGot.onChanged.Add(OnClickBtnHaveGot);
+            _ui.m_btnNotGet.onChanged.Add(OnClickBtnNotGet);
         }
 
         protected override void OnShown()
         {
             base.OnShown();
+            _valueBarController.OnShown();
+            _ui.m_btnHaveGot.selected = true;
+            _ui.m_btnNotGet.selected = true;
 
+            UpdateListSuit();
+            EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateSuitStatus);
         }
 
         protected override void OnHide()
         {
             base.OnHide();
-
+            _valueBarController.OnHide();
+            EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateSuitStatus);
         }
 
         private void OnClickBtnBack()
@@ -43,5 +66,94 @@ namespace GFGGame
             // this.Hide();
             ViewManager.GoBackFrom(typeof(SuitListView).FullName);
         }
+        private void OnClickListTypeItem()
+        {
+            UpdateListSuit();
+        }
+
+        private void OnComboBoxSortChanged()
+        {
+            UpdateListSuit();
+        }
+
+        private void OnClickBtnSwitch()
+        {
+            _menuType = 3 - _menuType;
+        }
+
+        private void OnClickBtnHaveGot()
+        {
+            if (!_ui.m_btnHaveGot.selected)
+            {
+                _ui.m_btnNotGet.selected = true;
+            }
+            UpdateListSuit();
+        }
+
+        private void OnClickBtnNotGet()
+        {
+            if (!_ui.m_btnNotGet.selected)
+            {
+                _ui.m_btnHaveGot.selected = true;
+            }
+            UpdateListSuit();
+        }
+        private void UpdateListSuit()
+        {
+            _ui.m_listSuit.RemoveChildrenToPool();
+            _suitIds = SuitUtil.GetClothingFosterSuitIdList(_ui.m_btnNotGet.selected, _ui.m_btnHaveGot.selected, _ui.m_comBoxSort.selectedIndex);
+            _ui.m_listSuit.numItems = _suitIds.Count;
+            _ui.m_listSuit.scrollPane.ScrollTop();
+        }
+
+        private void ListSuitItemRenderer(int index, GObject item)
+        {
+            UI_ListSuitItem listItem = UI_ListSuitItem.Proxy(item);
+            int suitId = _suitIds[index];
+            SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
+            listItem.m_txtName.text = suitCfg.name;
+            listItem.m_loaderPic.url = ResPathUtil.GetFieldGuideIconPath(suitCfg.res);
+            RarityIconController.UpdateRarityIcon(listItem.m_rarity, suitId, false, true);
+
+            listItem.target.data = suitId;
+            UpdateSuitStatusView(listItem);
+
+        }
+
+        private void UpdateSuitStatus(EventContext eventContext)
+        {
+            int num = _ui.m_listSuit.numChildren;
+            for (int i = 0; i < num; i++)
+            {
+                UI_ListSuitItem listItem = UI_ListSuitItem.Proxy(_ui.m_listSuit.GetChildAt(i));
+                UpdateSuitStatusView(listItem);
+            }
+        }
+
+        private void UpdateSuitStatusView(UI_ListSuitItem listItem)
+        {
+            int suitId = (int)listItem.target.data;
+            int count = 0;
+            int totalCount = 0;
+            DressUpMenuSuitDataManager.GetSuitProgressBySuitId(suitId, out count, out totalCount);
+            listItem.m_progBar.max = totalCount;
+            listItem.m_progBar.value = count;
+            bool haveSuit = DressUpMenuSuitDataManager.CheckHaveSuit(suitId);
+            listItem.m_imgLock.visible = listItem.m_imgLockBg.visible = !haveSuit;
+
+            listItem.m_bg.onClick.Clear();
+            listItem.m_bg.onClick.Add(() =>
+            {
+                if (haveSuit)
+                {
+                    ViewManager.Show<SuitView>(new object[] { suitId, _suitIds }, new object[] { typeof(SuitListView).Name, this.viewData });
+                }
+                else
+                {
+                    ViewManager.Show(ViewName.SUIT_PARTS_DETAIL_VIEW, suitId, new object[] { ViewName.SUIT_PARTS_DETAIL_VIEW, this.viewData });
+                }
+            });
+        }
     }
-}
+}
+

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

@@ -5,6 +5,8 @@ namespace GFGGame
     public class SuitRewardView : BaseWindow
     {
         private UI_SuitRewardUI _ui;
+        private int _suitId;
+        private string[] stageNames = { "浆洗", "晾晒", "熏香", "熨烫", "整饬" };
 
         public override void Dispose()
         {
@@ -20,21 +22,37 @@ namespace GFGGame
             _ui = UI_SuitRewardUI.Create();
             this.viewCom = _ui.target;
             this.viewCom.Center();
-            // this.modal = true;
-            // viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+            this.modal = true;
 
+            _ui.m_listReward.itemRenderer = ListRewardRecder;
         }
 
         protected override void OnShown()
         {
             base.OnShown();
-
+            _suitId = (int)this.viewData;
+            _ui.m_listReward.numItems = SuitFosterCfgArray.Instance.GetCfgs(_suitId).Length;
         }
 
         protected override void OnHide()
         {
             base.OnHide();
+        }
 
+        private void ListRewardRecder(int index, GObject obj)
+        {
+            UI_ListRewardItem item = UI_ListRewardItem.Proxy(obj);
+            SuitFosterCfg cfg = SuitFosterCfgArray.Instance.GetCfgs(_suitId)[index];
+            item.m_txtDiscribe.text = string.Format("完成套装{0}获得", stageNames[index]);
+            ItemData itemData = new ItemData();
+            itemData.id = cfg.rewardId;
+            itemData.num = cfg.rewardNum;
+            if (obj.data == null)
+            {
+                obj.data = new ItemView(item.m_ComReward);
+            }
+            (obj.data as ItemView).SetData(itemData);
+            // (obj.data as ItemView).ImgGotVisible = data.isGet == 1 ? true : false;
         }
     }
 }

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

@@ -1,11 +1,21 @@
+using System.Collections.Generic;
 using FairyGUI;
 using UI.ClothingFoster;
+using UnityEngine;
+
 namespace GFGGame
 {
     public class SuitView : BaseWindow
     {
-        private UI_SuitFosterUI _ui;
+        private UI_SuitUI _ui;
 
+        private int _suitId;
+        private GameObject _scenePrefab;
+        private GameObject _sceneObject;
+        private GoWrapper _wrapper;
+        private DressUpObjDataCache _dressUpObjDataCache;
+        private bool _actionIsPic;
+        private List<int> _suitIds;
         public override void Dispose()
         {
 
@@ -16,25 +26,121 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
-            packageName = UI_SuitFosterUI.PACKAGE_NAME;
-            _ui = UI_SuitFosterUI.Create();
+            packageName = UI_SuitUI.PACKAGE_NAME;
+            _ui = UI_SuitUI.Create();
             this.viewCom = _ui.target;
             this.viewCom.Center();
-            // this.modal = true;
-            // viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
+            isfullScreen = true;
+            this.clickBlankToClose = false;
+
+            _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneDressUp"));
+            _dressUpObjDataCache = new DressUpObjDataCache();
+
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_btnLeft.onClick.Add(() => { OnClickBtnDirection(-1); });
+            _ui.m_btnRight.onClick.Add(() => { OnClickBtnDirection(1); });
+            _ui.m_btnReward.target.onClick.Add(OnClickBtnReward);
+
+            _ui.m_listFoster.itemRenderer = ListFosterItemRender;
+            _ui.m_listFoster.onClickItem.Add(OnClickListFosterItem);
         }
 
         protected override void OnShown()
         {
             base.OnShown();
+            object[] datas = this.viewData as object[];
+            _suitId = (int)datas[0];
+            List<int> suitIds = datas[1] as List<int>;
+            _suitIds = new List<int>();
+            foreach (int suitId in suitIds)
+            {
+                if (DressUpMenuSuitDataManager.CheckHaveSuit(suitId))
+                {
+                    _suitIds.Add(suitId);
+                }
+            }
+
+            UpdateView();
 
         }
 
         protected override void OnHide()
         {
             base.OnHide();
+        }
+
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(SuitView).FullName);
+        }
+
+        private void UpdateView()
+        {
+            UpdateArrows();
+            UpdateSuitView();
 
+            _ui.m_listFoster.numItems = SuitFosterCfgArray.Instance.GetCfgs(_suitId).Length;
+        }
+        private void UpdateArrows()
+        {
+            int index = _suitIds.IndexOf(_suitId);
+            int count = _suitIds.Count;
+            _ui.m_btnRight.visible = (index + 1 < count);
+            _ui.m_btnLeft.visible = (index - 1 >= 0);
+        }
+
+        private void OnClickBtnDirection(int direction)
+        {
+            int index = _suitIds.IndexOf(_suitId);
+            int targetIndex = index + direction;
+            if (targetIndex >= 0 && direction == -1 || targetIndex < _suitIds.Count && direction == 1)
+            {
+                _suitId = _suitIds[targetIndex];
+                UpdateView();
+            }
+        }
+        private void UpdateSuitView(bool isPic = true)
+        {
+            _actionIsPic = isPic;
+            SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_suitId);
+            _ui.m_txtName.text = suitCfg.name;
+            if (_sceneObject != null)
+            {
+                GameObject.Destroy(_sceneObject);
+                _sceneObject = null;
+            }
+            _sceneObject = GameObject.Instantiate(_scenePrefab);
+            int scale = 100;
+            _sceneObject.transform.localScale = new Vector3(scale, scale, scale);
+            _dressUpObjDataCache.setSceneObj(_sceneObject);
+            _dressUpObjDataCache.PutOnDefaultSuitSaved(false);
+            _dressUpObjDataCache.PutOnSuitCfg(_suitId, isPic, false, new int[] { ConstDressUpItemType.BEI_JING });
+            if (_wrapper == null)
+            {
+                _wrapper = new GoWrapper(_sceneObject);
+                _ui.m_holder.SetNativeObject(_wrapper);
+            }
+            else
+            {
+                _wrapper.wrapTarget = _sceneObject;
+            }
+        }
+
+
+
+        private void ListFosterItemRender(int index, GObject obj)
+        {
+            UI_ListFosterItem item = UI_ListFosterItem.Proxy(obj);
+            item.target.data = index;
+        }
+        private void OnClickListFosterItem(EventContext context)
+        {
+            ViewManager.Show<SuitFosterView>(new object[] { _suitId, (int)((context.data as GObject).data) });
+        }
+        private void OnClickBtnReward()
+        {
+            ViewManager.Show<SuitRewardView>(_suitId);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitShowView.cs

@@ -19,12 +19,12 @@ namespace GFGGame
 
         public override void Dispose()
         {
-            if(_scenePrefab != null)
+            if (_scenePrefab != null)
             {
                 GameObject.Destroy(_scenePrefab);
                 _scenePrefab = null;
             }
-            if(_dressUpObjDataCache != null)
+            if (_dressUpObjDataCache != null)
             {
                 _dressUpObjDataCache.Dispose();
                 _dressUpObjDataCache = null;
@@ -64,9 +64,9 @@ namespace GFGGame
             _suitId = (int)datas[1];
             List<int> suitIds = datas[2] as List<int>;
             _suitIds = new List<int>();
-            foreach(int suitId in suitIds)
+            foreach (int suitId in suitIds)
             {
-                if(DressUpMenuSuitDataManager.CheckHaveSuit(suitId))
+                if (DressUpMenuSuitDataManager.CheckHaveSuit(suitId))
                 {
                     _suitIds.Add(suitId);
                 }
@@ -76,14 +76,14 @@ namespace GFGGame
             UpdateArrows();
             UpdateSuitView();
             UpdateSuitBoxStatus();
-            
+
             EventAgent.AddEventListener(ConstMessage.SUIT_BOX_STATUS_CHANGED, UpdateSuitBoxStatus);
         }
 
         protected override void OnHide()
         {
             base.OnHide();
-            if(_sceneObject != null)
+            if (_sceneObject != null)
             {
                 GameObject.Destroy(_sceneObject);
                 _sceneObject = null;
@@ -115,7 +115,7 @@ namespace GFGGame
             _actionIsPic = isPic;
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_suitId);
             _ui.m_txtSuitName.text = suitCfg.name;
-            if(_sceneObject != null)
+            if (_sceneObject != null)
             {
                 GameObject.Destroy(_sceneObject);
                 _sceneObject = null;
@@ -126,7 +126,7 @@ namespace GFGGame
             _dressUpObjDataCache.setSceneObj(_sceneObject);
             _dressUpObjDataCache.PutOnDefaultSuitSaved(false);
             _dressUpObjDataCache.PutOnSuitCfg(_suitId, isPic, false, new int[] { ConstDressUpItemType.BEI_JING });
-            if(_wrapper == null)
+            if (_wrapper == null)
             {
                 _wrapper = new GoWrapper(_sceneObject);
                 _ui.m_holder.SetNativeObject(_wrapper);
@@ -150,7 +150,7 @@ namespace GFGGame
         {
             int index = _suitIds.IndexOf(_suitId);
             int targetIndex = index - 1;
-            if(targetIndex >= 0)
+            if (targetIndex >= 0)
             {
                 _suitId = _suitIds[targetIndex];
                 UpdateArrows();
@@ -162,17 +162,17 @@ namespace GFGGame
         {
             int index = _suitIds.IndexOf(_suitId);
             int targetIndex = index + 1;
-            if(targetIndex < _suitIds.Count)
+            if (targetIndex < _suitIds.Count)
             {
                 _suitId = _suitIds[targetIndex];
                 UpdateArrows();
                 UpdateSuitView();
             }
         }
-        
+
         private void UpdateSuitBoxStatus(EventContext eventContext = null)
         {
-            if(eventContext == null || _suitId == (int)eventContext.data)
+            if (eventContext == null || _suitId == (int)eventContext.data)
             {
                 int status = DressUpMenuSuitDataManager.GetSuitGuideBonusStatus(_suitId);
                 if (status == ConstBonusStatus.CAN_GET)