Browse Source

Merge pull request '卡牌改色bug修复' (#50) from dev-0524-bugfix1016 into dev-0524

Reviewed-on: #50
pull/54/head
yjm484 1 year ago
parent
commit
3ef22fde2f
  1. 11
      ColorlessWorld-2024-4-2/Assets/Scripts/manager/CardManager.cs

11
ColorlessWorld-2024-4-2/Assets/Scripts/manager/CardManager.cs

@ -14,7 +14,8 @@ public class CardManager : Singleton<CardManager>
} }
public string switchCardCondition(string orginalCardId, CardOriginalData cardOriginalData, string newColor, int conditionCount) 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 condition = newCardOriginalData.conditionAndFunctionVal.ElementAt(conditionCount).Key;
string pattern = @"(\w+)([><=])(\d+)"; string pattern = @"(\w+)([><=])(\d+)";
newCardOriginalData.originFunctionVal.Clear(); newCardOriginalData.originFunctionVal.Clear();
@ -38,13 +39,12 @@ public class CardManager : Singleton<CardManager>
{ {
//CardOriginalData newCardOriginalData = new CardOriginalData(); //CardOriginalData newCardOriginalData = new CardOriginalData();
CardOriginalData newCardOriginalData = JsonConvert.DeserializeObject<CardOriginalData>(JsonConvert.SerializeObject(cardOriginalData)); CardOriginalData newCardOriginalData = JsonConvert.DeserializeObject<CardOriginalData>(JsonConvert.SerializeObject(cardOriginalData));
newCardOriginalData = cardOriginalData;
for (int i = 0; i < newCardOriginalData.nodesColor.Length; i++) for (int i = 0; i < newCardOriginalData.nodesColor.Length; i++)
{ {
newCardOriginalData.nodesColor[i] = newColor; newCardOriginalData.nodesColor[i] = newColor;
} }
string newCardImgPath = "CardIcon/" + cardOriginalData.EffectRange + newColor; string newCardImgPath = "CardIcon/" + cardOriginalData.EffectRange + newColor;
cardOriginalData.ImgPath = newCardImgPath; newCardOriginalData.ImgPath = newCardImgPath;
string newCardId = AddElementToDictionary(CardOriginalDataList.Instance.existCardOriginalDataList, cardOriginalData.CardId, newCardOriginalData); string newCardId = AddElementToDictionary(CardOriginalDataList.Instance.existCardOriginalDataList, cardOriginalData.CardId, newCardOriginalData);
return newCardId; return newCardId;
} }
@ -60,6 +60,11 @@ public class CardManager : Singleton<CardManager>
} }
value.CardId=key; value.CardId=key;
dictionary.Add(key, value); 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; return key;
} }
} }

Loading…
Cancel
Save