zhaoyang 2 years ago
parent
commit
5b873401dd
20 changed files with 183 additions and 92 deletions
  1. 26 23
      FGUIProject/assets/ClothingSynthetic/ClothingSyntheticUI.xml
  2. 2 5
      FGUIProject/assets/ClothingSynthetic/components/ClothingListItem.xml
  3. 5 3
      FGUIProject/assets/ClothingSynthetic/components/MateriasListItem.xml
  4. 1 1
      FGUIProject/assets/ClothingSynthetic/package.xml
  5. 10 0
      FGUIProject/assets/CommonGame/components/ComTopTitle.xml
  6. BIN
      FGUIProject/assets/CommonGame/images/xgnc_btkuang.png
  7. BIN
      FGUIProject/assets/CommonGame/images/xgnc_dik_1.png
  8. 3 0
      FGUIProject/assets/CommonGame/package.xml
  9. 16 16
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingSynthetic/UI_ClothingSyntheticUI.cs
  10. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTopTitle.cs
  11. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTopTitle.cs.meta
  12. 38 44
      GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs
  13. BIN
      GameClient/Assets/ResIn/UI/ClothingSynthetic/ClothingSynthetic_atlas0!a.png
  14. BIN
      GameClient/Assets/ResIn/UI/ClothingSynthetic/ClothingSynthetic_atlas0.png
  15. BIN
      GameClient/Assets/ResIn/UI/ClothingSynthetic/ClothingSynthetic_fui.bytes
  16. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  17. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  18. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png
  19. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png
  20. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes

+ 26 - 23
FGUIProject/assets/ClothingSynthetic/ClothingSyntheticUI.xml

@@ -4,45 +4,48 @@
     <loader id="n45_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
     <loader id="n45_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"/>
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     </loader>
-    <component id="n40_ja9w" name="compHolder" src="ja9w1c" fileName="components/Component1.xml" xy="0,319"/>
     <component id="n1_j539" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <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="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"/>
     <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="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"/>
+    <component id="n40_ja9w" name="compHolder" src="ja9w1c" fileName="components/Component1.xml" xy="0,145"/>
     <component id="n6_j539" name="compItemInfo" src="ja9w1f" fileName="components/CompItemInfo.xml" xy="735,237"/>
     <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="oqa1tjt" fileName="components/Button21.xml" pkg="eg2y0ldp" xy="355,1435">
-      <Button title="制作"/>
-    </component>
-    <text id="n27_j539" name="txtProgress" xy="688,1313" size="246,36" fontSize="26" color="#8c6e61" ubb="true" vars="true" text="套装制作进度:[color=#ff9966]{v1=8}[/color]/{v2=10}">
+    <image id="n51_v95q" name="n51" src="v95q2c" fileName="images/hc_zzjsdi.png" xy="874,575" group="n53_v95q"/>
+    <text id="n52_v95q" name="n52" xy="911,633" size="122,42" group="n53_v95q" fontSize="30" color="#c09d6b" text="制作进度"/>
+    <text id="n27_j539" name="txtProgress" xy="920,680" pivot="0.5,0" size="102,44" group="n53_v95q" font="ui://eg2y0ldpwonotjc" fontSize="32" color="#d7847e" ubb="true" vars="true" text="10/20">
       <relation target="" sidePair="center-center"/>
       <relation target="" sidePair="center-center"/>
     </text>
     </text>
-    <list id="n30_j539" name="listClothing" xy="0,1590" pivot="0.5,0" size="1080,275" layout="flow_hz" overflow="scroll" scroll="horizontal" lineGap="30" defaultItem="ui://4f294tdkv95q2e" align="center" autoClearItems="true">
-      <relation target="" sidePair="bottomext-bottom"/>
+    <group id="n53_v95q" name="n53" xy="874,575" size="200,200"/>
+    <image id="n23_j539" name="n23" src="j539v" fileName="images/hc_kuang_5.png" xy="0,774"/>
+    <image id="n54_v95q" name="n54" src="j539s" fileName="images/hc_kuang_1.png" xy="15,985" group="n58_v95q"/>
+    <image id="n55_v95q" name="n55" src="j539s" fileName="images/hc_kuang_1.png" xy="286,985" group="n58_v95q"/>
+    <image id="n56_v95q" name="n56" src="j539s" fileName="images/hc_kuang_1.png" xy="557,985" group="n58_v95q"/>
+    <image id="n57_v95q" name="n57" src="j539s" fileName="images/hc_kuang_1.png" xy="828,985" group="n58_v95q"/>
+    <group id="n58_v95q" name="n58" xy="15,985" size="1051,291" advanced="true" layout="hz" colGap="33" excludeInvisibles="true"/>
+    <component id="n49_v95q" name="n49" src="v95qtjx" fileName="components/ComTopTitle.xml" pkg="eg2y0ldp" xy="342,829">
+      <property target="title" propertyId="0" value="所需材料"/>
+    </component>
+    <list id="n37_ja9w" name="listMaterias" xy="0,969" size="1080,319" layout="row" scroll="horizontal" defaultItem="ui://4f294tdkv95q28">
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
+    </list>
+    <list id="n30_j539" name="listClothing" xy="0,1590" size="1080,275" layout="row" overflow="scroll" scroll="horizontal" lineGap="30" defaultItem="ui://4f294tdkv95q2e" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>
       <item/>
