Kaynağa Gözat

1.8.2.6 build

mbunch_kascope 1 yıl önce
ebeveyn
işleme
dc0a9def25

+ 26 - 0
Assets/Scenes/ContinuousControllerScene.unity

@@ -441,6 +441,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: f00ba80e8f234d841ac335861c08c0c7, type: 2}
   - {fileID: 11400000, guid: f00ba80e8f234d841ac335861c08c0c7, type: 2}
   - {fileID: 11400000, guid: 0227e21c58cd4d9429b6bd17983ab9a0, type: 2}
   - {fileID: 11400000, guid: 0227e21c58cd4d9429b6bd17983ab9a0, type: 2}
   - {fileID: 11400000, guid: caec41bf474be064ebce103e6babc790, type: 2}
   - {fileID: 11400000, guid: caec41bf474be064ebce103e6babc790, type: 2}
+  - {fileID: 11400000, guid: 85f03e27a1947f549be3b2f283debde2, type: 2}
   - {fileID: 11400000, guid: 2e31511712ff38c4ab97413369570ac5, type: 2}
   - {fileID: 11400000, guid: 2e31511712ff38c4ab97413369570ac5, type: 2}
   - {fileID: 11400000, guid: efd8013bccec0504582b40409d0936af, type: 2}
   - {fileID: 11400000, guid: efd8013bccec0504582b40409d0936af, type: 2}
   - {fileID: 11400000, guid: 04033b6c32c9c1744a005b1c8847c046, type: 2}
   - {fileID: 11400000, guid: 04033b6c32c9c1744a005b1c8847c046, type: 2}
@@ -449,6 +450,8 @@ MonoBehaviour:
   - {fileID: 11400000, guid: cda52dac859e4d241a9cc128fed7ee41, type: 2}
   - {fileID: 11400000, guid: cda52dac859e4d241a9cc128fed7ee41, type: 2}
   - {fileID: 11400000, guid: ba407dfac24e3af488cb4ccb5f98899b, type: 2}
   - {fileID: 11400000, guid: ba407dfac24e3af488cb4ccb5f98899b, type: 2}
   - {fileID: 11400000, guid: f537a61143573a44c99f6b18f264ef85, type: 2}
   - {fileID: 11400000, guid: f537a61143573a44c99f6b18f264ef85, type: 2}
+  - {fileID: 11400000, guid: 76371d0c2b9963845b1b48fa7045d8a3, type: 2}
+  - {fileID: 11400000, guid: ad272e8d0eb256546937af2153fc2b2a, type: 2}
   - {fileID: 11400000, guid: 09ea0fcb3c3bbc24e8464a578fcb1d55, type: 2}
   - {fileID: 11400000, guid: 09ea0fcb3c3bbc24e8464a578fcb1d55, type: 2}
   - {fileID: 11400000, guid: da57c33b8bf198e43a444fd2efd8fd2f, type: 2}
   - {fileID: 11400000, guid: da57c33b8bf198e43a444fd2efd8fd2f, type: 2}
   - {fileID: 11400000, guid: d8fad20ccf815fb4b9168d5ed4d6c4b7, type: 2}
   - {fileID: 11400000, guid: d8fad20ccf815fb4b9168d5ed4d6c4b7, type: 2}
@@ -463,17 +466,20 @@ MonoBehaviour:
   - {fileID: 11400000, guid: d04e26fc093dd2240a515e33ac6d7a5e, type: 2}
   - {fileID: 11400000, guid: d04e26fc093dd2240a515e33ac6d7a5e, type: 2}
   - {fileID: 11400000, guid: 163eb83da0583d14d97493152d5f8bdb, type: 2}
   - {fileID: 11400000, guid: 163eb83da0583d14d97493152d5f8bdb, type: 2}
   - {fileID: 11400000, guid: 4f33aca68e8ee0d4492a55173e9abf06, type: 2}
   - {fileID: 11400000, guid: 4f33aca68e8ee0d4492a55173e9abf06, type: 2}
