卡牌

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

@@ -138,7 +138,7 @@ namespace GFGGame
         public static bool isFullStar(int cardId, int star, bool showTips = true)
         {
             CardData cardData = _cardDicByType[0][cardId];
-            if (CardStarCfgArray.Instance.GetCfgBycardTypeAndcardRarityAndstarLvl(cardData.itemCfg.subType, cardData.itemCfg.rarity, star + 1) == null)
+            if (CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(cardData.id, star + 1) == null)
             {
                 if (showTips == true)
                 {

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

@@ -478,7 +478,7 @@ namespace GFGGame
 
         private void UpdateUpStarView()
         {
-            CardStarCfg cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardTypeAndcardRarityAndstarLvl(_cardData.itemCfg.subType, _cardData.itemCfg.rarity, _cardData.star);
+            CardStarCfg cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(_cardData.id, _cardData.star);
             _comFosterBottom.m_comStar.m_c1.selectedIndex = _cardData.star;
             _comFosterBottom.m_comStar.m_c2.selectedIndex = 5;
             if (CardDataManager.isFullStar(_cardData.id, _cardData.star, false))
@@ -583,7 +583,7 @@ namespace GFGGame
         private void OnClickBtnUpStar()
         {
 
-            CardStarCfg cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardTypeAndcardRarityAndstarLvl(_cardData.itemCfg.subType, _cardData.itemCfg.rarity, _cardData.star);
+            CardStarCfg cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(_cardData.id, _cardData.star);
 
             if (_cardData.lv < cardStarCfg.needLv)
             {
@@ -616,7 +616,7 @@ namespace GFGGame
         }
         private async void UpStar()
         {
-            CardStarCfg cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardTypeAndcardRarityAndstarLvl(_cardData.itemCfg.subType, _cardData.itemCfg.rarity, _cardData.star);
+            CardStarCfg cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(_cardData.id, _cardData.star);
 
             bool result = await CardSProxy.UpgradeCardStar(_cardData.id);
             if (result)
@@ -782,7 +782,7 @@ namespace GFGGame
             }
             if (!CardDataManager.isFullStar(_cardData.id, _cardData.star, false))
             {
-                CardStarCfg cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardTypeAndcardRarityAndstarLvl(_cardData.itemCfg.subType, _cardData.itemCfg.rarity, _cardData.star);
+                CardStarCfg cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(_cardData.id, _cardData.star);
                 _comFosterBottom.m_listStarConsume.numItems = cardStarCfg.materiarsArr.Length;
 
             }