public release

Assets/CardEffect/BT10/Red/JiesmonGX_BT10_112.cs

@@ -271,8 +271,7 @@ public class JiesmonGX_BT10_112 : CEntity_Effect
                         }
                     }
 
-                    if (!card.HasBlitz)
-                        yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.BlitzProcess(card, activateClass));
+                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.BlitzProcess(card, activateClass));
                 }
             }
         }

Assets/CardEffect/BT16/Black/DoruGreymon_BT16_061.cs

@@ -126,7 +126,7 @@ namespace DCGO.CardEffects.BT16
             #endregion
 
             #region All Turns - ESS
-            if (timing == EffectTiming.OnDestroyedAnyone || timing == EffectTiming.OnEndBattle)
+            if (timing == EffectTiming.OnDestroyedAnyone)
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Play 1 digimon 5 cost or less", CanUseCondition, card);
@@ -160,12 +160,12 @@ namespace DCGO.CardEffects.BT16
 
                 bool DeletionCardEffect(ICardEffect cardEffect)
                 {
-                    return (cardEffect.EffectSourcePermanent == card.PermanentOfThisCard());
+                    return (cardEffect.EffectSourceCard.PermanentOfThisCard() == card.PermanentOfThisCard());
                 }
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                         if (CardEffectCommons.IsByBattle(hashtable))
                         {
@@ -195,7 +195,7 @@ namespace DCGO.CardEffects.BT16
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnBattleArea(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

Assets/CardEffect/BT16/Red/PhoenixmonXAntibody_BT16_015.cs

@@ -34,59 +34,6 @@ namespace DCGO.CardEffects.BT16
             #endregion
 
             #region Your Turn
-            if(timing == EffectTiming.None)
-            {
-                            //List<ICardEffect> onDeletionEffects = card.PermanentOfThisCard().EffectList(EffectTiming.OnDestroyedAnyone).Where(x => x.IsOnDeletion && !x.IsSecurityEffect).ToList();
-                            //List<Func<EffectTiming, ICardEffect>> onEndAttackEffects = card.PermanentOfThisCard().UntilOwnerTurnEndEffects.Where(x => x(EffectTiming.OnEndAttack).HashString.StartsWith("EndOfAttack")).ToList();
-                            //List<ICardEffect> effectsToAdd = new List<ICardEffect>();
-                            //Debug.Log($"ACTIVATE COROUTINE: {onDeletionEffects.Count}-{onEndAttackEffects.Count}");
-                            /*if (onDeletionEffects.Count > onEndAttackEffects.Count)
-                            {
-                                foreach (ICardEffect deletionEffect in onDeletionEffects)
-                                {
-                                    ICardEffect foundMatchingEffect = onEndAttackEffects.Where(x => x(EffectTiming.OnEndAttack).HashString.EndsWith(deletionEffect.EffectSourceCard.CardID)).First()(EffectTiming.OnEndAttack);
-
-                                    if (foundMatchingEffect == null)
-                                        effectsToAdd.Add(deletionEffect);
-                                }
-                            }
-
-                            foreach (ICardEffect endofAttackEffect in effectsToAdd)
-                            {
-                                ActivateClass activateEndofAttack = new ActivateClass();
-                                activateEndofAttack.SetUpICardEffect(endofAttackEffect.EffectName, CanUseEndOfAttackCondition, card);
-                                activateEndofAttack.SetUpActivateClass(CanActivateEndOfAttackCondition, ActivateEndOfAttackCoroutine, endofAttackEffect.MaxCountPerTurn, endofAttackEffect.IsOptional, endofAttackEffect.EffectDiscription);
-                                activateEndofAttack.SetIsInheritedEffect(endofAttackEffect.IsInheritedEffect);
-                                activateEndofAttack.SetHashString($"EndOfAttack_{endofAttackEffect.EffectSourceCard.CardID}");
-                                activateEndofAttack.SetEffectSourcePermanent(card.PermanentOfThisCard());
-
-                                bool CanUseEndOfAttackCondition(Hashtable hashtable1)
-                                {
-                                    if (card.PermanentOfThisCard().TopCard != card)
-                                        return false;
-
-                                    return CardEffectCommons.CanTriggerOnEndAttack(hashtable1, card);
-                                }
-
-                                bool CanActivateEndOfAttackCondition(Hashtable hashtable1)
-                                {
-                                    return CardEffectCommons.IsExistOnBattleArea(card);
-                                }
-
-                                IEnumerator ActivateEndOfAttackCoroutine(Hashtable hashtable)
-                                {
-                                    yield return ContinuousController.instance.StartCoroutine(((ActivateICardEffect)endofAttackEffect).Activate(hashtable));
-                                }
-
-                                CardEffectCommons.AddEffectToPermanent(
-                                           targetPermanent: card.PermanentOfThisCard(),
-                                           effectDuration: EffectDuration.UntilOwnerTurnEnd,
-                                           card: card,
-                                           cardEffect: activateEndofAttack,
-                                           timing: EffectTiming.OnEndAttack);
-
-                            }*/
-            }
             if (timing == EffectTiming.AfterEffectsActivate || timing == EffectTiming.OnStartTurn || timing == EffectTiming.OnEnterFieldAnyone || timing == EffectTiming.OnDigivolutionCardDiscarded)
             {
                 ActivateClass activateClass = new ActivateClass();
@@ -201,7 +148,8 @@ namespace DCGO.CardEffects.BT16
                             {
                                 if (cardSource.HasAvianBeastAnimalTraits)
                                 {
-                                    return true;
+                                    if(CardEffectCommons.CanPlayAsNewPermanent(cardSource,false,activateClass))
+                                        return true;
                                 }
                             }
 

Assets/CardEffect/BT16/Yellow/Agumon_BT16_029.cs

@@ -56,7 +56,7 @@ namespace DCGO.CardEffects.BT16
                     return "[On Play] Reveal the top 3 cards of your deck. Add 1 card with the [Light Fang] trait and 1 card with the [Night Claw] trait or 2 colors among them to the hand. Return the rest to the bottom of the deck.";
                 }
 
-                bool CanSelectCardCondition(CardSource cardSource)
+                bool NightClawCondition(CardSource cardSource)
                 {
                     if (cardSource.CardTraits.Contains("Night Claw"))
                     {
@@ -68,10 +68,15 @@ namespace DCGO.CardEffects.BT16
                         return true;
                     }
 
+                    if (cardSource.CardColors.Count == 2)
+                    {
+                        return true;
+                    }
+
                     return false;
                 }
 
-                bool CanSelectCardCondition1(CardSource cardSource)
+                bool LightFangCondition(CardSource cardSource)
                 {
                     if (cardSource.CardTraits.Contains("Light Fang"))
                     {
@@ -83,11 +88,6 @@ namespace DCGO.CardEffects.BT16
                         return true;
                     }
 
-                    if (cardSource.CardColors.Count >= 2)
-                    {
-                        return true;
-                    }
-
                     return false;
                 }
 
@@ -117,13 +117,13 @@ namespace DCGO.CardEffects.BT16
                         new SimplifiedSelectCardConditionClass[]
                         {
                         new SimplifiedSelectCardConditionClass(
-                            canTargetCondition:CanSelectCardCondition1,
+                            canTargetCondition:LightFangCondition,
                             message: "Select 1 card with the [Light Fang] trait.",
                             mode: SelectCardEffect.Mode.AddHand,
                             maxCount: 1,
                             selectCardCoroutine: null),
                         new SimplifiedSelectCardConditionClass(
-                            canTargetCondition:CanSelectCardCondition,
+                            canTargetCondition:NightClawCondition,
                             message: "Select 1 card with the [Night Claw] trait or 2 colors.",
                             mode: SelectCardEffect.Mode.AddHand,
                             maxCount: 1,

Assets/CardEffect/EX6/Blue/Huankunmon_EX6_014.cs

@@ -354,6 +354,7 @@ namespace DCGO.CardEffects.EX6
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, true,
                     EffectDescription());
                 activateClass.SetIsInheritedEffect(true);
+                activateClass.SetHashString("Attacking_EX6_014");
                 cardEffects.Add(activateClass);
                 
                 string EffectDescription()

Assets/CardEffect/EX6/Yellow/Cupimon_EX6_003.cs

@@ -21,6 +21,7 @@ namespace DCGO.CardEffects.EX6
                     CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, true, EffectDescription());
                 activateClass.SetIsInheritedEffect(true);
+                activateClass.SetHashString("Attacking_EX6_003");
                 cardEffects.Add(activateClass);
                 
                 string EffectDescription()
@@ -31,14 +32,17 @@ namespace DCGO.CardEffects.EX6
                 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    if (cardSource.ContainsTraits("Angel") ||
-                        cardSource.ContainsTraits("Archangel") ||
-                        cardSource.ContainsTraits("Three Great Angels") ||
-                        cardSource.ContainsTraits("ThreeGreatAngels"))
+                    if (cardSource.IsDigimon)
                     {
-                        return true;
+                        if (cardSource.ContainsTraits("Angel") ||
+                            cardSource.ContainsTraits("Archangel") ||
+                            cardSource.ContainsTraits("Three Great Angels") ||
+                            cardSource.ContainsTraits("ThreeGreatAngels"))
+                        {
+                            return true;
+                        }
                     }
-                    
+                                        
                     return false;
                 }
                 

Assets/CardEffect/P/Blue/AlforsevdramonZero_P_048.cs

@@ -140,6 +140,7 @@ public class AlforsevdramonZero_P_048 : CEntity_Effect
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Memory +1", CanUseCondition, card);
             activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, false, EffectDiscription());
