合成替换

FGUIProject/assets/ClothingSynthetic/ClothingSyntheticUI.xml

@@ -8,12 +8,8 @@
     <component id="n1_j539" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n43_g3nf" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="36,220"/>
     <component id="n2_j539" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" pivot="1,0" controller="c1,6"/>
-    <image id="n3_j539" name="n3" src="j539p" fileName="images/hc_btkuang.png" pkg="eg2y0ldp" xy="259,218"/>
-    <text id="n4_j539" name="txtSuitName" xy="466,220" size="148,49" fontSize="36" color="#fdf4e3" text="套装名字">
-      <relation target="n3_j539" sidePair="center-center,middle-middle"/>
-    </text>
-    <component id="n6_j539" name="compItemInfo" src="ja9w1f" fileName="components/CompItemInfo.xml" xy="664,390"/>
-    <image id="n23_j539" name="n23" src="j539v" fileName="images/hc_kuang_5.png" xy="30,1047" size="1020,844">
+    <component id="n6_j539" name="compItemInfo" src="ja9w1f" fileName="components/CompItemInfo.xml" xy="735,237"/>
+    <image id="n23_j539" name="n23" src="j539v" fileName="images/hc_kuang_5.png" xy="0,774">
       <relation target="" sidePair="bottomext-bottom"/>
     </image>
     <component id="n21_j539" name="btnProduction" src="j53918" fileName="components/Button3.xml" xy="406,1361"/>
@@ -29,7 +25,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n37_ja9w" name="listMaterias" xy="111,1078" size="858,171" layout="row" scroll="horizontal" colGap="34" defaultItem="ui://4f294tdkja9w1b">
+    <list id="n37_ja9w" name="listMaterias" xy="0,969" size="1080,319" layout="row" scroll="horizontal" defaultItem="ui://4f294tdkv95q28" align="center">
       <item/>
       <item/>
       <item/>
@@ -41,5 +37,10 @@
     <text id="n42_ja9w" name="txtCost" xy="630,1336" size="160,34" fontSize="24" color="#a27b56" vars="true" text="花费{v1=1000}{v2=金币}">
       <relation target="n41_ja9w" sidePair="center-center,middle-middle"/>
     </text>
+    <image id="n3_j539" name="n3" src="vek81n" fileName="images/hc_btkuang.png" xy="146,343" group="n46_v95q"/>
+    <text id="n4_j539" name="txtSuitName" xy="162,387" size="46,199" group="n46_v95q" font="ui://eg2y0ldpwonotja" fontSize="38" color="#b38d58" autoSize="height" text="套装名字">
+      <relation target="n3_j539" sidePair="center-center,middle-middle"/>
+    </text>
+    <group id="n46_v95q" name="n46" xy="146,343" size="78,418"/>
   </displayList>
 </component>

FGUIProject/assets/ClothingSynthetic/components/Button5.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="270,321" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <displayList>
+    <image id="n3_v95q" name="n3" src="j539s" fileName="images/hc_kuang_1.png" xy="16,17">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+    <image id="n8_v95q" name="n8" src="ja9w1j" fileName="images/hc_kuang_6.png" xy="0,0"/>
+    <loader id="n4_v95q" name="loaderIcon" xy="81,60" size="73,73" fill="scale" shrinkOnly="true"/>
+    <text id="n5_v95q" name="txtName" xy="69,173" pivot="0.5,0" size="132,44" fontSize="32" color="#c8807b" text="材料名称">
+      <gearColor controller="button" default="#c8807b,#000000"/>
+      <relation target="" sidePair="center-center"/>
+    </text>
+    <text id="n7_v95q" name="txtProgess" xy="73,239" pivot="0.5,0.5" size="123,46" fontSize="34" color="#b26b65" letterSpacing="-1" text="100/10">
+      <gearColor controller="button" default="#b26b65,#000000"/>
+    </text>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

FGUIProject/assets/ClothingSynthetic/components/ClothingListItem.xml

@@ -3,7 +3,7 @@
   <displayList>
     <image id="n29_j539" name="bg" src="ja9w1g" fileName="images/hc_kuang_2.png" xy="0,0" size="186,186"/>
     <loader id="n24_j539" name="loaderIcon" xy="18,18" size="150,150" fill="scale" shrinkOnly="true"/>