-    </list>
-    <list id="n37_ja9w" name="listMaterias" xy="0,969" size="1080,319" layout="row" scroll="horizontal" defaultItem="ui://4f294tdkv95q28" align="center">
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
     </list>
-    <text id="n38_ja9w" name="n38" xy="194,1278" size="691,41" visible="false" fontSize="30" color="#917960" text="* 系统默认保留一件衣服,余下的才能作为合成材料*"/>
-    <image id="n41_ja9w" name="n41" src="j539t" fileName="images/hc_kuang_3.png" pkg="eg2y0ldp" xy="441,1310"/>
-    <text id="n42_ja9w" name="txtCost" xy="448,1313" 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"/>
-    <component id="n48_v95q" name="n48" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="418,1367"/>
+    <component id="n21_j539" name="btnProduction" src="oqa1tjt" fileName="components/Button21.xml" pkg="eg2y0ldp" xy="355,1435">
+      <Button title="制作"/>
+    </component>
+    <component id="n48_v95q" name="comCostCurrency" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="418,1355"/>
   </displayList>
   </displayList>
 </component>
 </component>

+ 2 - 5
FGUIProject/assets/ClothingSynthetic/components/ClothingListItem.xml

@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <component size="280,280" extention="Button">
 <component size="280,280" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="1"/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
   <displayList>
     <image id="n3_v95q" name="bg" src="ja9w1g" fileName="images/hc_kuang_2.png" xy="15,16"/>
     <image id="n3_v95q" name="bg" src="ja9w1g" fileName="images/hc_kuang_2.png" xy="15,16"/>
-    <image id="n7_v95q" name="n7" src="v95q29" fileName="images/hc_kuang_4.png" xy="0,1">
-      <gearDisplay controller="button" pages="1"/>
-    </image>
     <loader id="n4_v95q" name="loaderIcon" xy="65,47" size="150,150" fill="scale" shrinkOnly="true"/>
     <loader id="n4_v95q" name="loaderIcon" xy="65,47" size="150,150" fill="scale" shrinkOnly="true"/>
     <image id="n5_v95q" name="imgOwned" src="j53912" fileName="images/hc_yyy.png" xy="20,117"/>
     <image id="n5_v95q" name="imgOwned" src="j53912" fileName="images/hc_yyy.png" xy="20,117"/>
-    <text id="n6_v95q" name="txtName" xy="74,205" pivot="0.5,0" size="132,44" fontSize="32" color="#c98988" text="服装名称">
+    <text id="n6_v95q" name="txtName" xy="74,205" pivot="0.5,0" size="132,44" fontSize="32" color="#a58654" text="服装名称">
       <gearColor controller="button" pages="1" values="#c98988,#000000" default="#a58654,#000000"/>
       <gearColor controller="button" pages="1" values="#c98988,#000000" default="#a58654,#000000"/>
     </text>
     </text>
   </displayList>
   </displayList>

+ 5 - 3
FGUIProject/assets/ClothingSynthetic/components/MateriasListItem.xml

@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <component size="270,321" extention="Button">
 <component size="270,321" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
   <displayList>
     <image id="n3_v95q" name="n3" src="j539s" fileName="images/hc_kuang_1.png" xy="16,17">
     <image id="n3_v95q" name="n3" src="j539s" fileName="images/hc_kuang_1.png" xy="16,17">
+      <gearDisplay controller="button" pages="0"/>
+    </image>
+    <image id="n8_v95q" name="n8" src="ja9w1j" fileName="images/hc_kuang_6.png" xy="0,0">
       <gearDisplay controller="button" pages="1"/>
       <gearDisplay controller="button" pages="1"/>
     </image>
     </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"/>
