Эх сурвалжийг харах

Merge branch 'develop' into Warning-Removal-Experimental-and-Animations

x89rt2 3 сар өмнө
parent
commit
a6e3612fa6
42 өөрчлөгдсөн 134 нэмэгдсэн , 189 устгасан
  1. 1 1
      Assets/Editor/JSONLoader_CardEntity.cs
  2. 1 1
      Assets/Photon/PhotonRealtime/Code/LoadbalancingPeer.cs
  3. 5 21
      Assets/Scripts/CardEffect/BT1/Red/BT1_012.cs
  4. 2 2
      Assets/Scripts/CardEffect/BT10/Black/BT10_104.cs
  5. 1 1
      Assets/Scripts/CardEffect/BT12/Purple/BT12_081.cs
  6. 6 6
      Assets/Scripts/CardEffect/BT12/Red/BT12_015.cs
  7. 6 6
      Assets/Scripts/CardEffect/BT13/Green/BT13_056.cs
  8. 1 1
      Assets/Scripts/CardEffect/BT13/Yellow/BT13_034.cs
  9. 1 1
      Assets/Scripts/CardEffect/BT15/Purple/BT15_071.cs
  10. 2 2
      Assets/Scripts/CardEffect/BT16/Black/BT16_051.cs
  11. 1 1
      Assets/Scripts/CardEffect/BT16/Yellow/BT16_094.cs
  12. 7 28
      Assets/Scripts/CardEffect/BT21/Red/BT21_015.cs
  13. 11 11
      Assets/Scripts/CardEffect/BT21/Red/BT21_022.cs
  14. 6 5
      Assets/Scripts/CardEffect/BT22/Red/BT22_009.cs
  15. 2 1
      Assets/Scripts/CardEffect/BT23/Black/BT23_051.cs
  16. 10 11
      Assets/Scripts/CardEffect/BT23/Red/BT23_011.cs
  17. 1 1
      Assets/Scripts/CardEffect/BT23/Red/BT23_015.cs
  18. 1 1
      Assets/Scripts/CardEffect/BT25/Red/BT25_007.cs
  19. 7 7
      Assets/Scripts/CardEffect/BT25/Red/BT25_015.cs
  20. 3 3
      Assets/Scripts/CardEffect/BT3/Red/BT3_008.cs
  21. 1 1
      Assets/Scripts/CardEffect/BT8/Black/BT8_092.cs
  22. 1 1
      Assets/Scripts/CardEffect/BT8/Blue/BT8_087.cs
  23. 7 7
      Assets/Scripts/CardEffect/EX5/Green/EX5_043.cs
  24. 1 1
      Assets/Scripts/CardEffect/EX6/Black/EX6_037.cs
  25. 19 38
      Assets/Scripts/CardEffect/EX6/Yellow/EX6_017.cs
  26. 2 2
      Assets/Scripts/CardEffect/EX7/Purple/EX7_058.cs
  27. 1 1
      Assets/Scripts/CardEffect/LM/Black/LM_031.cs
  28. 1 1
      Assets/Scripts/CardEffect/LM/Blue/LM_028.cs
  29. 1 1
      Assets/Scripts/CardEffect/LM/Green/LM_030.cs
  30. 1 1
      Assets/Scripts/CardEffect/LM/Purple/LM_032.cs
  31. 1 1
      Assets/Scripts/CardEffect/LM/Red/LM_027.cs
  32. 1 1
      Assets/Scripts/CardEffect/LM/Yellow/LM_029.cs
  33. 2 1
      Assets/Scripts/CardEffect/P/Red/P_152.cs
  34. 1 1
      Assets/Scripts/CardEffect/P/Red/P_155.cs
  35. 2 2
      Assets/Scripts/CardEffect/P/Yellow/P_099.cs
  36. 7 7
      Assets/Scripts/Script/CEntity_Base.cs
  37. 1 1
      Assets/Scripts/Script/CardEffectCommons.cs
  38. 2 3
      Assets/Scripts/Script/CardEffectCommons/RevealLibrary.cs
  39. 1 1
      Assets/Scripts/Script/CardEffectFactory/AddDigivolutionRequirement.cs
  40. 1 1
      Assets/Scripts/Script/HideCannotSelectObject.cs
  41. 1 1
      Assets/Scripts/Script/MemoryObject.cs
  42. 4 4
      Assets/Scripts/Script/OfficialCardListUtility.cs

+ 1 - 1
Assets/Editor/JSONLoader_CardEntity.cs

@@ -124,7 +124,7 @@ namespace DCGO.CardEntities
         void CreateScriptableObject(CardData card, string imageID)
         {
             Debug.Log($"creating: {card.name.english} - {card.cardType}");
-            // CardEntity instance created
+            // CardEntity instance created
             CEntity_Base cardEntity = CreateInstance<CEntity_Base>();
             
             cardEntity.cardColors = GetCardColors(card.color);

+ 1 - 1
Assets/Photon/PhotonRealtime/Code/LoadbalancingPeer.cs

@@ -1908,7 +1908,7 @@ namespace Photon.Realtime
         ///
         /// 1) On server, room property ABC is set to value FOO, which triggers notifications to all the clients telling them that the property changed.
         /// 2) While that notification is in flight, a client sets the ABC property to value BAR.
-        /// 3) Client receives notification from the server and changes its local copy of ABC to FOO.
+        /// 3) Client receives notification from the server and changes it's local copy of ABC to FOO.
         /// 4) Server receives the set operation and changes the official value of ABC to BAR, but never notifies the client that sent the set operation that the value is now BAR.
         ///
         /// Without this option, the client that set the value to BAR never hears from the server that the official copy has been updated to BAR, and thus gets stuck with a value of FOO.

+ 5 - 21
Assets/Scripts/CardEffect/BT1/Red/BT1_012.cs

@@ -1,11 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
-using UnityEngine;
-using System.Linq;
-using Photon;
-using System;
-using Photon.Pun;
 
+// Biyomon
 public class BT1_012 : CEntity_Effect
 {
     public override List<ICardEffect> CardEffects(EffectTiming timing, CardSource card)
@@ -22,30 +18,18 @@ public class BT1_012 : CEntity_Effect
 
             string EffectDiscription()
             {
-                return "[Your Turn] When this Digimon is blocked�Cit gets +2000 DP.";
+                return "[Your Turn] When this Digimon is blocked, it gets +2000 DP.";
             }
 
             bool CanUseCondition(Hashtable hashtable)
             {
-                if (CardEffectCommons.CanTriggerOnAttack(hashtable, card))
-                {
-                    if (CardEffectCommons.IsOwnerTurn(card))
-                    {
-                        return true;
-                    }
-                }
-
-                return false;
+                return CardEffectCommons.CanTriggerOnAttack(hashtable, card)
+                    && CardEffectCommons.IsOwnerTurn(card);
             }
 
             bool CanActivateCondition(Hashtable hashtable)
             {
-                if (CardEffectCommons.IsExistOnBattleArea(card))
-                {
-                    return true;
-                }
-
-                return false;
+                return CardEffectCommons.IsExistOnBattleArea(card);
             }
 
             IEnumerator ActivateCoroutine(Hashtable _hashtable)

+ 2 - 2
Assets/Scripts/CardEffect/BT10/Black/BT10_104.cs

@@ -74,7 +74,7 @@ namespace DCGO.CardEffects.BT10
                         card.Owner,
                         activateClass).AddTrashCardsFromLibraryTop());
 
