配置优化

GameClient/Assets/Editor/Excel/Template/FunctionGroup.txt

@@ -6,7 +6,7 @@
             return ConfigUtil.GetCfgs<{CfgName}>("{CfgArrayName}", colNames, colValues, _cfgsGroupDic, HandleCfgInGroup);
         }
         
-        private void HandleCfgInGroup(CardLvlCfg cfg)
+        private void HandleCfgInGroup({CfgName} cfg)
         {
             _cfgsDic[cfg.combinedKey] = cfg;
         }

GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit 8e272bd5cd6a2b25bc0f3a4a1371dcee9774589b
+Subproject commit 5b94ad352d062cacf21b68b6857695c9ab270230

GameClient/Assets/Game/HotUpdate/ExcelConfig/Manager/CardCfgManager.cs

@@ -24,8 +24,7 @@ namespace GFGGame
         }
         public static CardStarCfg GetCardStarCfgByTypeAndRarityAndStar(int type, int rarity, int star)
         {
-            string id = type + "_" + rarity + "_" + star;
-            return CardStarCfgArray.Instance.GetCfg(id);
+            return CardStarCfgArray.Instance.GetCfg(type, rarity, star);
         }
 
         /// <summary>
@@ -76,8 +75,7 @@ namespace GFGGame
                 int _type = 1;
                 int _rarity = 1;
                 int _star = 1;
-                string _key = "1_1_1";
-                CardStarCfg starCfg = CardStarCfgArray.Instance.GetCfg(_key);
+                CardStarCfg starCfg = CardStarCfgArray.Instance.GetCfg(1, 1, 1);
 
                 while (starCfg != null)
                 {
@@ -100,21 +98,18 @@ namespace GFGGame
                     }
 
                     _star++;
-                    _key = string.Format("{0}_{1}_{2}", _type,_rarity,_star);
-                    starCfg = CardStarCfgArray.Instance.GetCfg(_key);
+                    starCfg = CardStarCfgArray.Instance.GetCfg(_type, _rarity, _star);
                     if (starCfg != null) continue;
                    
                     _star = 1;
                     _rarity++;
-                    _key = string.Format("{0}_{1}_{2}", _type, _rarity, _star);
-                    starCfg = CardStarCfgArray.Instance.GetCfg(_key);
+                    starCfg = CardStarCfgArray.Instance.GetCfg(_type, _rarity, _star);
 
                     if (starCfg != null) continue;
                     _star = 1;
                     _rarity=1;
                     _type++;
-                    _key = string.Format("{0}_{1}_{2}", _type, _rarity, _star);
-                    starCfg = CardStarCfgArray.Instance.GetCfg(_key);
+                    starCfg = CardStarCfgArray.Instance.GetCfg(_type, _rarity, _star);
                     if (starCfg == null) break;
                 }
             }
@@ -143,7 +138,7 @@ namespace GFGGame
 
                 for (int i=0;i< cardStoryCfgs.Length; i++)
                 {
-                    int _cardId =int.Parse (cardStoryCfgs[i].id.Split('_')[0]);
+                    int _cardId = cardStoryCfgs[i].cardId;
                     if (_cardStoryCfgDic.ContainsKey(_cardId)==false)
                     {
                         _cardStoryCfgDic.Add(_cardId, new List<CardStoryCfg>());

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -455,9 +455,9 @@ namespace GFGGame
                 _comFosterBottom.m_listStarConsume.data = cardStarCfg;
                 _comFosterBottom.m_listStarConsume.numItems = cardStarCfg.materiarsArr.Length;
 
-                _comFosterBottom.m_comTips.visible = _viewData.lv < cardStarCfg.lv ? true : false;
+                _comFosterBottom.m_comTips.visible = _viewData.lv < cardStarCfg.needLv ? true : false;
                 UI_ComTips comTips = UI_ComTips.Proxy(_comFosterBottom.m_comTips);
-                comTips.m_txtTips.text = _comFosterBottom.m_comTips.visible == true ? string.Format("需等级达到{0}级", cardStarCfg.lv) : "";
+                comTips.m_txtTips.text = _comFosterBottom.m_comTips.visible == true ? string.Format("需等级达到{0}级", cardStarCfg.needLv) : "";
 
 
                 _comFosterBottom.m_btnUpStar.grayed = int.Parse(_comFosterBottom.m_btnUpStar.data.ToString()) == 1 ? true : false;
@@ -522,7 +522,7 @@ namespace GFGGame
 
             CardStarCfg cardStarCfg = CardCfgManager.GetCardStarCfgByTypeAndRarityAndStar(_viewData.itemCfg.subType, _viewData.itemCfg.rarity, _viewData.star);
 
-            if (_viewData.lv < cardStarCfg.lv)
+            if (_viewData.lv < cardStarCfg.needLv)
             {
                 PromptController.Instance.ShowFloatTextPrompt("等级不足");
                 return;

GameClient/Assets/Game/HotUpdate/Views/Card/CardStoryView.cs

@@ -45,7 +45,7 @@ namespace GFGGame
                 if (listItem.target.data == null)
                 {
                     listItem.m_btnGo.onClick.Add(() => OnClickBtnGo(cardStoryCfg));
-                    listItem.target.data = cardStoryCfg.id;
+                    listItem.target.data = cardStoryCfg.cardId;
                 }
             }
             else