-    <image id="n25_j539" name="imgOwned" src="j53912" fileName="images/hc_yyy.png" xy="4,73"/>
-    <text id="n26_j539" name="txtName" xy="31,200" pivot="0.5,0" size="122,42" fontSize="30" color="#5e5b5a" text="服装名称"/>
+    <image id="n25_j539" name="imgOwned" src="j53912" fileName="images/hc_yyy.png" xy="-27,73"/>
+    <text id="n26_j539" name="txtName" xy="31,200" pivot="0.5,0" size="122,41" fontSize="30" color="#5e5b5a" text="服装名称"/>
   </displayList>
 </component>

FGUIProject/assets/ClothingSynthetic/components/CompItemInfo.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="898,310">
+<component size="345,334">
   <displayList>
-    <text id="n6_j539" name="txtName" xy="38,0" size="164,54" fontSize="40" color="#8c6e61" text="服装名称"/>
-    <image id="n8_j539" name="n8" src="j53911" fileName="images/hc_xiant_1.png" xy="0,54"/>
-    <image id="n9_j539" name="n9" src="842s6h" fileName="imagesExport/kp_sx_1.png" pkg="eg2y0ldp" xy="39,126" size="50,50"/>
-    <image id="n10_j539" name="n10" src="842s6i" fileName="imagesExport/kp_sx_2.png" pkg="eg2y0ldp" xy="199,126" size="50,50"/>
-    <image id="n11_j539" name="n11" src="842s6j" fileName="imagesExport/kp_sx_3.png" pkg="eg2y0ldp" xy="39,193" size="50,50"/>
-    <image id="n12_j539" name="n12" src="842s6k" fileName="imagesExport/kp_sx_4.png" pkg="eg2y0ldp" xy="199,193" size="50,50"/>
-    <text id="n14_j539" name="txtGong" xy="102,129" size="77,41" fontSize="30" color="#968778" autoClearText="true" text="5000"/>
-    <text id="n15_j539" name="txtZhi" xy="262,196" size="77,41" fontSize="30" color="#968778" autoClearText="true" text="5000"/>
-    <text id="n16_j539" name="txtShang" xy="262,129" size="77,41" fontSize="30" color="#968778" autoClearText="true" text="5000"/>
-    <text id="n18_j539" name="txtJue" xy="102,197" size="77,41" fontSize="30" color="#968778" autoClearText="true" text="5000"/>
-    <loader id="n19_ja9w" name="rarity" xy="-91,-73" size="53,121" url="ui://eg2y0ldpd4iw52"/>
+    <image id="n20_v95q" name="n20" src="f5bl1m" fileName="images/hc_kuang_3.png" xy="0,0"/>
+    <text id="n6_j539" name="txtName" xy="34,23" size="154,52" font="ui://eg2y0ldpwonotja" fontSize="38" color="#ab8756" text="服装名称"/>
+    <image id="n9_j539" name="n9" src="842s6h" fileName="imagesExport/kp_sx_1.png" pkg="eg2y0ldp" xy="39,126" size="42,42" aspect="true"/>
+    <image id="n10_j539" name="n10" src="842s6i" fileName="imagesExport/kp_sx_2.png" pkg="eg2y0ldp" xy="192,126" size="42,42" aspect="true"/>
+    <image id="n11_j539" name="n11" src="842s6j" fileName="imagesExport/kp_sx_3.png" pkg="eg2y0ldp" xy="39,193" size="42,42" aspect="true"/>
+    <image id="n12_j539" name="n12" src="842s6k" fileName="imagesExport/kp_sx_4.png" pkg="eg2y0ldp" xy="192,193" size="42,42" aspect="true"/>
+    <text id="n14_j539" name="txtGong" xy="92,129" size="68,36" fontSize="26" color="#968778" autoClearText="true" text="5000"/>
+    <text id="n16_j539" name="txtShang" xy="243,129" size="68,36" fontSize="26" color="#968778" autoClearText="true" text="5000"/>
+    <text id="n18_j539" name="txtJue" xy="92,194" size="68,36" fontSize="26" color="#968778" autoClearText="true" text="5000"/>
+    <text id="n15_j539" name="txtZhi" xy="243,194" size="68,36" fontSize="26" color="#968778" autoClearText="true" text="5000"/>
+    <loader id="n19_ja9w" name="rarity" xy="272,11" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
   </displayList>
 </component>

