Merge branch 'Release-Updates' of https://github.com/DCGO2/DCGO into Release-Updates

Assets/CardBaseEntity/EX8/Purple/Digimon/Barbamon(XAntibody)-EX8-063.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8cc1bd032c46a0ac8337db5318261c0e352aa5964678e64716780802c4f61450
-size 1613
+oid sha256:89ad5095e13ce9337e5c427bdaeeb7c80c7be12b6f88fdc119e0ae07ffbb1d42
+size 1614

Assets/CardBaseEntity/EX8/Purple/Digimon/Barbamon(XAntibody)-EX8-063_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e3f70f3fea5499e91a72adcd4591bc8f7b0f94de257d8c5a2ff8e75559df81f8
-size 1619
+oid sha256:8ba4a5d465dcfebb1da0c234ee1f7caf76e2a55d4286ec3b13ccab2a332183b3
+size 1620

Assets/CardBaseEntity/P/Purple/Option/PurpleMemoryBoost-P-040.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa5589cefa6129131460d538e892e5dfa756fa6d33d1e49bd98e1c9a559b649b
+oid sha256:9ca6270c3743163cb2bfba0c81986acf0f55b64c812f1b2e850b8dd2de9ec336
 size 2865

Assets/CardBaseEntity/P/Purple/Option/PurpleMemoryBoost-P-040_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5b4eca2db191c3248d02b62a253f4362266c22dacec45490edf6f1c7418a87d7
+oid sha256:a6e98d4915325e7a85b12917e24a22e47af4cc627357313285699c338972f748
 size 2871

Assets/CardEffect/EX8/Blue/Aegisdramon_EX8_029.cs

@@ -329,15 +329,9 @@ namespace DCGO.CardEffects.EX8
 
                 bool CardCondition(CardSource cardSource)
                 {
-                    if (cardSource == card)
+                    if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(cardSource.PermanentOfThisCard(), card))
                     {
-                        if (CardEffectCommons.IsExistOnBattleArea(card))
-                        {
-                            if (cardSource == card.PermanentOfThisCard().TopCard)
-                            {
-                                return CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(cardSource.PermanentOfThisCard(), card);
-                            }
-                        }
+                        return cardSource.EqualsTraits("DS");
                     }
 
                     return false;

Assets/CardEffect/EX8/Blue/Skadimon_EX8_028.cs

