瀏覽代碼

added banlist, updated apocalymon and numemon X

mbunch_kascope 2 年之前
父節點
當前提交
60f9131fab

+ 3 - 3
Assets/CardEffect/BT15/Black/Numemon_X_Antibody_BT15_057.cs

@@ -30,7 +30,7 @@ public class Numemon_X_Antibody_BT15_057 : CEntity_Effect
         {
             ActivateClass activateDeletion = new ActivateClass();
             activateDeletion.SetUpICardEffect("Play 1 [Numemon] from trash", CanUseOnDeletion, card);
-            activateDeletion.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
+            activateDeletion.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
             activateDeletion.SetHashString("Play1NumemonFromTrash_BT15_057");
             cardEffects.Add(activateDeletion);
 
@@ -47,7 +47,7 @@ public class Numemon_X_Antibody_BT15_057 : CEntity_Effect
                     {
                         if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateDeletion))
                         {
-                            if (cardSource.CardNames.Contains("Numemon"))
+                            if (cardSource.ContainsCardName("Numemon"))
                             {
                                 return true;
                             }
@@ -157,7 +157,7 @@ public class Numemon_X_Antibody_BT15_057 : CEntity_Effect
                     {
                         if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateDeletion))
                         {
-                            if (cardSource.CardNames.Contains("Numemon"))
+                            if (cardSource.ContainsCardName("Numemon"))
                             {
                                 return true;
                             }

+ 1 - 1
Assets/CardEffect/BT15/White/Apocalymon_BT15_102.cs

@@ -200,7 +200,7 @@ public class Apocalymon_BT15_102 : CEntity_Effect
 
                         if (selectedCards.Count >= 1)
                         {
-                            yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(selectedCards, activateClass));
+                            GManager.instance.GetComponent<SelectDigiXrosClass>().AddDigivolutionCardInfos(new AddDigivolutionCardsInfo(activateClass, selectedCards));
 
                             yield return StartCoroutine(AfterSelectCardCoroutine(selectedCards));
                         }

+ 5 - 5
Assets/Scripts/DataBase.cs

@@ -669,11 +669,11 @@ public class DataBase : MonoBehaviour
                     new CardLimitCount("BT13-012", 1),
                     new CardLimitCount("EX4-019", 1),
                     new CardLimitCount("BT7-069", 1),
-                    // new CardLimitCount("BT14-002", 1),
-                    // new CardLimitCount("BT15-102", 1),
-                    // new CardLimitCount("EX5-015", 1),
-                    // new CardLimitCount("EX5-018", 1),
-                    // new CardLimitCount("EX5-062", 1),
+                    new CardLimitCount("BT14-002", 1),
+                    new CardLimitCount("BT15-102", 1),
+                    new CardLimitCount("EX5-015", 1),
+                    new CardLimitCount("EX5-018", 1),
+                    new CardLimitCount("EX5-062", 1),
                 },
                 new List<BannedPair>()
                 {

+ 11 - 0
Assets/Scripts/SelectDigiXrosClass.cs

@@ -934,6 +934,7 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
                     {
                         List<CardSource> underTamerCards = new List<CardSource>();
                         List<Permanent> digimonPermanents = new List<Permanent>();
+                        List<CardSource> trashCards = new List<CardSource>();
 
                         foreach (CardSource cardSource in info.cardSources)
                         {
@@ -948,6 +949,11 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
                                 digimonPermanents.Add(cardSource.PermanentOfThisCard());
                                 addedCards.Add(cardSource);
                             }
+                            else if (isTrashCard(cardSource))
+                            {
+                                trashCards.Add(cardSource);
+                                addedCards.Add(cardSource);
+                            }
                         }
 
                         if (underTamerCards.Count >= 1)
@@ -962,6 +968,11 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
                                 yield return ContinuousController.instance.StartCoroutine(new IPlacePermanentToDigivolutionCards(new List<Permanent[]>() { new Permanent[] { digimonPermanent, card.PermanentOfThisCard() } }, false, info.cardEffect).PlacePermanentToDigivolutionCards());
                             }
                         }
+
+                        if (trashCards.Count >= 1)
+                        {
+                            yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(trashCards, info.cardEffect));
+                        }
                     }
 
                     yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().ShowCardEffect2(addedCards, "Digivolution Cards", true, true));