zhaoyang 3 жил өмнө
parent
commit
7f5653d71a
37 өөрчлөгдсөн 138 нэмэгдсэн , 138 устгасан
  1. 0 0
      FGUIProject/assets/ClothingFoster/ClothingFosterFinishUI.xml
  2. 0 0
      FGUIProject/assets/ClothingFoster/ClothingFosterUI.xml
  3. 0 0
      FGUIProject/assets/ClothingFoster/ClothingRenewFinishUI.xml
  4. 0 0
      FGUIProject/assets/ClothingFoster/ClothingRewardUI.xml
  5. 0 0
      FGUIProject/assets/ClothingFoster/ClothingropertyShowUI.xml
  6. 5 5
      FGUIProject/assets/ClothingFoster/package.xml
  7. 2 2
      GameClient/Assets/Game/HotUpdate/Data/ItemDataManager.cs
  8. 7 7
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingFosterFinishUI.cs
  9. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingFosterFinishUI.cs.meta
  10. 7 7
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingFosterUI.cs
  11. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingFosterUI.cs.meta
  12. 7 7
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingRenewFinishUI.cs
  13. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingRenewFinishUI.cs.meta
  14. 7 7
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingRewardUI.cs
  15. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingRewardUI.cs.meta
  16. 7 7
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingropertyShowUI.cs
  17. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingropertyShowUI.cs.meta
  18. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitRewardUI.cs.meta
  19. 4 4
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingFosterFinishView.cs
  20. 11 0
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingFosterFinishView.cs.meta
  21. 4 4
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingFosterView.cs
  22. 11 0
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingFosterView.cs.meta
  23. 1 1
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingListView.cs.meta
  24. 4 4
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingPropertyShowView.cs
  25. 11 0
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingPropertyShowView.cs.meta
  26. 4 4
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingRenewFinishView.cs
  27. 11 0
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingRenewFinishView.cs.meta
  28. 4 4
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingRewardView.cs
  29. 11 0
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingRewardView.cs.meta
  30. 5 5
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs
  31. 0 11
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitFosterFinishView.cs.meta
  32. 0 11
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitFosterView.cs.meta
  33. 0 11
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitPropertyShowView.cs.meta
  34. 0 11
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitRenewFinishView.cs.meta
  35. 0 11
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitRewardView.cs.meta
  36. BIN
      GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes
  37. BIN
      GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_fui.bytes

+ 0 - 0
FGUIProject/assets/ClothingFoster/SuitFosterFinishUI.xml → FGUIProject/assets/ClothingFoster/ClothingFosterFinishUI.xml


+ 0 - 0
FGUIProject/assets/ClothingFoster/SuitFosterUI.xml → FGUIProject/assets/ClothingFoster/ClothingFosterUI.xml


+ 0 - 0
FGUIProject/assets/ClothingFoster/SuitRenewFinishUI.xml → FGUIProject/assets/ClothingFoster/ClothingRenewFinishUI.xml


+ 0 - 0
FGUIProject/assets/ClothingFoster/SuitRewardUI.xml → FGUIProject/assets/ClothingFoster/ClothingRewardUI.xml


+ 0 - 0
FGUIProject/assets/ClothingFoster/SuitPropertyShowUI.xml → FGUIProject/assets/ClothingFoster/ClothingropertyShowUI.xml


+ 5 - 5
FGUIProject/assets/ClothingFoster/package.xml