+  - {fileID: 11400000, guid: c3228d9409848f5459cf19f536465f82, type: 2}
   - {fileID: 11400000, guid: 944cddba1fe15bb42a8f05a8ae124c71, type: 2}
   - {fileID: 11400000, guid: 944cddba1fe15bb42a8f05a8ae124c71, type: 2}
   - {fileID: 11400000, guid: 766f0227913bd314baeb5c8291c7e6fa, type: 2}
   - {fileID: 11400000, guid: 766f0227913bd314baeb5c8291c7e6fa, type: 2}
   - {fileID: 11400000, guid: 8a56d48945c2392409e13a2833b248b5, type: 2}
   - {fileID: 11400000, guid: 8a56d48945c2392409e13a2833b248b5, type: 2}
   - {fileID: 11400000, guid: eccbb99a3a95c4046b5a62e2d55a7a41, type: 2}
   - {fileID: 11400000, guid: eccbb99a3a95c4046b5a62e2d55a7a41, type: 2}
   - {fileID: 11400000, guid: 6c456c43fe619f140ac9748dbc5e03a9, type: 2}
   - {fileID: 11400000, guid: 6c456c43fe619f140ac9748dbc5e03a9, type: 2}
+  - {fileID: 11400000, guid: 1282380ee5dc8814897d57bea9c4ca1f, type: 2}
   - {fileID: 11400000, guid: 0af8820f0cb9d8f4cbb864ef0de9e318, type: 2}
   - {fileID: 11400000, guid: 0af8820f0cb9d8f4cbb864ef0de9e318, type: 2}
   - {fileID: 11400000, guid: 550db500f9df74546a01dabd7a335b7e, type: 2}
   - {fileID: 11400000, guid: 550db500f9df74546a01dabd7a335b7e, type: 2}
   - {fileID: 11400000, guid: 0d527c58e69886e4e814876b68158415, type: 2}
   - {fileID: 11400000, guid: 0d527c58e69886e4e814876b68158415, type: 2}
   - {fileID: 11400000, guid: 4896d486bd8f83044989407e670357a3, type: 2}
   - {fileID: 11400000, guid: 4896d486bd8f83044989407e670357a3, type: 2}
   - {fileID: 11400000, guid: da9668fcd6fbaa840a776f7485c94449, type: 2}
   - {fileID: 11400000, guid: da9668fcd6fbaa840a776f7485c94449, type: 2}
   - {fileID: 11400000, guid: 797dda43c25650946911d1b4c8699a2b, type: 2}
   - {fileID: 11400000, guid: 797dda43c25650946911d1b4c8699a2b, type: 2}
+  - {fileID: 11400000, guid: a7f1acb016daaa64eae65f96ebd6a278, type: 2}
   - {fileID: 11400000, guid: 384cbeced540f9242907b9e15cd9cbf5, type: 2}
   - {fileID: 11400000, guid: 384cbeced540f9242907b9e15cd9cbf5, type: 2}
   - {fileID: 11400000, guid: 3ed3b18e68c8f214eb68ad82c9d7e194, type: 2}
   - {fileID: 11400000, guid: 3ed3b18e68c8f214eb68ad82c9d7e194, type: 2}
   - {fileID: 11400000, guid: 5f7705c1dc123c44b9d62a6ee3d43cce, type: 2}
   - {fileID: 11400000, guid: 5f7705c1dc123c44b9d62a6ee3d43cce, type: 2}
@@ -2637,6 +2643,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 0bbe71129de6d74469c63febbd151590, type: 2}
   - {fileID: 11400000, guid: 0bbe71129de6d74469c63febbd151590, type: 2}
   - {fileID: 11400000, guid: 1c0ff60adf8dbce44bf06500211bf144, type: 2}
   - {fileID: 11400000, guid: 1c0ff60adf8dbce44bf06500211bf144, type: 2}
   - {fileID: 11400000, guid: c3da414eba919b94897f5e6bcd1a0c1d, type: 2}
   - {fileID: 11400000, guid: c3da414eba919b94897f5e6bcd1a0c1d, type: 2}
+  - {fileID: 11400000, guid: c5a8379cda16ff74e8bb35db6cd928e3, type: 2}
   - {fileID: 11400000, guid: 158a27bc46233ae4597f9ec6f93e6d17, type: 2}
   - {fileID: 11400000, guid: 158a27bc46233ae4597f9ec6f93e6d17, type: 2}
   - {fileID: 11400000, guid: c8f1e97807fc33b4298c5b533db96088, type: 2}
   - {fileID: 11400000, guid: c8f1e97807fc33b4298c5b533db96088, type: 2}
   - {fileID: 11400000, guid: 8345a14db1e55a749965205f6600ebac, type: 2}
   - {fileID: 11400000, guid: 8345a14db1e55a749965205f6600ebac, type: 2}
