Explorar o código

1.8.4.8 build

mbunch_kascope hai 1 ano
pai
achega
e13a122876

+ 2 - 2
Assets/CardBaseEntity/ST15/Black/Digimon/ST15_03_P0.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65e153725b60063782929b5eb22319de19108cfbc5c6b7d228d8cca46cf1b3ee
-size 1067
+oid sha256:494d27890db4d51c5687d0096f5dceb631a722306f82d352d9522b07d747f8ab
+size 1114

+ 2 - 2
Assets/CardBaseEntity/ST15/Black/Digimon/ST15_07_P0.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fcc33a8709a11b670d23a8e65b51542526ca808f83aea93c71a7d7ebe566cc34
-size 1063
+oid sha256:10d073a055c1ecd2ccb30cfe283cef675cb10c065d69231734c5da7f0398dbc9
+size 1110

+ 12 - 12
Assets/CardEffect/BT12/Purple/BT12_081.cs

@@ -151,27 +151,27 @@ namespace DCGO.CardEffects.BT12
 
                         if (canEvo)
                         {
-                            List<SelectionElement<bool>> selectionElements = new List<SelectionElement<bool>>()
+                            List<SelectionElement<int>> selectionElements = new List<SelectionElement<int>>()
                             {
-                                new SelectionElement<bool>(message: $"Play From Sources", value : true, spriteIndex: 0),
-                                new SelectionElement<bool>(message: $"Digivolve to [Quartzmon]", value : false, spriteIndex: 1),
+                                new SelectionElement<int>(message: $"Play From Sources", value : 1, spriteIndex: 0),
+                                new SelectionElement<int>(message: $"Digivolve to [Quartzmon]", value : 0, spriteIndex: 1),
                             };
 
                             string selectPlayerMessage = "Which effect would you like to do?";
                             string notSelectPlayerMessage = "The opponent is choosing effect to do.";
 
-                            GManager.instance.userSelectionManager.SetBoolSelection(selectionElements: selectionElements, selectPlayer: card.Owner, selectPlayerMessage: selectPlayerMessage, notSelectPlayerMessage: notSelectPlayerMessage);
+                            GManager.instance.userSelectionManager.SetIntSelection(selectionElements: selectionElements, selectPlayer: card.Owner, selectPlayerMessage: selectPlayerMessage, notSelectPlayerMessage: notSelectPlayerMessage);
                         }
                         else
                         {
-                            GManager.instance.userSelectionManager.SetBool(canEvo);
+                            GManager.instance.userSelectionManager.SetInt(1);
                         }
 
                         yield return ContinuousController.instance.StartCoroutine(GManager.instance.userSelectionManager.WaitForEndSelect());
                         
-                        if (GManager.instance.userSelectionManager.SelectedBoolValue)
+                        if (GManager.instance.userSelectionManager.SelectedIntValue == 0)
                         {
-                            #region 進化コスト
+                            #region 審educe Cost
 
                             ChangeCostClass changeCostClass = new ChangeCostClass();
                             changeCostClass.SetUpICardEffect("Digivolution Cost -3", CanUseCondition1, card);
@@ -291,10 +291,10 @@ namespace DCGO.CardEffects.BT12
                                 if (canSelectHand && canSelectTamer)
                                 {
                                     List<SelectionElement<bool>> selectionElements = new List<SelectionElement<bool>>()
-                        {
-                            new SelectionElement<bool>(message: $"From hand", value : true, spriteIndex: 0),
-                            new SelectionElement<bool>(message: $"Under Tamer", value : false, spriteIndex: 1),
-                        };
+                                    {
+                                        new SelectionElement<bool>(message: $"From hand", value : true, spriteIndex: 0),
+                                        new SelectionElement<bool>(message: $"Under Tamer", value : false, spriteIndex: 1),
+                                    };
 
                                     string selectPlayerMessage = "From which area do you select 1 [Quartzmon]?";
                                     string notSelectPlayerMessage = "The opponent is selecting from which area to select 1 [Quartzmon].";
@@ -447,7 +447,7 @@ namespace DCGO.CardEffects.BT12
                                 }
                             }
 