@@ -160,10 +160,11 @@ namespace DCGO.CardEffects.EX8
 
                 bool CanSelectPermanentCondition(Permanent permanent)
                 {
-                    if (permanent.IsDigimon)
+                    if (CardEffectCommons.IsPermanentExistsOnBattleAreaDigimon(permanent))
                     {
                         if (permanent.DigivolutionCards.Count == 0)
                         {
+                            
                             return true;
                         }
                     }
@@ -250,10 +251,11 @@ namespace DCGO.CardEffects.EX8
 
                 bool CanSelectPermanentCondition(Permanent permanent)
                 {
-                    if (permanent.IsDigimon)
+                    if (CardEffectCommons.IsPermanentExistsOnBattleAreaDigimon(permanent))
                     {
                         if (permanent.DigivolutionCards.Count == 0)
                         {
+
                             return true;
                         }
                     }

Assets/CardEffect/EX8/Purple/BarbamonXAntibody_EX8_063.cs

@@ -76,9 +76,9 @@ namespace DCGO.CardEffects.EX8
                     {
                         if (cardSource.IsDigimon)
                         {
-                            if (cardSource.GetCostItself == 7)
+                            if (cardSource.GetCostItself <= 7)
                             {
-                                if (cardSource.EqualsTraits("Fallen Angel") || cardSource.EqualsTraits("FallenAngel"))
+                                if (cardSource.EqualsTraits("Fallen Angel"))
                                 {
                                     return true;
                                 }

Assets/CardEffect/EX8/Purple/Gesomon_EX8_058.cs

@@ -75,7 +75,7 @@ namespace DCGO.CardEffects.EX8
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Delete opponents level 3 Digimon", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, true, EffectDescription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, false, EffectDescription());
                 activateClass.SetIsInheritedEffect(true);
                 activateClass.SetHashString("WhenAttacking_EX8_058");
                 cardEffects.Add(activateClass);
@@ -114,53 +114,22 @@ namespace DCGO.CardEffects.EX8
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
-                    bool discarded = false;
+                    SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
 
-                    SelectHandEffect selectHandEffect = GManager.instance.GetComponent<SelectHandEffect>();
-
-                    selectHandEffect.SetUp(
+                    selectPermanentEffect.SetUp(
                         selectPlayer: card.Owner,
-                        canTargetCondition: (cardSource) => true,
+                        canTargetCondition: SelectOpponentsLevel3Digimon,
                         canTargetCondition_ByPreSelecetedList: null,
                         canEndSelectCondition: null,
                         maxCount: 1,
-                        canNoSelect: true,
+                        canNoSelect: false,
                         canEndNotMax: false,
-                        isShowOpponent: true,
-                        selectCardCoroutine: null,
-                        afterSelectCardCoroutine: AfterSelectCardCoroutine,
-                        mode: SelectHandEffect.Mode.Discard,
+                        selectPermanentCoroutine: null,
+                        afterSelectPermanentCoroutine: null,
+                        mode: SelectPermanentEffect.Mode.Destroy,
                         cardEffect: activateClass);
 
-                    yield return StartCoroutine(selectHandEffect.Activate());
-                    
-                    IEnumerator AfterSelectCardCoroutine(List<CardSource> selectedCards)
-                    {
-                        if(selectedCards.Count > 0)
-                            discarded = true;
-
-                        yield return null;
-                    }
-
-                    if (discarded)
-                    {
-                        SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
-
-                        selectPermanentEffect.SetUp(
-                            selectPlayer: card.Owner,
-                            canTargetCondition: SelectOpponentsLevel3Digimon,
-                            canTargetCondition_ByPreSelecetedList: null,
-                            canEndSelectCondition: null,
-                            maxCount: 1,
-                            canNoSelect: false,
-                            canEndNotMax: false,
-                            selectPermanentCoroutine: null,
-                            afterSelectPermanentCoroutine: null,
-                            mode: SelectPermanentEffect.Mode.Destroy,
-                            cardEffect: activateClass);
-
-                        yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
-                    }
+                    yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
                 }
             }
             

Assets/CardEffect/EX8/Purple/MarineDevimon_EX8_061.cs

@@ -71,7 +71,7 @@ namespace DCGO.CardEffects.EX8
                 bool CanUseCondition(Hashtable hashtable)
                 {
                     if(CardEffectCommons.IsExistOnBattleAreaDigimon(card))
-                        return CardEffectCommons.CanTriggerWhenDigivolving(hashtable, card);
+                        return CardEffectCommons.CanTriggerOnAttack(hashtable, card);
 
                     return false;
                 }

Assets/CardEffect/EX8/Purple/NightmareSoldiers_EX8_071.cs

@@ -36,7 +36,13 @@ namespace DCGO.CardEffects.EX8
 
             if (timing == EffectTiming.None)
             {
-                bool CanUseCondition()
+                AddSkillClass addSkillClass = new AddSkillClass();
+                addSkillClass.SetUpICardEffect("Your NSo trait Digimon gain Scapegoat", CanUseCondition, card);
+                addSkillClass.SetUpAddSkillClass(cardSourceCondition: CardSourceCondition, getEffects: GetEffects);
+                addSkillClass.SetIsInheritedEffect(true);
+                cardEffects.Add(addSkillClass);
+
+                bool CanUseCondition(Hashtable hashtable)
                 {
                     return CardEffectCommons.IsExistInSecurity(card, false);
                 }
@@ -47,11 +53,34 @@ namespace DCGO.CardEffects.EX8
                            permanent.TopCard.EqualsTraits("NSo");
                 }
 
-                cardEffects.Add(CardEffectFactory.ScapegoatStaticEffect(
-                    permanentCondition: PermanentCondition,
-                    isInheritedEffect: false,
-                    card: card,
-                    condition: CanUseCondition));
+                bool CardSourceCondition(CardSource cardSource)
+                {
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(cardSource))
+                    {
+                        if (cardSource.Owner == card.Owner)
+                        {
+                            if (cardSource == cardSource.PermanentOfThisCard().TopCard)
+                            {
+                                if (PermanentCondition(cardSource.PermanentOfThisCard()))
+                                {
+                                    return true;
+                                }
+                            }
+                        }
+                    }
+
+                    return false;
+                }
+
+                List<ICardEffect> GetEffects(CardSource cardSource, List<ICardEffect> cardEffects, EffectTiming _timing)
+                {
+                    if (_timing == EffectTiming.WhenPermanentWouldBeDeleted)
+                    {
+                        cardEffects.Add(CardEffectFactory.ScapegoatSelfEffect(isInheritedEffect: false, card: card, condition: null, effectName: "<Scapegoat>", effectDiscription: null));
+                    }
+
+                    return cardEffects;
+                }
             }
 
             #endregion

Assets/CardEffect/P/Purple/VioletMemoryBoost_P_040.cs → Assets/CardEffect/P/Purple/PurpleMemoryBoost_P_040.cs

@@ -6,7 +6,7 @@ using Photon;
 using System;
 using Photon.Pun;
 
-public class VioletMemoryBoost_P_040 : CEntity_Effect
+public class PurpleMemoryBoost_P_040ine : CEntity_Effect
 {
     public override List<ICardEffect> CardEffects(EffectTiming timing, CardSource card)
     {

Assets/Scenes/ContinuousControllerScene.unity

@@ -5488,6 +5488,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 274c9606e9efff84ab1b1d202cac564b, type: 2}
   - {fileID: 11400000, guid: c4333926df4d1414198aa32b9b2b075b, type: 2}
   - {fileID: 11400000, guid: d439ee6397bd7a14caa067cd44e9234a, type: 2}
+  - {fileID: 11400000, guid: 0241b2ebbbfcf334391be37272f76f2d, type: 2}
   - {fileID: 11400000, guid: d592dc908760e46428f7effd8beeae5b, type: 2}
   - {fileID: 11400000, guid: be19ebe3b1538c642b77284f50a7b38a, type: 2}
   - {fileID: 11400000, guid: 38b97d0cb38130c4aa3a278de1832b48, type: 2}
@@ -5551,6 +5552,11 @@ MonoBehaviour:
   - {fileID: 11400000, guid: fbe10886d8009b243884bc57e8e1b36e, type: 2}
   - {fileID: 11400000, guid: c2f6a08dd624c264881c9261a4d1ec8d, type: 2}
   - {fileID: 11400000, guid: a10176f7ce1006a4883066522c6d92f2, type: 2}
+  - {fileID: 11400000, guid: ef8db92e0c171874899fd8cabe40274d, type: 2}
+  - {fileID: 11400000, guid: 561b2b21b02850e408f8e7ee13a32989, type: 2}
+  - {fileID: 11400000, guid: 52a69bb6bebdf794db4088e4e5a42aad, type: 2}
+  - {fileID: 11400000, guid: d1071e27bd0c917409ee44119e58373d, type: 2}
+  - {fileID: 11400000, guid: 4146a571bf8fdfe408e0247fe65d4621, type: 2}
   - {fileID: 11400000, guid: e62260a9dd14a3743bc1d559e88d18aa, type: 2}
   - {fileID: 11400000, guid: 609da9d18f186944b8e9710db96f3e3a, type: 2}
   - {fileID: 11400000, guid: 62cff5a349c37904f99c1f861e5ac90c, type: 2}
@@ -5608,6 +5614,8 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 1fc84f81a0a0d844e8aa1b091bb634fe, type: 2}
   - {fileID: 11400000, guid: b5fdbbb0b62596b4895b8df21869a232, type: 2}
   - {fileID: 11400000, guid: 5f8f16803494ad9498bbbf31b19ed84f, type: 2}
+  - {fileID: 11400000, guid: 0169efddeb70e08469448712a87d6b58, type: 2}
+  - {fileID: 11400000, guid: f6d0e2f0c4f87254ba85c539f1974021, type: 2}
   - {fileID: 11400000, guid: 99de8b57fc534a740a455255aad17046, type: 2}
   - {fileID: 11400000, guid: dcbf45052e02194418adbe47efa87dee, type: 2}
   - {fileID: 11400000, guid: edf2c4f510f612d428c5a72b96202290, type: 2}
@@ -5659,6 +5667,9 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 8969760c81a9df84d8b3c9d591c64ebe, type: 2}
   - {fileID: 11400000, guid: fd6ac0b5fc5bdaf498d5e9fe52660e71, type: 2}
   - {fileID: 11400000, guid: 564b4b8e9c8f69a48bf13c55e0c9a0b5, type: 2}
+  - {fileID: 11400000, guid: d4c248831dee7554ea6ac3bfef30c6e6, type: 2}
+  - {fileID: 11400000, guid: 9db30a7fc40199b4ca63f8bc286c5fa7, type: 2}
+  - {fileID: 11400000, guid: 39c48bd50e653c54182b1a5569964d86, type: 2}
   - {fileID: 11400000, guid: 8b407f27b312b044cb49cb11a148c989, type: 2}
   - {fileID: 11400000, guid: 31438a32c4cd8bc4a9f8ee12540270ea, type: 2}
   - {fileID: 11400000, guid: 0b4bb608e6a951141b9528be7b419b63, type: 2}
@@ -5712,6 +5723,11 @@ MonoBehaviour:
   - {fileID: 11400000, guid: b0a0c5cfe8bfe914fbc27fb07ac21345, type: 2}
   - {fileID: 11400000, guid: ef9bbb046adbc4b4aa454d36df1b7c09, type: 2}
   - {fileID: 11400000, guid: adbdca6d2fa1484428442a6acca762d0, type: 2}
+  - {fileID: 11400000, guid: 4d7b2ee9815a66844bc944c11719aefa, type: 2}
+  - {fileID: 11400000, guid: 5de692fe6cefec5458fc3b77060c8617, type: 2}
+  - {fileID: 11400000, guid: eb093c4dfbb266b4da717f286820a417, type: 2}
+  - {fileID: 11400000, guid: c93d75cd57872004a98932c3ea34074b, type: 2}
+  - {fileID: 11400000, guid: c4e68b7b096c7dc419497f3f672df41d, type: 2}
   - {fileID: 11400000, guid: eabf1c609de718c42a5ce2d0ed2c3f66, type: 2}
   - {fileID: 11400000, guid: 3177390918038b942894bff607f18385, type: 2}
   - {fileID: 11400000, guid: 60d73225a93ad3241b36dae2d75b2a70, type: 2}
@@ -10986,32 +11002,32 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 602364a0d8d103e4ebcd78b8b2f5f84a, type: 2}
   - {fileID: 11400000, guid: 7486db908d0b2224e99d2ac99b9859b9, type: 2}
   - {fileID: 11400000, guid: 5f8f16803494ad9498bbbf31b19ed84f, type: 2}