@@ -5850,6 +5857,8 @@ MonoBehaviour:
   - {fileID: 11400000, guid: f84ce5a42d4b1294487b0a9986c020d0, type: 2}
   - {fileID: 11400000, guid: f84ce5a42d4b1294487b0a9986c020d0, type: 2}
   - {fileID: 11400000, guid: cbebfad349b7dee4fbbee3f1cd6dc15f, type: 2}
   - {fileID: 11400000, guid: cbebfad349b7dee4fbbee3f1cd6dc15f, type: 2}
   - {fileID: 11400000, guid: 2810ef8b3aa52814aaf8534ffd7bc0e2, type: 2}
   - {fileID: 11400000, guid: 2810ef8b3aa52814aaf8534ffd7bc0e2, type: 2}
+  - {fileID: 11400000, guid: aa682946b51acef4086f9bf2355a8c2c, type: 2}
+  - {fileID: 11400000, guid: 35b9d2e07408f234181dee64bf137f99, type: 2}
   - {fileID: 11400000, guid: d592dc908760e46428f7effd8beeae5b, type: 2}
   - {fileID: 11400000, guid: d592dc908760e46428f7effd8beeae5b, type: 2}
   - {fileID: 11400000, guid: be19ebe3b1538c642b77284f50a7b38a, type: 2}
   - {fileID: 11400000, guid: be19ebe3b1538c642b77284f50a7b38a, type: 2}
   - {fileID: 11400000, guid: 38b97d0cb38130c4aa3a278de1832b48, type: 2}
   - {fileID: 11400000, guid: 38b97d0cb38130c4aa3a278de1832b48, type: 2}
@@ -6036,6 +6045,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 3046de36714443c499bf71f06027571f, type: 2}
   - {fileID: 11400000, guid: 3046de36714443c499bf71f06027571f, type: 2}
   - {fileID: 11400000, guid: b0b6601d664fcd642bb53d13bc8083de, type: 2}
   - {fileID: 11400000, guid: b0b6601d664fcd642bb53d13bc8083de, type: 2}
   - {fileID: 11400000, guid: 9a61817ebf1af2847b4587be1bd0fef1, type: 2}
   - {fileID: 11400000, guid: 9a61817ebf1af2847b4587be1bd0fef1, type: 2}
+  - {fileID: 11400000, guid: f3f3ccbba803a0e468adf5485f082186, type: 2}
   - {fileID: 11400000, guid: 8b407f27b312b044cb49cb11a148c989, type: 2}
   - {fileID: 11400000, guid: 8b407f27b312b044cb49cb11a148c989, type: 2}
   - {fileID: 11400000, guid: 31438a32c4cd8bc4a9f8ee12540270ea, type: 2}
   - {fileID: 11400000, guid: 31438a32c4cd8bc4a9f8ee12540270ea, type: 2}
   - {fileID: 11400000, guid: 0b4bb608e6a951141b9528be7b419b63, type: 2}
   - {fileID: 11400000, guid: 0b4bb608e6a951141b9528be7b419b63, type: 2}
@@ -6099,6 +6109,8 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 7959e6a72be1bbe40a54d6d73566cd0e, type: 2}
   - {fileID: 11400000, guid: 7959e6a72be1bbe40a54d6d73566cd0e, type: 2}
   - {fileID: 11400000, guid: ae21a620c9ab828459925d8b8783a338, type: 2}
   - {fileID: 11400000, guid: ae21a620c9ab828459925d8b8783a338, type: 2}
   - {fileID: 11400000, guid: ac726f92ac6bf514394de2eb04a001d5, type: 2}
   - {fileID: 11400000, guid: ac726f92ac6bf514394de2eb04a001d5, type: 2}
+  - {fileID: 11400000, guid: da685e438f1d3d34db5b701873ab6d6c, type: 2}
+  - {fileID: 11400000, guid: 20599dc7920db664bbff823e103d0c16, type: 2}
   - {fileID: 11400000, guid: eabf1c609de718c42a5ce2d0ed2c3f66, type: 2}
   - {fileID: 11400000, guid: eabf1c609de718c42a5ce2d0ed2c3f66, type: 2}
   - {fileID: 11400000, guid: 3177390918038b942894bff607f18385, type: 2}
   - {fileID: 11400000, guid: 3177390918038b942894bff607f18385, type: 2}
   - {fileID: 11400000, guid: 60d73225a93ad3241b36dae2d75b2a70, type: 2}
   - {fileID: 11400000, guid: 60d73225a93ad3241b36dae2d75b2a70, type: 2}
