hooperk 5 месяцев назад
Родитель
Сommit
681b3d54ff

+ 0 - 1
Assets/Scripts/CardEffect/BT12/White/BT12_112.cs

@@ -17,7 +17,6 @@ namespace DCGO.CardEffects.BT12
                 activateClass.SetUpICardEffect("Play Cost -1 and select trash cards for a DigiXros", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
                 activateClass.SetHashString("PlayCost-1_BT12_112");
-                activateClass.SetIsEffectOfCard(true);
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()

+ 0 - 1
Assets/Scripts/CardEffect/BT21/Red/BT21_030.cs

@@ -127,7 +127,6 @@ namespace DCGO.CardEffects.BT21
                 activateClass.SetUpICardEffect("Play Cost -1 and select trash cards for a DigiXros", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
                 activateClass.SetHashString("PlayCost-1_BT21_030");
-                activateClass.SetIsEffectOfCard(true);
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()

+ 0 - 18
Assets/Scripts/Script/ICardEffect.cs

@@ -29,7 +29,6 @@ public abstract class ICardEffect
         SetIsDeclarative(false);
         SetIsInheritedEffect(false);
         SetIsLinkedEffect(false);
-        SetIsEffectOfCard(false);
         SetIsSecurityEffect(false);
         SetIsCounterEffect(false);
         SetIsDigimonEffect(false);
@@ -514,23 +513,6 @@ public abstract class ICardEffect
 
     #endregion
 
-    #region Whether this is a static effect on a card itself
-
-    bool _isEffectOfCard = false;
-
-    public bool IsEffectOfCard
-    {
-        get { return _isEffectOfCard; }
-        private set { _isEffectOfCard = value; }
-    }
-
-    public void SetIsEffectOfCard(bool isEffectOfCard)
-    {
-        IsEffectOfCard = isEffectOfCard;
-    }
-
-    #endregion
-
     #region Whether this effect is an Security Effect
 
     bool _isSecurityEffect = false;

+ 10 - 10
Assets/Scripts/Script/Permanent.cs

@@ -1144,7 +1144,6 @@ public class Permanent
                 {
                     yield return ContinuousController.instance.StartCoroutine(RemoveLinkedCard(addedDigivolutionCard, trashCard: false));
                 }
-
                 else if (addedDigivolutionCard == TopCard)
                 {
                     yield return ContinuousController.instance.StartCoroutine(CardObjectController.RemoveFromAllArea(addedDigivolutionCard));
@@ -1480,27 +1479,28 @@ public class Permanent
                     if (!cardSource.IsFlipped)
                     {
                         bool isTopCard = cardSource == TopCard;
-                        bool isDigimon = IsDigimon;
+                        
+                        if (!isTopCard)
+                        {
+                            if (!IsDigimon)
+                            {
+                                continue;
+                            }
+                        }
 
                         foreach (ICardEffect cardEffect in cardSource.cEntity_EffectController.GetCardEffects(timing, cardSource))
                         {
                             if (cardEffect != null)
                             {
-                                if (cardEffect.IsEffectOfCard)
-                                {
-                                    _EffectList.Add(cardEffect);
-                                    continue;
-                                }
-
                                 #region Entity, Inherited and Link effects
 
-                                if (cardEffect.IsInheritedEffect && !isTopCard && isDigimon)
+                                if (cardEffect.IsInheritedEffect && !isTopCard)
                                 {
                                     _EffectList.Add(cardEffect);
                                     continue;
                                 }
 
-                                if (cardEffect.IsLinkedEffect && cardSource.IsLinked && isDigimon)
+                                if (cardEffect.IsLinkedEffect && cardSource.IsLinked)
                                 {
                                     _EffectList.Add(cardEffect);
                                     continue;