Revert "套装培养"

This reverts commit 2400788d815dfa60aa0d2cb4879d02f7df5eb4cf.

FGUIProject/assets/ClothingFoster/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packageDescription id="uicwtr5b">
   <resources>
-    <component id="py5g0" name="ClothingListUI.xml" path="/" exported="true"/>
+    <component id="py5g0" name="SuitListUI.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/"/>
@@ -16,7 +16,7 @@
     <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"/>
+    <component id="py5gf" name="SuitUI.xml" path="/" exported="true"/>
     <image id="py5gg" name="sc_bjtu.png" path="/images/images/" atlas="alone_npot"/>
     <image id="py5gh" name="tujian_tzxian.png" path="/images/images/"/>
     <image id="py5gi" name="tujian_tzk_1.png" path="/images/images/"/>
@@ -26,10 +26,10 @@
     <component id="py5gm" name="Button5.xml" path="/components/"/>
     <component id="py5gn" name="Button6.xml" path="/components/"/>
     <component id="py5go" name="Button7.xml" path="/components/"/>
-    <component id="py5gp" name="ClothingFosterUI.xml" path="/" exported="true"/>
-    <component id="py5gq" name="ClothingPropertyShowUI.xml" path="/" exported="true"/>
-    <component id="py5gr" name="ClothingRewardUI.xml" path="/" exported="true"/>
-    <component id="py5gs" name="ClothingFosterFinishUI.xml" path="/" exported="true"/>
+    <component id="py5gp" name="SuitFosterUI.xml" path="/" exported="true"/>
+    <component id="py5gq" name="SuitPropertyShowUI.xml" path="/" exported="true"/>
+    <component id="py5gr" name="SuitRewardUI.xml" path="/" exported="true"/>
+    <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="ListPropertyShowItem.xml" path="/components/"/>
@@ -42,7 +42,7 @@
     <component id="nk8d13" name="ComFosterReward.xml" path="/components/"/>
     <component id="nk8d14" name="ComRenewReward.xml" path="/components/"/>
     <component id="nk8d15" name="ComRenewRewardGet.xml" path="/components/"/>
-    <component id="nk8d16" name="ClothingRenewFinishUI.xml" path="/" exported="true"/>
+    <component id="nk8d16" name="SuitRenewFinishUI.xml" path="/" exported="true"/>
     <component id="nk8d17" name="comFosterAni.xml" path="/components/"/>
     <image id="bd1c18" name="fzyc_yjanniu_4.png" path="/images/"/>
     <image id="bd1c19" name="fzyc_dgo.png" path="/images/"/>

GameClient/Assets/Game/HotUpdate/Controller/GuideController.cs

@@ -57,7 +57,7 @@ namespace GFGGame
             if (cfg.special <= 0) return false;
             if (cfg.key == ConstGuideId.SUIT_LIST_VIEW)
             {
-                return FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ClothingListView).Name, false);
+                return FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SuitListView).Name, false);
             }
             return false;
 

GameClient/Assets/Game/HotUpdate/Data/FunctionOpenDataManager.cs