@@ -6139,6 +6151,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 3a5ac411d3a53b14c8f694d1a775b11d, type: 2}
   - {fileID: 11400000, guid: 3a5ac411d3a53b14c8f694d1a775b11d, type: 2}
   - {fileID: 11400000, guid: d443e23d6fb8304429c900ff55f70daa, type: 2}
   - {fileID: 11400000, guid: d443e23d6fb8304429c900ff55f70daa, type: 2}
   - {fileID: 11400000, guid: 8c7a59197e3740344a6671583af38f06, type: 2}
   - {fileID: 11400000, guid: 8c7a59197e3740344a6671583af38f06, type: 2}
+  - {fileID: 11400000, guid: c3f9c42c9734c934b80c4e1e304c7c37, type: 2}
   - {fileID: 11400000, guid: a1bd8e0a9746ee142bf2b76e8b2da7a7, type: 2}
   - {fileID: 11400000, guid: a1bd8e0a9746ee142bf2b76e8b2da7a7, type: 2}
   - {fileID: 11400000, guid: e8a79deb2fbbdee4fb06295c5fcd171f, type: 2}
   - {fileID: 11400000, guid: e8a79deb2fbbdee4fb06295c5fcd171f, type: 2}
   - {fileID: 11400000, guid: 94a5e6198e6f2eb428716d49b81d3c56, type: 2}
   - {fileID: 11400000, guid: 94a5e6198e6f2eb428716d49b81d3c56, type: 2}
@@ -10482,6 +10495,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 711b100f406a1f7419a6fbf15cc500fd, type: 2}
   - {fileID: 11400000, guid: 711b100f406a1f7419a6fbf15cc500fd, type: 2}
   - {fileID: 11400000, guid: 78505fc72aaa7914fa9924abc6dc3886, type: 2}
   - {fileID: 11400000, guid: 78505fc72aaa7914fa9924abc6dc3886, type: 2}
   - {fileID: 11400000, guid: c3da414eba919b94897f5e6bcd1a0c1d, type: 2}
   - {fileID: 11400000, guid: c3da414eba919b94897f5e6bcd1a0c1d, type: 2}
+  - {fileID: 11400000, guid: c5a8379cda16ff74e8bb35db6cd928e3, type: 2}
   - {fileID: 11400000, guid: 2242d1820eb913845ac7650c6f8bf22b, type: 2}
   - {fileID: 11400000, guid: 2242d1820eb913845ac7650c6f8bf22b, type: 2}
   - {fileID: 11400000, guid: aebce3a505e6d624dacd012967a4237f, type: 2}
   - {fileID: 11400000, guid: aebce3a505e6d624dacd012967a4237f, type: 2}
   - {fileID: 11400000, guid: 4e78655b0a5b61e4c8f3d93906355e78, type: 2}
   - {fileID: 11400000, guid: 4e78655b0a5b61e4c8f3d93906355e78, type: 2}
@@ -11517,6 +11531,18 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 3612487f0205f51459cf870f51534665, type: 2}
   - {fileID: 11400000, guid: 3612487f0205f51459cf870f51534665, type: 2}
   - {fileID: 11400000, guid: 88ef20d7ed7837d42b7919d63ed48083, type: 2}
   - {fileID: 11400000, guid: 88ef20d7ed7837d42b7919d63ed48083, type: 2}
   - {fileID: 11400000, guid: ba6c39b4312391e46beb7f4c23ab5875, type: 2}
   - {fileID: 11400000, guid: ba6c39b4312391e46beb7f4c23ab5875, type: 2}
+  - {fileID: 11400000, guid: aa682946b51acef4086f9bf2355a8c2c, type: 2}
+  - {fileID: 11400000, guid: da685e438f1d3d34db5b701873ab6d6c, type: 2}
+  - {fileID: 11400000, guid: 20599dc7920db664bbff823e103d0c16, type: 2}
+  - {fileID: 11400000, guid: f3f3ccbba803a0e468adf5485f082186, type: 2}
+  - {fileID: 11400000, guid: 35b9d2e07408f234181dee64bf137f99, type: 2}
+  - {fileID: 11400000, guid: c3f9c42c9734c934b80c4e1e304c7c37, type: 2}
+  - {fileID: 11400000, guid: 85f03e27a1947f549be3b2f283debde2, type: 2}
+  - {fileID: 11400000, guid: 76371d0c2b9963845b1b48fa7045d8a3, type: 2}
+  - {fileID: 11400000, guid: ad272e8d0eb256546937af2153fc2b2a, type: 2}
+  - {fileID: 11400000, guid: c3228d9409848f5459cf19f536465f82, type: 2}
+  - {fileID: 11400000, guid: 1282380ee5dc8814897d57bea9c4ca1f, type: 2}
+  - {fileID: 11400000, guid: a7f1acb016daaa64eae65f96ebd6a278, type: 2}
   - {fileID: 11400000, guid: 03f5e14579a633043a99437490dfef8d, type: 2}
   - {fileID: 11400000, guid: 03f5e14579a633043a99437490dfef8d, type: 2}
   - {fileID: 11400000, guid: f722aa20dbee0824b9b2638096816697, type: 2}
   - {fileID: 11400000, guid: f722aa20dbee0824b9b2638096816697, type: 2}
   - {fileID: 11400000, guid: e085fbfb0bc42744f9eb98b5afffaac0, type: 2}
   - {fileID: 11400000, guid: e085fbfb0bc42744f9eb98b5afffaac0, type: 2}

