代码整理

GameClient/Assets/Game/HotUpdate/DressUp/DressUpObjDataCache.cs

@@ -307,36 +307,6 @@ namespace GFGGame
                 }
             }
         }
-        /// <summary>
-        /// 检测是否穿戴完整（穿着连衣裙或同时穿着上装下装）
-        /// </summary>
-        /// <returns></returns>
-        public bool CheckPutOnFinish()
-        {
-            if (EquipDataCache.cacher.suitId > 0) return true;
-            List<int> equipDatas = EquipDataCache.cacher.equipDatas;
-            bool isLianYiQun = false;
-            bool isShangYi = false;
-            bool isXiaZhuang = false;
-
-            for (int i = 0; i < equipDatas.Count; i++)
-            {
-                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(equipDatas[i]);
-                if (itemCfg.subType == ConstDressUpItemType.LIAN_YI_QUN && itemCfg.id != ConstItemID.DEFULT_LIAN_YI_QUN)
-                {
-                    isLianYiQun = true; break;
-                }
-                if (itemCfg.subType == ConstDressUpItemType.SHANG_YI && itemCfg.id != ConstItemID.DEFULT_NEI_DA)
-                {
-                    isShangYi = true;
-                }
-                if (itemCfg.subType == ConstDressUpItemType.XIA_ZHUANG && itemCfg.id != ConstItemID.DEFULT_XIA_ZHUANG)
-                {
-                    isXiaZhuang = true;
-                }
-            }
-            return isLianYiQun || isXiaZhuang && isShangYi;
-        }
         private void UpdatePicAction()
         {
             if (IsSuitPic)
@@ -499,15 +469,7 @@ namespace GFGGame
             checkDefaultItem();
             UpdatePicAction();
         }
-        public CustomSuitData GetCurSuitData(int index)
-        {
-            CustomSuitData suitSavedData = new CustomSuitData(index);
-            suitSavedData.equipDatas = EquipDataCache.cacher.equipDatas;
-            suitSavedData.bg = EquipDataCache.cacher.bgId;
-            suitSavedData.pic = EquipDataCache.cacher.picStatus;
-            suitSavedData.suitId = EquipDataCache.cacher.suitId;
-            return suitSavedData;
-        }
+        
         public void PutOnSuitSaved(int index)
         {
 

GameClient/Assets/Game/HotUpdate/DressUp/EquipDataCache.cs

@@ -1,3 +1,5 @@
+using System.Collections.Generic;
+
 namespace GFGGame
 {
     public class EquipDataCache
@@ -14,5 +16,47 @@ namespace GFGGame
                 return _cacher;
             }
         }
+
+        public static CustomSuitData GetCurSuitData(int index)
+        {
+            CustomSuitData suitSavedData = new CustomSuitData(index);
+            suitSavedData.equipDatas = EquipDataCache.cacher.equipDatas;
+            suitSavedData.bg = EquipDataCache.cacher.bgId;
+            suitSavedData.pic = EquipDataCache.cacher.picStatus;
+            suitSavedData.suitId = EquipDataCache.cacher.suitId;
+            return suitSavedData;
+        }
+
+
+        /// <summary>
+        /// 检测是否穿戴完整（穿着连衣裙或同时穿着上装下装）
+        /// </summary>
+        /// <returns></returns>
+        public static bool CheckPutOnFinish()
+        {
+            if (EquipDataCache.cacher.suitId > 0) return true;
+            List<int> equipDatas = EquipDataCache.cacher.equipDatas;
+            bool isLianYiQun = false;
+            bool isShangYi = false;
+            bool isXiaZhuang = false;
+
+            for (int i = 0; i < equipDatas.Count; i++)
+            {
+                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(equipDatas[i]);
+                if (itemCfg.subType == ConstDressUpItemType.LIAN_YI_QUN && itemCfg.id != ConstItemID.DEFULT_LIAN_YI_QUN)
+                {
+                    isLianYiQun = true; break;
+                }
+                if (itemCfg.subType == ConstDressUpItemType.SHANG_YI && itemCfg.id != ConstItemID.DEFULT_NEI_DA)
+                {
+                    isShangYi = true;
+                }
+                if (itemCfg.subType == ConstDressUpItemType.XIA_ZHUANG && itemCfg.id != ConstItemID.DEFULT_XIA_ZHUANG)
+                {
+                    isXiaZhuang = true;
+                }
+            }
+            return isLianYiQun || isXiaZhuang && isShangYi;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -400,7 +400,7 @@ namespace GFGGame
 
         private void OnClickBtnNext()
         {
-            if (!EquipDataCache.cacher.CheckPutOnFinish())
+            if (!EquipDataCache.CheckPutOnFinish())
             {
                 AlertUI.Show("只有换好衣服才能出门哦！")
                     .SetRightButton(true, "好的");

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -298,7 +298,7 @@ namespace GFGGame
             {
                 _dressMemory.RemoveRange(_stepIndex, _dressMemory.Count - _stepIndex);
             }
-            CustomSuitData suitSavedData = EquipDataCache.cacher.GetCurSuitData(_ui.m_comboBox.selectedIndex);
+            CustomSuitData suitSavedData = EquipDataCache.GetCurSuitData(_ui.m_comboBox.selectedIndex);
             _dressMemory.Add(suitSavedData);
             UpdateStepBtn();
         }