-                    #region �f�W�N���X�Ńg���b�V����I���”\
+                    #region Select DigiXros from Trash
 
                     AddMaxTrashCountDigiXrosClass addMaxTrashCountDigiXrosClass = new AddMaxTrashCountDigiXrosClass();
                     addMaxTrashCountDigiXrosClass.SetUpICardEffect("Can select DigiXros cards from trash", CanUseCondition1, card);
@@ -151,7 +151,7 @@ namespace DCGO.CardEffects.BT10
                             activateETB: true));
                     }
 
-                    #region �f�W�N���X�Ńg���b�V����I���”\����
+                    #region Remove Reduction
 
                     card.Owner.UntilCalculateFixedCostEffect.Remove(getCardEffect);
 

+ 1 - 1
Assets/Scripts/CardEffect/BT12/Purple/BT12_081.cs

@@ -171,7 +171,7 @@ namespace DCGO.CardEffects.BT12
                         
                         if (GManager.instance.userSelectionManager.SelectedIntValue == 0)
                         {
-                            #region Reduce Cost
+                            #region Reduce Cost
 
                             ChangeCostClass changeCostClass = new ChangeCostClass();
                             changeCostClass.SetUpICardEffect("Digivolution Cost -3", CanUseCondition1, card);

+ 6 - 6
Assets/Scripts/CardEffect/BT12/Red/BT12_015.cs

@@ -247,11 +247,11 @@ namespace DCGO.CardEffects.BT12
 
                                     if (digivolve)
                                     {
-                                        #region �Ԃ̃��x��4�f�W�����Ƃ��Ĉ���
+                                        #region 1
 
                                         CardSource topCard = selectedPermanent.TopCard;
 
-                                        #region �ԂƂ��Ĉ���
+                                        #region 2
 
                                         ChangeCardColorClass changeCardColorClass = new ChangeCardColorClass();
                                         changeCardColorClass.SetUpICardEffect($"Treated as red", CanUseCondition1, card);
@@ -286,7 +286,7 @@ namespace DCGO.CardEffects.BT12
 
                                         #endregion
 
-                                        #region ���x��4�Ƃ��Ĉ���
+                                        #region 3
 
                                         ChangePermanentLevelClass changePermanentLevelClass = new ChangePermanentLevelClass();
                                         changePermanentLevelClass.SetUpICardEffect($"Treated as level 4", CanUseCondition1, card);
@@ -308,7 +308,7 @@ namespace DCGO.CardEffects.BT12
 
                                         #endregion
 
-                                        #region �f�W�����Ƃ��Ĉ���
+                                        #region 4
 
                                         TreatAsDigimonClass treatAsDigimonClass = new TreatAsDigimonClass();
                                         treatAsDigimonClass.SetUpICardEffect($"Treated as Digimon", CanUseCondition1, card);
@@ -330,7 +330,7 @@ namespace DCGO.CardEffects.BT12
 
                                         #endregion
 
-                                        #region DP�������Ȃ�(UI�ɕ\������Ȃ��悤��
+                                        #region 5
 
                                         DontHaveDPClass dontHaveDPClass = new DontHaveDPClass();
                                         dontHaveDPClass.SetUpICardEffect("Don't have DP", CanUseCondition1, card);
@@ -366,7 +366,7 @@ namespace DCGO.CardEffects.BT12
                                                 activateETB: true).PlayCard());
                                         }
 
-                                        #region �Ԃ̃��x��4�f�W�����Ƃ��Ĉ������ʂ�����
+                                        #region 6
 
                                         foreach (Func<EffectTiming, ICardEffect> GetCardEffect in GetCardEffects)
                                         {

+ 6 - 6
Assets/Scripts/CardEffect/BT13/Green/BT13_056.cs

@@ -62,7 +62,7 @@ namespace DCGO.CardEffects.BT13
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 {
-                    #region �o��R�X�g-4
+                    #region Reduce play cost by 4
 
                     ChangeCostClass changeCostClass = new ChangeCostClass();
                     changeCostClass.SetUpICardEffect("Play Cost -4", CanUseCondition1, card);
@@ -191,7 +191,7 @@ namespace DCGO.CardEffects.BT13
                         yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.PlayPermanentCards(cardSources: selectedCards, activateClass: activateClass, payCost: true, isTapped: false, root: SelectCardEffect.Root.Hand, activateETB: true));
                     }
 
-                    #region �o��R�X�g-4����
+                    #region Remove Reduction
 
                     card.Owner.UntilCalculateFixedCostEffect.Remove(getCardEffect);
 
@@ -239,7 +239,7 @@ namespace DCGO.CardEffects.BT13
                     {
                         bool canPlay = false;
 
-                        #region �o��R�X�g-4
+                        #region Reduce play cost by 4
 
                         ChangeCostClass changeCostClass = new ChangeCostClass();
                         changeCostClass.SetUpICardEffect("Play Cost -4", CanUseCondition1, card);
@@ -336,7 +336,7 @@ namespace DCGO.CardEffects.BT13
                             canPlay = true;
                         }
 
-                        #region �o��R�X�g-4����
+                        #region Remove Reduction
 
                         card.Owner.UntilCalculateFixedCostEffect.Remove(getCardEffect);
 
