|
@@ -934,6 +934,7 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
|
|
|
{
|
|
{
|
|
|
List<CardSource> underTamerCards = new List<CardSource>();
|
|
List<CardSource> underTamerCards = new List<CardSource>();
|
|
|
List<Permanent> digimonPermanents = new List<Permanent>();
|
|
List<Permanent> digimonPermanents = new List<Permanent>();
|
|
|
|
|
+ List<CardSource> trashCards = new List<CardSource>();
|
|
|
|
|
|
|
|
foreach (CardSource cardSource in info.cardSources)
|
|
foreach (CardSource cardSource in info.cardSources)
|
|
|
{
|
|
{
|
|
@@ -948,6 +949,11 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
|
|
|
digimonPermanents.Add(cardSource.PermanentOfThisCard());
|
|
digimonPermanents.Add(cardSource.PermanentOfThisCard());
|
|
|
addedCards.Add(cardSource);
|
|
addedCards.Add(cardSource);
|
|
|
}
|
|
}
|
|
|
|
|
+ else if (isTrashCard(cardSource))
|
|
|
|
|
+ {
|
|
|
|
|
+ trashCards.Add(cardSource);
|
|
|
|
|
+ addedCards.Add(cardSource);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if (underTamerCards.Count >= 1)
|
|
if (underTamerCards.Count >= 1)
|
|
@@ -962,6 +968,11 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
|
|
|
yield return ContinuousController.instance.StartCoroutine(new IPlacePermanentToDigivolutionCards(new List<Permanent[]>() { new Permanent[] { digimonPermanent, card.PermanentOfThisCard() } }, false, info.cardEffect).PlacePermanentToDigivolutionCards());
|
|
yield return ContinuousController.instance.StartCoroutine(new IPlacePermanentToDigivolutionCards(new List<Permanent[]>() { new Permanent[] { digimonPermanent, card.PermanentOfThisCard() } }, false, info.cardEffect).PlacePermanentToDigivolutionCards());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ if (trashCards.Count >= 1)
|
|
|
|
|
+ {
|
|
|
|
|
+ yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(trashCards, info.cardEffect));
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().ShowCardEffect2(addedCards, "Digivolution Cards", true, true));
|
|
yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().ShowCardEffect2(addedCards, "Digivolution Cards", true, true));
|