卡牌升级

GameClient/Assets/Editor/Excel/ExcelScanner.cs

@@ -16,8 +16,8 @@ namespace GFGEditor
             ItemApproachScanner.startScan();
             //扫描副本
             InstanceZonesScanner.StartScan();
-            //写入卡牌最大等级
-            CardScanner.StartScan();
+            // //写入卡牌最大等级
+            // CardScanner.StartScan();
 
             GiftBagScanner.StartScan();
             FieldScanner.StartScan();

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

@@ -15,45 +15,45 @@ namespace GFGEditor
         public static void StartScan()
         {
             levelCountDIc.Clear();
-            var dataArray = CardLvlCfgArray.Instance.dataArray;
-            SQLiteHelper.Instance.OpenConnection();
-            try
-            {
-                foreach (var cfg in dataArray)
-                {
-                    int count = levelCountDIc.ContainsKey(cfg.cardRarity) ? levelCountDIc[cfg.cardRarity] : 0;
-                    levelCountDIc[cfg.cardRarity] = count + 1;
-                }
-            }
-            catch (Exception e)
-            {
-                ET.Log.Error(e.ToString());
-            }
-            finally
-            {
-                SQLiteHelper.Instance.CloseConnection();
-            }
-            SQLiteHelper.Instance.OpenConnection();
-            try
-            {
-                ICollection<int> keys = levelCountDIc.Keys;
-                foreach (int key in keys)
-                {
-                    int count = levelCountDIc[key];
+            // var dataArray = CardLvlCfgArray.Instance.dataArray;
+            // SQLiteHelper.Instance.OpenConnection();
+            // try
+            // {
+            //     foreach (var cfg in dataArray)
+            //     {
+            //         int count = levelCountDIc.ContainsKey(cfg.cardRarity) ? levelCountDIc[cfg.cardRarity] : 0;
+            //         levelCountDIc[cfg.cardRarity] = count + 1;
+            //     }
+            // }
+            // catch (Exception e)
+            // {
+            //     ET.Log.Error(e.ToString());
+            // }
+            // finally
+            // {
+            //     SQLiteHelper.Instance.CloseConnection();
+            // }
+            // SQLiteHelper.Instance.OpenConnection();
+            // try
+            // {
+            //     ICollection<int> keys = levelCountDIc.Keys;
+            //     foreach (int key in keys)
+            //     {
+            //         int count = levelCountDIc[key];
 
-                    var names = new string[] { "maxCardLvl" };
-                    var values = new string[] { "" + count };
-                    SQLiteHelper.Instance.UpdateValues(nameof(CardRarityCfgArray), names, values, "cardRarity", key.ToString());
-                }
-            }
-            catch (Exception e)
-            {
-                ET.Log.Error(e.ToString());
-            }
-            finally
-            {
-                SQLiteHelper.Instance.CloseConnection();
-            }
+            //         var names = new string[] { "maxCardLvl" };
+            //         var values = new string[] { "" + count };
+            //         SQLiteHelper.Instance.UpdateValues(nameof(CardRarityCfgArray), names, values, "cardRarity", key.ToString());
+            //     }
+            // }
+            // catch (Exception e)
+            // {
+            //     ET.Log.Error(e.ToString());
+            // }
+            // finally
+            // {
+            //     SQLiteHelper.Instance.CloseConnection();
+            // }
 
         }
 

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