+            activateClass.SetHashString("Memory_P_048");
             cardEffects.Add(activateClass);
 
             string EffectDiscription()
@@ -149,7 +150,7 @@ public class AlforsevdramonZero_P_048 : CEntity_Effect
 
             bool CanUseCondition(Hashtable hashtable)
             {
-                if (CardEffectCommons.IsExistOnBattleArea(card))
+                if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                 {
                     if (CardEffectCommons.IsOwnerTurn(card))
                     {
@@ -165,7 +166,7 @@ public class AlforsevdramonZero_P_048 : CEntity_Effect
 
             bool CanActivateCondition(Hashtable hashtable)
             {
-                if (CardEffectCommons.IsExistOnBattleArea(card))
+                if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                 {
                     return true;
                 }

Assets/Scenes/BattleScene.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.18028331, g: 0.2257133, b: 0.3069217, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -302,7 +302,7 @@ GameObject:
   - component: {fileID: 3813191}
   - component: {fileID: 3813190}
   m_Layer: 5
-  m_Name: Canvas0
+  m_Name: Background Effects
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -12285,7 +12285,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchorMin.x
@@ -12293,7 +12293,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_SizeDelta.x
@@ -12333,11 +12333,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 227.95001
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -449.80002
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -14162,7 +14162,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchorMin.x
@@ -14170,7 +14170,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_SizeDelta.x
@@ -14210,11 +14210,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 227.95001
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -825.1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -16264,8 +16264,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -4.8800054, y: -593.14}
-  m_SizeDelta: {x: 3902, y: 9369}
+  m_AnchoredPosition: {x: -4.8800054, y: -592.81604}
+  m_SizeDelta: {x: 3902, y: 9363.601}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &185850053
 MonoBehaviour:
@@ -19205,7 +19205,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchorMin.x
@@ -19213,7 +19213,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_SizeDelta.x
@@ -19253,11 +19253,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 227.95001
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -74.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -31472,7 +31472,7 @@ GameObject:
   - component: {fileID: 360743533}
   - component: {fileID: 360743534}
   m_Layer: 0
-  m_Name: "\u30AB\u30FC\u30C9\u78BA\u8A8D\u30D1\u30CD\u30EB"
+  m_Name: ' Card confirmation panel'
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -34183,7 +34183,7 @@ GameObject:
   m_Component:
   - component: {fileID: 391899598}
   m_Layer: 0
-  m_Name: "\u52B9\u679C\u767A\u52D5\u30AB\u30FC\u30C9\u89AA"
+  m_Name: ' Effect activation card parent'
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -36994,7 +36994,7 @@ GameObject:
   - component: {fileID: 441885482}
   - component: {fileID: 441885483}
   m_Layer: 0
-  m_Name: "\u30AB\u30FC\u30C9\u9078\u629E\u30D1\u30CD\u30EB"
+  m_Name: ' Card selection panel'
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -39645,7 +39645,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchorMin.x
@@ -39653,7 +39653,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_SizeDelta.x
@@ -39693,11 +39693,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 227.95001
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -324.7
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -51516,7 +51516,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 1934565667}
   m_Direction: 2
   m_Value: 1
-  m_Size: 0.76925063
+  m_Size: 0.76968235
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -60165,7 +60165,7 @@ GameObject:
   - component: {fileID: 814965178}
   - component: {fileID: 814965177}
   m_Layer: 0
-  m_Name: "\u30D5\u30A7\u30A4\u30BA\u7D42\u4E86\u30DC\u30BF\u30F3"
+  m_Name: Next Phase
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -68753,7 +68753,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 954493549}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 93d6d1a8e5126ad45a7d39d07d538d2f, type: 3}
   m_Name: 
