lvl 5 updates, color combo updates

Assets/CardEffect/BT12/Purple/BT12_083.cs

@@ -50,7 +50,7 @@ namespace DCGO.CardEffects.BT12
                         }
                     }
 
-                    int tamersCount = Combinations.GetDifferenetColorCardCount(tamerCards);
+                    int tamersCount = Combinations.GetDifferenetColorCardCount(tamerCards, true);
 
                     return maxLevel + tamersCount;
                 }

Assets/CardEffect/ST20/Green/ST20_09.cs

@@ -189,7 +189,7 @@ namespace DCGO.CardEffects.ST20
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Gain alliance then attack", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, true, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, false, EffectDiscription());
                 activateClass.SetHashString("alliance-attack-ST20-009");
                 cardEffects.Add(activateClass);
 
@@ -285,7 +285,7 @@ namespace DCGO.CardEffects.ST20
                             canTargetCondition_ByPreSelecetedList: null,
                             canEndSelectCondition: null,
                             maxCount: 1,
-                            canNoSelect: false,
+                            canNoSelect: true,
                             canEndNotMax: false,
                             selectPermanentCoroutine: SelectPermanentCoroutine,
                             afterSelectPermanentCoroutine: null,

Assets/CardEffect/ST20/Red/ST20_04.cs

@@ -310,8 +310,6 @@ namespace DCGO.CardEffects.ST20
                                 defenderCondition: _ => true,
                                 cardEffect: activateClass);
 
-                            selectAttackEffect.SetCanNotSelectNotAttack();
-
                             yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
                         }
                     }

Assets/CardEffect/ST20/Yellow/ST20_06.cs

@@ -369,8 +369,6 @@ namespace DCGO.CardEffects.ST20
                                 defenderCondition: _ => true,
                                 cardEffect: activateClass);
 
-                            selectAttackEffect.SetCanNotSelectNotAttack();
-
                             yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
                         }
                     }

Assets/CardEffect/ST21/Blue/ST21_04.cs

@@ -309,8 +309,6 @@ namespace DCGO.CardEffects.ST21
                                 defenderCondition: _ => true,
                                 cardEffect: activateClass);
 
-                            selectAttackEffect.SetCanNotSelectNotAttack();
-
                             yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
                         }
                     }

Assets/CardEffect/ST21/Green/ST21_09.cs

@@ -284,8 +284,6 @@ namespace DCGO.CardEffects.ST21
                                 defenderCondition: _ => true,
                                 cardEffect: activateClass);
 
-                            selectAttackEffect.SetCanNotSelectNotAttack();
-
                             yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
                         }
                     }

Assets/CardEffect/ST21/Yellow/ST21_06.cs

@@ -302,8 +302,6 @@ namespace DCGO.CardEffects.ST21
                                 defenderCondition: _ => true,
                                 cardEffect: activateClass);
 
-                            selectAttackEffect.SetCanNotSelectNotAttack();
-
                             yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
                         }
                     }

Assets/Scripts/Combinations.cs

@@ -50,7 +50,7 @@ public static class Combinations
     }
 
     //GetDifferenetColorCardCount
-    public static int GetDifferenetColorCardCount(List<CardSource> cardSources)
+    public static int GetDifferenetColorCardCount(List<CardSource> cardSources, bool allowSkip = false)
     {
         List<CardColor[]> cardColors = new List<CardColor[]>();
 
@@ -79,26 +79,29 @@ public static class Combinations
                 {
                     CardSource cardSource = cardSources[i];
 
-                    /*bool skip = false;
-
-                    for (int j = 0; j < cardsCorrespondingToColor.Length; j++)
+                    if (allowSkip)
                     {
-                        if (cardsCorrespondingToColor[j] != null)
+                        bool skip = false;
+
+                        for (int j = 0; j < cardsCorrespondingToColor.Length; j++)
                         {
-                            //既に同じ組み合わせの色のカードが配列に格納されている場合
-                            if (Enumerable.SequenceEqual(cardSource.CardColors.OrderBy(e => e), cardsCorrespondingToColor[j].CardColors.OrderBy(e => e)))
+                            if (cardsCorrespondingToColor[j] != null)
                             {
-                                UnityEngine.Debug.Log($"SKIPPING: {cardSource.BaseENGCardNameFromEntity}");
-                                skip = true;
-                                break;
+                                //既に同じ組み合わせの色のカードが配列に格納されている場合
+                                if (Enumerable.SequenceEqual(cardSource.CardColors.OrderBy(e => e), cardsCorrespondingToColor[j].CardColors.OrderBy(e => e)))
+                                {
+                                    UnityEngine.Debug.Log($"SKIPPING: {cardSource.BaseENGCardNameFromEntity}");
+                                    skip = true;
+                                    break;
+                                }
                             }
                         }
-                    }
 
-                    if (skip)
-                    {
-                        continue;
-                    }*/
+                        if (skip)
+                        {
+                            continue;
+                        }
+                    }                    
 
                     CardColor cardColor = cardColorArray[i];
 

ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d7b71563120a0d99861d6929244d4e697a39e1330a862f7d071aeec06d663a1
+oid sha256:acc411e8792d42511458944d9f8ef7784c28f23f0c94d5ee22dde6d0c256048c
 size 20168