diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/CardManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/CardManager.cs index 27214b68..cff7b534 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/CardManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/CardManager.cs @@ -14,7 +14,8 @@ public class CardManager : Singleton } public string switchCardCondition(string orginalCardId, CardOriginalData cardOriginalData, string newColor, int conditionCount) { - CardOriginalData newCardOriginalData=cardOriginalData; + //CardOriginalData newCardOriginalData=cardOriginalData; + CardOriginalData newCardOriginalData = JsonConvert.DeserializeObject(JsonConvert.SerializeObject(cardOriginalData)); string condition = newCardOriginalData.conditionAndFunctionVal.ElementAt(conditionCount).Key; string pattern = @"(\w+)([><=])(\d+)"; newCardOriginalData.originFunctionVal.Clear(); @@ -38,13 +39,12 @@ public class CardManager : Singleton { //CardOriginalData newCardOriginalData = new CardOriginalData(); CardOriginalData newCardOriginalData = JsonConvert.DeserializeObject(JsonConvert.SerializeObject(cardOriginalData)); - newCardOriginalData = cardOriginalData; for (int i = 0; i < newCardOriginalData.nodesColor.Length; i++) { newCardOriginalData.nodesColor[i] = newColor; } string newCardImgPath = "CardIcon/" + cardOriginalData.EffectRange + newColor; - cardOriginalData.ImgPath = newCardImgPath; + newCardOriginalData.ImgPath = newCardImgPath; string newCardId = AddElementToDictionary(CardOriginalDataList.Instance.existCardOriginalDataList, cardOriginalData.CardId, newCardOriginalData); return newCardId; } @@ -60,6 +60,11 @@ public class CardManager : Singleton } value.CardId=key; dictionary.Add(key, value); + Debug.Log("keyÊÇ" + key + "imgpathÊÇ" + value.ImgPath); + foreach (KeyValuePair kvp in CardOriginalDataList.Instance.existCardOriginalDataList) + { + //Debug.Log("keyÊÇ"+kvp.Key+"imgpathÊÇ"+kvp.Value.ImgPath); + } return key; } }