Prechádzať zdrojové kódy

Remove Several Debugs

mbunch_kascope 1 rok pred
rodič
commit
d3420671d9
30 zmenil súbory, kde vykonal 27 pridanie a 105 odobranie
  1. 0 5
      Assets/CardEffect/BT10/Red/BT10_112.cs
  2. 0 6
      Assets/CardEffect/BT11/Black/BT11_092.cs
  3. 0 1
      Assets/CardEffect/BT15/Red/BT15_082.cs
  4. 0 1
      Assets/CardEffect/BT15/Yellow/BT15_041.cs
  5. 0 2
      Assets/CardEffect/BT16/Black/BT16_096.cs
  6. 0 1
      Assets/CardEffect/BT16/Yellow/BT16_032.cs
  7. 0 8
      Assets/CardEffect/BT19/Yellow/BT19_038.cs
  8. 0 3
      Assets/CardEffect/BT20/Black/BT20_055.cs
  9. 0 1
      Assets/CardEffect/BT20/Green/BT20_044.cs
  10. 0 1
      Assets/CardEffect/BT21/Purple/BT21_074.cs
  11. 0 5
      Assets/CardEffect/BT21/Purple/BT21_088.cs
  12. 1 5
      Assets/CardEffect/BT21/Red/BT21_023.cs
  13. 0 1
      Assets/CardEffect/BT22/Yellow/BT22_088.cs
  14. 0 16
      Assets/CardEffect/EX1/Black/EX1_046.cs
  15. 0 3
      Assets/CardEffect/EX5/Red/EX5_001.cs
  16. 0 1
      Assets/CardEffect/EX6/Green/EX6_034.cs
  17. 0 1
      Assets/CardEffect/EX6/Purple/EX6_057.cs
  18. 2 6
      Assets/CardEffect/EX8/Red/EX8_073.cs
  19. 0 2
      Assets/CardEffect/P/Green/P_181.cs
  20. 1 1
      Assets/CardEffect/P/Red/P_152.cs
  21. 1 3
      Assets/Editor/AttachCardData.cs
  22. 2 3
      Assets/Scripts/CardController.cs
  23. 1 1
      Assets/Scripts/CardEffectCommons.cs
  24. 0 1
      Assets/Scripts/CardEffectCommons/CanUseEffects/OnDeletion.cs
  25. 3 5
      Assets/Scripts/CardEffectCommons/KeyWordEffects/Collision.cs
  26. 9 9
      Assets/Scripts/CardObjectController.cs
  27. 2 2
      Assets/Scripts/CardSource.cs
  28. 0 6
      Assets/Scripts/ContinuousController.cs
  29. 4 4
      Assets/Scripts/Permanent.cs
  30. 1 1
      Assets/Scripts/SelectCardEffect.cs

+ 0 - 5
Assets/CardEffect/BT10/Red/BT10_112.cs