-                            #region 進化コスト-3解除
+                            #region End Cost Reduction
 
                             card.Owner.UntilCalculateFixedCostEffect.Remove(getCardEffect);
 

+ 1 - 0
Assets/CardEffect/BT21/Blue/BT21_035.cs

@@ -80,6 +80,7 @@ namespace DCGO.CardEffects.BT21
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Unsuspend this Digimon", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, false, EffectDescription());
+                activateClass.SetHashString("Unsuspend_BT21-035");
                 cardEffects.Add(activateClass);
 
                 string EffectDescription()

+ 2 - 2
Assets/CardEffect/BT21/Red/BT21_083.cs

@@ -214,8 +214,8 @@ namespace DCGO.CardEffects.BT21
                         IEnumerator SelectPermanentCoroutine(Permanent permanent)
                         {
                             selectedPermanent = permanent;
-
-                            if(selectedPermanent.CanAttack(activateClass))
+                            UnityEngine.Debug.Log($"SELECT ATTACK: {selectedPermanent.CanAttack(activateClass)}, {GManager.instance.attackProcess.IsAttacking}");
+                            if (selectedPermanent.CanAttack(activateClass))
                             {
                                 SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
 

+ 14 - 0
Assets/CardEffect/BT8/White/BT8_110.cs

@@ -146,6 +146,20 @@ public class BT8_110 : CEntity_Effect
 
                                 permanent.ShowingPermanentCard.ShowPermanentData(true);
                                 yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().RemoveDigivolveRootEffect(cardSource, permanent));
+
+                                #region "When Top Card is Trashed" effect
+                                #region Hashtable Setting
+                                System.Collections.Hashtable hashtable = new System.Collections.Hashtable()
+                                {
+                                    {"Permanent", permanent},
+                                    {"CardSources", new List<CardSource> { cardSource } }
+                                };
+                                #endregion
+
+                                yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing
+                                    .StackSkillInfos(hashtable, EffectTiming.WhenTopCardTrashed));
+
+                                #endregion
                             }
                         }
                     }

+ 6 - 1
Assets/CardEffect/EX7/Red/EX7_014.cs

@@ -176,7 +176,7 @@ namespace DCGO.CardEffects.EX7
                 {
                     CanNotMoveClass canNotMoveClass = new CanNotMoveClass();
                     canNotMoveClass.SetUpICardEffect("Can't move Digimon with 6000 DP or less", CanUseCondition1, card);
-                    canNotMoveClass.SetUpCanNotMoveClass(cardCondition: CardCondition, cardEffectCondition: CardEffectCondition);
+                    canNotMoveClass.SetUpCanNotMoveClass(cardCondition: CardCondition, cardEffectCondition: MoveCardEffectCondition);
                     card.Owner.Enemy.UntilOwnerTurnEndEffects.Add((_timing) => canNotMoveClass);
 
                     CanNotPutFieldClass canNotPutFieldClass = new CanNotPutFieldClass();
@@ -204,6 +204,11 @@ namespace DCGO.CardEffects.EX7
                         return false;
                      }
 
+                    bool MoveCardEffectCondition(ICardEffect cardEffect)
+                    {
+                        return true;
+                    }
+
                     bool CardEffectCondition(ICardEffect cardEffect)
                     {
                         if (cardEffect == null)

+ 2 - 2
Assets/Scripts/AttackProcess.cs

@@ -465,8 +465,7 @@ public class AttackProcess : MonoBehaviourPunCallbacks
         }
 
         // activate cutin effects
-        yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.RuleProcess());
-        yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.TriggeredSkillProcess(true, null));
+        yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.AutoProcessCheck());
 
         #region reset effects which continues until the end of attack
         foreach (Player player in GManager.instance.turnStateMachine.gameContext.Players_ForTurnPlayer)
@@ -486,6 +485,7 @@ public class AttackProcess : MonoBehaviourPunCallbacks
         SecurityDigimon = null;
         IsAttacking = false;
         IsEndAttack = false;
+        UnityEngine.Debug.Log("ATTACK IS OVER");
     }
 
     public IEnumerator SwitchDefender(ICardEffect cardEffect, bool isBlock, Permanent newDefendingPermanent)