@@ -353,7 +353,7 @@ namespace DCGO.CardEffects.BT13
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 {
-                    #region �o��R�X�g-4
+                    #region Reduce play cost by 4
 
                     ChangeCostClass changeCostClass = new ChangeCostClass();
                     changeCostClass.SetUpICardEffect("Play Cost -4", CanUseCondition1, card);
@@ -482,7 +482,7 @@ namespace DCGO.CardEffects.BT13
                         yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.PlayPermanentCards(cardSources: selectedCards, activateClass: activateClass, payCost: true, isTapped: false, root: SelectCardEffect.Root.Hand, activateETB: true));
                     }
 
-                    #region �o��R�X�g-4����
+                    #region Remove Reduction
 
                     card.Owner.UntilCalculateFixedCostEffect.Remove(getCardEffect);
 

+ 1 - 1
Assets/Scripts/CardEffect/BT13/Yellow/BT13_034.cs

@@ -107,7 +107,7 @@ namespace DCGO.CardEffects.BT13
 
                 string EffectDiscription()
                 {
-                    return "[When Attacking][Once per Turn] If there're 6 or fewer total cards in both players' security stacks, 1 of your opponent�f Digimon gets -2000 DP for the turn.";
+                    return "[When Attacking][Once per Turn] If there're 6 or fewer total cards in both players' security stacks, 1 of your opponent's Digimon gets -2000 DP for the turn.";
                 }
 
                 bool CanSelectPermanentCondition(Permanent permanent)

+ 1 - 1
Assets/Scripts/CardEffect/BT15/Purple/BT15_071.cs

@@ -78,7 +78,7 @@ namespace DCGO.CardEffects.BT15
                     {
                         if (permanent.HasDP)
                         {
-                            if (permanent.DP <= 3000)
+                            if (permanent.DP <= card.Owner.MaxDP_DeleteEffect(3000, activateClass))
                             {
                                 return true;
                             }

+ 2 - 2
Assets/Scripts/CardEffect/BT16/Black/BT16_051.cs

@@ -136,7 +136,7 @@ namespace DCGO.CardEffects.BT16
                         if (selectedPermanent != null)
                         {
                             CanNotBeRemovedClass canNotBeRemovedClass = new CanNotBeRemovedClass();
-                            canNotBeRemovedClass.SetUpICardEffect("Can't leave battle area except by deletion effect", CanUseProtectionCondition, card);
+                            canNotBeRemovedClass.SetUpICardEffect("Can't leave battle area except by deletion", CanUseProtectionCondition, card);
                             canNotBeRemovedClass.SetUpCanNotBeRemovedClass(permanentCondition: PermanentCondition);
                             selectedPermanent.UntilOpponentTurnEndEffects.Add((_timing) => canNotBeRemovedClass);
 
@@ -184,4 +184,4 @@ namespace DCGO.CardEffects.BT16
             return cardEffects;
         }
     }
-}
+}

+ 1 - 1
Assets/Scripts/CardEffect/BT16/Yellow/BT16_094.cs

@@ -87,7 +87,7 @@ namespace DCGO.CardEffects.BT16
 
                 string EffectDiscription()
                 {
-                    return "[Main] <Delay>\r\n Place 1 [Trial of the Four Great Dragons] from your hand in the battle area, or you may trash 1 card with the [Four Great Dragons] trait in your hand. If you did either, 1 of your opponent's Digimon gets -7000 DP for the turn.";
+                    return "[Main] <Delay>\r\n Place 1 [Trial of the Four Great Dragons] from your hand in the battle area, or you may trash 1 card with the [Four Great Dragons] trait in your hand. If you did either, 1 of your opponent's Digimon gets -7000 DP for the turn.";
                 }
 
                 bool CanUseCondition(Hashtable hashtable)

+ 7 - 28
Assets/Scripts/CardEffect/BT21/Red/BT21_015.cs

@@ -20,23 +20,16 @@ namespace DCGO.CardEffects.BT21
 
             #endregion
 
-            #region On Play / When Digivolving Shared
+            #region On Play / When Digivolving Shared       
 
-            bool CanSelectPermanentCondition(Permanent permanent)
+            IEnumerator ActivateCoroutine(Hashtable _hashtable, ActivateClass activateClass)
             {
-                if (CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card))
+                bool CanSelectPermanentCondition(Permanent permanent)
                 {
-                    if (permanent.DP <= 4000)
-                    {
-                        return true;
-                    }
+                    return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card)
+                        && permanent.DP <= card.Owner.MaxDP_DeleteEffect(4000, activateClass);
                 }
 
-                return false;
-            }
-
-            IEnumerator ActivateCoroutine(Hashtable _hashtable, ActivateClass activateClass)
-            {
                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                 {
                     int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
@@ -88,14 +81,7 @@ namespace DCGO.CardEffects.BT21
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
-                    {
-                        if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
-                        {
-                            return true;
-                        }
-                    }
-                    return false;
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
             }
 
@@ -127,14 +113,7 @@ namespace DCGO.CardEffects.BT21
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
-                    {
-                        if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
-                        {
-                            return true;
-                        }
-                    }
-                    return false;
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
             }
 

+ 11 - 11
Assets/Scripts/CardEffect/BT21/Red/BT21_022.cs

@@ -53,11 +53,11 @@ namespace DCGO.CardEffects.BT21
                 return false;
             }
 
-            bool CanSelectPermanentCondition(Permanent permanent)
+            bool SharedCanActivateCondition(Hashtable hashtable)
             {
-                if (CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card))
+                if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                 {
-                    if (permanent.DP <= 7000)
+                    if (CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectCardCondition))
                     {
                         return true;
                     }
@@ -65,20 +65,20 @@ namespace DCGO.CardEffects.BT21
                 return false;
             }
 
-            bool SharedCanActivateCondition(Hashtable hashtable)
+            IEnumerator SharedActivateCoroutine(Hashtable hashtable, ActivateClass activateClass)
             {
-                if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
+                bool CanSelectPermanentCondition(Permanent permanent)
                 {
-                    if (CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectCardCondition))
+                    if (CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card))
                     {
-                        return true;
+                        if (permanent.DP <= card.Owner.MaxDP_DeleteEffect(7000, activateClass))
+                        {
+                            return true;
+                        }
                     }
+                    return false;
                 }
-                return false;
-            }
 