@@ -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="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="py5gp" name="ClothingFosterUI.xml" path="/" exported="true"/>
+    <component id="py5gq" name="ClothingropertyShowUI.xml" path="/" exported="true"/>
+    <component id="py5gr" name="ClothingRewardUI.xml" path="/" exported="true"/>
+    <component id="py5gs" name="ClothingFosterFinishUI.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="SuitRenewFinishUI.xml" path="/" exported="true"/>
+    <component id="nk8d16" name="ClothingRenewFinishUI.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/"/>

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Data/ItemDataManager.cs

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

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

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.ClothingFoster
 {
-    public partial class UI_SuitFosterFinishUI
+    public partial class UI_ClothingFosterFinishUI
     {
         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 = "SuitFosterFinishUI";
-        private static UI_SuitFosterFinishUI _proxy;
+        public const string RES_NAME = "ClothingFosterFinishUI";
+        private static UI_ClothingFosterFinishUI _proxy;
 
-        public static UI_SuitFosterFinishUI Create(GObject gObject = null)
+        public static UI_ClothingFosterFinishUI Create(GObject gObject = null)
         {
-            var ui = new UI_SuitFosterFinishUI();
+            var ui = new UI_ClothingFosterFinishUI();
             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_SuitFosterFinishUI Proxy(GObject gObject = null)
+        public static UI_ClothingFosterFinishUI Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_SuitFosterFinishUI();
+                _proxy = new UI_ClothingFosterFinishUI();
             }
             var ui = _proxy;
             if(gObject == null)

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

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

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

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.ClothingFoster
 {
-    public partial class UI_SuitFosterUI
+    public partial class UI_ClothingFosterUI
     {
         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 = "SuitFosterUI";
-        private static UI_SuitFosterUI _proxy;
+        public const string RES_NAME = "ClothingFosterUI";
+        private static UI_ClothingFosterUI _proxy;
 
-        public static UI_SuitFosterUI Create(GObject gObject = null)
+        public static UI_ClothingFosterUI Create(GObject gObject = null)
         {
-            var ui = new UI_SuitFosterUI();
+            var ui = new UI_ClothingFosterUI();
             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_SuitFosterUI Proxy(GObject gObject = null)
+        public static UI_ClothingFosterUI Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_SuitFosterUI();
+                _proxy = new UI_ClothingFosterUI();
             }
             var ui = _proxy;
             if(gObject == null)

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

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

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

@@ -4,19 +4,19 @@ using FairyGUI;
 
 namespace UI.ClothingFoster
 {
-    public partial class UI_SuitRenewFinishUI
+    public partial class UI_ClothingRenewFinishUI
     {
         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 = "SuitRenewFinishUI";
-        private static UI_SuitRenewFinishUI _proxy;
+        public const string RES_NAME = "ClothingRenewFinishUI";
+        private static UI_ClothingRenewFinishUI _proxy;
 
-        public static UI_SuitRenewFinishUI Create(GObject gObject = null)
+        public static UI_ClothingRenewFinishUI Create(GObject gObject = null)
         {
-            var ui = new UI_SuitRenewFinishUI();
+            var ui = new UI_ClothingRenewFinishUI();
             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_SuitRenewFinishUI Proxy(GObject gObject = null)
+        public static UI_ClothingRenewFinishUI Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_SuitRenewFinishUI();
+                _proxy = new UI_ClothingRenewFinishUI();
             }
             var ui = _proxy;
             if(gObject == null)

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitPropertyShowUI.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingRenewFinishUI.cs.meta

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

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

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

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitRenewFinishUI.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingRewardUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ceaae0af2c7bb6c4eac7c0a96795556b
+guid: 396785944ef337f449b9abcdfdd0792c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 7 - 7
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitPropertyShowUI.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingropertyShowUI.cs

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

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingropertyShowUI.cs.meta

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

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitRewardUI.cs.meta

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

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

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

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingFosterFinishView.cs.meta

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

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

@@ -5,9 +5,9 @@ using UI.ClothingFoster;
 using UI.CommonGame;
 namespace GFGGame
 {
-    public class SuitFosterView : BaseWindow
+    public class ClothingFosterView : BaseWindow
     {
-        private UI_SuitFosterUI _ui;
+        private UI_ClothingFosterUI _ui;
 
         private int _suitId;
         private int _index;
@@ -24,8 +24,8 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
-            packageName = UI_SuitFosterUI.PACKAGE_NAME;
-            _ui = UI_SuitFosterUI.Create();
+            packageName = UI_ClothingFosterUI.PACKAGE_NAME;
+            _ui = UI_ClothingFosterUI.Create();
             this.viewCom = _ui.target;
             this.viewCom.Center();
             this.modal = true;

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingFosterView.cs.meta

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

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingListView.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 45827086fd274f349a17b9aa000ae553
+guid: 2669870b25867a845a0c18502ab3e95c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -8,9 +8,9 @@ using UnityEngine;
 
 namespace GFGGame
 {
-    public class SuitPropertyShowView : BaseWindow
+    public class ClothingPropertyShowView : BaseWindow
     {
-        private UI_SuitPropertyShowUI _ui;
+        private UI_ClothingropertyShowUI _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_SuitPropertyShowUI.PACKAGE_NAME;
-            _ui = UI_SuitPropertyShowUI.Create();
+            packageName = UI_ClothingropertyShowUI.PACKAGE_NAME;
+            _ui = UI_ClothingropertyShowUI.Create();
             this.viewCom = _ui.target;
             this.viewCom.Center();
             this.modal = true;

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingPropertyShowView.cs.meta

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

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

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

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingRenewFinishView.cs.meta

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

+ 4 - 4
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitRewardView.cs → GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingRewardView.cs

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

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingRewardView.cs.meta

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

+ 5 - 5
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs

@@ -244,7 +244,7 @@ namespace GFGGame
             }
             else if (state == 1)
             {
-                ViewManager.Show<SuitFosterView>(new object[] { _suitId, index, _propertyList, _addPropertyList, this.viewData });
+                ViewManager.Show<ClothingFosterView>(new object[] { _suitId, index, _propertyList, _addPropertyList, this.viewData });
             }
             else
             {
@@ -256,7 +256,7 @@ namespace GFGGame
             SuitFosterDataManager.Instance.GetFosterRewardState(_suitId, out int state, out int index);
             if (state == 1 || state == 2)
             {
-                ViewManager.Show<SuitRewardView>(_suitId);
+                ViewManager.Show<ClothingRewardView>(_suitId);
             }
             else
             {
@@ -265,7 +265,7 @@ namespace GFGGame
         }
         private void OnClickBtnPropertyShow()
         {
-            ViewManager.Show<SuitPropertyShowView>(new object[] { _suitId, _index });
+            ViewManager.Show<ClothingPropertyShowView>(new object[] { _suitId, _index });
         }
 
         private void OnListenerFoster()
@@ -284,7 +284,7 @@ namespace GFGGame
 
             _ui.m_comFosterAni.m_t0.Play(() =>
             {
-                ViewManager.Show<SuitFosterFinishView>(new object[] { _suitId, _index, _propertyList });
+                ViewManager.Show<ClothingFosterFinishView>(new object[] { _suitId, _index, _propertyList });
                 UpdateFoster();
                 _ui.m_comFosterAni.target.visible = false;
             });
@@ -399,7 +399,7 @@ namespace GFGGame
         }
         private void OnListenerRenew()
         {
-            ViewManager.Show<SuitRenewFinishView>(_suitId);
+            ViewManager.Show<ClothingRenewFinishView>(_suitId);
             UpdateRenew();
             Debug.Log("换新奖励:" + ItemDataManager.GetItemNum(10370));
 

+ 0 - 11
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitFosterFinishView.cs.meta

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

+ 0 - 11
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitFosterView.cs.meta

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

+ 0 - 11
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitPropertyShowView.cs.meta

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

+ 0 - 11
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitRenewFinishView.cs.meta

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

+ 0 - 11
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitRewardView.cs.meta

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

BIN
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes


BIN
GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_fui.bytes