+    <loader id="n4_v95q" name="loaderIcon" xy="67,44" size="135,135" aspect="true" 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="材料名称">
     <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"/>
       <gearColor controller="button" default="#c8807b,#000000"/>
       <relation target="" sidePair="center-center"/>
       <relation target="" sidePair="center-center"/>

+ 1 - 1
FGUIProject/assets/ClothingSynthetic/package.xml

@@ -49,7 +49,7 @@
     <image id="j83026" name="jbhc_btzi_6.png" path="/images/"/>
     <image id="j83026" name="jbhc_btzi_6.png" path="/images/"/>
     <image id="j83027" name="jbhc_btzi_5.png" path="/images/"/>
     <image id="j83027" name="jbhc_btzi_5.png" path="/images/"/>
     <component id="v95q28" name="MateriasListItem.xml" path="/components/"/>
     <component id="v95q28" name="MateriasListItem.xml" path="/components/"/>
-    <image id="v95q29" name="hc_kuang_4.png" path="/images/"/>
+    <image id="v95q29" name="hc_kuang_4.png" path="/images/" exported="true"/>
     <image id="v95q2a" name="hc_sxkuang.png" path="/images/"/>
     <image id="v95q2a" name="hc_sxkuang.png" path="/images/"/>
     <image id="v95q2b" name="hc_xtxtx.png" path="/images/"/>
     <image id="v95q2b" name="hc_xtxtx.png" path="/images/"/>
     <image id="v95q2c" name="hc_zzjsdi.png" path="/images/"/>
     <image id="v95q2c" name="hc_zzjsdi.png" path="/images/"/>

+ 10 - 0
FGUIProject/assets/CommonGame/components/ComTopTitle.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="396,68">
+  <displayList>
+    <image id="n13_v95q" name="n13" src="v95qtjz" fileName="images/xgnc_btkuang.png" xy="0,0">
+      <relation target="" sidePair="width-width"/>
+    </image>
+    <text id="n14_v95q" name="title" xy="105,3" pivot="0.5,0" size="186,61" font="ui://eg2y0ldpwonotja" fontSize="46" color="#a98151" text="修改昵称"/>
+  </displayList>
+  <customProperty target="title" propertyId="0"/>
+</component>

BIN
FGUIProject/assets/CommonGame/images/xgnc_btkuang.png


BIN
FGUIProject/assets/CommonGame/images/xgnc_dik_1.png


+ 3 - 0
FGUIProject/assets/CommonGame/package.xml

@@ -234,6 +234,9 @@
     <image id="v95qtju" name="hc_yyy.png" path="/images/" exported="true"/>
     <image id="v95qtju" name="hc_yyy.png" path="/images/" exported="true"/>
     <image id="v95qtjv" name="anniuty5.png" path="/images/"/>
     <image id="v95qtjv" name="anniuty5.png" path="/images/"/>
     <component id="v95qtjw" name="Button22.xml" path="/components/" exported="true"/>
     <component id="v95qtjw" name="Button22.xml" path="/components/" exported="true"/>
+    <component id="v95qtjx" name="ComTopTitle.xml" path="/components/" exported="true"/>
+    <image id="v95qtjy" name="xgnc_dik_1.png" path="/images/"/>
+    <image id="v95qtjz" name="xgnc_btkuang.png" path="/images/" scale="9grid" scale9grid="99,17,198,34"/>
   </resources>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>
 </packageDescription>

+ 16 - 16
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingSynthetic/UI_ClothingSyntheticUI.cs

