Просмотр исходного кода

clean up and miraculous mega knight fix

mbunch_kascope 2 лет назад
Родитель
Сommit
1cc7a1c8f6

+ 2 - 4
Assets/CardEffect/BT17/Red/MiraculousMegaKnight_BT17_095.cs

@@ -225,9 +225,9 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
+                    if (CardEffectCommons.CanDeclareOptionDelayEffect(card))
                     {
-                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, IsOwnerPermanentCondition) || CardEffectCommons.CanTriggerWhenPermanentRemoveField(hashtable, IsOwnerPermanentCondition))
+                        if (CardEffectCommons.CanTriggerWhenPermanentRemoveField(hashtable, IsOwnerPermanentCondition))
                         {
                             if (!CardEffectCommons.IsByBattle(hashtable))
                             {
@@ -346,8 +346,6 @@ namespace DCGO.CardEffects.BT17
                                 return false;
                             }
 
-                            Debug.Log($"WORKABLE: {allowedPermanents.Count} : {allowedCards.Count}");
-
                             maxCount = Math.Min(1, allowedPermanents.Count);
 
                             SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();

+ 1 - 1
Assets/CardEffect/BT17/White/Eosmon_BT17_075.cs

@@ -323,7 +323,7 @@ namespace DCGO.CardEffects.BT17
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
                     #region Opponent has tamer to play
-                    UnityEngine.Debug.Log($"RELAVENT CARDS IN OPP HAND: {card.Owner.Enemy.HandCards.Count(CanSelectTamerOpponentCondition)}");
+
                     if (card.Owner.Enemy.HandCards.Count(CanSelectTamerOpponentCondition) > 0)
                     {
                         List<CardSource> selectedCardsOpponent = new List<CardSource>();

+ 0 - 3
Assets/CardEffect/EX5/Blue/Moonmon_EX5_002.cs

@@ -68,10 +68,8 @@ public class Moonmon_EX5_002 : CEntity_Effect
                 {
                     if (CardEffectCommons.IsOwnerTurn(card))
                     {
-                        Debug.Log($"USE CONDITION: {CardEffectCommons.CanTriggerOnPermanentPlay(hashtable, PermanentCondition)}");
                         if (CardEffectCommons.CanTriggerOnPermanentPlay(hashtable, PermanentCondition))
                         {
-                            Debug.Log($"USE CONDITION: TRUE");
                             return true;
                         }
                     }
@@ -86,7 +84,6 @@ public class Moonmon_EX5_002 : CEntity_Effect
                 {
                     if (card.Owner.HandCards.Count >= 1)
                     {
-                        Debug.Log($"ACTIVATE CONDITION: TRUE");
                         return true;
                     }
                 }

+ 0 - 6
Assets/CardEffect/EX6/Black/Kakkinmon_EX6_005.cs

@@ -32,14 +32,10 @@ namespace DCGO.CardEffects.EX6
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    Debug.Log("Kakkinmon_EX6 - CanUseCondtion");
-                    Debug.Log($"Kakkinmon_EX6 - CanUseCondtion: {CardEffectCommons.IsExistOnBattleAreaDigimon(card)}");
                     if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
-                        Debug.Log($"Kakkinmon_EX6 - CanUseCondtion: {CardEffectCommons.IsOwnerTurn(card)}");
                         if (CardEffectCommons.IsOwnerTurn(card))
                         {
-                            Debug.Log($"Kakkinmon_EX6 - CanUseCondtion: {card.PermanentOfThisCard().DigivolutionCards.Count(HasLegendArms)}");
                             return card.PermanentOfThisCard().DigivolutionCards.Count(HasLegendArms) > 0;
                         }
                     }
@@ -50,13 +46,11 @@ namespace DCGO.CardEffects.EX6
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    Debug.Log($"Kakkinmon_EX6 - CanActivateCondition: {CardEffectCommons.IsExistOnBattleAreaDigimon(card)}");
                     return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
-                    Debug.Log($"Kakkinmon_EX6 - ActivateCoroutine");
                     SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
 
                     selectCardEffect.SetUp(

+ 0 - 1
Assets/Scripts/CardController.cs

@@ -684,7 +684,6 @@ public class PlayCardClass
 
             if (PayCost)
             {
-                UnityEngine.Debug.Log($"Pay Cost: {Cost}, {card.Owner.MaxMemoryCost}, {baseCost}, {_fixedCost}");
                 if (Cost > card.Owner.MaxMemoryCost)
                 {
                     endPlayCard = true;

+ 0 - 4
Assets/Scripts/CardEffectCommons/CanUseEffects/OnDeletion.cs

@@ -238,10 +238,6 @@ public partial class CardEffectCommons
                     {
                         if (CardSources.Some(cardSource => cardCondition == null || cardCondition(cardSource)))
                         {
-                            foreach (DictionaryEntry entry in hashtable1)
-                            {
-                                Debug.Log($"{entry.Key}, {entry.Value}");
-                            }
                             if (hashtable1.ContainsKey("TopCard"))
                             {
                                 if (hashtable1["TopCard"] is CardSource)