@@ -248,11 +248,6 @@ namespace DCGO.CardEffects.BT10
 
                                         IEnumerator AfterSelectIndexCoroutine(List<int> selectedIndexes)
                                         {
-                                            Debug.Log($"Testing: {selectedIndexes.Count}");
-
-                                            foreach(int index in selectedIndexes)
-                                                Debug.Log(index);
-
                                             if (selectedIndexes.Count == 1)
                                             {
                                                 selectedEffect = candidateEffects[selectedIndexes[0]];

+ 0 - 6
Assets/CardEffect/BT11/Black/BT11_092.cs

@@ -146,16 +146,12 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    Debug.Log($"CanUseCondition: {CardEffectCommons.IsExistOnBattleArea(card)}");
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
-                        Debug.Log($"CanUseCondition: {CardEffectCommons.IsOpponentTurn(card)}");
                         if (CardEffectCommons.IsOpponentTurn(card))
                         {
-                            Debug.Log($"CanUseCondition: {CardEffectCommons.CanTriggerOnPermanentAttack(hashtable, PermanentCondition)}");
                             if (CardEffectCommons.CanTriggerOnPermanentAttack(hashtable, PermanentCondition))
                             {
-                                Debug.Log($"CanUseCondition: {GManager.instance.attackProcess.DefendingPermanent}");
                                 if (GManager.instance.attackProcess.DefendingPermanent == null)
                                 {
                                     return true;
@@ -169,10 +165,8 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    Debug.Log($"CanActivateCondition: {CardEffectCommons.IsExistOnBattleArea(card)}");
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
-                        Debug.Log($"CanActivateCondition: {CardEffectCommons.CanActivateSuspendCostEffect(card)}");
                         if (CardEffectCommons.CanActivateSuspendCostEffect(card))
                         {
                             return true;

+ 0 - 1
Assets/CardEffect/BT15/Red/BT15_082.cs

@@ -94,7 +94,6 @@ namespace DCGO.CardEffects.BT15
 
                         IEnumerator SuccessProcess()
                         {
-                            Debug.Log("Successful Return: Select and Play out digimon");
                             List<CardSource> selectedCards = new List<CardSource>();
 
                             SelectHandEffect selectHandEffect = GManager.instance.GetComponent<SelectHandEffect>();

+ 0 - 1
Assets/CardEffect/BT15/Yellow/BT15_041.cs

@@ -318,7 +318,6 @@ namespace DCGO.CardEffects.BT15
                                     if (selectedEffect != null)
                                     {
                                         Hashtable effectHashtable = CardEffectCommons.WhenDigivolvingCheckHashtableOfCard(selectedEffect.EffectSourceCard);
-                                        Debug.Log("XX");
 
                                         yield return ContinuousController.instance.StartCoroutine(
                                             ((ActivateICardEffect)selectedEffect).Activate_Optional_Effect_Execute(effectHashtable));

+ 0 - 2
Assets/CardEffect/BT16/Black/BT16_096.cs

@@ -76,10 +76,8 @@ namespace DCGO.CardEffects.BT16
                 {
                     if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
                     {
-                        Debug.Log($"SelectCondion ({cardSource.BaseENGCardNameFromEntity}): Can Play as new permanent - {cardSource.HasDBrigadeorDigiPoliceTraits}");
                         if (cardSource.HasDBrigadeorDigiPoliceTraits)
                         {
-                            Debug.Log($"SelectCondion ({cardSource.BaseENGCardNameFromEntity}): has right traits");
                             if (cardSource.HasPlayCost && cardSource.GetCostItself <= 4)
                             {
                                 return true;

+ 0 - 1
Assets/CardEffect/BT16/Yellow/BT16_032.cs

@@ -64,7 +64,6 @@ namespace DCGO.CardEffects.BT16
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
-                    Debug.Log("SHEEPMON: END ATTACK");
                     GManager.instance.attackProcess.IsEndAttack = true;
 
                     yield return null;

+ 0 - 8
Assets/CardEffect/BT19/Yellow/BT19_038.cs

@@ -150,28 +150,20 @@ namespace DCGO.CardEffects.BT19
 
                         bool InvalidateCondition(ICardEffect cardEffect)
                         {
-                            UnityEngine.Debug.Log($"DISABLE CLASS: {selectedPermanent.TopCard}");
                             if (selectedPermanent.TopCard != null)
                             {
-                                UnityEngine.Debug.Log($"DISABLE CLASS: {cardEffect}");
                                 if (cardEffect != null)
                                 {
-                                    UnityEngine.Debug.Log($"DISABLE CLASS: {cardEffect.EffectSourceCard}");
                                     if (cardEffect.EffectSourceCard != null)
                                     {
-                                        UnityEngine.Debug.Log($"DISABLE CLASS: {isExistOnField(cardEffect.EffectSourceCard)}");
                                         if (isExistOnField(cardEffect.EffectSourceCard))
                                         {
-                                            UnityEngine.Debug.Log($"DISABLE CLASS: {(cardEffect.EffectSourceCard.PermanentOfThisCard() == selectedPermanent)}");
                                             if (cardEffect.EffectSourceCard.PermanentOfThisCard() == selectedPermanent)
                                             {
-                                                UnityEngine.Debug.Log($"DISABLE CLASS: {cardEffect.IsWhenDigivolving}");
                                                 if (cardEffect.IsWhenDigivolving)
                                                 {
-                                                    UnityEngine.Debug.Log($"DISABLE CLASS: {!selectedPermanent.TopCard.CanNotBeAffected(activateClass)}");
                                                     if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
                                                     {
-                                                        UnityEngine.Debug.Log($"DISABLE CLASS: DONE");
                                                         return true;
                                                     }
                                                 }

+ 0 - 3
Assets/CardEffect/BT20/Black/BT20_055.cs

@@ -269,9 +269,6 @@ namespace DCGO.CardEffects.BT20
                             {
                                 if (!CardEffectCommons.GetCardFromHashtable(hashtable).IsFlipped)
                                 {
-                                    UnityEngine.Debug.Log(card);
-                                    UnityEngine.Debug.Log(card.PermanentOfThisCard());
-                                    UnityEngine.Debug.Log(card.PermanentOfThisCard().DigivolutionCards);
                                     return card.PermanentOfThisCard().DigivolutionCards.Count > 0;
                                 }
                             }

+ 0 - 1
Assets/CardEffect/BT20/Green/BT20_044.cs

@@ -292,7 +292,6 @@ namespace DCGO.CardEffects.BT20
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    UnityEngine.Debug.Log($"CanActivateCondtion: {CardEffectCommons.IsExistOnBattleAreaDigimon(card)}, {CardEffectCommons.HasMatchConditionPermanent(CanSelectOpponentPermanentCondition)}");
                     return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
                            CardEffectCommons.HasMatchConditionPermanent(CanSelectOpponentPermanentCondition);
                 }

+ 0 - 1
Assets/CardEffect/BT21/Purple/BT21_074.cs

@@ -415,7 +415,6 @@ namespace DCGO.CardEffects.BT21
                             IEnumerator SelectPermanentCoroutine(Permanent permanent)
                             {
                                 selectedPermanent = permanent;
-                                UnityEngine.Debug.Log($"PERMENENT SELECTED: {permanent}");
                                 yield return null;
                             }
 

+ 0 - 5
Assets/CardEffect/BT21/Purple/BT21_088.cs

@@ -156,13 +156,10 @@ namespace DCGO.CardEffects.BT21
 
                 bool CanSelectPermanentCondition(Permanent permanent)
                 {
-                    UnityEngine.Debug.Log($"CAN SELECT: {CardEffectCommons.IsPermanentExistsOnOwnerBattleArea(permanent, card)}");
                     if (CardEffectCommons.IsPermanentExistsOnOwnerBattleArea(permanent, card))
                     {
-                        UnityEngine.Debug.Log($"CAN SELECT: {permanent.IsTamer}");
                         if (permanent.IsTamer)
                         {
-                            UnityEngine.Debug.Log($"CAN SELECT: {permanent.DigivolutionCards.Count(CanSelectCardCondition)}");
                             if (permanent.DigivolutionCards.Count() >= 1)
                             {
                                 return true;
@@ -213,7 +210,6 @@ namespace DCGO.CardEffects.BT21
                     {
                         if (CardEffectCommons.CanActivateSuspendCostEffect(card))
                         {
-                            UnityEngine.Debug.Log($"CAN ACTIVATE: {card.Owner.GetBattleAreaPermanents().Count(CanSelectPermanentCondition)}");
                             if (card.Owner.GetBattleAreaPermanents().Count(CanSelectPermanentCondition) >= 1)
                             {
                                 return true;
@@ -226,7 +222,6 @@ namespace DCGO.CardEffects.BT21
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 {
-                    UnityEngine.Debug.Log($"ACTIVATE: {card.Owner.GetBattleAreaPermanents().Count(CanSelectPermanentCondition)}");
                     if (card.Owner.GetBattleAreaPermanents().Count(CanSelectPermanentCondition) >= 1)
                     {
                         yield return ContinuousController.instance.StartCoroutine(new SuspendPermanentsClass(new List<Permanent>() { card.PermanentOfThisCard() }, CardEffectCommons.CardEffectHashtable(activateClass)).Tap());

+ 1 - 5
Assets/CardEffect/BT21/Red/BT21_023.cs

@@ -166,7 +166,6 @@ namespace DCGO.CardEffects.BT21
             {
                 bool canSelectHand = CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectCardConditionShared);
                 bool canSelectSources = card.PermanentOfThisCard().DigivolutionCards.Filter(x => CanSelectCardConditionShared(x)).Count > 0;
-                UnityEngine.Debug.Log($"GLOBEMON: ACTIVATION - {canSelectHand}, {canSelectSources}");
                 if (canSelectHand || canSelectSources)
                 {
                     if (canSelectHand && canSelectSources)
@@ -191,7 +190,7 @@ namespace DCGO.CardEffects.BT21
 
                     bool fromHand = GManager.instance.userSelectionManager.SelectedBoolValue;
                     CardSource selectedCard = null;
-                    UnityEngine.Debug.Log($"GLOBEMON: ACTIVATION - {fromHand}");
+
                     if (fromHand)
                     {
                         int maxCount = Math.Min(1, CardEffectCommons.MatchConditionOwnersCardCountInHand(card, CanSelectCardConditionShared));
@@ -252,7 +251,6 @@ namespace DCGO.CardEffects.BT21
 
                     if (selectedCard != null)
                     {
-                        UnityEngine.Debug.Log($"GLOBEMON: ACTIVATION - {selectedCard.BaseENGCardNameFromEntity}");
                         yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddLinkCard(selectedCard, activateClass));
                     }
                 }
@@ -317,7 +315,6 @@ namespace DCGO.CardEffects.BT21
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    UnityEngine.Debug.Log($"GLOBEMON: CAN USE - {CardEffectCommons.IsExistOnBattleAreaDigimon(card)}, {CardEffectCommons.CanTriggerWhenDigivolving(hashtable, card)}");
                     if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                         if (CardEffectCommons.CanTriggerWhenDigivolving(hashtable, card))
@@ -330,7 +327,6 @@ namespace DCGO.CardEffects.BT21
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    UnityEngine.Debug.Log($"GLOBEMON: CAN ACTIVATE - {CardEffectCommons.IsExistOnBattleAreaDigimon(card)}, ({CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectCardConditionShared)} || {card.PermanentOfThisCard().DigivolutionCards.Filter(x => CanSelectCardConditionShared(x)).Count})");
                     if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectCardConditionShared) || card.PermanentOfThisCard().DigivolutionCards.Filter(x => CanSelectCardConditionShared(x)).Count > 0)

+ 0 - 1
Assets/CardEffect/BT22/Yellow/BT22_088.cs

@@ -106,7 +106,6 @@ namespace DCGO.CardEffects.BT22
                                     activateETB: true));
                         }
 
-                        UnityEngine.Debug.Log($"THEN: {card.Owner.GetBattleAreaDigimons().Any()}, {CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, IsShoemon)}");
                         if (!card.Owner.GetBattleAreaDigimons().Any() && CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, IsShoemon))
                         {
                             CardSource selectedTrashCard = null;

+ 0 - 16
Assets/CardEffect/EX1/Black/EX1_046.cs

@@ -26,20 +26,12 @@ namespace DCGO.CardEffects.EX1
 
                 bool PermanentCondition(Permanent permanent)
                 {
-                    Debug.Log("A001");
-
                     if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card))
                     {
-                        Debug.Log("A002");
-
                         if (permanent != card.PermanentOfThisCard())
                         {
-                            Debug.Log("A003");
-
                             if (permanent.TopCard.HasSameCardName(card.PermanentOfThisCard().TopCard))
                             {
-                                Debug.Log("A004");
-
                                 return true;
                             }
                         }
@@ -50,20 +42,12 @@ namespace DCGO.CardEffects.EX1
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    Debug.Log("B001");
-
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
-                        Debug.Log("B002");
-
                         if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition))
                         {
-                            Debug.Log("B003");
-
                             if (CardEffectCommons.IsOwnerTurn(card))
                             {
-                                Debug.Log("B004");
-
                                 return true;
                             }
                         }

+ 0 - 3
Assets/CardEffect/EX5/Red/EX5_001.cs

@@ -52,13 +52,10 @@ public class EX5_001 : CEntity_Effect
 
             bool CanActivateCondition(Hashtable hashtable)
             {
-                Debug.Log("b01");
                 if (CardEffectCommons.IsExistOnBattleArea(card))
                 {
-                    Debug.Log("b02");
                     if (card.Owner.HandCards.Count >= 1)
                     {
-                        Debug.Log("b03");
                         return true;
                     }
                 }

+ 0 - 1
Assets/CardEffect/EX6/Green/EX6_034.cs

@@ -222,7 +222,6 @@ namespace DCGO.CardEffects.EX6
 
                         IEnumerator SuccessProcess()
                         {
-                            Debug.Log("Successful Return: Select and Play out Digimon");
                             List<CardSource> selectedCards = new List<CardSource>();
 
                             SelectHandEffect selectHandEffect = GManager.instance.GetComponent<SelectHandEffect>();

+ 0 - 1
Assets/CardEffect/EX6/Purple/EX6_057.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using Photon;
 using System;
 using Photon.Pun;
-using static UnityEngine.Rendering.DebugUI;
 
 namespace DCGO.CardEffects.EX6
 {

+ 2 - 6
Assets/CardEffect/EX8/Red/EX8_073.cs

@@ -226,7 +226,6 @@ namespace DCGO.CardEffects.EX8
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    UnityEngine.Debug.Log($"CAN USE: {CardEffectCommons.IsExistOnBattleAreaDigimon(card)}, {CardEffectCommons.CanTriggerWhenDigivolving(hashtable, card)}");
                     if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                         if (CardEffectCommons.CanTriggerWhenDigivolving(hashtable, card))
@@ -240,14 +239,13 @@ namespace DCGO.CardEffects.EX8
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    UnityEngine.Debug.Log($"CAN ACTIVATE: {CardEffectCommons.IsExistOnBattleAreaDigimon(card)}");
                     return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
                     List<Permanent> deleteTargetPermanents = new List<Permanent>();
-                    UnityEngine.Debug.Log($"ACTIVATE: {CardEffectCommons.HasMatchConditionPermanent(CanSelectOpponentPermanentCondition)}");
+
                     if (CardEffectCommons.HasMatchConditionPermanent(CanSelectOpponentPermanentCondition))
                     {
                         int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectOpponentPermanentCondition));
@@ -273,14 +271,12 @@ namespace DCGO.CardEffects.EX8
 
                         IEnumerator AfterSelectPermanentCoroutine(List<Permanent> permanents)
                         {
-                            UnityEngine.Debug.Log($"ACTIVATE: Select Permanents - {permanents.Count}");
                             deleteTargetPermanents = permanents.Clone();
                             yield return null;
                         }
                     }
-                    UnityEngine.Debug.Log($"ACTIVATE: Attempt Delete");
                     yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DeletePeremanentAndProcessAccordingToResult(targetPermanents: deleteTargetPermanents, activateClass: activateClass, successProcess: null, failureProcess: FailureProcess));
-                    UnityEngine.Debug.Log($"ACTIVATE: Post Delete");
+
                     IEnumerator FailureProcess()
                     {
                         if (card.Owner.Enemy.SecurityCards.Count >= 1)

+ 0 - 2
Assets/CardEffect/P/Green/P_181.cs

@@ -25,7 +25,6 @@ namespace DCGO.CardEffects.P
                     => "[Security] [Your Turn] [Once Per Turn] When any of your Digimon would digivolve into a Digimon card with the [Royal Base] trait, reduce the digivolution cost by 1.";
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    UnityEngine.Debug.Log($"CAN USE: {CardEffectCommons.IsExistInSecurity(card, false)}, {CardEffectCommons.IsOwnerTurn(card)}, {CardEffectCommons.CanTriggerWhenPermanentWouldDigivolve(hashtable, DigivolveTargetCondition, DigivolveCondition)}");
                     return CardEffectCommons.IsExistInSecurity(card, false) &&
                            CardEffectCommons.IsOwnerTurn(card) &&
                            CardEffectCommons.CanTriggerWhenPermanentWouldDigivolve(hashtable, DigivolveTargetCondition, DigivolveCondition);
@@ -33,7 +32,6 @@ namespace DCGO.CardEffects.P
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    UnityEngine.Debug.Log($"CAN ACTIVATE: {CardEffectCommons.IsExistInSecurity(card, false)}");
                     return CardEffectCommons.IsExistInSecurity(card, false);
                 }
 

+ 1 - 1
Assets/CardEffect/P/Red/P_152.cs

@@ -144,7 +144,7 @@ namespace DCGO.CardEffects.P
                                 activateClass: activateClass));
                     }
                     #endregion
-                    UnityEngine.Debug.Log($"SHOUTMONDORULUCANNON: {card.PermanentOfThisCard().DigivolutionCards.Count(DigivolutionCondition)}");
+
                     if (card.PermanentOfThisCard().DigivolutionCards.Count(DigivolutionCondition) > 0)
                     {
                         int maxCount = Math.Min(1, card.PermanentOfThisCard().DigivolutionCards.Count(DigivolutionCondition));

+ 1 - 3
Assets/Editor/AttachCardData.cs

@@ -22,7 +22,7 @@ public class AttachCardData : MonoBehaviour
          BT11_086 Mervamon
          BT10_042
          */
-        List<string> DebugCardSpriteNames = new List<string>() { "EX5-070_P1" };
+        List<string> DebugCardSpriteNames = new List<string>() { };
 
         foreach (GameObject obj in Selection.gameObjects)
         {
@@ -70,8 +70,6 @@ public class AttachCardData : MonoBehaviour
                     EditorSceneManager.MarkSceneDirty(scene);
                 }
 
-                Debug.Log($"card:{CCtrl.CardList.ToList().Map(cEntity_Base => cEntity_Base.CardID).Distinct().ToList().Count}kinds");
-
                 return;
             }
         }

+ 2 - 3
Assets/Scripts/CardController.cs

@@ -166,7 +166,6 @@ public class PlayCardClass
 
     private bool GetIgnoreRequirement(CardEffectCommons.IgnoreRequirement ignore)
     {
-        Debug.Log($"Get Ignore Requirement: {_ignoreRequirement.Equals(ignore)}, {_ignoreRequirement.Equals(CardEffectCommons.IgnoreRequirement.All)}");
         return _ignoreRequirement.Equals(ignore) || _ignoreRequirement.Equals(CardEffectCommons.IgnoreRequirement.All);
     }
     
@@ -1653,7 +1652,7 @@ public class UseOptionClass
 
             GManager.instance.turnStateMachine.isSync = true;
 
-            card.SetFace("CardContoller.UseOption");
+            card.SetFace();
 
             int cost = card.GetCostItself;
 
@@ -3068,7 +3067,7 @@ public class IPutSecurityPermanent
                 if (!_isFaceup)
                     topCard.SetReverse();
                 else
-                    topCard.SetFace("CardController.PutSecurity");
+                    topCard.SetFace();
 
                 if (!_toTop)
                 {

+ 1 - 1
Assets/Scripts/CardEffectCommons.cs

@@ -520,7 +520,7 @@ public partial class CardEffectCommons
         {
             fixedCost = fixedCostTuple.Value.fixedCost;
         }
-        Debug.Log($"Digivolve into hand or trash: {ignoreDigivolutionRequirement}");
+
         if (ignoreDigivolutionRequirement)
         {
             fixedCost = ignoreDigivolutionRequirementFixedCost;

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

@@ -4,7 +4,6 @@ using System;
 using System.Linq;
 using UnityEngine;
 using UnityEditor.Rendering;
-using static UnityEngine.Rendering.DebugUI;
 
 public partial class CardEffectCommons
 {

+ 3 - 5
Assets/Scripts/CardEffectCommons/KeyWordEffects/Collision.cs

@@ -9,16 +9,14 @@ public partial class CardEffectCommons
     #region Target 1 Digimon gains [Collision]
     public static IEnumerator GainCollision(Permanent targetPermanent, EffectDuration effectDuration, ICardEffect activateClass)
     {
-        Debug.Log($"GAIN COLLISION: START");
         if (targetPermanent == null) yield break;
-        Debug.Log($"GAIN COLLISION: PERMANENT");
+
         if (!IsPermanentExistsOnBattleArea(targetPermanent)) yield break;
-        Debug.Log($"GAIN COLLISION: BATTLE AREA");
+
         if (activateClass == null) yield break;
-        Debug.Log($"GAIN COLLISION: ACTIVATE CLASS");
+
         if (activateClass.EffectSourceCard == null) yield break;
 
-        Debug.Log($"GAIN COLLISION: PASSED");
         CardSource card = activateClass.EffectSourceCard;
 
         bool PermanentCondition(Permanent permanent) => permanent == targetPermanent;

+ 9 - 9
Assets/Scripts/CardObjectController.cs

@@ -371,7 +371,7 @@ public class CardObjectController : MonoBehaviour
     {
         //TODO: This might not even be necessary at all? - MB
         if(!cardSource.IsFlipped || cardSource.IsBeingRevealed || GManager.instance.turnStateMachine.gameContext.IsSecurityLooking)
-            cardSource.SetFace("CardObjectController.RemoveFromAllArea");
+            cardSource.SetFace();
 
         if (cardSource.Owner.HandCards.Contains(cardSource))
         {
@@ -483,7 +483,7 @@ public class CardObjectController : MonoBehaviour
 
                     permanent.TopCard.Owner.fieldCardFrames[frameID].SetFramePermanent(permanent);
 
-                    permanent.TopCard.SetFace("CardObjectController.CreateNewPermanent");
+                    permanent.TopCard.SetFace();
 
                     FieldPermanentCard fieldPermanentCard = Instantiate(GManager.instance.fieldCardPrefab, permanent.TopCard.Owner.PermanentTransform);
 
@@ -610,7 +610,7 @@ public class CardObjectController : MonoBehaviour
     public static IEnumerator AddHandCard(CardSource cardSource, bool isDraw)
     {
         cardSource.Init();
-        cardSource.SetFace("CardObjectController.AddHandCard");
+        cardSource.SetFace();
 
         if (!cardSource.Owner.HandCards.Contains(cardSource))
         {
@@ -707,7 +707,7 @@ public class CardObjectController : MonoBehaviour
 
             if (!cardSource.IsToken)
             {
-                cardSource.SetFace("CardObjectController.AddTrashCard");
+                cardSource.SetFace();
 
                 if (!CardEffectCommons.IsExistOnTrash(cardSource))
                 {
@@ -748,7 +748,7 @@ public class CardObjectController : MonoBehaviour
 
                 if (!cardSource.IsToken)
                 {
-                    cardSource.SetFace("CardObjectController.AddTrashCards");
+                    cardSource.SetFace();
 
                     if (!CardEffectCommons.IsExistOnTrash(cardSource))
                     {
@@ -799,7 +799,7 @@ public class CardObjectController : MonoBehaviour
 
             if (!cardSource.IsToken)
             {
-                cardSource.SetFace("CardObjectController.AddLibraryTopCards");
+                cardSource.SetFace();
 
                 if (!cardSource.IsDigiEgg)
                 {
@@ -893,7 +893,7 @@ public class CardObjectController : MonoBehaviour
 
             if (!cardSource.IsToken)
             {
-                cardSource.SetFace("CardObjectController.AddLibraryBottomCards");
+                cardSource.SetFace();
 
                 if (!cardSource.IsDigiEgg)
                 {
@@ -947,7 +947,7 @@ public class CardObjectController : MonoBehaviour
 
             if (!cardSource.IsToken)
             {
-                cardSource.SetFace("CardObjectController.AddExecutingCard");
+                cardSource.SetFace();
 
                 cardSource.Owner.ExecutingCards.Insert(0, cardSource);
 
@@ -969,7 +969,7 @@ public class CardObjectController : MonoBehaviour
                 if (!faceUp)
                     cardSource.SetReverse();
                 else
-                    cardSource.SetFace("CardObjectController.AddSecurityCard");
+                    cardSource.SetFace();
 
                 cardSource.Owner.SecurityCards.Insert(0, cardSource);
 

+ 2 - 2
Assets/Scripts/CardSource.cs

@@ -41,7 +41,7 @@ public class CardSource : MonoBehaviour
         Owner = owner;
         gameObject.name = _cEntity_Base.CardName_ENG;
 
-        SetFace("CardSource.SetBaseData");
+        SetFace();
     }
 
     #endregion
@@ -309,7 +309,7 @@ public class CardSource : MonoBehaviour
     public void Init()
     {
         cEntity_EffectController.InitUseCountThisTurn();
-        SetFace("CardSource.Initialize");
+        SetFace();
     }
 
     #endregion

+ 0 - 6
Assets/Scripts/ContinuousController.cs

@@ -1177,8 +1177,6 @@ public class ContinuousController : MonoBehaviour
             yield return new WaitForSeconds(0.1f);
 
             EventSystem.current.SetSelectedGameObject(Opening.instance.battle.selectBattleMode.transform.GetChild(0).gameObject);
-
-            //Debug.Log("フォーカスを設定");
         }
 
         //GUI.UnfocusWindow();
@@ -1550,13 +1548,9 @@ public class PhotonUtility
 
         else
         {
-            Debug.Log($"SIGN UP BATTLE DECK: {ContinuousController.DeckDataPropertyKey}");
-            Debug.Log($"SIGN UP BATTLE DECK: {ContinuousController.instance.BattleDeckData.GetThisDeckCode()}");
             hash.Add(ContinuousController.DeckDataPropertyKey, ContinuousController.instance.BattleDeckData.GetThisDeckCode());
         }
 
-        //Debug.Log($"バトルデッキデータ登録,KeyCard:{ContinuousController.instance.BattleDeckData.KeyCard.CardName_JPN}");
-
         PhotonNetwork.LocalPlayer.SetCustomProperties(hash);
 
         while (true)

+ 4 - 4
Assets/Scripts/Permanent.cs

@@ -846,7 +846,7 @@ public class Permanent
         cardSources.Insert(0, cardSource);
 
         if (!cardSource.IsFlipped)
-            cardSource.SetFace("Permanent.AddSourceCard");
+            cardSource.SetFace();
         else
             cardSource.SetReverse();
     }
@@ -889,7 +889,7 @@ public class Permanent
                 this.cardSources.Insert(1, addedDigivolutionCard);
 
                 if (!addedDigivolutionCard.IsFlipped || addedDigivolutionCard.IsBeingRevealed || GManager.instance.turnStateMachine.gameContext.IsSecurityLooking)
-                    addedDigivolutionCard.SetFace("Permanent.AddDigivolutionCardsTop");
+                    addedDigivolutionCard.SetFace();
 
                 addedCards.Add(addedDigivolutionCard);
             }
@@ -989,7 +989,7 @@ public class Permanent
                 if (isFacedown)
                     addedDigivolutionCard.SetReverse();
                 else
-                    addedDigivolutionCard.SetFace("Permanent.AddDigivolutionCardsBottom");
+                    addedDigivolutionCard.SetFace();
 
                 addedCards.Add(addedDigivolutionCard);
             }
@@ -1059,7 +1059,7 @@ public class Permanent
             LinkedDP += addedLinkCard.LinkDP;
 
             this.cardSources.Insert(1, addedLinkCard);
-            addedLinkCard.SetFace("Permanent.AddLinkCard");
+            addedLinkCard.SetFace();
             addedCard = true;
         }
 

+ 1 - 1
Assets/Scripts/SelectCardEffect.cs

@@ -716,7 +716,7 @@ public class SelectCardEffect : MonoBehaviourPunCallbacks
                 case Mode.AddHand:
                     foreach (CardSource cardSource in _targetCards)
                     {
-                        cardSource.SetFace("SelectCardEffect.Activate.AddHand");
+                        cardSource.SetFace();
 
                         if (cardSource.IsDigiEgg) yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddLibraryBottomCards(new List<CardSource> { cardSource }));
                         else