-            IEnumerator SharedActivateCoroutine(Hashtable hashtable, ActivateClass activateClass)
-            {
                 bool cardAdded = false;
                 CardSource selectedCard = null;
                 SelectHandEffect selectHandEffect = GManager.instance.GetComponent<SelectHandEffect>();

+ 6 - 5
Assets/Scripts/CardEffect/BT22/Red/BT22_009.cs

@@ -143,13 +143,14 @@ namespace DCGO.CardEffects.BT22
 
             #region OP/WD/WL Shared
 
-            bool SharedPermanentCondition(Permanent permanent)
-            {
-                return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card) && permanent.DP <= 4000;
-            }
-
             IEnumerator SharedActivateCoroutine(ActivateClass activateClass)
             {
+                bool SharedPermanentCondition(Permanent permanent)
+                {
+                    return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card)
+                        && permanent.DP <= card.Owner.MaxDP_DeleteEffect(4000, activateClass);
+                }
+
                 if (CardEffectCommons.HasMatchConditionPermanent(SharedPermanentCondition))
                 {
                     int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(SharedPermanentCondition));

+ 2 - 1
Assets/Scripts/CardEffect/BT23/Black/BT23_051.cs

@@ -98,7 +98,8 @@ namespace DCGO.CardEffects.BT23
                 bool CanSelectPermamentCondition(Permanent permanent)
                 {
                     return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card)
-                        && permanent.HasDP && permanent.DP <= 4000;
+                        && permanent.HasDP 
+                        && permanent.DP <= card.Owner.MaxDP_DeleteEffect(4000, activateClass);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

+ 10 - 11
Assets/Scripts/CardEffect/BT23/Red/BT23_011.cs

@@ -34,15 +34,16 @@ namespace DCGO.CardEffects.BT23
             #endregion
 
             #region OP/WD Shared
-
-            bool SharedCanSelectPermanentCondition(Permanent permanent)
-            {
-                return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card)
-                    && permanent.HasDP && permanent.DP <= 4000;
-            }
-
+        
             IEnumerator SharedActivateCoroutine(Hashtable hashtable, ActivateClass activateClass)
             {
+                bool SharedCanSelectPermanentCondition(Permanent permanent)
+                {
+                    return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card)
+                        && permanent.HasDP 
+                        && permanent.DP <= card.Owner.MaxDP_DeleteEffect(4000, activateClass);
+                }
+
                 if (CardEffectCommons.HasMatchConditionPermanent(SharedCanSelectPermanentCondition))
                 {
                     int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(SharedCanSelectPermanentCondition));
@@ -90,8 +91,7 @@ namespace DCGO.CardEffects.BT23
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
-                        && CardEffectCommons.HasMatchConditionPermanent(SharedCanSelectPermanentCondition);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
             }
 
@@ -119,8 +119,7 @@ namespace DCGO.CardEffects.BT23
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
-                        && CardEffectCommons.HasMatchConditionPermanent(SharedCanSelectPermanentCondition);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
             }
 

+ 1 - 1
Assets/Scripts/CardEffect/BT23/Red/BT23_015.cs

@@ -228,7 +228,7 @@ namespace DCGO.CardEffects.BT23
                 bool CanSelectPermanentCondition(Permanent permanent)
                 {
                     return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card)
-                        && permanent.DP <= 9000;
+                        && permanent.DP <= card.Owner.MaxDP_DeleteEffect(9000, activateClass);
                 }
 
                 bool CanSelectCardCondition(CardSource cardSource)

+ 1 - 1
Assets/Scripts/CardEffect/BT25/Red/BT25_007.cs

@@ -131,7 +131,7 @@ namespace DCGO.CardEffects.BT25
                 {
                     return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card)
                         && permanent.HasDP
-                        && permanent.DP <= 3000;
+                        && permanent.DP <= card.Owner.MaxDP_DeleteEffect(3000, activateClass);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

+ 7 - 7
Assets/Scripts/CardEffect/BT25/Red/BT25_015.cs

@@ -54,15 +54,15 @@ namespace DCGO.CardEffects.BT25
                 return $"[{tag}] Delete 1 of your opponent's Digimon with 6000 DP or less.";
             }
 
-            bool CanSelectPermanentCondition(Permanent permanent)
-            {
-                return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card)
-                    &&permanent.HasDP
-                    && permanent.DP <= 6000;
-            }
-
             IEnumerator SharedActivateCoroutine(Hashtable _hashtable, ActivateClass activateClass)
             {
+                bool CanSelectPermanentCondition(Permanent permanent)
+                {
+                    return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card)
+                        && permanent.HasDP
+                        && permanent.DP <= card.Owner.MaxDP_DeleteEffect(6000, activateClass);
+                }
+
                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                 {
                     SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();

+ 3 - 3
Assets/Scripts/CardEffect/BT3/Red/BT3_008.cs

@@ -115,7 +115,7 @@ public class BT3_008 : CEntity_Effect
 
                                             int maxCount = 2;
 
-                                            #region �ő喇��
+                                            #region ???
                                             List<CardSource[]> cardsList = ParameterComparer.Enumerate(revealLibrary.revealedCards, maxCount).ToList();
 
                                             List<int> maxCounts = new List<int>() { 0 };
@@ -213,7 +213,7 @@ public class BT3_008 : CEntity_Effect
 
                                             yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
 
-                                            #region ���X�g�ɂ��I������
+                                            #region ???
                                             bool CanTargetCondition_ByPreSelecetedList(List<CardSource> cardSources, CardSource cardSource)
                                             {
                                                 List<CardSource> _cardSources = new List<CardSource>();
@@ -265,7 +265,7 @@ public class BT3_008 : CEntity_Effect
                                             }
                                             #endregion
 
-                                            #region �I������
+                                            #region ???
                                             bool CanEndSelectCondition(List<CardSource> cardSources)
                                             {
                                                 List<CardSource[]> cardsList = ParameterComparer.Enumerate(cardSources, cardSources.Count).ToList();

+ 1 - 1
Assets/Scripts/CardEffect/BT8/Black/BT8_092.cs

@@ -21,7 +21,7 @@ public class BT8_092 : CEntity_Effect
 
             string EffectDiscription()
             {
-                return "[Your Turn] When one of your Digimon with [X-Antibody] in its traits is moved from your breeding area to your battle area, gain 1 memory and <Draw 1��.";
+                return "[Your Turn] When one of your Digimon with [X-Antibody] in its traits is moved from your breeding area to your battle area, gain 1 memory and <Draw 1>.";
             }
 
             bool PermanentCondition(Permanent permanent)

+ 1 - 1
Assets/Scripts/CardEffect/BT8/Blue/BT8_087.cs

@@ -27,7 +27,7 @@ public class BT8_087 : CEntity_Effect
 
             string EffectDiscription()
             {
-                return "[Opponent's Turn] When one of your opponent's Digimon attacks one of your blue Digimon, you may suspend this Tamer to <Draw 1��. (Draw 1 card from your deck.)";
+                return "[Opponent's Turn] When one of your opponent's Digimon attacks one of your blue Digimon, you may suspend this Tamer to <Draw 1>. (Draw 1 card from your deck.)";
             }
 
             bool PermanentCondition(Permanent permanent)

+ 7 - 7
Assets/Scripts/CardEffect/EX5/Green/EX5_043.cs

@@ -89,7 +89,7 @@ public class EX5_043 : CEntity_Effect
 
             IEnumerator ActivateCoroutine(Hashtable _hashtable)
             {
-                #region �o��R�X�g-
+                #region Reduce Cost Effect
                 ChangeCostClass changeCostClass = new ChangeCostClass();
                 changeCostClass.SetUpICardEffect("Reduce Play Cost", CanUseCondition1, card);
                 changeCostClass.SetUpChangeCostClass(changeCostFunc: ChangeCost, cardSourceCondition: CardSourceCondition, rootCondition: RootCondition, isUpDown: isUpDown, isCheckAvailability: () => false, isChangePayingCost: () => true);
@@ -217,7 +217,7 @@ public class EX5_043 : CEntity_Effect
                         activateETB: true));
                 }
 
