|
|
@@ -61,6 +61,8 @@ public partial class CardEffectCommons
|
|
|
|
|
|
int permanentSelectedCount = 0;
|
|
|
|
|
|
+ List<CardSource> selectedCards = new List<CardSource>();
|
|
|
+
|
|
|
while (true)
|
|
|
{
|
|
|
if (isFromOnly1Permanent)
|
|
|
@@ -114,13 +116,13 @@ public partial class CardEffectCommons
|
|
|
maxDigivolutionDiscardCount - digivolutionDiscardedCount,
|
|
|
selectedPermanent.DigivolutionCards.Count(CanSelectCardCondition));
|
|
|
|
|
|
- List<CardSource> selectedCards = new List<CardSource>();
|
|
|
+
|
|
|
|
|
|
SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
|
|
|
|
|
|
selectCardEffect.SetUp(
|
|
|
canTargetCondition: CanSelectCardCondition,
|
|
|
- canTargetCondition_ByPreSelecetedList: null,
|
|
|
+ canTargetCondition_ByPreSelecetedList: CanTargetCondition_ByPreSelecetedList,
|
|
|
canEndSelectCondition: null,
|
|
|
canNoSelect: () => canNoTrash && NotSelectYet(),
|
|
|
selectCardCoroutine: SelectCardCoroutine,
|
|
|
@@ -140,6 +142,11 @@ public partial class CardEffectCommons
|
|
|
|
|
|
yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
|
|
|
|
|
|
+ bool CanTargetCondition_ByPreSelecetedList(List<CardSource> sources, CardSource source)
|
|
|
+ {
|
|
|
+ return !selectedCards.Contains(source);
|
|
|
+ }
|
|
|
+
|
|
|
IEnumerator SelectCardCoroutine(CardSource cardSource)
|
|
|
{
|
|
|
selectedCards.Add(cardSource);
|