FGUIProject/assets/ClothingSynthetic/components/Component3.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="101,34">
   <displayList>
-    <image id="n34_ja9w" name="n34" src="ja9w1j" fileName="images/hc_kuang_6.png" xy="-8,3" size="118,28"/>
-    <image id="n36_ja9w" name="loaderPlus" src="ja9w1i" fileName="images/jiahao.png" xy="84,7"/>
     <text id="n35_ja9w" name="txtProgess" xy="2,0" pivot="0.5,0.5" size="88,34" fontSize="24" color="#e5ded7" letterSpacing="-1" text="100/10"/>
   </displayList>
 </component>

FGUIProject/assets/ClothingSynthetic/components/MateriasListItem.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="190,175">
+<component size="238,291">
   <displayList>
-    <image id="n31_ja9w" name="n31" src="j539s" fileName="images/hc_kuang_1.png" xy="40,44"/>
+    <image id="n31_ja9w" name="n31" src="j539s" fileName="images/hc_kuang_1.png" xy="0,0"/>
     <loader id="n32_ja9w" name="loaderIcon" xy="58,64" size="73,73" fill="scale" shrinkOnly="true"/>
-    <text id="n33_ja9w" name="txtName" xy="41,0" size="108,37" fontSize="26" color="#85756d" text="材料名称">
+    <text id="n33_ja9w" name="txtName" xy="65,0" size="106,36" fontSize="26" color="#85756d" text="材料名称">
       <relation target="" sidePair="center-center"/>
     </text>
-    <component id="n34_ja9w" name="groupCount" src="lwri1k" fileName="components/Component3.xml" xy="44,139"/>
+    <component id="n34_ja9w" name="groupCount" src="lwri1k" fileName="components/Component3.xml" xy="61,235"/>
   </displayList>
 </component>

FGUIProject/assets/ClothingSynthetic/package.xml

@@ -50,6 +50,7 @@
     <component id="kqeb25" name="Button4.xml" path="/components/"/>
     <image id="j83026" name="jbhc_btzi_6.png" path="/images/"/>
     <image id="j83027" name="jbhc_btzi_5.png" path="/images/"/>
+    <component id="v95q28" name="Button5.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingSynthetic" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingSynthetic/UI_MateriasListItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingSynthetic/UI_Button5.cs

@@ -4,39 +4,39 @@ using FairyGUI;
 
 namespace UI.ClothingSynthetic
 {
-    public partial class UI_MateriasListItem
+    public partial class UI_Button5
     {
-        public GComponent target;
+        public GButton target;
         public GLoader m_loaderIcon;
         public GTextField m_txtName;
-        public UI_Component3 m_groupCount;
-        public const string URL = "ui://4f294tdkja9w1b";
+        public GTextField m_txtProgess;
+        public const string URL = "ui://4f294tdkv95q28";
         public const string PACKAGE_NAME = "ClothingSynthetic";
-        public const string RES_NAME = "MateriasListItem";
-        private static UI_MateriasListItem _proxy;
+        public const string RES_NAME = "Button5";
+        private static UI_Button5 _proxy;
 
-        public static UI_MateriasListItem Create(GObject gObject = null)
+        public static UI_Button5 Create(GObject gObject = null)
         {
-            var ui = new UI_MateriasListItem();
+            var ui = new UI_Button5();
             if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GComponent)gObject;
+            	ui.target =  (GButton)gObject;
             ui.Init(ui.target);
             return ui;
         }
 
-        public static UI_MateriasListItem Proxy(GObject gObject = null)
+        public static UI_Button5 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_MateriasListItem();
+                _proxy = new UI_Button5();
             }
             var ui = _proxy;
             if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GComponent)gObject;
+            	ui.target =  (GButton)gObject;
             ui.Init(ui.target);
             return ui;
         }
