mbunch_kascope 1 rok temu
rodzic
commit
54a940def1

+ 2 - 16
Assets/CardEffect/BT16/Black/Publimon_BT16_056.cs

@@ -87,14 +87,7 @@ namespace DCGO.CardEffects.BT16
                                     Permanent securityPermanent = selectedPermanent;
                                     CardSource securityCard = securityPermanent.TopCard;
 
-                                    if(securityPermanent.DigivolutionCards.Count < 1)
-                                    {
-                                        yield return ContinuousController.instance.StartCoroutine(new IPutSecurityPermanent(
-                                            securityPermanent,
-                                            CardEffectCommons.CardEffectHashtable(activateClass),
-                                            true).PutSecurity());
-                                    }
-                                    else
+                                    if(securityPermanent.DigivolutionCards.Count >= 1)
                                     {
                                         yield return ContinuousController.instance.StartCoroutine(CardObjectController.RemoveFromAllArea(permanent.TopCard));
 
@@ -205,14 +198,7 @@ namespace DCGO.CardEffects.BT16
                                     Permanent securityPermanent = selectedPermanent;
                                     CardSource securityCard = securityPermanent.TopCard;
 
-                                    if (securityPermanent.DigivolutionCards.Count < 1)
-                                    {
-                                        yield return ContinuousController.instance.StartCoroutine(new IPutSecurityPermanent(
-                                            securityPermanent,
-                                            CardEffectCommons.CardEffectHashtable(activateClass),
-                                            true).PutSecurity());
-                                    }
-                                    else
+                                    if (securityPermanent.DigivolutionCards.Count >= 1)
                                     {
                                         yield return ContinuousController.instance.StartCoroutine(CardObjectController.RemoveFromAllArea(permanent.TopCard));
 

+ 2 - 2
Assets/CardEffect/BT17/Black/DoomsdayClock_BT17_100.cs

@@ -110,7 +110,7 @@ namespace DCGO.CardEffects.BT17
 
                 if (CardEffectCommons.MatchConditionOwnersPermanentCount(card, IsDoomsdayClock) >= 4)
                 {
-                    GManager.instance.turnStateMachine.EndGame(card.Owner, false, "Doomsday Clock");
+                    card.Owner.Enemy.SetLose();
                 }
             }
             #endregion
@@ -289,7 +289,7 @@ namespace DCGO.CardEffects.BT17
                                         canTargetCondition: CanSelectCardCondition,
                                         canTargetCondition_ByPreSelecetedList: null,
                                         canEndSelectCondition: null,
-                                        canNoSelect: () => true,
+                                        canNoSelect: () => false,
                                         selectCardCoroutine: SelectCardCoroutine,
                                         afterSelectCardCoroutine: null,
                                         message: "Select 1 card to play.",

+ 20 - 26
Assets/CardEffect/BT17/Blue/MetalGarurumon_BT17_027.cs

@@ -321,19 +321,16 @@ namespace DCGO.CardEffects.BT17
 
                                     if (selectedPermanent != null)
                                     {
-                                        yield return ContinuousController.instance.StartCoroutine(
-                                            CardEffectCommons.DigivolveIntoHandOrTrashCard(
-                                                targetPermanent: selectedPermanent,
-                                                cardCondition: CanSelectHandCardSharedCondition,
-                                                payCost: false,
-                                                reduceCostTuple: null,
-                                                fixedCostTuple: null,
-                                                ignoreDigivolutionRequirementFixedCost: 0,
-                                                isHand: true,
-                                                activateClass: activateClass,
-                                                successProcess: null,
-                                                ignoreLevel: true,
-                                                ignoreSelection: true));
+                                        yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DigivolveIntoHandOrTrashCard(
+                                            targetPermanent: selectedPermanent,
+                                            cardCondition: CanSelectHandCardSharedCondition,
+                                            payCost: false,
+                                            reduceCostTuple: null,
+                                            fixedCostTuple: null,
+                                            ignoreDigivolutionRequirementFixedCost: 0,
+                                            isHand: true,
+                                            activateClass: activateClass,
+                                            successProcess: null));
                                     }
                                 }
 