-  - {fileID: 11400000, guid: be4b3bd768c13fe4cbd8b2f33a002a4b, type: 2}
   - {fileID: 11400000, guid: 0b4bb608e6a951141b9528be7b419b63, type: 2}
+  - {fileID: 11400000, guid: be4b3bd768c13fe4cbd8b2f33a002a4b, type: 2}
   - {fileID: 11400000, guid: 517d9954b4d9cb64783dab620df7b585, type: 2}
   - {fileID: 11400000, guid: 01d4c4d6c14e6b444a46e2529957f682, type: 2}
   - {fileID: 11400000, guid: c4333926df4d1414198aa32b9b2b075b, type: 2}
   - {fileID: 11400000, guid: e7481bba3118ca44ca24a386a0e04dbb, type: 2}
-  - {fileID: 11400000, guid: 3177390918038b942894bff607f18385, type: 2}
   - {fileID: 11400000, guid: d439ee6397bd7a14caa067cd44e9234a, type: 2}
-  - {fileID: 11400000, guid: 5f7e6fc2c37061f45a9164acf94d7686, type: 2}
+  - {fileID: 11400000, guid: 3177390918038b942894bff607f18385, type: 2}
   - {fileID: 11400000, guid: a794a294e74e6b2459890f4aaef50fd7, type: 2}