-                #region �o��R�X�g-����
+                #region Remove Reduce Cost Effect
                 card.Owner.UntilCalculateFixedCostEffect.Remove(getCardEffect);
                 #endregion
             }
@@ -263,7 +263,7 @@ public class EX5_043 : CEntity_Effect
                 {
                     bool canPlay = false;
 
-                    #region �o��R�X�g-
+                    #region Reduce Cost Effect
                     ChangeCostClass changeCostClass = new ChangeCostClass();
                     changeCostClass.SetUpICardEffect("Reduce Play Cost", CanUseCondition1, card);
                     changeCostClass.SetUpChangeCostClass(changeCostFunc: ChangeCost, cardSourceCondition: CardSourceCondition, rootCondition: RootCondition, isUpDown: isUpDown, isCheckAvailability: () => true, isChangePayingCost: () => true);
@@ -354,7 +354,7 @@ public class EX5_043 : CEntity_Effect
                         canPlay = true;
                     }
 
-                    #region �o��R�X�g-����
+                    #region Remove Reduce Cost Effect
                     card.Owner.UntilCalculateFixedCostEffect.Remove(getCardEffect);
                     #endregion
 
@@ -369,7 +369,7 @@ public class EX5_043 : CEntity_Effect
 
             IEnumerator ActivateCoroutine(Hashtable _hashtable)
             {
-                #region �o��R�X�g-
+                #region Reduce Cost Effect
                 ChangeCostClass changeCostClass = new ChangeCostClass();
                 changeCostClass.SetUpICardEffect("Reduce Play Cost", CanUseCondition1, card);
                 changeCostClass.SetUpChangeCostClass(changeCostFunc: ChangeCost, cardSourceCondition: CardSourceCondition, rootCondition: RootCondition, isUpDown: isUpDown, isCheckAvailability: () => false, isChangePayingCost: () => true);
@@ -497,7 +497,7 @@ public class EX5_043 : CEntity_Effect
                         activateETB: true));
                 }
 
-                #region �o��R�X�g-����
+                #region Remove Reduce Cost Effect
                 card.Owner.UntilCalculateFixedCostEffect.Remove(getCardEffect);
                 #endregion
             }
@@ -513,7 +513,7 @@ public class EX5_043 : CEntity_Effect
 
             string EffectDiscription()
             {
-                return "[Your Turn] [Once Per Turn] When one of your Digimon is played, you may return 1 of your opponent's 5000 DP or lower Digimon to the hand. For each of your other Digimon, add 3000 to the maximum DP this effect can choose.";
+                return "[Your Turn] [Once Per Turn] When one of your Digimon is played, you may return 1 of your opponent's 5000 DP or lower Digimon to the hand. For each of your other Digimon, add 3000 to the maximum DP this effect can choose.";
             }
 
             int maxDP()

+ 1 - 1
Assets/Scripts/CardEffect/EX6/Black/EX6_037.cs

@@ -199,7 +199,7 @@ namespace DCGO.CardEffects.EX6
                 {
                     if(CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card))
                     {
-                        if(permanent.HasDP && permanent.DP <= 3000)
+                        if(permanent.HasDP && permanent.DP <= card.Owner.MaxDP_DeleteEffect(3000, activateClass))
                         {
                             return true;
                         }

+ 19 - 38
Assets/Scripts/CardEffect/EX6/Yellow/EX6_017.cs

@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 
+// Luxmon
 namespace DCGO.CardEffects.EX6
 {
     public class EX6_017 : CEntity_Effect
@@ -14,53 +15,36 @@ namespace DCGO.CardEffects.EX6
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Reveal the top 3 cards of deck", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDescription());
                 cardEffects.Add(activateClass);
 
-                string EffectDiscription()
+                string EffectDescription()
                 {
                     return "[On Play] Reveal the top 3 cards of your deck. Add 1 Digimon card with the [Angel]/[Archangel] trait and 1 card with the [Three Great Angels] trait among them to your hand. Return the rest to the bottom of the deck.";
                 }
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    if (cardSource.IsDigimon)
-                    {
-                        if (cardSource.CardTraits.Contains("Angel") || cardSource.CardTraits.Contains("Archangel"))
-                        {
-                            return true;
-                        }
-                    }
-
-                    return false;
+                    return cardSource.IsDigimon
+                        && (cardSource.CardTraits.Contains("Angel")
+                            || cardSource.CardTraits.Contains("Archangel"));
                 }
 
                 bool CanSelectCardCondition1(CardSource cardSource)
                 {
-                    if (cardSource.CardTraits.Contains("Three Great Angels") || cardSource.CardTraits.Contains("ThreeGreatAngels"))
-                    {
-                        return true;
-                    }
-
-                    return false;
+                    return cardSource.CardTraits.Contains("Three Great Angels")
+                            || cardSource.CardTraits.Contains("ThreeGreatAngels");
                 }
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanTriggerOnPlay(hashtable, card);
+                    return CardEffectCommons.IsExistOnBattleArea(card)
+                        && CardEffectCommons.CanTriggerOnPlay(hashtable, card);
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
-                    {
-                        if (card.Owner.LibraryCards.Count >= 1)
-                        {
-                            return true;
-                        }
-                    }
-
-                    return false;
+                    return CardEffectCommons.IsExistOnBattleArea(card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
@@ -107,20 +91,17 @@ namespace DCGO.CardEffects.EX6
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanTriggerOnAttack(hashtable, card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
+                        && CardEffectCommons.CanTriggerOnAttack(hashtable, card);
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
-                    {
-                        if (card.PermanentOfThisCard().TopCard.CardTraits.Contains("Angel") || card.PermanentOfThisCard().TopCard.CardTraits.Contains("Archangel") || card.PermanentOfThisCard().TopCard.CardTraits.Contains("Three Great Angels") || card.PermanentOfThisCard().TopCard.CardTraits.Contains("ThreeGreatAngels"))
-                        {
-                            return true;
-                        }
-                    }
-
-                    return false;
+                    return CardEffectCommons.IsExistOnBattleArea(card)
+                        && (card.PermanentOfThisCard().TopCard.CardTraits.Contains("Angel")
+                            || card.PermanentOfThisCard().TopCard.CardTraits.Contains("Archangel")
+                            || card.PermanentOfThisCard().TopCard.CardTraits.Contains("Three Great Angels")
+                            || card.PermanentOfThisCard().TopCard.CardTraits.Contains("ThreeGreatAngels"));
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
@@ -133,4 +114,4 @@ namespace DCGO.CardEffects.EX6
             return cardEffects;
         }
     }
-}
+}

+ 2 - 2
Assets/Scripts/CardEffect/EX7/Purple/EX7_058.cs

@@ -53,7 +53,7 @@ namespace DCGO.CardEffects.EX7
 
                 string EffectDiscription()
                 {
-                    return "[On Play] 1 of your opponent's Digimon gains \"[End of Attack] Delete this Digimon.\" until the end of their turn. Then, if this Digimon has [LadyDevimon]/[X Antibody] in its digivolution cards, you may play 1 [Vol�e & Zerdr�cken] Token (Digimon/Lv.4/Purple/5000 DP/<Blocker>/<Retaliation>).";
+                    return "[On Play] 1 of your opponent's Digimon gains \"[End of Attack] Delete this Digimon.\" until the end of their turn. Then, if this Digimon has [LadyDevimon]/[X Antibody] in its digivolution cards, you may play 1 [Volée & Zerdrücken] Token (Digimon/Lv.4/Purple/5000 DP/<Blocker>/<Retaliation>).";
                 }
 
                 bool CanUseCondition(Hashtable hashtable)
@@ -204,7 +204,7 @@ namespace DCGO.CardEffects.EX7
 
                 string EffectDiscription()
                 {
-                    return "[When Digivolving] 1 of your opponent's Digimon gains \" Delete this Digimon.\" until the end of their turn. Then, if this Digimon has [LadyDevimon]/[X Antibody] in its digivolution cards, you may play 1 [Vol�e & Zerdr�cken] Token (Digimon/Lv.4/Purple/5000 DP/<Blocker>/<Retaliation>).";
+                    return "[When Digivolving] 1 of your opponent's Digimon gains \" Delete this Digimon.\" until the end of their turn. Then, if this Digimon has [LadyDevimon]/[X Antibody] in its digivolution cards, you may play 1 [Volée & Zerdrücken] Token (Digimon/Lv.4/Purple/5000 DP/<Blocker>/<Retaliation>).";
                 }
 
                 bool CanUseCondition(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/LM/Black/LM_031.cs

@@ -102,7 +102,7 @@ namespace DCGO.CardEffects.LM
 
                 string EffectDiscription()
                 {
-                    return "[Start of your Turn] If your opponent has a Digimon, <Delay>.\r\n Return 1 black Digimon card from your trash to the top of the deck. Then, if you don't have a Digimon, you may play 1 black Digimon card with 2000 DP or less from your trash without paying the cost.";
+                    return "[Start of your Turn] If your opponent has a Digimon, <Delay>.\r\n Return 1 black Digimon card from your trash to the top of the deck. Then, if you don't have a Digimon, you may play 1 black Digimon card with 2000 DP or less from your trash without paying the cost.";
                 }
 
                 bool CanSelectCardCondition(CardSource cardSource)

+ 1 - 1
Assets/Scripts/CardEffect/LM/Blue/LM_028.cs

@@ -102,7 +102,7 @@ namespace DCGO.CardEffects.LM
 
                 string EffectDiscription()
                 {
-                    return "[Start of your Turn] If your opponent has a Digimon, <Delay>.\r\n Return 1 blue Digimon card from your trash to the top of the deck. Then, if you don't have a Digimon, you may play 1 blue Digimon card with 2000 DP or less from your trash without paying the cost.";
+                    return "[Start of your Turn] If your opponent has a Digimon, <Delay>.\r\n Return 1 blue Digimon card from your trash to the top of the deck. Then, if you don't have a Digimon, you may play 1 blue Digimon card with 2000 DP or less from your trash without paying the cost.";
                 }
 
                 bool CanSelectCardCondition(CardSource cardSource)

+ 1 - 1
Assets/Scripts/CardEffect/LM/Green/LM_030.cs

@@ -102,7 +102,7 @@ namespace DCGO.CardEffects.LM
 
                 string EffectDiscription()
                 {
-                    return "[Start of your Turn] If your opponent has a Digimon, <Delay>.\r\n Return 1 green Digimon card from your trash to the top of the deck. Then, if you don't have a Digimon, you may play 1 green Digimon card with 2000 DP or less from your trash without paying the cost.";
+                    return "[Start of your Turn] If your opponent has a Digimon, <Delay>.\r\n Return 1 green Digimon card from your trash to the top of the deck. Then, if you don't have a Digimon, you may play 1 green Digimon card with 2000 DP or less from your trash without paying the cost.";
                 }
 
                 bool CanSelectCardCondition(CardSource cardSource)

+ 1 - 1
Assets/Scripts/CardEffect/LM/Purple/LM_032.cs

@@ -102,7 +102,7 @@ namespace DCGO.CardEffects.LM
 
                 string EffectDiscription()
                 {
-                    return "[Start of your Turn] If your opponent has a Digimon, <Delay>.\r\n Return 1 purple Digimon card from your trash to the top of the deck. Then, if you don't have a Digimon, you may play 1 purple Digimon card with 2000 DP or less from your trash without paying the cost.";
+                    return "[Start of your Turn] If your opponent has a Digimon, <Delay>.\r\n Return 1 purple Digimon card from your trash to the top of the deck. Then, if you don't have a Digimon, you may play 1 purple Digimon card with 2000 DP or less from your trash without paying the cost.";
                 }
 
                 bool CanSelectCardCondition(CardSource cardSource)

+ 1 - 1
Assets/Scripts/CardEffect/LM/Red/LM_027.cs

@@ -102,7 +102,7 @@ namespace DCGO.CardEffects.LM
 
                 string EffectDiscription()
                 {
-                    return "[Start of your Turn] If your opponent has a Digimon, <Delay>.\r\n Return 1 red Digimon card from your trash to the top of the deck. Then, if you don't have a Digimon, you may play 1 red Digimon card with 2000 DP or less from your trash without paying the cost.";
+                    return "[Start of your Turn] If your opponent has a Digimon, <Delay>.\r\n Return 1 red Digimon card from your trash to the top of the deck. Then, if you don't have a Digimon, you may play 1 red Digimon card with 2000 DP or less from your trash without paying the cost.";
                 }
 
                 bool CanSelectCardCondition(CardSource cardSource)

+ 1 - 1
Assets/Scripts/CardEffect/LM/Yellow/LM_029.cs

@@ -102,7 +102,7 @@ namespace DCGO.CardEffects.LM
 
                 string EffectDiscription()
                 {
-                    return "[Start of your Turn] If your opponent has a Digimon, <Delay>.\r\n Return 1 yellow Digimon card from your trash to the top of the deck. Then, if you don't have a Digimon, you may play 1 yellow Digimon card with 2000 DP or less from your trash without paying the cost.";
+                    return "[Start of your Turn] If your opponent has a Digimon, <Delay>.\r\n Return 1 yellow Digimon card from your trash to the top of the deck. Then, if you don't have a Digimon, you may play 1 yellow Digimon card with 2000 DP or less from your trash without paying the cost.";
                 }
 
                 bool CanSelectCardCondition(CardSource cardSource)

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

@@ -74,7 +74,8 @@ namespace DCGO.CardEffects.P
                 bool DeletionCondition(Permanent permanent)
                 {
                     if (CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card))
-                        return permanent.HasDP && permanent.DP <= 3000;
+                        return permanent.HasDP
+                            && permanent.DP <= card.Owner.MaxDP_DeleteEffect(3000, activateClass);
 
                     return false;
                 }

+ 1 - 1
Assets/Scripts/CardEffect/P/Red/P_155.cs

@@ -70,7 +70,7 @@ namespace DCGO.CardEffects.P
 
                 string EffectDiscription()
                 {
-                    return "[Main] <Delay> (By trashing this card after the placing turn, active the effect.)\r\n By trashing 1 of your non-red option cards in your battle area, gain 1 memory.";
+                    return "[Main] <Delay> (By trashing this card after the placing turn, active the effect.)\r\n By trashing 1 of your non-red option cards in your battle area, gain 1 memory.";
                 }
 
                 bool HasNonRedOption(Permanent permanent)

+ 2 - 2
Assets/Scripts/CardEffect/P/Yellow/P_099.cs

@@ -30,7 +30,7 @@ public class P_099 : CEntity_Effect
 
             string EffectDiscription()
             {
-                return "[On Play] ��De-Digivolve  1��1 of your opponent's Digimon (Trash up to 1 card from the top of one of your opponent's Digimon. If it has no digivolution cards, or becomes a level 3 Digimon, you can't trash any more cards).";
+                return "[On Play] <De-Digivolve 1>1 of your opponent's Digimon (Trash up to 1 card from the top of one of your opponent's Digimon. If it has no digivolution cards, or becomes a level 3 Digimon, you can't trash any more cards).";
             }
 
             bool CanSelectPermanentCondition(Permanent permanent)
@@ -96,7 +96,7 @@ public class P_099 : CEntity_Effect
 
             string EffectDiscription()
             {
-                return "[When Digivolving] ��De-Digivolve  1��1 of your opponent's Digimon (Trash up to 1 card from the top of one of your opponent's Digimon. If it has no digivolution cards, or becomes a level 3 Digimon, you can't trash any more cards).";
+                return "[When Digivolving] <De-Digivolve 1> 1 of your opponent's Digimon (Trash up to 1 card from the top of one of your opponent's Digimon. If it has no digivolution cards, or becomes a level 3 Digimon, you can't trash any more cards).";
             }
 
             bool CanSelectPermanentCondition(Permanent permanent)

+ 7 - 7
Assets/Scripts/Script/CEntity_Base.cs

@@ -219,7 +219,7 @@ public class CEntity_Base : ScriptableObject
     }
     #endregion
 
