Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Editor/Excel/ExcelChecker.cs

@@ -260,7 +260,7 @@ namespace GFGEditor
 
         private static void CheckClothingSyntheticCfgExist(ItemCfg itemCfg)
         {
-            if (itemCfg.suitId > 0)
+            if (itemCfg.itemType == ConstItemType.DRESS_UP && itemCfg.suitId > 0)
             {
                 var suitCfg = SuitCfgArray.Instance.GetCfg(itemCfg.suitId);
                 if (suitCfg != null && suitCfg.syntheticType > 0)

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -24,7 +24,7 @@ namespace GFGEditor
             int suitPartTotalCount = 0;
             foreach (ItemCfg cfg in dataArray)
             {
-                HandleSuitTable(cfg, suitDic);
+                HandleItemAndSuitTable(cfg, suitDic);
                 HandleItemApproch(cfg, actions);
             }
             var globalCfg = GlobalCfgArray.globalCfg;
@@ -69,7 +69,7 @@ namespace GFGEditor
             SQLiteHelper.Instance.UpdateValues(nameof(GlobalCfgArray), names, values, nameof(globalCfg.id), globalCfg.id.ToString());
         }
 
-        private static void HandleSuitTable(ItemCfg itemCfg, Dictionary<SuitCfg, List<int>> suitDic)
+        private static void HandleItemAndSuitTable(ItemCfg itemCfg, Dictionary<SuitCfg, List<int>> suitDic)
         {
             if (itemCfg.suitId <= 0)
             {
@@ -80,13 +80,16 @@ namespace GFGEditor
             {
                 return;
             }
-            suitDic.TryGetValue(suitCfg, out var partsList);
-            if (partsList == null)
+            if(itemCfg.itemType == ConstItemType.DRESS_UP)
             {
-                partsList = new List<int>();
-                suitDic[suitCfg] = partsList;
+                suitDic.TryGetValue(suitCfg, out var partsList);
+                if (partsList == null)
+                {
+                    partsList = new List<int>();
+                    suitDic[suitCfg] = partsList;
+                }
+                partsList.Add(itemCfg.id);
             }
-            partsList.Add(itemCfg.id);
             itemCfg.isHide = suitCfg.isHide;
         }
 
@@ -262,6 +265,10 @@ namespace GFGEditor
             {
                 return null;
             }
+            if(itemCfg.itemType != ConstItemType.DRESS_UP)
+            {
+                return null;
+            }
             if (itemCfg.suitId <= 0)
             {
                 return null;
@@ -301,6 +308,10 @@ namespace GFGEditor
             {
                 return null;
             }
+            if (itemCfg.itemType != ConstItemType.DRESS_UP)
+            {
+                return null;
+            }
             if (itemCfg.suitId <= 0)
             {
                 return null;

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

@@ -107,11 +107,11 @@ namespace GFGGame
                     if (cfg.group <= 0)
                     {
                         ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.item);
-                        if (itemCfg == null || itemCfg.suitId <= 0 && itemCfg.showSuitId <= 0)
+                        if (itemCfg == null || itemCfg.suitId <= 0)
                         {
                             continue;
                         }
-                        group = itemCfg.suitId == 0 ? itemCfg.showSuitId : itemCfg.suitId;
+                        group = itemCfg.suitId;
                     }
                     LuckyBoxBonusData luckyBoxBonusData = GetBonusData(group, dic);
                     if (luckyBoxBonusData == null)