套装合成

GameClient/Assets/Editor/Excel/CodeBuilder.cs

@@ -13,7 +13,6 @@ namespace GFGEditor
 {
     public class CodeBuilder
     {
-        private const string PREFIX = "zzz_temp_";
         private const string SQL_PREFIX = "_";
         private static StringBuilder _declarationBuilder = new StringBuilder();
         private static StringBuilder _assignmentBuilder = new StringBuilder();
@@ -169,7 +168,6 @@ namespace GFGEditor
                 //生成解析后的数据变量
                 _declarationBuilder.AppendFormat("\t\t//{0}", annotation);
                 _declarationBuilder.AppendLine();
-                string tempName = PREFIX + name;
                 if (type.Contains("[]"))
                 {
                     //_declarationBuilder.AppendFormat("\t\tpublic {0} {1};", "string", tempName);

GameClient/Assets/Editor/Excel/ExcelChecker.cs

@@ -165,46 +165,46 @@ namespace GFGEditor
 
         private static void CheckSuitSyntheticMenuCfg()
         {
-            SuitSyntheticMenuCfgArray cfgArray = SuitSyntheticMenuCfgArray.Instance;
-            SuitSyntheticMenuCfg[] dataArray = cfgArray.dataArray;
-            foreach(SuitSyntheticMenuCfg cfg in dataArray)
-            {
-                if (cfg.suitIds.Length > 0)
-                {
-                    string[] values = cfg.suitIds.Split(';');
-                    foreach (string value in values)
-                    {
-                        int valueInt = int.Parse(value);
-                        CheckSuitExist(valueInt, "合成SuitSyntheticMenuCfg.suitIds");
-                        CheckSuitSyntheticCfgExist(valueInt, "合成SuitSyntheticMenuCfg.suitIds");
-                        CheckSuitClothingSyntheticCfgExist(valueInt, "合成SuitSyntheticMenuCfg.suitIds");
-                    }
-                }
-            }
+            //SuitSyntheticMenuCfgArray cfgArray = SuitSyntheticMenuCfgArray.Instance;
+            //SuitSyntheticMenuCfg[] dataArray = cfgArray.dataArray;
+            //foreach(SuitSyntheticMenuCfg cfg in dataArray)
+            //{
+            //    if (cfg.suitIds.Length > 0)
+            //    {
+            //        string[] values = cfg.suitIds.Split(';');
+            //        foreach (string value in values)
+            //        {
+            //            int valueInt = int.Parse(value);
+            //            CheckSuitExist(valueInt, "合成SuitSyntheticMenuCfg.suitIds");
+            //            CheckSuitSyntheticCfgExist(valueInt, "合成SuitSyntheticMenuCfg.suitIds");
+            //            CheckSuitClothingSyntheticCfgExist(valueInt, "合成SuitSyntheticMenuCfg.suitIds");
+            //        }
+            //    }
+            //}
         }
 
         private static void CheckSuitSyntheticCfg()
         {
-            SuitSyntheticCfgArray cfgArray = SuitSyntheticCfgArray.Instance;
-            SuitSyntheticCfg[] dataArray = cfgArray.dataArray;
-            foreach(SuitSyntheticCfg cfg in dataArray)
-            {
-                CheckStoryLevelCfgExist(cfg.storyLevelId, "合成SuitSyntheticCfg.storyLevelId");
-                CheckSuitExist(cfg.preSuitId, "合成SuitSyntheticCfg.preSuitId");
-                CheckItemsExist(cfg.boxBonusArr, "合成SuitSyntheticCfg.boxBonus");
-            }
+            //SuitSyntheticCfgArray cfgArray = SuitSyntheticCfgArray.Instance;
+            //SuitSyntheticCfg[] dataArray = cfgArray.dataArray;
+            //foreach(SuitSyntheticCfg cfg in dataArray)
+            //{
+            //    CheckStoryLevelCfgExist(cfg.storyLevelId, "合成SuitSyntheticCfg.storyLevelId");
+            //    CheckSuitExist(cfg.preSuitId, "合成SuitSyntheticCfg.preSuitId");
+            //    CheckItemsExist(cfg.boxBonusArr, "合成SuitSyntheticCfg.boxBonus");
+            //}
         }
 
 
         private static void CheckClothingSyntheticCfg()
         {
-            ClothingSyntheticCfgArray cfgArray = ClothingSyntheticCfgArray.Instance;
-            ClothingSyntheticCfg[] dataArray = cfgArray.dataArray;
-            foreach(ClothingSyntheticCfg cfg in dataArray)
-            {
-                CheckItemIdExist(cfg.costID, "合成ClothingSyntheticCfg.costID");
-                CheckItemsExist(cfg.materiarsArr, "合成ClothingSyntheticCfg.materiars");
-            }
+            //ClothingSyntheticCfgArray cfgArray = ClothingSyntheticCfgArray.Instance;
+            //ClothingSyntheticCfg[] dataArray = cfgArray.dataArray;
+            //foreach(ClothingSyntheticCfg cfg in dataArray)
+            //{
+            //    CheckItemIdExist(cfg.costID, "合成ClothingSyntheticCfg.costID");
+            //    CheckItemsExist(cfg.materiarsArr, "合成ClothingSyntheticCfg.materiars");
+            //}
         }
 
         private static void CheckItemCfg()
@@ -324,15 +324,15 @@ namespace GFGEditor
 
         private static void CheckSuitSyntheticCfgExist(int id, string keyName)
         {
-            if(id > 0)
-            {
-                SuitSyntheticCfgArray cfgArray = SuitSyntheticCfgArray.Instance;
-                SuitSyntheticCfg cfg = cfgArray.GetCfg(id);
-                if (cfg == null)
-                {
-                    Debug.LogFormat("{0}配置的套装{1}没有对应的合成解锁配置", new object[] { keyName, id });
-                }
-            }
+            //if(id > 0)
+            //{
+            //    SuitSyntheticCfgArray cfgArray = SuitSyntheticCfgArray.Instance;
+            //    SuitSyntheticCfg cfg = cfgArray.GetCfg(id);
+            //    if (cfg == null)
+            //    {
+            //        Debug.LogFormat("{0}配置的套装{1}没有对应的合成解锁配置", new object[] { keyName, id });
+            //    }
+            //}
         }
 
         private static void CheckSuitClothingSyntheticCfgExist(int id, string keyName)
@@ -352,15 +352,15 @@ namespace GFGEditor
 
         private static void CheckClothingSyntheticCfgExist(int id, string keyName)
         {
-            if(id > 0)
-            {
-                ClothingSyntheticCfgArray cfgArray = ClothingSyntheticCfgArray.Instance;
-                ClothingSyntheticCfg cfg = cfgArray.GetCfg(id);
-                if (cfg == null)
-                {
-                    Debug.LogErrorFormat("{0}配置的服装{1}没有对应的合成消耗配置", new object[] { keyName, id });
-                }
-            }
+            //if(id > 0)
+            //{
+            //    ClothingSyntheticCfgArray cfgArray = ClothingSyntheticCfgArray.Instance;
+            //    ClothingSyntheticCfg cfg = cfgArray.GetCfg(id);
+            //    if (cfg == null)
+            //    {
+            //        Debug.LogErrorFormat("{0}配置的服装{1}没有对应的合成消耗配置", new object[] { keyName, id });
+            //    }
+            //}
         }
 
         private static void CheckStoryLevelCfgExist(int id, string keyName)

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

@@ -6,7 +6,9 @@ using System;
 namespace GFGEditor
 {
     /// <summary>
-    /// 物品获取途径扫描器:扫描获取途径，并填入物品表的获取途径字段
+    /// 物品扫描器:
+    /// 1.扫描获取途径，并填入物品表的获取途径字段
+    /// 2.扫描套装部件个数
     /// </summary>
     public class ItemApproachScanner
     {
@@ -16,35 +18,59 @@ namespace GFGEditor
 
         public static void startScan()
         {
-            ItemCfgArray itemManager = ItemCfgArray.Instance;
-            if (itemManager != null)
+            ItemCfg[] dataArray = ItemCfgArray.Instance.dataArray;
+            GetApproachCall[] actions = new GetApproachCall[] { GetClothingShopApproach, GetZhaiXingApproach, GetStoryLevelApproach, GetClothingSyntheticApproach, GetSuitGuideApproach, GetSuitSyntheticApproach };
+            Dictionary<SuitCfg, List<int>> suitDic = new Dictionary<SuitCfg, List<int>>();
+            foreach (ItemCfg cfg in dataArray)
+            {
+                HandleSuitTable(cfg, suitDic);
+                HandleItemApproch(cfg, actions);
+            }
+            SQLiteHelper.Instance.OpenConnection();
+            try
             {
-                ItemCfg[] dataArray = itemManager.dataArray;
-                GetApproachCall[] actions = new GetApproachCall[] { GetClothingShopApproach, GetZhaiXingApproach, GetStoryLevelApproach, GetClothingSyntheticApproach, GetSuitGuideApproach, GetSuitSyntheticApproach };
                 foreach (ItemCfg cfg in dataArray)
                 {
-                    //HandleItemType(cfg);
-                    HandleItemApproch(cfg, actions);
-                }
-                SQLiteHelper.Instance.OpenConnection();
-                try
-                {
-                    foreach (ItemCfg cfg in dataArray)
-                    {
-                        var names = new string[] { nameof(cfg.subType), nameof(cfg.itemType), nameof(cfg.approach) };
-                        var values = new string[] { "" + cfg.subType, "" + cfg.itemType, "" + cfg.approach };
-                        SQLiteHelper.Instance.UpdateValues(nameof(ItemCfgArray), names, values, nameof(cfg.id), cfg.id.ToString());
-                    }
-                }
-                catch (Exception e)
-                {
-                    ET.Log.Error(e.ToString());
+                    var names = new string[] { nameof(cfg.subType), nameof(cfg.itemType), nameof(cfg.approach) };
+                    var values = new string[] { "" + cfg.subType, "" + cfg.itemType, "" + cfg.approach };
+                    SQLiteHelper.Instance.UpdateValues(nameof(ItemCfgArray), names, values, nameof(cfg.id), cfg.id.ToString());
                 }
-                finally
+                foreach (var a in suitDic)
                 {
-                    SQLiteHelper.Instance.CloseConnection();
+
+                    var names = new string[] { nameof(a.Key.partsArr).Replace("Arr", "") };
+                    var values = new string[] { string.Join(";", a.Value) };
+                    SQLiteHelper.Instance.UpdateValues(nameof(SuitCfgArray), names, values, nameof(a.Key.id), a.Key.id.ToString());
                 }
             }
+            catch (Exception e)
+            {
+                ET.Log.Error(e.ToString());
+            }
+            finally
+            {
+                SQLiteHelper.Instance.CloseConnection();
+            }
+        }
+
+        private static void HandleSuitTable(ItemCfg itemCfg, Dictionary<SuitCfg, List<int>> suitDic)
+        {
+            if (itemCfg.suitId <= 0)
+            {
+                return;
+            }
+            var suitCfg = SuitCfgArray.Instance.GetCfg(itemCfg.suitId);
+            if(suitCfg == null)
+            {
+                return;
+            }
+            suitDic.TryGetValue(suitCfg, out var partsList);
+            if(partsList == null)
+            {
+                partsList = new List<int>();
+                suitDic[suitCfg] = partsList;
+            }
+            partsList.Add(itemCfg.id);
         }
 
         private static void HandleItemApproch(ItemCfg cfg, GetApproachCall[] actions)
@@ -160,17 +186,25 @@ namespace GFGEditor
         /// <returns></returns>
         private static string GetClothingSyntheticApproach(int itemId)
         {
-            SuitSyntheticMenuCfgArray manager = SuitSyntheticMenuCfgArray.Instance;
-            SuitSyntheticMenuCfg[] dataArray = manager.dataArray;
-            foreach (SuitSyntheticMenuCfg cfg in dataArray)
+            var itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+            if(itemCfg == null)
             {
-                int suitId = CheckItemInSuit(itemId, cfg.suitIds);
-                if (suitId > 0)
-                {
-                    return "FU_ZHUANG_HE_CHENG=" + suitId;
-                }
+                return null;
             }
-            return null;
+            if(itemCfg.suitId <= 0)
+            {
+                return null;
+            }
+            var suitCfg = SuitCfgArray.Instance.GetCfg(itemCfg.suitId);
+            if(suitCfg == null)
+            {
+                return null;
+            }
+            if(suitCfg.syntheticType <= 0)
+            {
+                return null;
+            }
+            return "FU_ZHUANG_HE_CHENG=" + suitCfg.id;
         }
 
         private static string GetSuitGuideApproach(int itemId)
@@ -179,7 +213,7 @@ namespace GFGEditor
             SuitCfg[] dataArray = manager.dataArray;
             foreach (SuitCfg cfg in dataArray)
             {
-                bool result = CheckItemInBonus(itemId, cfg.boxBonusArr);
+                bool result = CheckItemInBonus(itemId, cfg.guideBoxBonusArr);
                 if (result)
                 {
                     return "TAO_ZHUANG_TU_JIAN";
@@ -190,15 +224,29 @@ namespace GFGEditor
 
         private static string GetSuitSyntheticApproach(int itemId)
         {
-            SuitSyntheticCfgArray manager = SuitSyntheticCfgArray.Instance;
-            SuitSyntheticCfg[] dataArray = manager.dataArray;
-            foreach (SuitSyntheticCfg cfg in dataArray)
+
+            var itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+            if (itemCfg == null)
             {
-                bool result = CheckItemInBonus(itemId, cfg.boxBonusArr);
-                if (result)
-                {
-                    return "TAO_ZHUANG_HE_CHENG";
-                }
+                return null;
+            }
+            if (itemCfg.suitId <= 0)
+            {
+                return null;
+            }
+            var suitCfg = SuitCfgArray.Instance.GetCfg(itemCfg.suitId);
+            if (suitCfg == null)
+            {
+                return null;
+            }
+            if (suitCfg.syntheticType <= 0)
+            {
+                return null;
+            }
+            bool result = CheckItemInBonus(itemId, suitCfg.syntheticBoxBonusArr);
+            if (result)
+            {
+                return "TAO_ZHUANG_HE_CHENG";
             }
             return null;
         }
@@ -280,37 +328,5 @@ namespace GFGEditor
             return false;
         }
 
-        private static int CheckItemInSuit(int ItemId, string suitIds)
-        {
-            if (suitIds.Length > 0)
-            {
-                string[] aArray = suitIds.Split(';');
-                foreach (string value in aArray)
-                {
-                    int valueInt = int.Parse(value);
-                    bool result = CheckItemInSuit(ItemId, valueInt);
-                    if (result)
-                    {
-                        return valueInt;
-                    }
-                }
-            }
-            return 0;
-        }
-
-        private static bool CheckItemInSuit(int ItemId, int suitId)
-        {
-            SuitCfgArray manager = SuitCfgArray.Instance;
-            SuitCfg suitCfg = manager.GetCfg(suitId);
-            int[] aArray = suitCfg.partsArr;
-            foreach (int valueInt in aArray)
-            {
-                if (ItemId == valueInt)
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
     }
 }

GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit 506b34d9c3b9400de0fabb78d0dda1d2ecc46802
+Subproject commit 900532f5c5348dcfc4d97bf0e532b08415720693

GameClient/Assets/Game/HotUpdate/ServerProxy/SuitSProxy.cs

@@ -14,7 +14,7 @@ namespace GFGGame
                 {
                     DressUpMenuSuitDataManager.SetSuitGuideBoxBonusCompleted(m2C_GetSuitGuideBoxBonus.SuitId);
                     SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
-                    BonusController.TryShowBonusList(suitCfg.boxBonusArr);
+                    BonusController.TryShowBonusList(suitCfg.guideBoxBonusArr);
                 }
             }
         }
@@ -27,8 +27,8 @@ namespace GFGGame
                 if (m2C_GetSuitSyntheticBoxBonus.Error == ErrorCode.ERR_Success)
                 {
                     DressUpMenuSuitDataManager.SetSuitSyntheticBoxBonusCompleted(m2C_GetSuitSyntheticBoxBonus.SuitId);
-                    SuitSyntheticCfg suitCfg = SuitSyntheticCfgArray.Instance.GetCfg(suitId);
-                    BonusController.TryShowBonusList(suitCfg.boxBonusArr);
+                    SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
+                    BonusController.TryShowBonusList(suitCfg.syntheticBoxBonusArr);
                 }
             }
         }

GameClient/Assets/Game/HotUpdate/Utils/SuitUtil.cs

@@ -286,7 +286,7 @@ namespace GFGGame
         public static void ShowSuitGuideBonus(int suitId)
         {
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
-            List<ItemData> itemDatas = ItemUtil.CreateItemDataList(suitCfg.boxBonusArr);
+            List<ItemData> itemDatas = ItemUtil.CreateItemDataList(suitCfg.guideBoxBonusArr);
             int GetStatus()
             {
                 return DressUpMenuSuitDataManager.GetSuitGuideBonusStatus(suitId);
@@ -300,8 +300,8 @@ namespace GFGGame
 
         public static void ShowSuitSyntheticBonus(int suitId)
         {
-            SuitSyntheticCfg suitCfg = SuitSyntheticCfgArray.Instance.GetCfg(suitId);
-            List<ItemData> itemDatas = ItemUtil.CreateItemDataList(suitCfg.boxBonusArr);
+            SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
+            List<ItemData> itemDatas = ItemUtil.CreateItemDataList(suitCfg.syntheticBoxBonusArr);
             int GetStatus()
             {
                 return DressUpMenuSuitDataManager.GetSuitSyntheticBonusStatus(suitId);

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -147,8 +147,8 @@ namespace GFGGame
                 return;
             }
             //合成
-            ClothingSyntheticCfg clothingSyntheticCfg = ClothingSyntheticCfgArray.Instance.GetCfg(_selectedItemId);
-            _materiarsOfSelectedItem = ItemUtil.CreateItemDataList(clothingSyntheticCfg.materiarsArr);
+            ItemCfg clothingSyntheticCfg = ItemCfgArray.Instance.GetCfg(_selectedItemId);
+            _materiarsOfSelectedItem = ItemUtil.CreateItemDataList(clothingSyntheticCfg.syntheticMateriarsArr);
             int count = _materiarsOfSelectedItem.Count;
             for (int i = 0; i < count; i++)
             {
@@ -302,10 +302,10 @@ namespace GFGGame
             UI_ClothingListItem selectedItem = UI_ClothingListItem.Proxy(_selectedListItem);
             selectedItem.m_imgOwned.visible = ItemDataManager.GetItemNum(_selectedItemId) > 0;
             //合成显示
-            ClothingSyntheticCfg clothingSyntheticCfg = ClothingSyntheticCfgArray.Instance.GetCfg(_selectedItemId);
-            string costName = ItemUtil.GetItemName(clothingSyntheticCfg.costID);
-            _ui.m_txtCost.SetVar("v1", "" + clothingSyntheticCfg.costNum).SetVar("v2", costName).FlushVars();
-            _materiarsOfSelectedItem = ItemUtil.CreateItemDataList(clothingSyntheticCfg.materiarsArr);
+            ItemCfg clothingSyntheticCfg = ItemCfgArray.Instance.GetCfg(_selectedItemId);
+            string costName = ItemUtil.GetItemName(clothingSyntheticCfg.syntheticCostID);
+            _ui.m_txtCost.SetVar("v1", "" + clothingSyntheticCfg.syntheticCostNum).SetVar("v2", costName).FlushVars();
+            _materiarsOfSelectedItem = ItemUtil.CreateItemDataList(clothingSyntheticCfg.syntheticMateriarsArr);
             int count = _ui.m_listMaterias.numChildren;
             for (int i = 0; i < count; i++)
             {

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/SuitSyntheticView.cs

@@ -68,21 +68,10 @@ namespace GFGGame
                 _suitListIds.Clear();
             }
             int index = _ui.m_listMenu.selectedIndex;
-            SuitSyntheticMenuCfg menuCfg = SuitSyntheticMenuCfgArray.Instance.GetCfg(index);
-            if (menuCfg.suitIds.Length > 0)
+            var suitCfgs = SuitCfgArray.Instance.GetCfgs(index + 1);
+            foreach (var suitCfg in suitCfgs)
             {
-                string[] values = menuCfg.suitIds.Split(';');
-                foreach (string value in values)
-                {
-                    if (value.Length > 0)
-                    {
-                        int suitId = int.Parse(value);
-                        if (suitId > 0)
-                        {
-                            _suitListIds.Add(suitId);
-                        }
-                    }
-                }
+                _suitListIds.Add(suitCfg.id);
             }
             _ui.m_listSuit.numItems = _suitListIds.Count;
         }
@@ -102,28 +91,28 @@ namespace GFGGame
             RarityIconController.UpdateRarityIcon(listItem.m_rarity, suitId, false, true);
             bool haveSuit = DressUpMenuSuitDataManager.CheckHaveSuit(suitId);
             bool isLock = false;
-            SuitSyntheticCfg suitSyntheticCfg = SuitSyntheticCfgArray.Instance.GetCfg(suitId);
-            if (suitSyntheticCfg.storyLevelId > 0)
+            SuitCfg suitSyntheticCfg = SuitCfgArray.Instance.GetCfg(suitId);
+            if (suitSyntheticCfg.syntheticStoryLevelId > 0)
             {
                 //int chapter = 0;
                 //int level = 0;
                 //CalculateHelper.GetStoryChapterLevel(suitSyntheticCfg.storyLevelId, out var chapter, out var level);
-                bool isLevelPass = InstanceZonesDataManager.CheckLevelPass(suitSyntheticCfg.storyLevelId);
+                bool isLevelPass = InstanceZonesDataManager.CheckLevelPass(suitSyntheticCfg.syntheticStoryLevelId);
                 if (!isLevelPass)
                 {
                     isLock = true;
-                    var levelCfg = StoryLevelCfgArray.Instance.GetCfg(suitSyntheticCfg.storyLevelId);
+                    var levelCfg = StoryLevelCfgArray.Instance.GetCfg(suitSyntheticCfg.syntheticStoryLevelId);
                     var chapterCfg = StoryChapterCfgArray.Instance.GetCfg(levelCfg.chapterId);
                     listItem.m_txtLockDesc.text = string.Format("通关第{0}章第{1}关", chapterCfg.order, levelCfg.order);
                 }
             }
-            if (suitSyntheticCfg.preSuitId > 0)
+            if (suitSyntheticCfg.syntheticPreSuitId > 0)
             {
-                bool hasPreSuit = DressUpMenuSuitDataManager.CheckHaveSuit(suitSyntheticCfg.preSuitId);
+                bool hasPreSuit = DressUpMenuSuitDataManager.CheckHaveSuit(suitSyntheticCfg.syntheticPreSuitId);
                 if (!hasPreSuit)
                 {
                     isLock = true;
-                    string preSuitName = SuitUtil.GetSuitName(suitSyntheticCfg.preSuitId);
+                    string preSuitName = SuitUtil.GetSuitName(suitSyntheticCfg.syntheticPreSuitId);
                     listItem.m_txtLockDesc.text = string.Format("集齐{0}套装", preSuitName);
                 }
             }