-    #region �Z�b�gID
+    #region ???
     public string SetID
     {
         get
@@ -238,7 +238,7 @@ public class CEntity_Base : ScriptableObject
     public bool IsPermanent => cardKind.Contains(CardKind.Digimon) || cardKind.Contains(CardKind.Tamer) || cardKind.Contains(CardKind.DigiEgg);
     #endregion
 
-    #region �J�[�hIndex���f�b�L�R�[�h�ɗp���镶����ɕϊ�(256�i��)
+    #region ???
     public string CardIndex_String
     {
         get
@@ -255,7 +255,7 @@ public class CEntity_Base : ScriptableObject
     }
     #endregion
 
-    #region �J�[�h�摜�����A���_�[�o�[�ŋ�؂�
+    #region ???
     public static string[] GetParseByUnderBar(string CardImageName)
     {
         string[] parseByUnderBar = new string[] { CardImageName };
@@ -269,7 +269,7 @@ public class CEntity_Base : ScriptableObject
     }
     #endregion
 
-    #region �J�[�h�摜�����n�C�t���ŋ�؂�
+    #region ???
     public static string[] GetParseByHyphen(string CardImageName)
     {
         string[] parseByHyphen = new string[] { CardImageName };
@@ -283,14 +283,14 @@ public class CEntity_Base : ScriptableObject
     }
     #endregion
 
-    #region �f�b�L�ɂ���Ɠ��J�[�hID�̃J�[�h�������Ă��閇��
+    #region ???
     public int SameCardIDCount(List<CEntity_Base> DeckCards)
     {
         return DeckCards.Count((cEntity_Base) => cEntity_Base.CardID == CardID);
     }
     #endregion
 
-    #region �p��������
+    #region ???
     public bool isParallel
     {
         get
@@ -313,7 +313,7 @@ public class CEntity_Base : ScriptableObject
     }
     #endregion
 
-    #region ���x�������‚�
+    #region ???
     public bool HasLevel
     {
         get

+ 1 - 1
Assets/Scripts/Script/CardEffectCommons.cs

@@ -292,7 +292,7 @@ public partial class CardEffectCommons
 
     #endregion
 
-    #region Play 1 [Vol�e & Zerdr�cken] Token
+    #region Play 1 [Volée & Zerdrücken] Token
 
     public static IEnumerator PlayVoleeZerdrucken(ICardEffect activateClass)
     {

+ 2 - 3
Assets/Scripts/Script/CardEffectCommons/RevealLibrary.cs

@@ -260,8 +260,7 @@ public partial class CardEffectCommons
 
         bool doAction = true;
 
-        // �o�[�j���O�X�^�[�N���b�V���[(BT10-096)
-        // �u���C�W���O�E�������[�u�[�X�g
+        // ??? (BT10-096)    
         if (selectCardConditions.Length >= 2)
         {
             if (canNoAction)
@@ -764,7 +763,7 @@ public class RevealLibraryClass
             yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().ShowCardEffect(RevealedCards, "Revealed Cards", true, true));
         }
 
-        #region ���O�lj�
+        #region ???
         if (RevealedCards.Count >= 1)
         {
             string log = "";

+ 1 - 1
Assets/Scripts/Script/CardEffectFactory/AddDigivolutionRequirement.cs

@@ -50,7 +50,7 @@ public partial class CardEffectFactory
 
         int GetEvoCost(Permanent permanent, CardSource cardSource, CardEffectCommons.IgnoreRequirement ignore, bool checkAvailability)
         {
-            // �i�������𖳎����Đi�����悤�Ƃ��Ă���̂ɁA�i�������𖳎��ł��Ȃ��ꍇ
+            // ???
             if (ignoreDigivolutionRequirement && !cardSource.Owner.CanIgnoreDigivolutionRequirement(permanent, cardSource))
             {
                 return -1;

+ 1 - 1
Assets/Scripts/Script/HideCannotSelectObject.cs

@@ -88,7 +88,7 @@ public class HideCannotSelectObject : MonoBehaviour
 
     void Update()
     {
-        #region ���t���[���Ɉ�x�������f
+        #region ???
         _timerCount++;
 
         if (_timerCount < _updateFrame)

+ 1 - 1
Assets/Scripts/Script/MemoryObject.cs

@@ -102,7 +102,7 @@ public class MemoryObject : MonoBehaviour
                 }
 
 
-                #region �A�j���[�V����
+                #region ???
                 bool end = false;
                 var sequence = DOTween.Sequence();
 

+ 4 - 4
Assets/Scripts/Script/OfficialCardListUtility.cs

@@ -594,7 +594,7 @@ public class OfficialCardListUtility
 
         if (cEntity_Base.CardID == "EX3-045")
         {
-            cEntity_Base.EffectDiscription_ENG = cEntity_Base.EffectDiscription_ENG.Replace("You may suspend 1 of you or your opponent�fs Digimon", "You may suspend 1 Digimon").Replace("[Fairy] in its traits", "[Fairy] in one of their traits").Replace("[Fairy] in their traits", "[Fairy] in one of their traits");
+            cEntity_Base.EffectDiscription_ENG = cEntity_Base.EffectDiscription_ENG.Replace("You may suspend 1 of you or your opponent's Digimon", "You may suspend 1 Digimon").Replace("[Fairy] in its traits", "[Fairy] in one of their traits").Replace("[Fairy] in their traits", "[Fairy] in one of their traits");
         }
 
         if (cEntity_Base.CardID == "EX3-035")
@@ -626,9 +626,9 @@ public class OfficialCardListUtility
 
         if (cEntity_Base.CardID == "EX3-024")
         {
-            cEntity_Base.EffectDiscription_ENG = cEntity_Base.EffectDiscription_ENG.Replace("You may suspend 1 of your Digimon with [Dramon] or [Examon] in its name to force 1 of your opponent�fs Digimon to attack", "By suspending 1 of your Digimon with [Dramon] or [Examon] in its name, your opponent attacks with 1 of their Digimon");
+            cEntity_Base.EffectDiscription_ENG = cEntity_Base.EffectDiscription_ENG.Replace("You may suspend 1 of your Digimon with [Dramon] or [Examon] in its name to force 1 of your opponent's Digimon to attack", "By suspending 1 of your Digimon with [Dramon] or [Examon] in its name, your opponent attacks with 1 of their Digimon");
 
-            cEntity_Base.InheritedEffectDiscription_ENG = cEntity_Base.InheritedEffectDiscription_ENG.Replace("You may suspend 1 of your Digimon with [Dramon] or [Examon] in its name to force 1 of your opponent�fs Digimon to attack", "By suspending 1 of your Digimon with [Dramon] or [Examon] in its name, your opponent attacks with 1 of their Digimon");
+            cEntity_Base.InheritedEffectDiscription_ENG = cEntity_Base.InheritedEffectDiscription_ENG.Replace("You may suspend 1 of your Digimon with [Dramon] or [Examon] in its name to force 1 of your opponent's Digimon to attack", "By suspending 1 of your Digimon with [Dramon] or [Examon] in its name, your opponent attacks with 1 of their Digimon");
         }
 
         if (cEntity_Base.CardID == "EX3-023")
@@ -943,7 +943,7 @@ public class OfficialCardListUtility
         {
             if (!cEntity_Base.EffectDiscription_ENG.Contains("Apollomon") || !cEntity_Base.EffectDiscription_ENG.Contains("Dianamon"))
             {
-                cEntity_Base.EffectDiscription_ENG = "��DNA Digivolution: 0 from [Apollomon] + [Dianamon]��" + cEntity_Base.EffectDiscription_ENG;
+                cEntity_Base.EffectDiscription_ENG = "DNA Digivolution: 0 from [Apollomon] + [Dianamon]" + cEntity_Base.EffectDiscription_ENG;
             }
         }