x89rt2 4 месяцев назад
Родитель
Сommit
c9bc7bfb79
1 измененных файлов с 12 добавлено и 7 удалено
  1. 12 7
      Assets/Scripts/CardEffect/EX11/Black/EX11_066.cs

+ 12 - 7
Assets/Scripts/CardEffect/EX11/Black/EX11_066.cs

@@ -239,17 +239,17 @@ namespace DCGO.CardEffects.EX11
                                         if (selectedCards.Count > 1)
                                         if (selectedCards.Count > 1)
                                         {
                                         {
                                             SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
                                             SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
-                                        
+
                                             selectCardEffect.SetUp(
                                             selectCardEffect.SetUp(
                                                 canTargetCondition: IsVemmon,
                                                 canTargetCondition: IsVemmon,
                                                 canTargetCondition_ByPreSelecetedList: null,
                                                 canTargetCondition_ByPreSelecetedList: null,
-                                                canEndSelectCondition: null,
+                                                canEndSelectCondition: CanEndSelectCondition,
                                                 canNoSelect: () => false,
                                                 canNoSelect: () => false,
                                                 selectCardCoroutine: null,
                                                 selectCardCoroutine: null,
                                                 afterSelectCardCoroutine: AfterSelectCardCoroutine,
                                                 afterSelectCardCoroutine: AfterSelectCardCoroutine,
                                                 message: "Specify the order to place the cards in the digivolution cards\n(cards will be placed so that cards with lower numbers are on top).",
                                                 message: "Specify the order to place the cards in the digivolution cards\n(cards will be placed so that cards with lower numbers are on top).",
                                                 maxCount: selectedCards.Count,
                                                 maxCount: selectedCards.Count,
-                                                canEndNotMax: false,
+                                                canEndNotMax: true,
                                                 isShowOpponent: true,
                                                 isShowOpponent: true,
                                                 mode: SelectCardEffect.Mode.Custom,
                                                 mode: SelectCardEffect.Mode.Custom,
                                                 root: SelectCardEffect.Root.Custom,
                                                 root: SelectCardEffect.Root.Custom,
@@ -257,18 +257,23 @@ namespace DCGO.CardEffects.EX11
                                                 canLookReverseCard: true,
                                                 canLookReverseCard: true,
                                                 selectPlayer: card.Owner,
                                                 selectPlayer: card.Owner,
                                                 cardEffect: activateClass);
                                                 cardEffect: activateClass);
-                                        
+
                                             selectCardEffect.SetUpCustomMessage_ShowCard("Digivolution Cards");
                                             selectCardEffect.SetUpCustomMessage_ShowCard("Digivolution Cards");
-                                        
+
+                                            bool CanEndSelectCondition(List<CardSource> cardSources)
+                                            {
+                                                return !CardEffectCommons.HasNoElement(cardSources);
+                                            }
+
                                             yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
                                             yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
-                                        
+
                                             IEnumerator AfterSelectCardCoroutine(List<CardSource> cardSources)
                                             IEnumerator AfterSelectCardCoroutine(List<CardSource> cardSources)
                                             {
                                             {
                                                 digivolutionCards_fixed.AddRange(cardSources);
                                                 digivolutionCards_fixed.AddRange(cardSources);
                                                 selectedCards.RemoveAll(cardSources.Contains);
                                                 selectedCards.RemoveAll(cardSources.Contains);
                                                 yield return null;
                                                 yield return null;
                                             }
                                             }
-                                        
+
                                             yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().ShowCardEffect2(digivolutionCards_fixed, "Digivolution Cards", true, true));
                                             yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().ShowCardEffect2(digivolutionCards_fixed, "Digivolution Cards", true, true));
                                             yield return ContinuousController.instance.StartCoroutine(selectedPermament.AddDigivolutionCardsBottom(digivolutionCards_fixed, activateClass));
                                             yield return ContinuousController.instance.StartCoroutine(selectedPermament.AddDigivolutionCardsBottom(digivolutionCards_fixed, activateClass));
                                         }
                                         }