-  - {fileID: 11400000, guid: edf2c4f510f612d428c5a72b96202290, type: 2}
+  - {fileID: 11400000, guid: 5f7e6fc2c37061f45a9164acf94d7686, type: 2}
   - {fileID: 11400000, guid: 744f3bf871455bb43bb10fe678cdffbf, type: 2}
+  - {fileID: 11400000, guid: edf2c4f510f612d428c5a72b96202290, type: 2}
   - {fileID: 11400000, guid: e6da9aed9041e7a4eb930d5b97e98014, type: 2}
   - {fileID: 11400000, guid: 0011de4a49b3d5747874a483b1213dc5, type: 2}
-  - {fileID: 11400000, guid: da5a163453eca4a46a47b27b9cd9afb1, type: 2}
   - {fileID: 11400000, guid: 66c051e2a5f24604dab04a15b4531a2f, type: 2}
+  - {fileID: 11400000, guid: da5a163453eca4a46a47b27b9cd9afb1, type: 2}
   - {fileID: 11400000, guid: b0a0c5cfe8bfe914fbc27fb07ac21345, type: 2}
   - {fileID: 11400000, guid: 0c8c543281081174bbc507f9e2dd8f97, type: 2}
-  - {fileID: 11400000, guid: ce1cb488e42b8d94d9548fc880ab7140, type: 2}
   - {fileID: 11400000, guid: ce5d8f47cab93064fa1b649727ee9c9a, type: 2}