@@ -533,19 +530,16 @@ namespace DCGO.CardEffects.BT17
 
                                     if (selectedPermanent != null)
                                     {
-                                        yield return ContinuousController.instance.StartCoroutine(
-                                            CardEffectCommons.DigivolveIntoHandOrTrashCard(
-                                                targetPermanent: selectedPermanent,
-                                                cardCondition: CanSelectHandCardSharedCondition,
-                                                payCost: false,
-                                                reduceCostTuple: null,
-                                                fixedCostTuple: null,
-                                                ignoreDigivolutionRequirementFixedCost: 0,
-                                                isHand: true,
-                                                activateClass: activateClass,
-                                                successProcess: null,
-                                                ignoreLevel: true,
-                                                ignoreSelection: true));
+                                        yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DigivolveIntoHandOrTrashCard(
+                                            targetPermanent: selectedPermanent,
+                                            cardCondition: CanSelectHandCardSharedCondition,
+                                            payCost: false,
+                                            reduceCostTuple: null,
+                                            fixedCostTuple: null,
+                                            ignoreDigivolutionRequirementFixedCost: 0,
+                                            isHand: true,
+                                            activateClass: activateClass,
+                                            successProcess: null));
                                     }
                                 }
 

+ 6 - 11
Assets/CardEffect/BT17/Green/Argomon_BT17_048.cs

@@ -99,24 +99,19 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if(CardEffectCommons.CanTriggerOnDeletion(hashtable, card))
-                    {
-                        if (CardEffectCommons.MatchConditionOwnersCardCountInHand(card, IsLevel6Argomon) >= 1)
-                        {
-                            return true;
-                        }
-                    }
-
-                    return false;
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                     if (CardEffectCommons.CanActivateOnDeletion(card))
                     {
-                        if (CardEffectCommons.MatchConditionOwnersCardCountInTrash(card, IsArgomon) >= 4)
+                        if(CardEffectCommons.HasMatchConditionOwnersHand(card, IsLevel6Argomon))
                         {
-                            return true;
+                            if (CardEffectCommons.MatchConditionOwnersCardCountInTrash(card, IsArgomon) >= 4)
+                            {
+                                return true;
+                            }
                         }
                     }
 

+ 2 - 2
Assets/CardEffect/BT17/Purple/DexDoruGreymon_BT17_067.cs

@@ -188,7 +188,7 @@ namespace DCGO.CardEffects.BT17
                             canTargetCondition_ByPreSelecetedList: null,
                             canEndSelectCondition: null,
                             maxCount: 1,
-                            canNoSelect: true,
+                            canNoSelect: false,
                             canEndNotMax: false,
                             isShowOpponent: true,
                             selectCardCoroutine: null,
@@ -333,7 +333,7 @@ namespace DCGO.CardEffects.BT17
                             yield return ContinuousController.instance.StartCoroutine(
                                 CardEffectCommons.DeletePeremanentAndProcessAccordingToResult(
                                     targetPermanents: chosenPermanents, activateClass: activateClass,
-                                    successProcess: _ => null, failureProcess: null));
+                                    successProcess: null, failureProcess: null));
                         }
                     }
                 }

+ 1 - 1
Assets/CardEffect/BT17/Red/Flamemon_BT17_009.cs

@@ -72,7 +72,7 @@ namespace DCGO.CardEffects.BT17
                             {
                                 new(
                                     canTargetCondition: CanSelectCardCondition,
-                                    message: "Select 1 Digimon card with the [Hybrid]/[Ten Warriors] trait.",
+                                    message: "Select 1 card with the [Hybrid]/[Ten Warriors] trait.",
                                     mode: SelectCardEffect.Mode.AddHand,
                                     maxCount: 1,
                                     selectCardCoroutine: null),

+ 2 - 2
Assets/CardEffect/BT17/Red/MiraculousMegaKnight_BT17_095.cs

@@ -39,8 +39,8 @@ namespace DCGO.CardEffects.BT17
                     {
                         if (cardSource.IsDigimon)
                         {
-                            return cardSource.ContainsCardName("Agumon") ||
-                                   cardSource.ContainsCardName("Gabumon");
+                            return cardSource.EqualsCardName("Agumon") ||
+                                   cardSource.EqualsCardName("Gabumon");
                         }
                     }
 

+ 20 - 26
Assets/CardEffect/BT17/Red/WarGreymon_BT17_015.cs

@@ -282,19 +282,16 @@ namespace DCGO.CardEffects.BT17
 
                                     if (selectedPermanent != null)
                                     {
-                                        yield return ContinuousController.instance.StartCoroutine(
-                                            CardEffectCommons.DigivolveIntoHandOrTrashCard(
-                                                targetPermanent: selectedPermanent,
-                                                cardCondition: CanSelectHandCardSharedCondition,
-                                                payCost: false,
-                                                reduceCostTuple: null,
-                                                fixedCostTuple: null,
-                                                ignoreDigivolutionRequirementFixedCost: 0,
-                                                isHand: true,
-                                                activateClass: activateClass,
-                                                successProcess: null,
-                                                ignoreLevel: true,
-                                                ignoreSelection: true));
+                                        yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DigivolveIntoHandOrTrashCard(
+                                            targetPermanent: selectedPermanent,
+                                            cardCondition: CanSelectHandCardSharedCondition,
+                                            payCost: false,
+                                            reduceCostTuple: null,
+                                            fixedCostTuple: null,
+                                            ignoreDigivolutionRequirementFixedCost: 0,
+                                            isHand: true,
+                                            activateClass: activateClass,
+                                            successProcess: null));
                                     }
                                 }
 
