Forráskód Böngészése

Update EX7_072.cs

x89rt2 1 hónapja
szülő
commit
6b9bf0f611
1 módosított fájl, 23 hozzáadás és 28 törlés
  1. 23 28
      Assets/Scripts/CardEffect/EX7/Purple/EX7_072.cs

+ 23 - 28
Assets/Scripts/CardEffect/EX7/Purple/EX7_072.cs

@@ -91,17 +91,15 @@ namespace DCGO.CardEffects.EX7
                     addSkillClass.SetUpAddSkillClass(cardSourceCondition: CardSourceCondition, getEffects: GetEffects);
                     card.Owner.UntilOpponentTurnEndEffects.Add((_timing) => addSkillClass);
 
-                    bool CardSourceCondition(CardSource cardSource)
+                    bool CanUseCondition(Hashtable hashtable)
                     {
-                        if (PermanentCondition(cardSource.PermanentOfThisCard()))
-                        {
-                            if (cardSource == cardSource.PermanentOfThisCard().TopCard)
-                            {
-                                return true;
-                            }
-                        }
+                        return true;
+                    }
 
-                        return false;
+                    bool CardSourceCondition(CardSource cardSource)
+                    {
+                        return PermanentCondition(cardSource.PermanentOfThisCard())
+                            && cardSource == cardSource.PermanentOfThisCard().TopCard;
                     }
 
                     List<ICardEffect> GetEffects(CardSource cardSource, List<ICardEffect> cardEffects, EffectTiming _timing)
@@ -138,25 +136,22 @@ namespace DCGO.CardEffects.EX7
 
                             IEnumerator ActivateCoroutine1(Hashtable hashtable)
                             {
-                                if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
-                                {
-                                    SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
-
-                                    selectPermanentEffect.SetUp(
-                                        selectPlayer: cardSource.Owner,
-                                        canTargetCondition: CanSelectPermanentCondition,
-                                        canTargetCondition_ByPreSelecetedList: null,
-                                        canEndSelectCondition: null,
-                                        maxCount: 1,
-                                        canNoSelect: false,
-                                        canEndNotMax: false,
-                                        selectPermanentCoroutine: null,
-                                        afterSelectPermanentCoroutine: null,
-                                        mode: SelectPermanentEffect.Mode.Destroy,
-                                        cardEffect: activateClass1);
-
-                                    yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
-                                }
+                                SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
+
+                                selectPermanentEffect.SetUp(
+                                    selectPlayer: cardSource.Owner,
+                                    canTargetCondition: CanSelectPermanentCondition,
+                                    canTargetCondition_ByPreSelecetedList: null,
+                                    canEndSelectCondition: null,
+                                    maxCount: 1,
+                                    canNoSelect: false,
+                                    canEndNotMax: false,
+                                    selectPermanentCoroutine: null,
+                                    afterSelectPermanentCoroutine: null,
+                                    mode: SelectPermanentEffect.Mode.Destroy,
+                                    cardEffect: activateClass1);
+
+                                yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
                             }
                         }