Эх сурвалжийг харах

服装养护红点没有加上星级判断问题

huangxiaoyue 1 жил өмнө
parent
commit
b9e141d7c2

+ 3 - 2
GameClient/Assets/Game/HotUpdate/Data/CardDataManager.cs

@@ -70,7 +70,6 @@ namespace GFGGame
             }
             }
             _cardDicByType[0][cardData.id] = cardData;
             _cardDicByType[0][cardData.id] = cardData;
             _cardDicByType[cardData.itemCfg.mainScore][cardData.id] = cardData;
             _cardDicByType[cardData.itemCfg.mainScore][cardData.id] = cardData;
-
         }
         }
 
 
         private static List<string> GetCardResources(ItemCfg itemCfg)
         private static List<string> GetCardResources(ItemCfg itemCfg)
@@ -137,7 +136,9 @@ namespace GFGGame
         /// <returns></returns>
         /// <returns></returns>
         public static CardData GetCardDataById(int cardId)
         public static CardData GetCardDataById(int cardId)
         {
         {
-            if (!_cardDicByType.ContainsKey(0) || !_cardDicByType[0].ContainsKey(cardId)) return null;
+            if (_cardDicByType.Count == 0 || !_cardDicByType.ContainsKey(0) || !_cardDicByType[0].ContainsKey(cardId)) { 
+                return null;
+            }
             return _cardDicByType[0][cardId];
             return _cardDicByType[0][cardId];
         }
         }
         /// <summary>
         /// <summary>

+ 18 - 1
GameClient/Assets/Game/HotUpdate/Data/RedDotDataManager.cs

@@ -415,16 +415,33 @@ namespace GFGGame
             {
             {
                 return false;
                 return false;
             }
             }
+
             if (!DressUpMenuSuitDataManager.CheckHaveSuit(suitId)) return false;
             if (!DressUpMenuSuitDataManager.CheckHaveSuit(suitId)) return false;
 
 
             SuitFosterCfg fosterCfg = fosterCfgs[index];
             SuitFosterCfg fosterCfg = fosterCfgs[index];
+
             if (fosterCfg.materialsArr.Length == 0) return false;
             if (fosterCfg.materialsArr.Length == 0) return false;
 
 
+            CardData cardData = new CardData();
+            List <ItemCfg> itemCfgs = ItemCfgArray.Instance.GetCfgsBysuitId(suitId);
+            for (int i = 0; i < itemCfgs.Count; i++)
+            {
+                if (itemCfgs[i].itemType == ConstItemType.CARD)
+                {
+                    cardData = CardDataManager.GetCardDataById(itemCfgs[i].id);
+                    break;
+                }
+            }
+           
+            if (cardData != null && fosterCfg.cardStar > 0 && cardData.star < fosterCfg.cardStar) {
+                return false;
+            } 
+
             long itemHas = ItemDataManager.GetItemNum(fosterCfg.materialsArr[0][0]);
             long itemHas = ItemDataManager.GetItemNum(fosterCfg.materialsArr[0][0]);
             int itemNeed = fosterCfg.materialsArr[0][1];
             int itemNeed = fosterCfg.materialsArr[0][1];
-
             long costHas = ItemDataManager.GetItemNum(fosterCfg.costId);
             long costHas = ItemDataManager.GetItemNum(fosterCfg.costId);
             int costNeed = fosterCfg.costNum;
             int costNeed = fosterCfg.costNum;
+
             return itemHas >= itemNeed && costHas >= costNeed;
             return itemHas >= itemNeed && costHas >= costNeed;
         }
         }
         /// <summary>
         /// <summary>

+ 1 - 0
GameClient/Assets/Game/HotUpdate/ServerProxy/CardSProxy.cs

@@ -32,6 +32,7 @@ namespace GFGGame
                         SkillDataManager.Instance.InitCardData(response.CardInfos[i].CardId, response.CardInfos[i].KsSkill, response.CardInfos[i].VsSkill);
                         SkillDataManager.Instance.InitCardData(response.CardInfos[i].CardId, response.CardInfos[i].KsSkill, response.CardInfos[i].VsSkill);
                     }
                     }
                     EventAgent.DispatchEvent(ConstMessage.CARD_INFO);
                     EventAgent.DispatchEvent(ConstMessage.CARD_INFO);
+                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                 }
                 }
             }
             }
         }
         }