@@ -135,7 +135,8 @@ namespace GFGGame
         public static bool isFullLv(int cardId, int lv, bool showTips = true)
         {
             CardData cardData = _cardDicByType[0][cardId];
-            if (lv >= CardRarityCfgArray.Instance.GetCfg(cardData.itemCfg.rarity).maxCardLvl && cardData.exp >= CardLvlCfgArray.Instance.GetCfgBycardLvlAndcardRarity(lv, cardData.itemCfg.rarity).needExp)
+            int maxLv = CardLvlCfgArray.Instance.GetCfgsBycardId(cardId).Count;
+            if (lv >= maxLv && cardData.exp >= CardLvlCfgArray.Instance.GetCfgBycardIdAndcardLvl(cardId, maxLv).needExp)
             {
                 if (showTips == true)
                 {
@@ -165,12 +166,12 @@ namespace GFGGame
             }
         }
 
-        public static void GetPreViewLvAndExp(int rarity, int curLv, int curExp, int hasExp, out int showLv, out int showExp)
+        public static void GetPreViewLvAndExp(int cardId, int curLv, int curExp, int hasExp, out int showLv, out int showExp)
         {
             showLv = curLv;
             showExp = curExp + hasExp;
-            int maxLv = CardRarityCfgArray.Instance.GetCfg(rarity).maxCardLvl;
-            CardLvlCfg tCurCfg = CardLvlCfgArray.Instance.GetCfgBycardLvlAndcardRarity(showLv, rarity);
+            int maxLv = CardLvlCfgArray.Instance.GetCfgsBycardId(cardId).Count;
+            CardLvlCfg tCurCfg = CardLvlCfgArray.Instance.GetCfgBycardIdAndcardLvl(cardId, showLv);
             while (showExp >= tCurCfg.needExp && showLv <= maxLv)
             {
 
@@ -183,7 +184,7 @@ namespace GFGGame
                     break;
                 }
                 showLv++;
-                tCurCfg = CardLvlCfgArray.Instance.GetCfgBycardLvlAndcardRarity(showLv, rarity);
+                tCurCfg = CardLvlCfgArray.Instance.GetCfgBycardIdAndcardLvl(cardId, showLv);
                 // if (showExp < tCurCfg.needExp)
                 // {
                 //     showLv = showLv - 1;
@@ -200,7 +201,7 @@ namespace GFGGame
                 CardData cardData = cardList[i];
                 bool isRole = _selectRoleList.Count == 0 || _selectRoleList.IndexOf(cardData.itemCfg.subType) >= 0;
                 bool isRarity = _selectRarityList.Count == 0 || _selectRarityList.IndexOf(cardData.itemCfg.rarity) >= 0;
-                int maxLv = CardRarityCfgArray.Instance.GetCfg(cardList[i].itemCfg.rarity).maxCardLvl;
+                int maxLv = CardLvlCfgArray.Instance.GetCfgsBycardId(cardData.id).Count;
                 bool isFoster = _selectFosterList.Count == 0 ||
                 _selectFosterList.IndexOf(ConstCardState.STATE_FULL_LV) >= 0 && cardList[i].lv == maxLv ||
                 _selectFosterList.IndexOf(ConstCardState.STATE_LV) >= 0 && cardList[i].lv < maxLv ||

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

@@ -213,11 +213,11 @@ namespace GFGGame
 
             _showLv = isPreview == true ? lv : _cardData.lv;
             _showExp = isPreview == true ? exp : _cardData.exp;
-            CardLvlCfg cardLvCfg = CardLvlCfgArray.Instance.GetCfgBycardLvlAndcardRarity(_showLv, _cardData.itemCfg.rarity);
+            CardLvlCfg cardLvCfg = CardLvlCfgArray.Instance.GetCfgBycardIdAndcardLvl(_cardData.id, _showLv);
 
             _comFosterBottom.m_barLv.max = cardLvCfg.needExp;
             _comFosterBottom.m_barLv.value = _showExp;
-            int maxLv = CardRarityCfgArray.Instance.GetCfg(_cardData.itemCfg.rarity).maxCardLvl;
+            int maxLv = CardLvlCfgArray.Instance.GetCfgsBycardId(cardLvCfg.cardId).Count;
             _comFosterBottom.m_txtMaxLv.text = maxLv.ToString();
             _comFosterBottom.m_txtCurLv.text = StringUtil.GetColorText(_showLv.ToString(), _showLv < maxLv ? "#D27869" : "#7D6956");
             _comFosterBottom.m_txtMaxExp.text = cardLvCfg.needExp.ToString();
@@ -242,7 +242,7 @@ namespace GFGGame
         private void RenderListLvConsumeItem(int index, GObject obj)
         {
             UI_ComConsume listItem = UI_ComConsume.Proxy(obj);
-            CardLvlCfg cardLvCfg = CardLvlCfgArray.Instance.GetCfgBycardLvlAndcardRarity(_cardData.lv, _cardData.itemCfg.rarity);
+            CardLvlCfg cardLvCfg = CardLvlCfgArray.Instance.GetCfgBycardIdAndcardLvl(_cardData.id, _cardData.lv);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(upgradeCardItemsArr[index]);
             listItem.m_loaItem.url = ResPathUtil.GetIconPath(itemCfg);
             listItem.m_txtNum.text = ItemDataManager.GetItemNum(itemCfg.id).ToString();
@@ -343,8 +343,8 @@ namespace GFGGame
 
                 return false;
             }
-            int maxLv = CardRarityCfgArray.Instance.GetCfg(_cardData.itemCfg.rarity).maxCardLvl;
-            int needExp = CardLvlCfgArray.Instance.GetCfgBycardLvlAndcardRarity(_showLv, _cardData.itemCfg.rarity).needExp;
+            int maxLv = CardLvlCfgArray.Instance.GetCfgsBycardId(_cardData.id).Count;
+            int needExp = CardLvlCfgArray.Instance.GetCfgBycardIdAndcardLvl(_cardData.id, _showLv).needExp;
             if (_showLv == maxLv && _comFosterBottom.m_barLv.value >= needExp)
             {
                 Timers.inst.Remove(OnTimedEvent);
@@ -402,7 +402,7 @@ namespace GFGGame
 
             int previewLv = 0;
             int previewExp = 0;
-            CardDataManager.GetPreViewLvAndExp(_cardData.itemCfg.rarity, _cardData.lv, _cardData.exp, hasExp, out previewLv, out previewExp);
+            CardDataManager.GetPreViewLvAndExp(_cardData.id, _cardData.lv, _cardData.exp, hasExp, out previewLv, out previewExp);
             this.UpdateUpLvView(true, previewLv, previewExp);
         }
         private void OnClcikBtnAll()