mbunch_kascope 2 лет назад
Родитель
Сommit
5e14d61ef5

+ 2 - 2
Assets/Scripts/CardController.cs

@@ -1914,7 +1914,7 @@ public class DeckBottomBounceClass
         && (cardEffect == null ||
         (!permanent.TopCard.CanNotBeAffected(cardEffect) 
         && !permanent.CannotReturnToLibrary(cardEffect)
-        && !permanent.CanBeRemoved())));
+        && permanent.CanBeRemoved())));
 
         if (_deckBounceTargetPermanents.Count == 0) yield break;
 
@@ -2048,7 +2048,7 @@ public class HandBounceClaass
         && (cardEffect == null ||
         (!permanent.TopCard.CanNotBeAffected(cardEffect) 
         && !permanent.CannotReturnToHand(cardEffect)
-        && !permanent.CanBeRemoved())));
+        && permanent.CanBeRemoved())));
 
         if (_bounceTargetPermanents.Count == 0) yield break;
 

+ 9 - 3
Assets/Scripts/CardEffectFactory/KeyWordEffects/Collision.cs

@@ -17,10 +17,16 @@ public partial class CardEffectFactory
             {
                 if (card.Owner.Enemy.GetBattleAreaDigimons().Count() > 0)
                 {
-                    if (condition == null || condition())
+                    if (GManager.instance.attackProcess.IsAttacking)
                     {
-                        return true;
-                    }
+                        if (GManager.instance.attackProcess.AttackingPermanent == card.PermanentOfThisCard())
+                        {
+                            if (condition == null || condition())
+                            {
+                                return true;
+                            }
+                        }
+                    }     
                 }
             }