@@ -455,19 +452,16 @@ namespace DCGO.CardEffects.BT17
 
                                     if (selectedPermanent != null)
                                     {
-                                        yield return ContinuousController.instance.StartCoroutine(
-                                            CardEffectCommons.DigivolveIntoHandOrTrashCard(
-                                                targetPermanent: selectedPermanent,
-                                                cardCondition: CanSelectHandCardSharedCondition,
-                                                payCost: false,
-                                                reduceCostTuple: null,
-                                                fixedCostTuple: null,
-                                                ignoreDigivolutionRequirementFixedCost: 0,
-                                                isHand: true,
-                                                activateClass: activateClass,
-                                                successProcess: null,
-                                                ignoreLevel: true,
-                                                ignoreSelection: true));
+                                        yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DigivolveIntoHandOrTrashCard(
+                                            targetPermanent: selectedPermanent,
+                                            cardCondition: CanSelectHandCardSharedCondition,
+                                            payCost: false,
+                                            reduceCostTuple: null,
+                                            fixedCostTuple: null,
+                                            ignoreDigivolutionRequirementFixedCost: 0,
+                                            isHand: true,
+                                            activateClass: activateClass,
+                                            successProcess: null));
                                     }
                                 }
 

+ 3 - 10
Assets/CardEffect/BT17/Yellow/HackerPride_BT17_098.cs

@@ -143,14 +143,7 @@ namespace DCGO.CardEffects.BT17
 
                                     if (!permanent.TopCard.IsToken)
                                     {
-                                        if (permanent.DigivolutionCards.Count < 1)
-                                        {
-                                            yield return ContinuousController.instance.StartCoroutine(new IPutSecurityPermanent(
-                                                permanent,
-                                                CardEffectCommons.CardEffectHashtable(activateClass),
-                                                true).PutSecurity());
-                                        }
-                                        else
+                                        if (permanent.DigivolutionCards.Count >= 1)
                                         {
                                             yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddSecurityCard(permanent.TopCard));
 
@@ -167,10 +160,10 @@ namespace DCGO.CardEffects.BT17
                                                     permanent.ShowingPermanentCard.WillBeDeletedObject.SetActive(false);
                                                 }
                                             }
+
+                                            yield return ContinuousController.instance.StartCoroutine(card.Owner.AddMemory(2, activateClass));
                                         }
                                     }
-
-                                    yield return ContinuousController.instance.StartCoroutine(card.Owner.AddMemory(2, activateClass));
                                 }
                             }
                         }

+ 1 - 1
Assets/CardEffect/BT17/Yellow/Kazuchimon_BT17_040.cs