@@ -59,14 +59,13 @@ namespace UI.ClothingSynthetic
         {
             m_loaderIcon = (GLoader)comp.GetChild("loaderIcon");
             m_txtName = (GTextField)comp.GetChild("txtName");
-            m_groupCount = (UI_Component3)UI_Component3.Create(comp.GetChild("groupCount"));
+            m_txtProgess = (GTextField)comp.GetChild("txtProgess");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaderIcon = null;
             m_txtName = null;
-            m_groupCount.Dispose();
-            m_groupCount = null;
+            m_txtProgess = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -12,13 +12,13 @@ namespace UI.ClothingSynthetic
         public GButton m_btnBack;
         public GButton m_btnHome;
         public GComponent m_valueBar;
-        public GTextField m_txtSuitName;
         public UI_CompItemInfo m_compItemInfo;
         public GButton m_btnProduction;
         public GTextField m_txtProgress;
         public GList m_listClothing;
         public GList m_listMaterias;
         public GTextField m_txtCost;
+        public GTextField m_txtSuitName;
         public const string URL = "ui://4f294tdkj5391";
         public const string PACKAGE_NAME = "ClothingSynthetic";
         public const string RES_NAME = "ClothingSyntheticUI";
@@ -71,13 +71,13 @@ namespace UI.ClothingSynthetic
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnHome = (GButton)comp.GetChild("btnHome");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
-            m_txtSuitName = (GTextField)comp.GetChild("txtSuitName");
             m_compItemInfo = (UI_CompItemInfo)UI_CompItemInfo.Create(comp.GetChild("compItemInfo"));
             m_btnProduction = (GButton)comp.GetChild("btnProduction");
             m_txtProgress = (GTextField)comp.GetChild("txtProgress");
             m_listClothing = (GList)comp.GetChild("listClothing");
             m_listMaterias = (GList)comp.GetChild("listMaterias");
             m_txtCost = (GTextField)comp.GetChild("txtCost");
+            m_txtSuitName = (GTextField)comp.GetChild("txtSuitName");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -87,7 +87,6 @@ namespace UI.ClothingSynthetic
             m_btnBack = null;
             m_btnHome = null;
             m_valueBar = null;
-            m_txtSuitName = null;
             m_compItemInfo.Dispose();
             m_compItemInfo = null;
             m_btnProduction = null;
@@ -95,6 +94,7 @@ namespace UI.ClothingSynthetic
             m_listClothing = null;
             m_listMaterias = null;
             m_txtCost = null;
+            m_txtSuitName = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -9,9 +9,9 @@ namespace UI.ClothingSynthetic
         public GComponent target;
         public GTextField m_txtName;
         public GTextField m_txtGong;
-        public GTextField m_txtZhi;
         public GTextField m_txtShang;
         public GTextField m_txtJue;
+        public GTextField m_txtZhi;
         public GLoader m_rarity;
         public const string URL = "ui://4f294tdkja9w1f";
         public const string PACKAGE_NAME = "ClothingSynthetic";
@@ -62,18 +62,18 @@ namespace UI.ClothingSynthetic
         {
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtGong = (GTextField)comp.GetChild("txtGong");
-            m_txtZhi = (GTextField)comp.GetChild("txtZhi");
             m_txtShang = (GTextField)comp.GetChild("txtShang");
             m_txtJue = (GTextField)comp.GetChild("txtJue");
+            m_txtZhi = (GTextField)comp.GetChild("txtZhi");
             m_rarity = (GLoader)comp.GetChild("rarity");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_txtName = null;
             m_txtGong = null;
-            m_txtZhi = null;
             m_txtShang = null;
             m_txtJue = null;
+            m_txtZhi = null;
             m_rarity = null;
             if(disposeTarget && target != null)
             {

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

@@ -1,74 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.ClothingSynthetic
-{
-    public partial class UI_Component3
-    {
-        public GComponent target;
-        public GImage m_loaderPlus;
-        public GTextField m_txtProgess;
-        public const string URL = "ui://4f294tdklwri1k";
-        public const string PACKAGE_NAME = "ClothingSynthetic";
-        public const string RES_NAME = "Component3";
-        private static UI_Component3 _proxy;
-
-        public static UI_Component3 Create(GObject gObject = null)
-        {
-            var ui = new UI_Component3();
-            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_Component3 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_Component3();
-            }
-            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_loaderPlus = (GImage)comp.GetChild("loaderPlus");
-            m_txtProgess = (GTextField)comp.GetChild("txtProgess");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_loaderPlus = null;
-            m_txtProgess = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}