@@ -72231,7 +72231,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: -0.000030517578}
-  m_SizeDelta: {x: -8.799988, y: 904.6}
+  m_SizeDelta: {x: -8.799988, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1043833511
 MonoBehaviour:
@@ -72696,7 +72696,7 @@ GameObject:
   - component: {fileID: 1060026865}
   - component: {fileID: 1060026866}
   m_Layer: 5
-  m_Name: "\u30AB\u30FC\u30C9\u9078\u629E\u306B\u623B\u308B\u30DC\u30BF\u30F3"
+  m_Name: Back to selection
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -79497,7 +79497,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchorMin.x
@@ -79505,7 +79505,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_SizeDelta.x
@@ -79545,11 +79545,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 227.95001
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -700
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -93517,7 +93517,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1237985150}
   m_Layer: 0
-  m_Name: CharacterInfos
+  m_Name: Stack Info
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -93920,7 +93920,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchorMin.x
@@ -93928,7 +93928,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_SizeDelta.x
@@ -93968,11 +93968,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 227.95001
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -574.9
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -94021,8 +94021,8 @@ RectTransform:
   m_Father: {fileID: 1913478803}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.13820724}
-  m_AnchorMax: {x: 1, y: 0.99999994}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 40, y: 45.67987}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -117806,7 +117806,7 @@ GameObject:
   - component: {fileID: 1457315256}
   - component: {fileID: 1457315255}
   m_Layer: 5