@@ -280,7 +280,7 @@ namespace DCGO.CardEffects.BT17
                         {
                             if (card.Owner.LibraryCards.Count >= 1)
                             {
-                                if (card.PermanentOfThisCard().TopCard.name.Contains("Fenriloogamon"))
+                                if (card.PermanentOfThisCard().TopCard.ContainsCardName("Fenriloogamon"))
                                 {
                                     return true;
                                 }

+ 7 - 8
Assets/CardEffect/BT17/Yellow/RikaNonaka_BT17_085.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 
 namespace DCGO.CardEffects.BT17
@@ -65,13 +66,12 @@ namespace DCGO.CardEffects.BT17
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Digivolve your [Renamon] into [Sakuyamon]", CanUseCondition, card);
-                activateClass.SetUpActivateClass(null, ActivateCoroutine, 1, false, EffectDiscription());
-                activateClass.SetHashString("Digivolution_BT17_85");
+                activateClass.SetUpActivateClass(null, ActivateCoroutine, -1, false, EffectDiscription());
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
                 {
-                    return "[Main][Once Per Turn] , By placing this Tamer and 1 [Kyubimon] and 1 [Taomon] from your trash in any order as the bottom digivolution cards of one of your [Renamon], that Digimon may digivolve into [Sakuyamon] in your hand for a digivolution cost of 4, ignoring its digivolution requirements. If digivolved by this effect, you may return 1 Option card from your trash to the hand.";
+                    return "[Main] By placing this Tamer and 1 [Kyubimon] and 1 [Taomon] from your trash in any order as the bottom digivolution cards of one of your [Renamon], that Digimon may digivolve into [Sakuyamon] in your hand for a digivolution cost of 4, ignoring its digivolution requirements. If digivolved by this effect, you may return 1 Option card from your trash to the hand.";
                 }
 
                 bool CanSelectPermanentCondition(Permanent permanent)
@@ -293,9 +293,8 @@ namespace DCGO.CardEffects.BT17
 
                                     if (selectedPermanent.TopCard != null)
                                     {
-                                        yield return ContinuousController.instance.StartCoroutine(selectedPermanent.AddDigivolutionCardsBottom(digivolutionCards, activateClass));
-
                                         added = true;
+                                        yield return ContinuousController.instance.StartCoroutine(selectedPermanent.AddDigivolutionCardsBottom(digivolutionCards, activateClass));
                                     }
                                 }
                             }
@@ -309,11 +308,11 @@ namespace DCGO.CardEffects.BT17
                                 payCost: true,
                                 reduceCostTuple: null,
                                 fixedCostTuple: (fixedCost: 4, fixedCostCardCondition: null),
-                                ignoreDigivolutionRequirementFixedCost: 4,
+                                ignoreDigivolutionRequirementFixedCost: -1,
                                 isHand: true,
                                 activateClass: activateClass,
-                                successProcess: SuccessProcess(),
-                                ignoreLevel: true));
+                                ignoreLevel: true,
+                                successProcess: SuccessProcess()));
 
                             IEnumerator SuccessProcess()
                             {

+ 2 - 2
Assets/CardEffect/BT17/Yellow/RizeGreymon_BT17_037.cs

@@ -100,7 +100,7 @@ namespace DCGO.CardEffects.BT17
             if (timing == EffectTiming.OnEnterFieldAnyone)
             {
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("Suspend a Tamer to gain +3000 DP and Piercing", CanUseCondition, card);
+                activateClass.SetUpICardEffect("Suspend a Tamer to give -3000 DP", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateSharedCondition, ActivateCoroutine, -1, true, EffectSharedDiscription1());
                 cardEffects.Add(activateClass);
 
@@ -206,7 +206,7 @@ namespace DCGO.CardEffects.BT17
             if (timing == EffectTiming.OnAllyAttack)
             {
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("Suspend a Tamer to gain +3000 DP and Piercing", CanUseCondition, card);
+                activateClass.SetUpICardEffect("Suspend a Tamer to give -3000 DP", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateSharedCondition, ActivateCoroutine, -1, true, EffectSharedDiscription2());
                 cardEffects.Add(activateClass);
 

+ 2 - 10
Assets/CardEffect/BT17/Yellow/ShineGreymonBurstMode_BT17_041.cs

@@ -307,22 +307,14 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if(CardEffectCommons.CanTriggerOnAttack(hashtable, card))
-                    {
-                        if(CardEffectCommons.MatchConditionOpponentsPermanentCount(card, CanSelectPermanentCondition) >= 2)
-                        {
-                            return true;
-                        }
-                    }
-
-                    return false;
+                    return CardEffectCommons.CanTriggerOnAttack(hashtable, card);
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
-                        if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
+                        if (CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition) >= 2)
                         {
                             return true;
                         }

+ 2 - 2
Assets/CardEffect/P/Yellow/LeomonXAntibody_P_139.cs

@@ -174,9 +174,9 @@ namespace DCGO.CardEffects.P
             #region All Turns
             bool LeomonCondition()
             {
-                if (card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) => cardSource.EqualsCardName("Leomon") || cardSource.EqualsCardName("X Antibody")) >= 1)
+                if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                 {
-                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
+                    if (card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) => cardSource.EqualsCardName("Leomon") || cardSource.EqualsCardName("X Antibody")) >= 1)
                     {
                         return true;
                     }

