Merge remote-tracking branch 'remotes/origin/master' into xiaojie

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

@@ -8,7 +8,10 @@ namespace GFGGame
     {
         private static int _currentIndex;
         public static int currentIndex { get; set; }
+        private const int _defaultPosCount = 3;
+        private static MonthlyCardPrivilegeCfg privilegeCfg = MonthlyCardPrivilegeCfgArray.Instance.GetCfg(MonthCardPrivilegeType.Privilege3);
 
+        // private string[] posItems = new string[_defaultPosCount + privilegeCfg.value1Arr[0] + privilegeCfg.value2Arr[1]];
 
         private static Dictionary<int, CustomSuitData> _dataDic = new Dictionary<int, CustomSuitData>();
         public static void SaveSuit(int index, DressUpData dressUpData)
@@ -82,5 +85,19 @@ namespace GFGGame
             }
         }
 
+        //检测是否是月卡位置,0默认位置
+        public static bool CheckIsCardPos(int cardType, int pos)
+        {
+            // if (pos < _defaultPosCount) return false;
+
+            // for (int i = _defaultPosCount; i < posItems.Length; i++)
+            // {
+            //     if (cardType == MonthCardType.Gold && pos <)
+            //     {
+
+            //     }
+            // }
+            return false;
+        }
     }
 }

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

@@ -74,8 +74,23 @@ namespace GFGGame
             _ui.m_btnSearch.visible = true;
             _ui.m_btnPhoto.visible = true;
             _ui.m_btnAction.visible = false;
+
+            // MonthlyCardPrivilegeCfg privilegeCfg = MonthlyCardPrivilegeCfgArray.Instance.GetCfg(MonthCardPrivilegeType.Privilege3);
+            // string[] items = new string[3 + privilegeCfg.value1Arr[0] + privilegeCfg.value2Arr[0]];
+            // for (int i = 0; i < items.Length; i++)
+            // {
+            //     if (i <= 3)
+            //     {
+
+            //     }else if(i<=(3+privilegeCfg.value1Arr[0])){
+
+
+            //     }else if()
+            // }
+
             _ui.m_comboBox.items = new string[] { "我的套装一", "我的套装二", "我的套装三", "我的套装四", "我的套装五", "我的套装六" };
             _ui.m_partsList.m_comboBoxRarity.items = new string[] { "高稀有度", "低稀有度", "最近获得" };
+
             InitLists();
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnHome.onClick.Add(OnClickBtnHome);