mbunch_kascope 1 سال پیش
والد
کامیت
3a52d73bb1

+ 2 - 2
Assets/CardEffect/BT14/Purple/Devimon_BT14_075.cs

@@ -170,8 +170,8 @@ public class Devimon_BT14_075 : CEntity_Effect
                         canEndNotMax: false,
                         isShowOpponent: false,
                         mode: SelectCardEffect.Mode.Discard,
-                        root: SelectCardEffect.Root.EnemyHand,
-                        customRootCardList: null,
+                        root: SelectCardEffect.Root.Custom,
+                        customRootCardList: card.Owner.Enemy.HandCards,
                         canLookReverseCard: false,
                         selectPlayer: card.Owner,
                         cardEffect: activateClass);

+ 1 - 1
Assets/CardEffect/BT16/Green/TerriermonXAntibody_BT16_038.cs

@@ -27,7 +27,7 @@ namespace DCGO.CardEffects.BT16
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Digivolution Cost -1", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
                 activateClass.SetHashString("DigivoltuionCost-1_BT16_038");
                 cardEffects.Add(activateClass);
 

+ 0 - 1
Assets/CardEffect/BT17/White/MenoaBellucci_BT17_092.cs

@@ -2,7 +2,6 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System;
-using UnityEngine.tvOS;
 
 namespace DCGO.CardEffects.BT17
 {

+ 4 - 4
Assets/CardEffect/EX6/Purple/Barbamon_EX6_059.cs

@@ -79,8 +79,8 @@ namespace DCGO.CardEffects.EX6
                         canEndNotMax: false,
                         isShowOpponent: false,
                         mode: SelectCardEffect.Mode.Discard,
-                        root: SelectCardEffect.Root.EnemyHand,
-                        customRootCardList: null,
+                        root: SelectCardEffect.Root.Custom,
+                        customRootCardList: card.Owner.Enemy.HandCards,
                         canLookReverseCard: false,
                         selectPlayer: card.Owner,
                         cardEffect: activateClass);
@@ -159,8 +159,8 @@ namespace DCGO.CardEffects.EX6
                         canEndNotMax: false,
                         isShowOpponent: false,
                         mode: SelectCardEffect.Mode.Discard,
-                        root: SelectCardEffect.Root.EnemyHand,
-                        customRootCardList: null,
+                        root: SelectCardEffect.Root.Custom,
+                        customRootCardList: card.Owner.Enemy.HandCards,
                         canLookReverseCard: false,
                         selectPlayer: card.Owner,
                         cardEffect: activateClass);

+ 2 - 1
Assets/CardEffect/EX7/Red/ChaosTriangular_EX7_066.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using Unity.Burst.Intrinsics;
 
@@ -119,7 +120,7 @@ namespace DCGO.CardEffects.EX7
 
                     foreach (Permanent selection in choices)
                     {
-                        if (cards.Some(permanent => !permanent.TopCard.HasSameCardName(selection.TopCard)))
+                        if (!cards.Some(permanent => permanent.TopCard.HasSameCardName(selection.TopCard)))
                             cards.Add(selection);
                     }
 

+ 0 - 7
Assets/Scripts/SelectCardEffect.cs

@@ -168,7 +168,6 @@ public class SelectCardEffect : MonoBehaviourPunCallbacks
         Recollection,
         Execution,
         DigivolutionCards,
-        EnemyHand,
         None,
     }
 
@@ -224,12 +223,6 @@ public class SelectCardEffect : MonoBehaviourPunCallbacks
                     RootCardList.Add(cardSource);
                 }
                 break;
-            case Root.EnemyHand:
-                foreach (CardSource cardSource in RandomUtility.ShuffledDeckCards(_selectPlayer.Enemy.HandCards))
-                {
-                    RootCardList.Add(cardSource);
-                }
-                break;
 
             case Root.Custom:
                 foreach (CardSource cardSource in _customRootCardList)

+ 1 - 1
ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a1a66ccca663afba50e1ae9223869fc89a00e58920ad7b9380d33a517a2db9b
+oid sha256:02abfc7ecbe35ae50df63b5d72f98d90e45511c8160df9a257cc46564cac837e
 size 20167