Browse Source

prep 1.2.6

mbunch_kascope 2 năm trước cách đây
mục cha
commit
7e4cc18a4f

+ 6 - 8
Assets/CardEffect/EX6/Blue/Huankunmon_EX6_014.cs

@@ -435,17 +435,15 @@ namespace DCGO.CardEffects.EX6
                         IEnumerator SelectPermanentCoroutine(Permanent permanent)
                         {
                             selectedCards.Add(permanent.TopCard);
-                            
-                            yield return null;
+
+                            yield return ContinuousController.instance.StartCoroutine(new IPlacePermanentToDigivolutionCards(
+                                new List<Permanent[]>() { new Permanent[] { permanent, card.PermanentOfThisCard() } },
+                                false,
+                                activateClass).PlacePermanentToDigivolutionCards());
                         }
                         
                         if (selectedCards.Count >= 1)
-                        {
-                            yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard()
-                                .AddDigivolutionCardsBottom(
-                                    selectedCards,
-                                    activateClass));
-                            
+                        {                            
                             yield return ContinuousController.instance.StartCoroutine(
                                 new IUnsuspendPermanents(new List<Permanent>() { card.PermanentOfThisCard() },
                                     activateClass).Unsuspend());

+ 4 - 4
Assets/CardEffect/EX6/Green/Cherubimon_EX6_035.cs

@@ -66,7 +66,7 @@ namespace DCGO.CardEffects.EX6
 
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Play 1 Digimon from hand", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
                 activateClass.SetHashString("Play1Digimon_EX6_035");
                 cardEffects.Add(activateClass);
 
@@ -133,7 +133,7 @@ namespace DCGO.CardEffects.EX6
                             mode: SelectHandEffect.Mode.Custom,
                             cardEffect: activateClass);
 
-                        selectHandEffect.SetUpCustomMessage("Select 1 card to play.", "The opponent is selecting 1 card to play.");
+                        selectHandEffect.SetUpCustomMessage("Play 1 Digimon from hand, Then -6k DP for each digimon", "The opponent is selecting 1 card to play.");
                         selectHandEffect.SetUpCustomMessage_ShowCard("Played Card");
 
                         yield return StartCoroutine(selectHandEffect.Activate());
@@ -203,8 +203,8 @@ namespace DCGO.CardEffects.EX6
                 }
 
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("Play 1 Digimon from hand", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
+                activateClass.SetUpICardEffect("Play 1 Digimon from hand, Then -6k DP for each digimon", CanUseCondition, card);
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
                 activateClass.SetHashString("Play1Digimon_EX6_035");
                 cardEffects.Add(activateClass);
 

+ 1 - 1
Assets/CardEffect/EX6/Purple/Belphemon_Rage_Mode_EX6_060.cs

@@ -118,7 +118,7 @@ namespace DCGO.CardEffects.EX6
                     {
                         SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
 
-                        int suspendCount = Math.Min(3, CardEffectCommons.MatchConditionOpponentsPermanentCount(card, OpponentsSuspendableTargets));
+                        int suspendCount = Math.Min(discarded.Count, CardEffectCommons.MatchConditionOpponentsPermanentCount(card, OpponentsSuspendableTargets));
 
                         selectPermanentEffect.SetUp(
                             selectPlayer: card.Owner,

+ 2 - 2
Assets/Scripts/DeckCodeUtility.cs

@@ -47,7 +47,7 @@ public class DeckCodeUtility
 
         foreach (CEntity_Base cEntity_Base in AllDeckCards)
         {
-            if (distinctAllDeckCards.Count((cEntity_Base1) => cEntity_Base.CardID == cEntity_Base1.CardID) == 0)
+            if (distinctAllDeckCards.Count((cEntity_Base1) => cEntity_Base.CardSpriteName == cEntity_Base1.CardSpriteName) == 0)
             {
                 distinctAllDeckCards.Add(cEntity_Base);
             }
@@ -57,7 +57,7 @@ public class DeckCodeUtility
         {
             string lineString = "";
 
-            int count = AllDeckCards.Count((cEntity_Base1) => cEntity_Base.CardID == cEntity_Base1.CardID);
+            int count = AllDeckCards.Count((cEntity_Base1) => cEntity_Base.CardSpriteName == cEntity_Base1.CardSpriteName);
 
             if (count >= 1)
             {