@@ -8,17 +8,17 @@ namespace UI.ClothingSynthetic
     {
     {
         public GComponent target;
         public GComponent target;
         public GLoader m_loaBg;
         public GLoader m_loaBg;
-        public UI_Component1 m_compHolder;
         public GButton m_btnBack;
         public GButton m_btnBack;
         public GButton m_btnHome;
         public GButton m_btnHome;
         public GComponent m_valueBar;
         public GComponent m_valueBar;
+        public GTextField m_txtSuitName;
+        public UI_Component1 m_compHolder;
         public UI_CompItemInfo m_compItemInfo;
         public UI_CompItemInfo m_compItemInfo;
-        public GButton m_btnProduction;
         public GTextField m_txtProgress;
         public GTextField m_txtProgress;
-        public GList m_listClothing;
         public GList m_listMaterias;
         public GList m_listMaterias;
-        public GTextField m_txtCost;
-        public GTextField m_txtSuitName;
+        public GList m_listClothing;
+        public GButton m_btnProduction;
+        public GComponent m_comCostCurrency;
         public const string URL = "ui://4f294tdkj5391";
         public const string URL = "ui://4f294tdkj5391";
         public const string PACKAGE_NAME = "ClothingSynthetic";
         public const string PACKAGE_NAME = "ClothingSynthetic";
         public const string RES_NAME = "ClothingSyntheticUI";
         public const string RES_NAME = "ClothingSyntheticUI";
@@ -67,34 +67,34 @@ namespace UI.ClothingSynthetic
         private void Init(GComponent comp)
         private void Init(GComponent comp)
         {
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_compHolder = (UI_Component1)UI_Component1.Create(comp.GetChild("compHolder"));
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnHome = (GButton)comp.GetChild("btnHome");
             m_btnHome = (GButton)comp.GetChild("btnHome");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_txtSuitName = (GTextField)comp.GetChild("txtSuitName");
+            m_compHolder = (UI_Component1)UI_Component1.Create(comp.GetChild("compHolder"));
             m_compItemInfo = (UI_CompItemInfo)UI_CompItemInfo.Create(comp.GetChild("compItemInfo"));
             m_compItemInfo = (UI_CompItemInfo)UI_CompItemInfo.Create(comp.GetChild("compItemInfo"));
-            m_btnProduction = (GButton)comp.GetChild("btnProduction");
             m_txtProgress = (GTextField)comp.GetChild("txtProgress");
             m_txtProgress = (GTextField)comp.GetChild("txtProgress");
-            m_listClothing = (GList)comp.GetChild("listClothing");
             m_listMaterias = (GList)comp.GetChild("listMaterias");
             m_listMaterias = (GList)comp.GetChild("listMaterias");
-            m_txtCost = (GTextField)comp.GetChild("txtCost");
-            m_txtSuitName = (GTextField)comp.GetChild("txtSuitName");
+            m_listClothing = (GList)comp.GetChild("listClothing");
+            m_btnProduction = (GButton)comp.GetChild("btnProduction");
+            m_comCostCurrency = (GComponent)comp.GetChild("comCostCurrency");
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
             m_loaBg = null;
             m_loaBg = null;
-            m_compHolder.Dispose();
-            m_compHolder = null;
             m_btnBack = null;
             m_btnBack = null;
             m_btnHome = null;
             m_btnHome = null;
             m_valueBar = null;
             m_valueBar = null;
+            m_txtSuitName = null;
+            m_compHolder.Dispose();
+            m_compHolder = null;
             m_compItemInfo.Dispose();
             m_compItemInfo.Dispose();
             m_compItemInfo = null;
             m_compItemInfo = null;
-            m_btnProduction = null;
             m_txtProgress = null;
             m_txtProgress = null;
-            m_listClothing = null;
             m_listMaterias = null;
             m_listMaterias = null;
-            m_txtCost = null;
-            m_txtSuitName = null;
+            m_listClothing = null;
+            m_btnProduction = null;
+            m_comCostCurrency = null;
             if(disposeTarget && target != null)
             if(disposeTarget && target != null)
             {
             {
                 target.RemoveFromParent();
                 target.RemoveFromParent();

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTopTitle.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ComTopTitle
+    {
+        public GComponent target;
+        public GTextField m_title;
+        public const string URL = "ui://eg2y0ldpv95qtjx";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComTopTitle";
+        private static UI_ComTopTitle _proxy;
+
+        public static UI_ComTopTitle Create(GObject gObject = null)
+        {
+            var ui = new UI_ComTopTitle();
+            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_ComTopTitle Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComTopTitle();
+            }
+            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_title = (GTextField)comp.GetChild("title");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_title = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTopTitle.cs.meta

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

+ 38 - 44
GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -39,7 +39,7 @@ namespace GFGGame
         private GoWrapper _wrapper;
         private GoWrapper _wrapper;
         private DressUpObjDataCache _dressUpObjDataCache;
         private DressUpObjDataCache _dressUpObjDataCache;
         private ValueBarController _valueBarController;
         private ValueBarController _valueBarController;
-        private GComponent _imgSelected;
+        private GImage _imgSelected;
         private int _suitId;
         private int _suitId;
         private int _itemId;
         private int _itemId;
         private int[] _items;
         private int[] _items;
@@ -102,12 +102,13 @@ namespace GFGGame
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneDressUpSynthetic"));
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneDressUpSynthetic"));
             _dressUpObjDataCache = new DressUpObjDataCache();
             _dressUpObjDataCache = new DressUpObjDataCache();
 
 
-            _imgSelected = new GComponent();
-            _imgSelected = UIPackage.CreateObject(UI_ClothingSyntheticUI.PACKAGE_NAME, "ComSelect").asCom;
+            _imgSelected = new GImage();
+            _imgSelected = UIPackage.CreateObject(UI_ClothingSyntheticUI.PACKAGE_NAME, "hc_kuang_4").asImage;
 
 
             _ui.m_listClothing.itemRenderer = ListClothingItemRender;
             _ui.m_listClothing.itemRenderer = ListClothingItemRender;
             _ui.m_listClothing.onClickItem.Add(OnClickListClothingItem);
             _ui.m_listClothing.onClickItem.Add(OnClickListClothingItem);
 
 
+            _ui.m_listMaterias.itemRenderer = RenderListMateriasItem;
 
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnProduction.onClick.Add(OnClickBtnProcuction);
             _ui.m_btnProduction.onClick.Add(OnClickBtnProcuction);
@@ -146,6 +147,7 @@ namespace GFGGame
             {
             {
                 _wrapper.wrapTarget = null;
                 _wrapper.wrapTarget = null;
             }
             }
+            _ui.m_listMaterias.selectedIndex = 0;
             Timers.inst.Remove(CheckGuide);
             Timers.inst.Remove(CheckGuide);
 
 
         }
         }
@@ -317,7 +319,7 @@ namespace GFGGame
         private void UpdateSelectedItemInfo(GComponent listItem, bool tween)
         private void UpdateSelectedItemInfo(GComponent listItem, bool tween)
         {
         {
             _selectedListItem = listItem;
             _selectedListItem = listItem;
-            listItem.AddChild(_imgSelected);
+            listItem.AddChildAt(_imgSelected, 1);
             _selectedItemId = (int)listItem.data;
             _selectedItemId = (int)listItem.data;
             UpdateRole(tween);
             UpdateRole(tween);
             UpdateSelectedItemInfo();
             UpdateSelectedItemInfo();
@@ -338,42 +340,39 @@ namespace GFGGame
             UI_ClothingListItem.ProxyEnd();
             UI_ClothingListItem.ProxyEnd();
             //合成显示
             //合成显示
             ItemCfg clothingSyntheticCfg = ItemCfgArray.Instance.GetCfg(_selectedItemId);
             ItemCfg clothingSyntheticCfg = ItemCfgArray.Instance.GetCfg(_selectedItemId);
-            string costName = ItemUtil.GetItemName(clothingSyntheticCfg.syntheticCostID);
-            _ui.m_txtCost.SetVar("v1", "" + clothingSyntheticCfg.syntheticCostNum).SetVar("v2", costName).FlushVars();
+            // string costName = ItemUtil.GetItemName(clothingSyntheticCfg.syntheticCostID);
+            // _ui.m_txtCost.SetVar("v1", "" + clothingSyntheticCfg.syntheticCostNum).SetVar("v2", costName).FlushVars();
+            ItemUtil.SetItemNeedNum(_ui.m_comCostCurrency, clothingSyntheticCfg.syntheticCostID, clothingSyntheticCfg.syntheticCostNum);
             _materiarsOfSelectedItem = ItemUtil.CreateItemDataList(clothingSyntheticCfg.syntheticMateriarsArr);
             _materiarsOfSelectedItem = ItemUtil.CreateItemDataList(clothingSyntheticCfg.syntheticMateriarsArr);
-            int count = _ui.m_listMaterias.numChildren;
-            for (int i = 0; i < count; i++)
-            {
-                UI_MateriasListItem listItem = UI_MateriasListItem.Proxy(_ui.m_listMaterias.GetChildAt(i));
-                if (i < _materiarsOfSelectedItem.Count)
-                {
-                    ItemData itemData = _materiarsOfSelectedItem[i];
-                    ItemCfg materiasItemCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
-                    listItem.m_txtName.text = ItemUtil.GetItemName(itemData.id);
-                    listItem.m_loaderIcon.url = ResPathUtil.GetIconPath(materiasItemCfg);
-                    int num = ItemDataManager.GetItemNum(itemData.id);
-                    ItemCfg materialCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
-                    bool isDressUp = materialCfg.itemType == ConstItemType.DRESS_UP;
-                    int numSynthetic = Mathf.Max(num, 0);
-                    listItem.m_txtProgess.text = numSynthetic + "/" + itemData.num;
-                    listItem.m_loaderIcon.visible = true;
-                    listItem.m_txtProgess.visible = true;
-                    listItem.target.onClick.Clear();
-                    listItem.target.onClick.Add(OnClickMateriasItemPlus);
-                    listItem.target.data = itemData;
+            _ui.m_listMaterias.numItems = _materiarsOfSelectedItem.Count;
 
 
-                }
-                else
-                {
-                    listItem.m_txtName.text = "";
-                    listItem.m_loaderIcon.visible = false;
-                    listItem.m_txtProgess.visible = false;
-                }
-                UI_MateriasListItem.ProxyEnd();
-            }
+
+            _ui.m_listMaterias.selectedIndex = 0;
             _ui.m_btnProduction.grayed = ItemDataManager.GetItemNum(_selectedItemId) > 0;
             _ui.m_btnProduction.grayed = ItemDataManager.GetItemNum(_selectedItemId) > 0;
         }
         }
-
+        private void RenderListMateriasItem(int index, GObject obj)
+        {
+            UI_MateriasListItem listItem = UI_MateriasListItem.Proxy(obj);
+
+            ItemData itemData = _materiarsOfSelectedItem[index];
+            ItemCfg materiasItemCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
+            listItem.m_txtName.text = ItemUtil.GetItemName(itemData.id);
+            listItem.m_loaderIcon.url = ResPathUtil.GetIconPath(materiasItemCfg);
+            int num = ItemDataManager.GetItemNum(itemData.id);
+            ItemCfg materialCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
+            bool isDressUp = materialCfg.itemType == ConstItemType.DRESS_UP;
+            int numSynthetic = Mathf.Max(num, 0);
+            listItem.m_txtProgess.text = numSynthetic + "/" + itemData.num;
+            listItem.m_loaderIcon.visible = true;
+            listItem.m_txtProgess.visible = true;
+            listItem.target.onClick.Clear();
+            if (listItem.target.data == null)
+            {
+                listItem.target.onClick.Add(OnClickMateriasItemPlus);
+            }
+            listItem.target.data = index;
+            UI_MateriasListItem.ProxyEnd();
+        }
         private void OnClickMateriasItemPlus(EventContext context)
         private void OnClickMateriasItemPlus(EventContext context)
         {
         {
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.CLOTHING_SYNTHETIC);
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.CLOTHING_SYNTHETIC);
@@ -381,16 +380,11 @@ namespace GFGGame
             {
             {
                 return;
                 return;
             }
             }
-            // UI_Component3 groupCount = UI_Component3.Proxy(context.sender as GObject);
-            UI_MateriasListItem listItem = UI_MateriasListItem.Proxy(context.sender as GObject);
-            ItemData itemData = listItem.target.data as ItemData;
-            // int num = ItemDataManager.GetItemNum(itemData.id);
-            // int needCount = (itemData.num - num) > 0 ? itemData.num - num : 1;
-            // ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemData.id, new object[] { ViewName.CLOTHING_SYNTHETIC_VIEW, new object[] { _suitId, _selectedItemId } }, itemData.num });
+            int index = (int)(context.sender as GObject).data;
+            _ui.m_listMaterias.selectedIndex = index;
+            ItemData itemData = _materiarsOfSelectedItem[index];
             object[] sourceDatas = new object[] { itemData.id, new object[] { ViewName.CLOTHING_SYNTHETIC_VIEW, new object[] { _suitId, _selectedItemId } }, itemData.num };
             object[] sourceDatas = new object[] { itemData.id, new object[] { ViewName.CLOTHING_SYNTHETIC_VIEW, new object[] { _suitId, _selectedItemId } }, itemData.num };
             GoodsItemTipsController.ShowItemTips(itemData.id, sourceDatas);
             GoodsItemTipsController.ShowItemTips(itemData.id, sourceDatas);
-            // UI_Component3.ProxyEnd();
-            UI_MateriasListItem.ProxyEnd();
         }
         }
 
 
         private void OnItemNumChanged()
         private void OnItemNumChanged()

BIN
GameClient/Assets/ResIn/UI/ClothingSynthetic/ClothingSynthetic_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/ClothingSynthetic/ClothingSynthetic_atlas0.png


BIN
GameClient/Assets/ResIn/UI/ClothingSynthetic/ClothingSynthetic_fui.bytes


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes