|
|
|
@ -14,7 +14,8 @@ public class CardManager : Singleton<CardManager> |
|
|
|
} |
|
|
|
public string switchCardCondition(string orginalCardId, CardOriginalData cardOriginalData, string newColor, int conditionCount) |
|
|
|
{ |
|
|
|
CardOriginalData newCardOriginalData=cardOriginalData; |
|
|
|
//CardOriginalData newCardOriginalData=cardOriginalData;
|
|
|
|
CardOriginalData newCardOriginalData = JsonConvert.DeserializeObject<CardOriginalData>(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<CardManager> |
|
|
|
{ |
|
|
|
//CardOriginalData newCardOriginalData = new CardOriginalData();
|
|
|
|
CardOriginalData newCardOriginalData = JsonConvert.DeserializeObject<CardOriginalData>(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<CardManager> |
|
|
|
} |
|
|
|
value.CardId=key; |
|
|
|
dictionary.Add(key, value); |
|
|
|
Debug.Log("keyĘÇ" + key + "imgpathĘÇ" + value.ImgPath); |
|
|
|
foreach (KeyValuePair<string, CardOriginalData> kvp in CardOriginalDataList.Instance.existCardOriginalDataList) |
|
|
|
{ |
|
|
|
//Debug.Log("keyĘÇ"+kvp.Key+"imgpathĘÇ"+kvp.Value.ImgPath);
|
|
|
|
} |
|
|
|
return key; |
|
|
|
} |
|
|
|
} |
|
|
|
|