-  - {fileID: 11400000, guid: 1800c4b7868090e42a7fe85d25a0523a, type: 2}
+  - {fileID: 11400000, guid: ce1cb488e42b8d94d9548fc880ab7140, type: 2}
   - {fileID: 11400000, guid: fd8ef57a1463e34429218795883ae573, type: 2}
-  - {fileID: 11400000, guid: ef9bbb046adbc4b4aa454d36df1b7c09, type: 2}
+  - {fileID: 11400000, guid: 1800c4b7868090e42a7fe85d25a0523a, type: 2}
   - {fileID: 11400000, guid: e121e796db02f014eb850ac5a4f772a2, type: 2}
-  - {fileID: 11400000, guid: adbdca6d2fa1484428442a6acca762d0, type: 2}
+  - {fileID: 11400000, guid: ef9bbb046adbc4b4aa454d36df1b7c09, type: 2}
   - {fileID: 11400000, guid: 0787067567f1a9c4f900173dc1f8b255, type: 2}
+  - {fileID: 11400000, guid: adbdca6d2fa1484428442a6acca762d0, type: 2}
   - {fileID: 11400000, guid: 8dfc90f4dcd6e444ca447cd4bbdb808d, type: 2}
   - {fileID: 11400000, guid: 4e4690852a224494ea67338c2afcc93b, type: 2}
   - {fileID: 11400000, guid: 96ed4a45cac80c54086b4ccd5d0f4efb, type: 2}
@@ -11092,6 +11108,22 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 02ef728e1dea33245bc69d521b531182, type: 2}
   - {fileID: 11400000, guid: 8238787ea70f8c34d9dc232d7d6f65ca, type: 2}
   - {fileID: 11400000, guid: e8116be362996dc46af1b2e770dc9290, type: 2}