-  m_Name: Canvas3
+  m_Name: Card Details UI
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -120017,7 +120017,7 @@ GameObject:
   - component: {fileID: 1483926570}
   - component: {fileID: 1483926569}
   m_Layer: 0
-  m_Name: "\u30BF\u30FC\u30F3\u30D7\u30EC\u30A4\u30E4\u30FC\u8868\u793A\u30C6\u30AD\u30B9\u30C8"
+  m_Name: ' Turn player display text'
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -121752,7 +121752,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1513313337}
   m_Layer: 0
-  m_Name: "\u30BF\u30FC\u30B2\u30C3\u30C8\u77E2\u5370\u89AA (1)"
+  m_Name: ' target arrow parent'
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -129311,7 +129311,7 @@ GameObject:
   - component: {fileID: 1548092349}
   - component: {fileID: 1548092350}
   m_Layer: 5
-  m_Name: "\u52B9\u679C\u30C6\u30AD\u30B9\u30C8\u8868\u793A\u89AA"
+  m_Name: ' effect text display parent'
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -144771,7 +144771,7 @@ GameObject:
   - component: {fileID: 1647233660}
   - component: {fileID: 1647233659}
   m_Layer: 0
-  m_Name: "\u30D5\u30A7\u30A4\u30BA\u901A\u77E5"
+  m_Name: ' Phase notification'
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -146314,7 +146314,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchorMin.x
@@ -146322,7 +146322,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_SizeDelta.x
@@ -146362,11 +146362,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 227.95001
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -199.6
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8857762179482184235, guid: 422e3a5acfd91f945b16eca24393e500, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -149412,7 +149412,7 @@ GameObject:
   - component: {fileID: 1758026219}
   - component: {fileID: 1758026220}
   m_Layer: 5