+ 29 - 33
Assets/Scripts/CardEffectCommons.cs

@@ -113,18 +113,22 @@ public partial class CardEffectCommons
 
         Player player = isOwnerPermanent ? card.Owner : card.Owner.Enemy;
 
-        if (card.Owner.fieldCardFrames.Count((frame) => frame.IsEmptyFrame() && frame.IsBattleAreaFrame()) >= 1)
+        if (card.Owner.fieldCardFrames.Count((frame) => frame.IsEmptyFrame() && frame.IsBattleAreaFrame()) >= quantity)
         {
             List<CardSource> playCards = new List<CardSource>();
-            CardSource tokenCard = CardObjectController.CreateCardSource(
+            
+            for (int i = 0; i < quantity; i++)
+            {
+                CardSource tokenCard = CardObjectController.CreateCardSource(
                 player.PlayerID,
                 tokenData,
                 true);
 
-            for (int i = 0; i < quantity; i++)
                 playCards.Add(tokenCard);
+            }
+                
 
-            if (CanPlayAsNewPermanent(cardSource: tokenCard, payCost: false, cardEffect: activateClass))
+            if (CanPlayAsNewPermanent(cardSource: playCards[0], payCost: false, cardEffect: activateClass))
             {
                 yield return ContinuousController.instance.StartCoroutine(new PlayCardClass(
                     cardSources: playCards,
@@ -558,36 +562,28 @@ public partial class CardEffectCommons
             if (owner.HandCards.Count(CanSelectCardCondition) >= 1)
             {
 
-                int maxCount = Mathf.Max(1, owner.HandCards.Count(CanSelectCardCondition));
+                int maxCount = Mathf.Min(1, owner.HandCards.Count(CanSelectCardCondition));
 
-                if(maxCount > 1)
-                {
-                    SelectHandEffect selectHandEffect = GManager.instance.GetComponent<SelectHandEffect>();
-
-                    selectHandEffect.SetUp(
-                        selectPlayer: owner,
-                        canTargetCondition: CanSelectCardCondition,
-                        canTargetCondition_ByPreSelecetedList: null,
-                        canEndSelectCondition: null,
-                        maxCount: maxCount,
-                        canNoSelect: true,
-                        canEndNotMax: false,
-                        isShowOpponent: true,
-                        selectCardCoroutine: SelectCardCoroutine,
-                        afterSelectCardCoroutine: null,
-                        mode: SelectHandEffect.Mode.Custom,
-                        cardEffect: activateClass);
-
-                    selectHandEffect.SetUpCustomMessage("Select 1 card to digivolve.", "The opponent is selecting 1 card to digivolve.");
-                    selectHandEffect.SetUpCustomMessage_ShowCard("Selected Card");
-
-                    yield return ContinuousController.instance.StartCoroutine(selectHandEffect.Activate());
-                }
-                else
-                {
-                    selectedCards.Add(owner.HandCards.Find(CanSelectCardCondition));
-                }
-                
+                SelectHandEffect selectHandEffect = GManager.instance.GetComponent<SelectHandEffect>();
+
+                selectHandEffect.SetUp(
+                    selectPlayer: owner,
+                    canTargetCondition: CanSelectCardCondition,
+                    canTargetCondition_ByPreSelecetedList: null,
+                    canEndSelectCondition: null,
+                    maxCount: maxCount,
+                    canNoSelect: true,
+                    canEndNotMax: false,
+                    isShowOpponent: true,
+                    selectCardCoroutine: SelectCardCoroutine,
+                    afterSelectCardCoroutine: null,
+                    mode: SelectHandEffect.Mode.Custom,
+                    cardEffect: activateClass);
+
+                selectHandEffect.SetUpCustomMessage("Select 1 card to digivolve.", "The opponent is selecting 1 card to digivolve.");
+                selectHandEffect.SetUpCustomMessage_ShowCard("Selected Card");
+
+                yield return ContinuousController.instance.StartCoroutine(selectHandEffect.Activate());
             }
         }
 

+ 1 - 14
Assets/Scripts/CardEffectCommons/KeyWordEffects/Blitz.cs

@@ -20,16 +20,7 @@ public partial class CardEffectCommons
                         if (!GManager.instance.attackProcess.UsedBlitz)
                         {
                             return true;
-                        }
-                        else
-                        {
-                            if (GManager.instance.attackProcess.AttackingPermanent.TopCard != cardSource.PermanentOfThisCard().TopCard)
-                            {
-
-                                return true;
-                            }
-                        }
-                                                
+                        }                                                
                     }
                 }
             }