+  - {fileID: 11400000, guid: 0241b2ebbbfcf334391be37272f76f2d, type: 2}
+  - {fileID: 11400000, guid: ef8db92e0c171874899fd8cabe40274d, type: 2}
+  - {fileID: 11400000, guid: 4d7b2ee9815a66844bc944c11719aefa, type: 2}
+  - {fileID: 11400000, guid: d4c248831dee7554ea6ac3bfef30c6e6, type: 2}
+  - {fileID: 11400000, guid: 561b2b21b02850e408f8e7ee13a32989, type: 2}
+  - {fileID: 11400000, guid: 52a69bb6bebdf794db4088e4e5a42aad, type: 2}
+  - {fileID: 11400000, guid: 0169efddeb70e08469448712a87d6b58, type: 2}
+  - {fileID: 11400000, guid: f6d0e2f0c4f87254ba85c539f1974021, type: 2}
+  - {fileID: 11400000, guid: 9db30a7fc40199b4ca63f8bc286c5fa7, type: 2}
+  - {fileID: 11400000, guid: 39c48bd50e653c54182b1a5569964d86, type: 2}
+  - {fileID: 11400000, guid: 5de692fe6cefec5458fc3b77060c8617, type: 2}
+  - {fileID: 11400000, guid: eb093c4dfbb266b4da717f286820a417, type: 2}
+  - {fileID: 11400000, guid: d1071e27bd0c917409ee44119e58373d, type: 2}
+  - {fileID: 11400000, guid: 4146a571bf8fdfe408e0247fe65d4621, type: 2}
+  - {fileID: 11400000, guid: c93d75cd57872004a98932c3ea34074b, type: 2}
+  - {fileID: 11400000, guid: c4e68b7b096c7dc419497f3f672df41d, type: 2}
   ReverseCard: {fileID: 21300000, guid: ff90b0f41defc6e4d8331cae90f2edfa, type: 3}
   ReverseCard_Digitama: {fileID: 21300000, guid: 542271417046c25458d624e43223c985, type: 3}
   soundObject: {fileID: 2099658912993173812, guid: bd165147db2f1de478fbb125a5222199, type: 3}

Assets/Scripts/Permanent.cs

@@ -2151,7 +2151,7 @@ public class Permanent
     }
     #endregion
 
-    #region 道連れを持つ個数
+    #region Retaliation Count
     public int RetaliationCount
     {
         get
@@ -2336,6 +2336,28 @@ public class Permanent
                         }
                     }
                     #endregion
+
+                    #region Effects of faceup security
+                    foreach (CardSource source in player.SecurityCards)
+                    {
+                        if (source.IsFlipped)
+                            continue;
+
+                        foreach (ICardEffect cardEffect in permanent.EffectList(EffectTiming.OnAllyAttack))
+                        {
+                            if (cardEffect is IAllianceEffect)
+                            {
+                                if (cardEffect.CanTrigger(null))
+                                {
+                                    if (((IAllianceEffect)cardEffect).HasAlliance(this))
+                                    {
+                                        return true;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    #endregion
                 }
 
                 #region Player Effects
@@ -2480,7 +2502,7 @@ public class Permanent
     }
     #endregion
 
-    #region このデジモンが戦闘によって消滅するか
+    #region Can Be Destroyed By Battle
     public bool CanBeDestroyedByBattle(Permanent AttackingPermanent, Permanent DefendingPermanent, CardSource DefendingCard)
     {
         if (!CanBeDestroyed())
@@ -2510,6 +2532,28 @@ public class Permanent
                 #endregion
             }
 
+            #region Effects of faceup security
+            foreach (CardSource source in player.SecurityCards)
+            {
+                if (source.IsFlipped)
+                    continue;
+
+                foreach (ICardEffect cardEffect in source.EffectList(EffectTiming.None))
+                {
+                    if (cardEffect is ICanNotBeDestroyedByBattleEffect)
+                    {
+                        if (cardEffect.CanUse(null))
+                        {
+                            if (((ICanNotBeDestroyedByBattleEffect)cardEffect).CanNotBeDestroyedByBattle(this, AttackingPermanent, DefendingPermanent, DefendingCard))
+                            {
+                                return true;
+                            }
+                        }
+                    }
+                }
+            }
+            #endregion
+
             #region プレイヤーの効果
             foreach (ICardEffect cardEffect in player.EffectList(EffectTiming.None))
             {