-  m_Name: "\u30ED\u30B0"
+  m_Name: ' log'
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -149867,7 +149867,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1768823879
 RectTransform:
   m_ObjectHideFlags: 0
@@ -152077,7 +152077,7 @@ GameObject:
   - component: {fileID: 1822333118}
   - component: {fileID: 1822333117}
   m_Layer: 5
-  m_Name: Canvas2
+  m_Name: Game UI
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -155239,7 +155239,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 444.34995}
-  m_SizeDelta: {x: 229.23999, y: 1155.28}
+  m_SizeDelta: {x: 229.23999, y: 1154.6321}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1881485800
 MonoBehaviour:
@@ -158798,7 +158798,7 @@ RectTransform:
   m_Father: {fileID: 2141664163}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.23074937}
+  m_AnchorMin: {x: 0, y: 0.23031765}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: -0.1449585}
   m_SizeDelta: {x: 40, y: 45.38994}
@@ -159470,7 +159470,7 @@ GameObject:
   - component: {fileID: 1948517704}
   - component: {fileID: 1948517703}
   m_Layer: 0
-  m_Name: Canvas1
+  m_Name: Board UI
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -168928,7 +168928,7 @@ GameObject:
   - component: {fileID: 2142809524}
   - component: {fileID: 2142809523}
   m_Layer: 0
-  m_Name: "\u30AB\u30FC\u30C9\u78BA\u8A8D\u30D1\u30CD\u30EB (1)"
+  m_Name: Card confirmation panel Trash
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -169690,7 +169690,7 @@ RectTransform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 156150922234379327}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: -5.28}
   m_LocalScale: {x: 0.86, y: 0.86, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -171118,7 +171118,7 @@ GameObject:
   - component: {fileID: 7949587185277551902}
   - component: {fileID: 8200926122536285532}
   m_Layer: 5
-  m_Name: Popup007_Cyan_Opaque
+  m_Name: Background
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Scripts/CardEffectCommons/KeyWordEffects/Blitz.cs

@@ -17,7 +17,8 @@ public partial class CardEffectCommons
                 {
                     if (!GManager.instance.attackProcess.IsAttacking)
                     {
-                        return true;
+                        if(GManager.instance.attackProcess.AttackingPermanent != cardSource.PermanentOfThisCard())
+                            return true;
                     }
                 }
             }

Assets/Scripts/CardObjectController.cs

@@ -571,7 +571,7 @@ public class CardObjectController : MonoBehaviour
         }
 
         List<CardSource> eggCards = cardSources.Filter(cardSource => cardSource.IsDigiEgg);
-        List<CardSource> addedCards = cardSources.Filter(cardSource => !cardSource.IsDigiEgg || !cardSource.IsToken);
+        List<CardSource> addedCards = cardSources.Filter(cardSource => !cardSource.IsDigiEgg && !cardSource.IsToken);
 
         if (eggCards.Count <= 0)
             yield return ContinuousController.instance.StartCoroutine(AddLibraryBottomCards(eggCards));

Assets/Scripts/PermanentDetail.cs

@@ -215,10 +215,10 @@ public class PermanentDetail : MonoBehaviour
         #endregion
 
         #region Partition
-        /*if (permanent.HasPartition)
+        if (permanent.HasPartition)
         {
             effectString += $"- Partition\n";
-        }*/
+        }
         #endregion
 
         #region Security Attack Changes

ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e7dcf8e1cfe3d1288607ffc13a5104e0df11608b863f9216902121148703e9c
+oid sha256:a25bf032f2f43e156aacbb90ffc8f61d37312e69e766e38e21e25f2229de6a1c
 size 20166