服装升级替换资源

FGUIProject/assets/ClothingFoster/ClothingListUI.xml

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

FGUIProject/assets/ClothingFoster/components/Button2.xml

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

FGUIProject/assets/ClothingFoster/components/Button3.xml

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

FGUIProject/assets/ClothingFoster/components/ComboBox1.xml

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

FGUIProject/assets/ClothingFoster/components/ComboBox1_item.xml

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

FGUIProject/assets/ClothingFoster/components/ListSuitItem.xml

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

FGUIProject/assets/ClothingFoster/images/ProgressBar1.xml

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

FGUIProject/assets/ClothingFoster/package.xml

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

FGUIProject/assets/DressUp/package.xml

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

FGUIProject/assets/FieldGuide/components/CompSuitItem.xml

@@ -11,6 +11,6 @@
     </component>
     <loader id="n16_pjip" name="rarity" xy="291,8" size="44,94" touchable="false" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
     <image id="n17_pjip" name="imgLockBg" src="pjip1k" fileName="images/tujian_suoan.png" xy="0,1"/>
-    <image id="n18_pjip" name="imgLock" src="pjip1l" fileName="images/zhuxian_shuoto.png" xy="135,232"/>
+    <image id="n18_pjip" name="imgLock" src="pjip1l" fileName="images/zhuxian_shuoto.png" xy="135,214"/>
   </displayList>
 </component>

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

@@ -9,9 +9,9 @@ namespace UI.ClothingFoster
         public GComponent target;
         public GLoader m_loaBg;
         public GButton m_btnBack;
-        public GComboBox m_comBoxSort;
         public GButton m_btnNotGet;
         public GButton m_btnHaveGot;
+        public GComboBox m_comBoxSort;
         public GList m_listSuit;
         public const string URL = "ui://uicwtr5bpy5g0";
         public const string PACKAGE_NAME = "ClothingFoster";
@@ -62,18 +62,18 @@ namespace UI.ClothingFoster
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_comBoxSort = (GComboBox)comp.GetChild("comBoxSort");
             m_btnNotGet = (GButton)comp.GetChild("btnNotGet");
             m_btnHaveGot = (GButton)comp.GetChild("btnHaveGot");
+            m_comBoxSort = (GComboBox)comp.GetChild("comBoxSort");
             m_listSuit = (GList)comp.GetChild("listSuit");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
             m_btnBack = null;
-            m_comBoxSort = null;
             m_btnNotGet = null;
             m_btnHaveGot = null;
+            m_comBoxSort = null;
             m_listSuit = null;
             if(disposeTarget && target != null)
             {

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

@@ -47,6 +47,9 @@ namespace GFGGame
             _ui.m_comBoxSort.onChanged.Add(OnComboBoxSortChanged);
             _ui.m_btnHaveGot.onChanged.Add(OnClickBtnHaveGot);
             _ui.m_btnNotGet.onChanged.Add(OnClickBtnNotGet);
+
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xc_bjbj");
+
         }
         protected override void AddEventListener()
         {
@@ -59,7 +62,6 @@ namespace GFGGame
             // _valueBarController.OnShown();
             _ui.m_btnHaveGot.selected = true;
             _ui.m_btnNotGet.selected = true;
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gxhd_bjbj");
 
             SuitFosterProxy.SendGetSuitInfos().Coroutine();
             UpdateListSuit();