build 1.9.0.10

Assets/CardEffect/EX9/Blue/EX9_018.cs

@@ -321,7 +321,7 @@ namespace DCGO.CardEffects.EX9
                                 canTargetCondition: CanSelectCardCondition,
                                 canTargetCondition_ByPreSelecetedList: null,
                                 canEndSelectCondition: null,
-                                canNoSelect: () => false,
+                                canNoSelect: () => true,
                                 selectCardCoroutine: SelectCardCoroutine,
                                 afterSelectCardCoroutine: null,
                                 message: "Select 1 card to place on bottom of digivolution cards.",
@@ -490,7 +490,7 @@ namespace DCGO.CardEffects.EX9
                                 canTargetCondition: CanSelectCardCondition,
                                 canTargetCondition_ByPreSelecetedList: null,
                                 canEndSelectCondition: null,
-                                canNoSelect: () => false,
+                                canNoSelect: () => true,
                                 selectCardCoroutine: SelectCardCoroutine,
                                 afterSelectCardCoroutine: null,
                                 message: "Select 1 card to place on bottom of digivolution cards.",

Assets/CardEffect/EX9/Green/EX9_041.cs

@@ -71,16 +71,14 @@ namespace DCGO.CardEffects.EX9
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnHand(card))
+                    if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, PermanentEvoCondition))
                     {
-                        if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, PermanentEvoCondition))
+                        if (CardEffectCommons.CanTriggerWhenPermanentWouldDigivolve(hashtable, PermanentEvoCondition, CardCondition))
                         {
-                            if (CardEffectCommons.CanTriggerWhenPermanentWouldDigivolve(hashtable, PermanentEvoCondition, CardCondition))
-                            {
-                                return true;
-                            }
+                            return true;
                         }
                     }
+
                     return false;
                 }
 

Assets/CardEffect/EX9/Purple/EX9_063.cs

@@ -70,16 +70,14 @@ namespace DCGO.CardEffects.EX9
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnHand(card))
+                    if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, PermanentEvoCondition))
                     {
-                        if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, PermanentEvoCondition))
+                        if (CardEffectCommons.CanTriggerWhenPermanentWouldDigivolve(hashtable, PermanentEvoCondition, CardCondition))
                         {
-                            if (CardEffectCommons.CanTriggerWhenPermanentWouldDigivolve(hashtable, PermanentEvoCondition, CardCondition))
-                            {
-                                return true;
-                            }
+                            return true;
                         }
                     }
+
                     return false;
                 }
 

Assets/CardEffect/EX9/Yellow/EX9_031.cs

@@ -74,16 +74,14 @@ namespace DCGO.CardEffects.EX9
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnHand(card))
+                    if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, PermanentEvoCondition))
                     {
-                        if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, PermanentEvoCondition))
+                        if (CardEffectCommons.CanTriggerWhenPermanentWouldDigivolve(hashtable, PermanentEvoCondition, CardCondition))
                         {
-                            if (CardEffectCommons.CanTriggerWhenPermanentWouldDigivolve(hashtable, PermanentEvoCondition, CardCondition))
-                            {
-                                return true;
-                            }
+                            return true;
                         }
                     }
+
                     return false;
                 }
 

Assets/Scripts/CardEffectCommons/TrashDigivolutionCards.cs

@@ -21,10 +21,7 @@ public partial class CardEffectCommons
             {
                 if (permanentCondition == null || permanentCondition(permanent))
                 {
-                    if (!permanent.TopCard.CanNotBeAffected(activateClass))
-                    {
-                        return true;
-                    }
+                    return true;
                 }
             }
 

Assets/Scripts/Player.cs

@@ -653,8 +653,18 @@ public class Player : MonoBehaviour
     }
     #endregion
 
-    #region プレイヤー名
-    public string PlayerName { get; set; }
+    #region Player Name
+    private string _playerName = "Opponent";
+    public string PlayerName {
+
+        get {
+            if (isYou || GManager.instance.IsAI)
+                return _playerName; 
+            else 
+                return "Opponent";
+        }
+        set { _playerName = value; }
+    }
     [Header("プレイヤー名")]
     public TextMeshProUGUI PlayerNameText;
     #endregion

ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30f6a3bcdd240b9b3d463de8c8035473f60583fc3b9b3d8a3cb51edf7c9441ea
-size 20168
+oid sha256:83ce3fcfe007328cf1816022d1342e9eab60c4f318474f249e8041dccbf5696e
+size 20169