Ver Fonte

1.7.6.2 build

mbunch_kascope há 1 ano atrás
pai
commit
a32efcf1ed

+ 2 - 2
Assets/CardBaseEntity/BT11/Red/Digimon/BT11_007_P0.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:206b672f0aefc22570e56bdd5faeb966a524219db31954e60044fa7310d8bbc9
-size 1270
+oid sha256:9dff1ab9808506cbad040a9f25a9c784f1117bce17ff0b2b6082357673908bfc
+size 1315

+ 2 - 2
Assets/CardBaseEntity/BT16/Black/DigiEgg/BT16_005.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f701a6e56fe1f79ff3bc6940a21ed9192f8c22a37b72fef434bffefad8c5a1c9
-size 1453
+oid sha256:5193c92f2a6441f2205c5f772df5f4a67e453937ef676d54a7d7ed70fc3e97be
+size 1463

+ 2 - 2
Assets/CardBaseEntity/BT16/Black/DigiEgg/BT16_005_P0.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:44e472219f846715b51b1944dd95bc7f2b9a678d7d8a2375920653e9304af2e2
-size 1120
+oid sha256:123cbe4fa9e632c091a68c70d439e02959735d2722d16e3fd166fc8bdc1f9b3f
+size 1111

+ 2 - 2
Assets/CardBaseEntity/BT16/Black/DigiEgg/BT16_005_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fb74c4f571fb492c5c796eb3896a738a313b2b645b22ab089699aac04c1f6d91
-size 1459
+oid sha256:bbea8aa972f2ba3813354761e6df94778eb49f491d2f0ec3b28ceb8077efc381
+size 1469

+ 8 - 4
Assets/CardEffect/BT20/Red/BT20_001.cs

@@ -13,16 +13,20 @@ namespace DCGO.CardEffects.BT20
             {                
                 bool CanActivateCondition()
                 {
-                        if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
+                    if (CardEffectCommons.IsOwnerTurn(card))
                     {
-                        if (card.Owner.LibraryCards.Count >= 1)
+                        if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                         {
-                            if (card.PermanentOfThisCard().DigivolutionCards.Count >= 4)
+                            if (card.Owner.LibraryCards.Count >= 1)
                             {
-                                return true;
+                                if (card.PermanentOfThisCard().DigivolutionCards.Count >= 4)
+                                {
+                                    return true;
+                                }
                             }
                         }
                     }
+                    
                     return false;
                 }
 

+ 10 - 6
Assets/CardEffect/BT20/White/BT20_099.cs

@@ -204,6 +204,8 @@ namespace DCGO.CardEffects.BT20
 
                     if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                     {
+                        Permanent selectedPermanent = null;
+
                         int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
 
                         SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
@@ -227,14 +229,16 @@ namespace DCGO.CardEffects.BT20
 
                         IEnumerator SelectPermanentCoroutine(Permanent permanent)
                         {
-                            Permanent selectedPermanent = permanent;
+                            selectedPermanent = permanent;
 
-                            if (selectedPermanent != null)
-                            {
-                                yield return ContinuousController.instance.StartCoroutine(card.Owner.brainStormObject.CloseBrainstrorm(card));
+                            yield return null;
+                        }
 
-                                yield return ContinuousController.instance.StartCoroutine(selectedPermanent.AddDigivolutionCardsBottom(new List<CardSource>() { card }, activateClass));
-                            }
+                        if (selectedPermanent != null && !selectedPermanent.IsToken)
+                        {
+                            yield return ContinuousController.instance.StartCoroutine(card.Owner.brainStormObject.CloseBrainstrorm(card));
+
+                            yield return ContinuousController.instance.StartCoroutine(selectedPermanent.AddDigivolutionCardsBottom(new List<CardSource>() { card }, activateClass));
                         }
                     }
                 }

+ 10 - 6
Assets/CardEffect/BT9/White/BT9_109.cs

@@ -89,6 +89,8 @@ public class BT9_109 : CEntity_Effect
             {
                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                 {
+                    Permanent selectedPermanent = null;
+
                     int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
 
                     SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
@@ -112,14 +114,16 @@ public class BT9_109 : CEntity_Effect
 
                     IEnumerator SelectPermanentCoroutine(Permanent permanent)
                     {
-                        Permanent selectedPermanent = permanent;
+                        selectedPermanent = permanent;
 
-                        if (selectedPermanent != null)
-                        {
-                            yield return ContinuousController.instance.StartCoroutine(card.Owner.brainStormObject.CloseBrainstrorm(card));
+                        yield return null;   
+                    }
 
-                            yield return ContinuousController.instance.StartCoroutine(selectedPermanent.AddDigivolutionCardsBottom(new List<CardSource>() { card }, activateClass));
-                        }
+                    if (selectedPermanent != null && !selectedPermanent.IsToken)
+                    {
+                        yield return ContinuousController.instance.StartCoroutine(card.Owner.brainStormObject.CloseBrainstrorm(card));
+
+                        yield return ContinuousController.instance.StartCoroutine(selectedPermanent.AddDigivolutionCardsBottom(new List<CardSource>() { card }, activateClass));
                     }
                 }
             }

+ 8 - 2
Assets/CardEffect/EX8/Blue/EX8_028.cs

@@ -226,12 +226,15 @@ namespace DCGO.CardEffects.EX8
                     {
                         if (!selectedCard.TopCard.CanNotBeAffected(activateClass))
                         {
+                            CardSource _topCard = selectedCard.TopCard;
+
                             yield return ContinuousController.instance.StartCoroutine(new IPutSecurityPermanent(
                                     selectedCard,
                                     CardEffectCommons.CardEffectHashtable(activateClass),
                                     false).PutSecurity());
 
-                            yield return ContinuousController.instance.StartCoroutine(new IUnsuspendPermanents(new List<Permanent>() { card.PermanentOfThisCard() }, activateClass).Unsuspend());
+                            if(CardEffectCommons.IsExistInSecurity(_topCard, true))
+                                yield return ContinuousController.instance.StartCoroutine(new IUnsuspendPermanents(new List<Permanent>() { card.PermanentOfThisCard() }, activateClass).Unsuspend());
                         }
                     }
                 }
@@ -320,12 +323,15 @@ namespace DCGO.CardEffects.EX8
                     {
                         if (!selectedCard.TopCard.CanNotBeAffected(activateClass))
                         {
+                            CardSource _topCard = selectedCard.TopCard;
+
                             yield return ContinuousController.instance.StartCoroutine(new IPutSecurityPermanent(
                                     selectedCard,
                                     CardEffectCommons.CardEffectHashtable(activateClass),
                                     false).PutSecurity());
 
-                            yield return ContinuousController.instance.StartCoroutine(new IUnsuspendPermanents(new List<Permanent>() { card.PermanentOfThisCard() }, activateClass).Unsuspend());
+                            if (CardEffectCommons.IsExistInSecurity(_topCard, true))
+                                yield return ContinuousController.instance.StartCoroutine(new IUnsuspendPermanents(new List<Permanent>() { card.PermanentOfThisCard() }, activateClass).Unsuspend());
                         }
                     }
                 }