+ 69 - 0
Assets/Scripts/AutoProcessing.cs

@@ -183,6 +183,39 @@ public class AutoProcessing : MonoBehaviourPunCallbacks
         return false;
         return false;
     }
     }
 
 
+    bool IsAttackerNotADigimon()
+    {
+        if (!GManager.instance.attackProcess.IsAttacking)
+            return false;
+
+        if (GManager.instance.attackProcess.AttackingPermanent != null)
+        {
+            if (!GManager.instance.attackProcess.AttackingPermanent.IsDigimon)
+                return true;
+
+            if (GManager.instance.attackProcess.DefendingPermanent == null && GManager.instance.attackProcess.HasDefender)
+                return true;
+        }
+
+        return false;
+    }
+
+    bool IsDigimonLackLinkCondition(Permanent permanent)
+    {
+        if (permanent != null)
+        {
+            if (permanent.TopCard != null)
+            {
+                if (!permanent.LinkedCards.Any(source => source.CanLinkToTargetPermanent(permanent, false)))
+                {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
     public IEnumerator RuleProcess()
     public IEnumerator RuleProcess()
     {
     {
         while (DoRuleProcess())
         while (DoRuleProcess())
@@ -233,6 +266,20 @@ public class AutoProcessing : MonoBehaviourPunCallbacks
         }
         }
         #endregion
         #endregion
 
 
+        #region Is it necessary to deal with Battle Without Digimon?
+        if (IsAttackerNotADigimon())
+        {
+            return true;
+        }
+        #endregion
+
+        #region Is it necessary to deal with Digimon's Link Cards?
+        if (CardEffectCommons.HasMatchConditionPermanent(IsDigimonLackLinkCondition))
+        {
+            return true;
+        }
+        #endregion
+
         return false;
         return false;
     }
     }
     #endregion
     #endregion
@@ -325,6 +372,28 @@ public class AutoProcessing : MonoBehaviourPunCallbacks
     }
     }
     #endregion
     #endregion
 
 
+    #region Link Card Lacking conditions handling
+    IEnumerator DigimonLackLinkConditionProcess()
+    {
+        List<Permanent> LackLinkConditionPermanents = GManager.instance.turnStateMachine.gameContext.Players_ForTurnPlayer
+            .Map(player => player.GetFieldPermanents()
+            .Filter(IsDigimonLackLinkCondition)).Flat();
+
+        if (LackLinkConditionPermanents.Count >= 1)
+        {
+            foreach(Permanent permanent in LackLinkConditionPermanents)
+            {
+                List<CardSource> selectedCards = permanent.LinkedCards.FindAll(source => source.CanLinkToTargetPermanent(permanent, false));
+
+                yield return ContinuousController.instance.StartCoroutine(new ITrashLinkCards(
+                               permanent,
+                               selectedCards,
+                               null).TrashLinkCards());
+            }
+        }
+    }
+    #endregion
+
     #endregion
     #endregion
 
 
     #endregion
     #endregion

+ 2 - 2
Assets/Scripts/CardEffectCommons/TrashLinkedCards.cs

@@ -147,10 +147,10 @@ public partial class CardEffectCommons
                             yield return null;
                             yield return null;
                         }
                         }
 
 
-                        yield return ContinuousController.instance.StartCoroutine(new ITrashDigivolutionCards(
+                        yield return ContinuousController.instance.StartCoroutine(new ITrashLinkCards(
                                 selectedPermanent,
                                 selectedPermanent,
                                 selectedCards,
                                 selectedCards,
-                                activateClass).TrashDigivolutionCards());
+                                activateClass).TrashLinkCards());
 
 
                        linkDiscardedCount += selectedCards.Count;
                        linkDiscardedCount += selectedCards.Count;
 
 

+ 1 - 1
ProjectSettings/ProjectSettings.asset

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