@@ -150,7 +150,7 @@ namespace GFGGame
         private bool CheckIsSpecialFunOpen(FunctionOpenCfg cfg, bool showTips = true)
         {
             if (cfg.special <= 0) return true;
-            if (cfg.id == typeof(ClothingListView).Name)//服装升级获取第一套【天衣】套装后开启
+            if (cfg.id == typeof(SuitListView).Name)//服装升级获取第一套【天衣】套装后开启
             {
 
                 if (StorageDataManager.Instance.GetStorageValue(ConstStorageId.FUNCTION_OPEN + cfg.index) == 1) return true;

GameClient/Assets/Game/HotUpdate/Data/ItemDataManager.cs

@@ -41,11 +41,8 @@ namespace GFGGame
                 {
                     DecomposeDataManager.Instance.Add(itemID);
                 }
-                string name = typeof(ClothingListView).Name;
-                FunctionOpenCfg functionOpenCfg = FunctionOpenCfgArray.Instance.GetCfg(name);
-                ET.Log.Debug("GameGlobal.myUnit" + GameGlobal.myUnit);
-                ET.Log.Debug("rarity" + itemCfg.rarity);
-                ET.Log.Debug("index" + functionOpenCfg.index);
+
+                FunctionOpenCfg functionOpenCfg = FunctionOpenCfgArray.Instance.GetCfg(typeof(SuitListView).Name);
                 if (GameGlobal.myUnit != null//游戏角色初始数据不处理
                     && itemCfg.rarity == ConstDressRarity.Rarity_TIANYI
                     && StorageDataManager.Instance.GetStorageValue(ConstStorageId.FUNCTION_OPEN + functionOpenCfg.index) == 0)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingRenewFinishUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingRewardUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingFosterFinishUI.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitFosterFinishUI.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.ClothingFoster
 {
-    public partial class UI_ClothingFosterFinishUI
+    public partial class UI_SuitFosterFinishUI
     {
         public GComponent target;
         public GLoader m_loaBg;
@@ -25,12 +25,12 @@ namespace UI.ClothingFoster
         public Transition m_t1;
         public const string URL = "ui://uicwtr5bpy5gs";
         public const string PACKAGE_NAME = "ClothingFoster";
-        public const string RES_NAME = "ClothingFosterFinishUI";
-        private static UI_ClothingFosterFinishUI _proxy;
+        public const string RES_NAME = "SuitFosterFinishUI";
+        private static UI_SuitFosterFinishUI _proxy;
 
-        public static UI_ClothingFosterFinishUI Create(GObject gObject = null)
+        public static UI_SuitFosterFinishUI Create(GObject gObject = null)
         {
-            var ui = new UI_ClothingFosterFinishUI();
+            var ui = new UI_SuitFosterFinishUI();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -39,11 +39,11 @@ namespace UI.ClothingFoster
             return ui;
         }
 
-        public static UI_ClothingFosterFinishUI Proxy(GObject gObject = null)
+        public static UI_SuitFosterFinishUI Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ClothingFosterFinishUI();
+                _proxy = new UI_SuitFosterFinishUI();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingFosterFinishUI.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitFosterFinishUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 438072e3f6fecac46b7f30abf25c9498
+guid: 5076ce15ac300aa4ab5e729c851e87a1
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.ClothingFoster
 {
-    public partial class UI_ClothingFosterUI
+    public partial class UI_SuitFosterUI
     {
         public GComponent target;
         public GTextField m_txtDiscribe;
@@ -14,12 +14,12 @@ namespace UI.ClothingFoster
         public GComponent m_ComConsume;
         public const string URL = "ui://uicwtr5bpy5gp";
         public const string PACKAGE_NAME = "ClothingFoster";
-        public const string RES_NAME = "ClothingFosterUI";
-        private static UI_ClothingFosterUI _proxy;
+        public const string RES_NAME = "SuitFosterUI";
+        private static UI_SuitFosterUI _proxy;
 
-        public static UI_ClothingFosterUI Create(GObject gObject = null)
+        public static UI_SuitFosterUI Create(GObject gObject = null)
         {
-            var ui = new UI_ClothingFosterUI();
+            var ui = new UI_SuitFosterUI();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -28,11 +28,11 @@ namespace UI.ClothingFoster
             return ui;
         }
 
-        public static UI_ClothingFosterUI Proxy(GObject gObject = null)
+        public static UI_SuitFosterUI Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ClothingFosterUI();
+                _proxy = new UI_SuitFosterUI();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingFosterUI.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitFosterUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ea947379c137e2a43b80fa4b4c90a040
+guid: 85c14adf80433f846abd217aa7060fe7
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.ClothingFoster
 {
-    public partial class UI_ClothingListUI
+    public partial class UI_SuitListUI
     {
         public GComponent target;
         public GLoader m_loaBg;
@@ -16,12 +16,12 @@ namespace UI.ClothingFoster
         public GList m_listSuit;
         public const string URL = "ui://uicwtr5bpy5g0";
         public const string PACKAGE_NAME = "ClothingFoster";
-        public const string RES_NAME = "ClothingListUI";
-        private static UI_ClothingListUI _proxy;
+        public const string RES_NAME = "SuitListUI";
+        private static UI_SuitListUI _proxy;
 
-        public static UI_ClothingListUI Create(GObject gObject = null)
+        public static UI_SuitListUI Create(GObject gObject = null)
         {
-            var ui = new UI_ClothingListUI();
+            var ui = new UI_SuitListUI();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -30,11 +30,11 @@ namespace UI.ClothingFoster
             return ui;
         }
 
-        public static UI_ClothingListUI Proxy(GObject gObject = null)
+        public static UI_SuitListUI Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ClothingListUI();
+                _proxy = new UI_SuitListUI();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingListUI.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitListUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 213c6e14accb3cd489246231398616fb
+guid: 01f9bddd4e6b8b743873b12d58e3d128
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingPropertyShowUI.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitPropertyShowUI.cs

@@ -4,18 +4,18 @@ using FairyGUI;
 
 namespace UI.ClothingFoster
 {
-    public partial class UI_ClothingPropertyShowUI
+    public partial class UI_SuitPropertyShowUI
     {
         public GComponent target;
         public GList m_listPropertyShow;
         public const string URL = "ui://uicwtr5bpy5gq";
         public const string PACKAGE_NAME = "ClothingFoster";
-        public const string RES_NAME = "ClothingPropertyShowUI";
-        private static UI_ClothingPropertyShowUI _proxy;
+        public const string RES_NAME = "SuitPropertyShowUI";
+        private static UI_SuitPropertyShowUI _proxy;
 
-        public static UI_ClothingPropertyShowUI Create(GObject gObject = null)
+        public static UI_SuitPropertyShowUI Create(GObject gObject = null)
         {
-            var ui = new UI_ClothingPropertyShowUI();
+            var ui = new UI_SuitPropertyShowUI();
             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_ClothingPropertyShowUI Proxy(GObject gObject = null)
+        public static UI_SuitPropertyShowUI Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ClothingPropertyShowUI();
+                _proxy = new UI_SuitPropertyShowUI();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingPropertyShowUI.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitPropertyShowUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 21ca91be6df68f146af9ed198052fae3
+guid: af2295ae47dccee4bab446c7f19dc857
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingRenewFinishUI.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitRenewFinishUI.cs

@@ -4,19 +4,19 @@ using FairyGUI;
 
 namespace UI.ClothingFoster
 {
-    public partial class UI_ClothingRenewFinishUI
+    public partial class UI_SuitRenewFinishUI
     {
         public GComponent target;
         public GLoader m_loaBg;
         public GTextField m_txtProperty;
         public const string URL = "ui://uicwtr5bnk8d16";
         public const string PACKAGE_NAME = "ClothingFoster";
-        public const string RES_NAME = "ClothingRenewFinishUI";
-        private static UI_ClothingRenewFinishUI _proxy;
+        public const string RES_NAME = "SuitRenewFinishUI";
+        private static UI_SuitRenewFinishUI _proxy;
 
-        public static UI_ClothingRenewFinishUI Create(GObject gObject = null)
+        public static UI_SuitRenewFinishUI Create(GObject gObject = null)
         {
-            var ui = new UI_ClothingRenewFinishUI();
+            var ui = new UI_SuitRenewFinishUI();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -25,11 +25,11 @@ namespace UI.ClothingFoster
             return ui;
         }
 
-        public static UI_ClothingRenewFinishUI Proxy(GObject gObject = null)
+        public static UI_SuitRenewFinishUI Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ClothingRenewFinishUI();
+                _proxy = new UI_SuitRenewFinishUI();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitRenewFinishUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingRewardUI.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitRewardUI.cs

@@ -4,18 +4,18 @@ using FairyGUI;
 
 namespace UI.ClothingFoster
 {
-    public partial class UI_ClothingRewardUI
+    public partial class UI_SuitRewardUI
     {
         public GComponent target;
         public GList m_listReward;
         public const string URL = "ui://uicwtr5bpy5gr";
         public const string PACKAGE_NAME = "ClothingFoster";
-        public const string RES_NAME = "ClothingRewardUI";
-        private static UI_ClothingRewardUI _proxy;
+        public const string RES_NAME = "SuitRewardUI";
+        private static UI_SuitRewardUI _proxy;
 
-        public static UI_ClothingRewardUI Create(GObject gObject = null)
+        public static UI_SuitRewardUI Create(GObject gObject = null)
         {
-            var ui = new UI_ClothingRewardUI();
+            var ui = new UI_SuitRewardUI();
             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_ClothingRewardUI Proxy(GObject gObject = null)
+        public static UI_SuitRewardUI Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ClothingRewardUI();
+                _proxy = new UI_SuitRewardUI();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitRewardUI.cs.meta

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

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

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.ClothingFoster
 {
-    public partial class UI_ClothingUI
+    public partial class UI_SuitUI
     {
         public GComponent target;
         public Controller m_c1;
@@ -36,12 +36,12 @@ namespace UI.ClothingFoster
         public UI_comFosterAni m_comFosterAni;
         public const string URL = "ui://uicwtr5bpy5gf";
         public const string PACKAGE_NAME = "ClothingFoster";
-        public const string RES_NAME = "ClothingUI";
-        private static UI_ClothingUI _proxy;
+        public const string RES_NAME = "SuitUI";
+        private static UI_SuitUI _proxy;
 
-        public static UI_ClothingUI Create(GObject gObject = null)
+        public static UI_SuitUI Create(GObject gObject = null)
         {
-            var ui = new UI_ClothingUI();
+            var ui = new UI_SuitUI();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -50,11 +50,11 @@ namespace UI.ClothingFoster
             return ui;
         }
 
-        public static UI_ClothingUI Proxy(GObject gObject = null)
+        public static UI_SuitUI Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ClothingUI();
+                _proxy = new UI_SuitUI();
             }
             var ui = _proxy;
             if(gObject == null)

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

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

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingFosterFinishView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingFosterRewardView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingFosterView.cs.meta

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

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

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

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingPropertyShowView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingRenewFinishView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingFosterFinishView.cs → GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitFosterFinishView.cs

@@ -6,9 +6,9 @@ using UI.CommonGame;
 
 namespace GFGGame
 {
-    public class ClothingFosterFinishView : BaseWindow
+    public class SuitFosterFinishView : BaseWindow
     {
-        private UI_ClothingFosterFinishUI _ui;
+        private UI_SuitFosterFinishUI _ui;
         private int _suitId;
         private int _index;
         private SortedList _lastPropertyList;
@@ -23,8 +23,8 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
-            packageName = UI_ClothingFosterFinishUI.PACKAGE_NAME;
-            _ui = UI_ClothingFosterFinishUI.Create();
+            packageName = UI_SuitFosterFinishUI.PACKAGE_NAME;
+            _ui = UI_SuitFosterFinishUI.Create();
             this.viewCom = _ui.target;
             this.viewCom.Center();
             this.modal = true;

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitFosterFinishView.cs.meta

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

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

@@ -5,9 +5,9 @@ using UI.ClothingFoster;
 using UI.CommonGame;
 namespace GFGGame
 {
-    public class ClothingFosterView : BaseWindow
+    public class SuitFosterView : BaseWindow
     {
-        private UI_ClothingFosterUI _ui;
+        private UI_SuitFosterUI _ui;
 
         private int _suitId;
         private int _index;
@@ -24,8 +24,8 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
-            packageName = UI_ClothingFosterUI.PACKAGE_NAME;
-            _ui = UI_ClothingFosterUI.Create();
+            packageName = UI_SuitFosterUI.PACKAGE_NAME;
+            _ui = UI_SuitFosterUI.Create();
             this.viewCom = _ui.target;
             this.viewCom.Center();
             this.modal = true;
@@ -40,7 +40,6 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             EventAgent.AddEventListener(ConstMessage.JUMP_TO_SOURCE, this.Hide);
-
         }
         protected override void OnShown()
         {
@@ -66,7 +65,7 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-            // UI_ComCostCurrency.ProxyEnd();
+
         }
         protected override void RemoveEventListener()
         {
@@ -90,7 +89,7 @@ namespace GFGGame
         private void OnListMaterialsItem(EventContext context)
         {
             int itemId = (int)(context.data as GComponent).data;
-            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { typeof(ClothingView).Name, ( this.viewData as object[])[4]  }
+            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { typeof(SuitView).Name, ( this.viewData as object[])[4]  }
     });
         }
 

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

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

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

@@ -4,9 +4,9 @@ using FairyGUI;
 using UI.ClothingFoster;
 namespace GFGGame
 {
-    public class ClothingListView : BaseWindow
+    public class SuitListView : BaseWindow
     {
-        private UI_ClothingListUI _ui;
+        private UI_SuitListUI _ui;
         private ValueBarController _valueBarController;
         private int _menuType = ConstSuitGuideTypeId.TYPE_1;
         private int[] _menuTypeDataArray;
@@ -22,8 +22,8 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
-            packageName = UI_ClothingListUI.PACKAGE_NAME;
-            _ui = UI_ClothingListUI.Create();
+            packageName = UI_SuitListUI.PACKAGE_NAME;
+            _ui = UI_SuitListUI.Create();
             this.viewCom = _ui.target;
             // this.viewCom.Center();
             isfullScreen = true;
@@ -43,7 +43,10 @@ namespace GFGGame
             _ui.m_btnHaveGot.onChanged.Add(OnClickBtnHaveGot);
             _ui.m_btnNotGet.onChanged.Add(OnClickBtnNotGet);
         }
-
+        protected override void AddEventListener()
+        {
+            EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateSuitStatus);
+        }
         protected override void OnShown()
         {
             base.OnShown();
@@ -55,10 +58,7 @@ namespace GFGGame
             SuitFosterProxy.SendGetSuitInfos().Coroutine();
             UpdateListSuit();
         }
-        protected override void AddEventListener()
-        {
-            EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateSuitStatus);
-        }
+
         protected override void OnHide()
         {
             base.OnHide();
@@ -71,7 +71,7 @@ namespace GFGGame
         private void OnClickBtnBack()
         {
             // this.Hide();
-            ViewManager.GoBackFrom(typeof(ClothingListView).FullName);
+            ViewManager.GoBackFrom(typeof(SuitListView).FullName);
         }
         private void OnClickListTypeItem()
         {
@@ -125,7 +125,6 @@ namespace GFGGame
             listItem.target.data = suitId;
             UpdateSuitStatusView(listItem);
             UI_ListSuitItem.ProxyEnd();
-
         }
 
         private void UpdateSuitStatus(EventContext eventContext)
@@ -155,7 +154,7 @@ namespace GFGGame
             {
                 if (haveSuit)
                 {
-                    ViewManager.Show<ClothingView>(new object[] { suitId, _suitIds }, new object[] { typeof(ClothingListView).Name, this.viewData });
+                    ViewManager.Show<SuitView>(new object[] { suitId, _suitIds }, new object[] { typeof(SuitListView).Name, this.viewData });
                 }
                 else
                 {

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

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

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingPropertyShowView.cs → GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitPropertyShowView.cs

@@ -8,9 +8,9 @@ using UnityEngine;
 
 namespace GFGGame
 {
-    public class ClothingPropertyShowView : BaseWindow
+    public class SuitPropertyShowView : BaseWindow
     {
-        private UI_ClothingPropertyShowUI _ui;
+        private UI_SuitPropertyShowUI _ui;
         // private Dictionary<string, int> _data = new Dictionary<string, int>();
         // List<int> _dataList = new List<int>(); StudentDictionary.Values.ToList();
         List<KeyValuePair<int, string>> _dataList;// = new List<KeyValuePair<string, int>>();
@@ -24,8 +24,8 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
-            packageName = UI_ClothingPropertyShowUI.PACKAGE_NAME;
-            _ui = UI_ClothingPropertyShowUI.Create();
+            packageName = UI_SuitPropertyShowUI.PACKAGE_NAME;
+            _ui = UI_SuitPropertyShowUI.Create();
             this.viewCom = _ui.target;
             this.viewCom.Center();
             this.modal = true;

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitPropertyShowView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingRenewFinishView.cs → GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitRenewFinishView.cs

@@ -2,9 +2,9 @@ using FairyGUI;
 using UI.ClothingFoster;
 namespace GFGGame
 {
-    public class ClothingRenewFinishView : BaseWindow
+    public class SuitRenewFinishView : BaseWindow
     {
-        private UI_ClothingRenewFinishUI _ui;
+        private UI_SuitRenewFinishUI _ui;
         private int _suitId;
         public override void Dispose()
         {
@@ -16,8 +16,8 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
-            packageName = UI_ClothingRenewFinishUI.PACKAGE_NAME;
-            _ui = UI_ClothingRenewFinishUI.Create();
+            packageName = UI_SuitRenewFinishUI.PACKAGE_NAME;
+            _ui = UI_SuitRenewFinishUI.Create();
             this.viewCom = _ui.target;
             this.viewCom.Center();
             this.modal = true;

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitRenewFinishView.cs.meta

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

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

@@ -5,9 +5,9 @@ using FairyGUI;
 using UI.ClothingFoster;
 namespace GFGGame
 {
-    public class ClothingFosterRewardView : BaseWindow
+    public class SuitRewardView : BaseWindow
     {
-        private UI_ClothingRewardUI _ui;
+        private UI_SuitRewardUI _ui;
         private int _suitId;
         private List<SuitFosterCfg> _rewardsList;
 
@@ -21,8 +21,8 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
-            packageName = UI_ClothingRewardUI.PACKAGE_NAME;
-            _ui = UI_ClothingRewardUI.Create();
+            packageName = UI_SuitRewardUI.PACKAGE_NAME;
+            _ui = UI_SuitRewardUI.Create();
             this.viewCom = _ui.target;
             this.viewCom.Center();
             this.modal = true;

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

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

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

@@ -8,9 +8,9 @@ using ET;
 
 namespace GFGGame
 {
-    public class ClothingView : BaseWindow
+    public class SuitView : BaseWindow
     {
-        private UI_ClothingUI _ui;
+        private UI_SuitUI _ui;
 
         private GameObject _scenePrefab;
         private GameObject _sceneObject;
@@ -38,8 +38,8 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
-            packageName = UI_ClothingUI.PACKAGE_NAME;
-            _ui = UI_ClothingUI.Create();
+            packageName = UI_SuitUI.PACKAGE_NAME;
+            _ui = UI_SuitUI.Create();
             this.viewCom = _ui.target;
             // this.viewCom.Center();
             isfullScreen = true;
@@ -102,8 +102,6 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-            // UI_ComCostCurrency.ProxyEnd();
-
         }
         protected override void RemoveEventListener()
         {
@@ -113,7 +111,7 @@ namespace GFGGame
         }
         private void OnClickBtnBack()
         {
-            ViewManager.GoBackFrom(typeof(ClothingView).FullName);
+            ViewManager.GoBackFrom(typeof(SuitView).FullName);
         }
         private void OnTabChange()
         {
@@ -233,7 +231,7 @@ namespace GFGGame
             }
             else if (state == 1)
             {
-                ViewManager.Show<ClothingFosterView>(new object[] { _suitId, index, _propertyList, _addPropertyList, this.viewData });
+                ViewManager.Show<SuitFosterView>(new object[] { _suitId, index, _propertyList, _addPropertyList, this.viewData });
             }
             else
             {
@@ -245,7 +243,7 @@ namespace GFGGame
             SuitFosterDataManager.Instance.GetFosterRewardState(_suitId, out int state, out int index);
             if (state == 1 || state == 2)
             {
-                ViewManager.Show<ClothingFosterRewardView>(_suitId);
+                ViewManager.Show<SuitRewardView>(_suitId);
             }
             else
             {
@@ -254,20 +252,26 @@ namespace GFGGame
         }
         private void OnClickBtnPropertyShow()
         {
-            ViewManager.Show<ClothingPropertyShowView>(new object[] { _suitId, _index });
+            ViewManager.Show<SuitPropertyShowView>(new object[] { _suitId, _index });
         }
 
         private void OnListenerFoster()
         {
             _ui.m_comFosterAni.target.visible = true;
             _ui.m_comFosterAni.m_txtContent.text = string.Format("服装{0}中......", SuitFosterDataManager.Instance.stepNames[_index]);
-
+            // _ui.m_comFosterAni.m_proFoster.value = 0;
             string resPath = ResPathUtil.GetViewEffectPath("ui_gcdh", "ui_gcdh_" + (_index + 1));
             SceneController.AddObjectToView(_gameobject1, _wrapper1, _ui.m_comFosterAni.m_holder, resPath, out _gameobject1, out _wrapper1);
+            // _ui.m_comFosterAni.m_proFoster.TweenValue(100, 4f).OnComplete(() =>
+            // {
+            //     ViewManager.Show<SuitFosterFinishView>(new object[] { _suitId, _index, _propertyList });
+            //     UpdateFoster();
+            //     _ui.m_comFosterAni.target.visible = false;
+            // });
 
             _ui.m_comFosterAni.m_t0.Play(() =>
             {
-                ViewManager.Show<ClothingFosterFinishView>(new object[] { _suitId, _index, _propertyList });
+                ViewManager.Show<SuitFosterFinishView>(new object[] { _suitId, _index, _propertyList });
                 UpdateFoster();
                 _ui.m_comFosterAni.target.visible = false;
             });
@@ -356,7 +360,7 @@ namespace GFGGame
         {
             int itemId = (int)(context.data as GComponent).data;
             // GoodsItemTipsController.ShowItemTips(itemId);
-            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { typeof(ClothingView).FullName, this.viewData } });
+            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { typeof(SuitView).FullName, this.viewData } });
         }
 
         private async void OnClickBtnRenew()
@@ -382,7 +386,7 @@ namespace GFGGame
         }
         private void OnListenerRenew()
         {
-            ViewManager.Show<ClothingRenewFinishView>(_suitId);
+            ViewManager.Show<SuitRenewFinishView>(_suitId);
             UpdateRenew();
             Debug.Log("换新奖励：" + ItemDataManager.GetItemNum(10370));
 

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

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

GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachOfItemView.cs

@@ -266,7 +266,7 @@ namespace GFGGame
                     break;
                 case ConstFunctionId.SUIT_FOSTER:
                     this.Hide();
-                    isJump = ViewManager.Show<ClothingListView>(null, _fromeViewDatas);
+                    isJump = ViewManager.Show<SuitListView>(null, _fromeViewDatas);
                     break;
             }
             if (isJump)

GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs

@@ -75,7 +75,7 @@ namespace GFGGame
         {
             LogServerHelper.SendNodeLog((int)PlayParticipationEnum.FU_ZHUANG_YANG_CHENG, 1);
 
-            ViewManager.Show<ClothingListView>(null, new object[] { ViewName.XIU_FANG_VIEW, this.viewData }, false, true);
+            ViewManager.Show<SuitListView>(null, new object[] { ViewName.XIU_FANG_VIEW, this.viewData }, false, true);
 
             // PromptController.Instance.ShowFloatTextPrompt("暂未开放", MessageType.WARNING);
         }