+ 41 - 43
Assets/Scripts/Combinations.cs

@@ -10,15 +10,26 @@ public static class Combinations
 {
     public static void Sample()
     {
-        List<string[]> sourceList = new List<string[]>(3);
-        sourceList.Add(new string[] { "black", "green" });
-        sourceList.Add(new string[] { "red", "yellow"});
+        List<string[]> sourceList = new List<string[]>(4);
+        sourceList.Add(new string[] { "red", "yellow" });
+        sourceList.Add(new string[] { "purple", "red"});
+        sourceList.Add(new string[] { "purple", "red" });
+        sourceList.Add(new string[] { "purple", "red" });
         List<string[]> resultList = GetCombinations(sourceList);
 
-        foreach (string[] item in resultList)
-        {
-            Debug.Log(string.Join(",", item));
-        }
+        HighestValue(resultList);
+    }
+
+    public static void NameSample()
+    {
+        List<string[]> sourceList = new List<string[]>(4);
+        sourceList.Add(new string[] { "Takuya Kanbara & Koji Minamoto", "Takuya Kanbara", "Koji Minamoto" });
+        sourceList.Add(new string[] { "Takuya Kanbara"});
+        sourceList.Add(new string[] { "Takuya Kanbara & Koji Minamoto", "Takuya Kanbara", "Koji Minamoto" });
+        sourceList.Add(new string[] { "Koji Minamoto" });
+        List<string[]> resultList = GetCombinations(sourceList);
+
+        HighestValue(resultList);
     }
     public static List<T[]> GetCombinations<T>(List<T[]> sourceList)
     {
@@ -50,59 +61,46 @@ public static class Combinations
         }
     }
 
-    struct UniqueCardValue
+    static int HighestValue(List<string[]> resultList)
     {
-        public string value;
-        public List<CardSource> sources;
+        int highestCount = 0;
+
+        foreach (string[] item in resultList)
+        {
+            Debug.Log(string.Join(",", item));
+
+            int count = item.Distinct().ToArray().Length;
+
+            if (count > highestCount)
+            {
+                highestCount = count;
+                Debug.Log($"New Highest Count: {highestCount}");
+            }
+        }
+
+        return highestCount;
     }
 
     //GetUniqueNameCardCount
     public static int GetUniqueNameCardCount(List<CardSource> cardSources)
     {
-        List<UniqueCardValue> cardList = new List<UniqueCardValue>();
+        List<string[]> cardNames = new List<string[]>();
 
         foreach (CardSource cardSource in cardSources)
-        {
-            foreach (string name in cardSource.CardNames)
-            {
-                if (!cardList.Any(x => x.value == name))
-                {
-                    cardList.Add(
-                        new UniqueCardValue
-                        {
-                            value = name,
-                            sources = new List<CardSource> { cardSource }
-                        }
-                    );
-                }
-            }
-        }
+            cardNames.Add(cardSource.CardNames.ToArray());
 
-        return cardList.Count;
+        return HighestValue(GetCombinations(cardNames));
     }
 
     //GetUniqueColorCardCount
     public static int GetUniqueColorCardCount(List<CardSource> cardSources)
     {
-        List<UniqueCardValue> cardList = new List<UniqueCardValue>();
+        List<string[]> cardColors = new List<string[]>();
 
         foreach (CardSource cardSource in cardSources)
-        {
-            foreach(CardColor cardColor in cardSource.CardColors)
-            {
-                if (!cardList.Any(x => x.value == cardColor.ToString()))
-                {
-                    cardList.Add(
-                        new UniqueCardValue {
-                            value = cardColor.ToString(),
-                            sources = new List<CardSource> { cardSource }
-                        }
-                    );
-                }
-            }
-        }
+            cardColors.Add(cardSource.CardColors.Map(x => x.ToString()).ToArray());
 
-        return cardList.Count;
+        return HighestValue(GetCombinations(cardColors));
     }
 
     //GetDifferenetColorCardCount

+ 1 - 1
ProjectSettings/ProjectSettings.asset

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