合成替换资源

FGUIProject/assets/ClothingSynthetic/ClothingSyntheticListUI.xml

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

FGUIProject/assets/ClothingSynthetic/components/Button1.xml

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

FGUIProject/assets/ClothingSynthetic/components/Button2.xml

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

FGUIProject/assets/ClothingSynthetic/components/Button4.xml

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

FGUIProject/assets/ClothingSynthetic/components/ProgressBar1.xml

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

FGUIProject/assets/ClothingSynthetic/components/SuitListItem.xml

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

FGUIProject/assets/ClothingSynthetic/package.xml

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

FGUIProject/assets/CommonGame/package.xml

@@ -223,6 +223,7 @@
     <image id="ysx9tk6" name="xc_bto_1.png" path="/imagesExport/"/>
     <image id="ysx9tk7" name="kp_anniu_5.png" path="/images/"/>
     <image id="ysx9tka" name="dangance.png" path="/imgItemIcon/" exported="true"/>
+    <image id="uyuxzx" name="xc_xzdik.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="137,19,274,38"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/poem/PoemPhotoUI.xml

@@ -10,7 +10,7 @@
       <relation target="" sidePair="left-left,top-top"/>
       <Button icon="ui://iyz778gkuyux10a"/>
     </component>
-    <image id="n13_uyux" name="n13" src="uyuxzx" fileName="imagesPhoto/xc_xzdik.png" xy="266,212" group="n14_uyux"/>
+    <image id="n13_uyux" name="n13" src="uyuxzx" fileName="imagesPhoto/xc_xzdik.png" xy="266,212" group="n14_uyux" pkg="eg2y0ldp"/>
     <component id="n11_11rzz" name="btnTab0" src="11rzzf" fileName="componentsPhoto/Button6.xml" xy="260,210" group="n14_uyux">
       <Button checked="true" icon="ui://iyz778gkuyux108" selectedIcon="ui://iyz778gkuyuxzv" controller="c1" page="0"/>
     </component>

FGUIProject/assets/poem/package.xml

@@ -26,7 +26,6 @@
     <image id="uyuxzu" name="xc_xcxc.png" path="/imagesPhoto/"/>
     <image id="uyuxzv" name="xc_xzanniu_1.png" path="/imagesPhoto/"/>
     <image id="uyuxzw" name="xc_xzanniu_2.png" path="/imagesPhoto/"/>
-    <image id="uyuxzx" name="xc_xzdik.png" path="/imagesPhoto/" scale="9grid" scale9grid="137,19,274,38"/>
     <image id="uyuxzy" name="xc_kuangscsc.png" path="/imagesPhoto/"/>
     <image id="uyuxzz" name="xc_zfzf.png" path="/imagesPhoto/"/>
     <image id="uyux100" name="xc_dakuang.png" path="/imagesPhoto/"/>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingSynthetic/UI_SuitListItem.cs

@@ -10,10 +10,10 @@ namespace UI.ClothingSynthetic
         public GLoader m_bg;
         public GLoader m_loaderPic;
         public GTextField m_txtName;
-        public GLoader m_loaderBonusBox;
-        public GImage m_iconGot;
         public GProgressBar m_progBar;
         public GLoader m_rarity;
+        public GLoader m_loaderBonusBox;
+        public GImage m_iconGot;
         public GImage m_imgLockBg;
         public GImage m_imgLock;
         public GTextField m_txtLockDesc;
@@ -68,10 +68,10 @@ namespace UI.ClothingSynthetic
             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_iconGot = (GImage)comp.GetChild("iconGot");
             m_progBar = (GProgressBar)comp.GetChild("progBar");
             m_rarity = (GLoader)comp.GetChild("rarity");
+            m_loaderBonusBox = (GLoader)comp.GetChild("loaderBonusBox");
+            m_iconGot = (GImage)comp.GetChild("iconGot");
             m_imgLockBg = (GImage)comp.GetChild("imgLockBg");
             m_imgLock = (GImage)comp.GetChild("imgLock");
             m_txtLockDesc = (GTextField)comp.GetChild("txtLockDesc");
@@ -82,10 +82,10 @@ namespace UI.ClothingSynthetic
             m_bg = null;
             m_loaderPic = null;
             m_txtName = null;
-            m_loaderBonusBox = null;
-            m_iconGot = null;
             m_progBar = null;
             m_rarity = null;
+            m_loaderBonusBox = null;
+            m_iconGot = null;
             m_imgLockBg = null;
             m_imgLock = null;
             m_txtLockDesc = null;

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/SuitSyntheticView.cs

@@ -35,6 +35,9 @@ namespace GFGGame
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_listMenu.onClickItem.Add(OnClickListMenuItem);
+
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hz_bjbj");
+
         }
         protected override void AddEventListener()
         {
@@ -44,7 +47,6 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hc_bj_1");
 
             _ui.m_listMenu.selectedIndex = 0;
             _ui.m_listMenu.GetChildAt(1).visible = false;
@@ -122,7 +124,7 @@ namespace GFGGame
                     if (levelCfg.type == ConstInstanceZonesType.Studio)
                     {
                         StoryLevelCfg cfg = StoryLevelCfgArray.Instance.GetCfg(suitCfg.syntheticStoryLevelId);
-                        str = string.Format("需通关{0}关卡解锁", cfg.name);
+                        str = string.Format("通关关卡{0}", cfg.name);
                     }
                     else
                     {