@@ -58,10 +49,6 @@ public partial class CardEffectCommons
 
             GManager.instance.attackProcess.UsedBlitz = true;
         }
-        else
-        {
-            GManager.instance.attackProcess.UsedBlitz = false;
-        }
     }
     #endregion
 

+ 2 - 2
Assets/Scripts/ContinuousController.cs

@@ -270,6 +270,8 @@ public class ContinuousController : MonoBehaviour
             ReverseCard_Digitama = reverseDigieggCardSprite;
         }
 
+        LoadBanList();
+
         // deck data
         //DeckDatas = PlayerPrefsUtil.LoadList<DeckData>(DeckDatasPlayerPrefsKey);
         LoadDeckLists();
@@ -306,8 +308,6 @@ public class ContinuousController : MonoBehaviour
 
         await CreateTokenData();
 
-        LoadBanList();
-
         DontDestroyOnLoad(gameObject);
     }
 

+ 0 - 1
Assets/Scripts/DeckBuildingRule.cs

@@ -58,7 +58,6 @@ public class DeckBuildingRule : MonoBehaviour
             }
 
             List<CEntity_Base> deckCards = new List<CEntity_Base>();
-
             foreach (CEntity_Base cEntity_Base in cEntity_Bases)
             {
                 deckCards.Add(cEntity_Base);

+ 0 - 6
Assets/Scripts/DeckData.cs

@@ -727,8 +727,6 @@ public class DeckData
             }
         }
 
-        Debug.Log($"ModifiedDeckData: {deckCards.Count}");
-
         List<CEntity_Base> modifiedDeckCards = modifiedList(deckCards);
         List<CEntity_Base> modifiedDigitamaDeckCards = modifiedList(digitamaDeckCards);
 
@@ -757,7 +755,6 @@ public class DeckData
             //Remove more than the specified number of cards
             foreach (CEntity_Base cEntity_Base in DistinctDeckCards1)
             {
-                Debug.Log($"Remove more than max count: {cEntity_Base.SameCardIDCount(deckCards)}, {cEntity_Base.MaxCountInDeck}");
                 while (cEntity_Base.SameCardIDCount(deckCards) > cEntity_Base.MaxCountInDeck)
                 {
                     CEntity_Base removeCard = null;
@@ -773,14 +770,11 @@ public class DeckData
 
                     if (removeCard != null)
                     {
-                        Debug.Log($"Remove card: {removeCard.CardID}");
                         deckCards.Remove(removeCard);
                     }
                 }
             }
 
-            Debug.Log($"Modified Deck: {deckCards.Count}");
-
             return deckCards;
         }
 

+ 9 - 0
Assets/Scripts/MemoryObject.cs

@@ -122,6 +122,15 @@ public class MemoryObject : MonoBehaviour
                 yield return new WaitWhile(() => !end);
                 end = false;
                 #endregion
+
+                #region setting used blitz
+                if (GManager.instance.attackProcess.UsedBlitz)
+                {
+                    if (GManager.instance.turnStateMachine.gameContext.Memory <= 0)
+                        GManager.instance.attackProcess.UsedBlitz = false;
+                }
+                    
+                #endregion
             }
         }
 

+ 3 - 0
Assets/Scripts/ResultObject.cs

@@ -52,6 +52,9 @@ public class ResultObject : MonoBehaviour
 
                 if (Surrendered)
                     ResultText.text = "The opponent has surrendered.";
+
+                if (String.IsNullOrEmpty(effectName))
+                    ResultText.text = effectName;
             }
         }
 

+ 1 - 1
Assets/Scripts/SelectDigiXrosClass.cs

@@ -376,7 +376,7 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
                     if (_endSelectDigiXros)
                     {
                         _endSelectDigiXros = false;
-                        break;
+                        //break; TODO: Removed for not triggering digixros in all situations
                     }
 
                     bool canSelectHand = false;

+ 2 - 2
ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:621dbfd09b7a8b5161a996f8cf1338efce1a4bcc6d9bfe04132155e2b1ab1407
-size 20166
+oid sha256:b4bcbf9ffec950c04704b52dc185b5d3d02482f324b61bc8e8251ceb0038ce37
+size 20167