Просмотр исходного кода

fixing plesio and updating AAs

mbunch_kascope 1 год назад
Родитель
Сommit
a1008bd5c9

+ 3 - 0
Assets/CardBaseEntity/BT19/Red/Digimon/BT19_014_P1.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ceade20a13ccc1e159fab492408012ce681e2b6e6660fec5f9a41edc94dc4c3d
+size 1609

+ 8 - 0
Assets/CardBaseEntity/BT19/Red/Digimon/BT19_014_P1.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 86e13217dbf70134898aba851f6df309
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/CardBaseEntity/BT4/Blue/Digimon/BT4_028_P0.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5d64f39dcd1fa2f8c96111599ba8352e311b949302fd2b6731bf0cee02b65c5
+oid sha256:4ce52a5ad556040466d4f34804de3e0ba0f776a8ad6cec29a6c0a3ae520d8586
 size 1186

+ 1 - 1
Assets/CardBaseEntity/BT6/White/Digimon/BT6_084_P0.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e990952818238675ae512bd7a92c1c85771e08845941d2c423c32d14fdb8005b
+oid sha256:ee6c311a144380ce5cb9d2dd0ed17f2e7787247e80482cdfdb7e8e62ff5b8c4b
 size 1198

+ 1 - 1
Assets/CardBaseEntity/BT6/White/Digimon/BT6_084_P2.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:59b187edb31a249d1a0554f68a8493d45bdb84e552f7142a25205769ab7e782a
+oid sha256:10168c23074fc67ed2a4a8db6e427703aedad35cd8042b2aee975a9f9e830c14
 size 1198

+ 1 - 1
Assets/CardBaseEntity/BT6/White/Digimon/BT6_084_P3.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1d32c25104ded402f96a110c45dee9528f9852ca4a00b41801d66b28cf0bc0e6
+oid sha256:800f659e2542610412b7b4b36a8e29b11e2cc81d6b34658634c7ef05aa4945f2
 size 1198

+ 1 - 1
Assets/CardBaseEntity/BT6/White/Digimon/BT6_084_P4.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2c48717c4762a71d55a44b5f0373250c0cd50cb225a01dba9385c203616fefcc
+oid sha256:afb54807ed7b4a58b2d6922d4f9dbb800c359c4017a1d58bfcae2ff94cce920c
 size 1198

+ 1 - 1
Assets/CardBaseEntity/BT7/White/Digimon/BT7_083_P0.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c2b9b284bb44b9fab2e92055c0fc3da63c37f715cf006c8b7a93417349b1d7d
+oid sha256:6b3d31e22cb98845d6ae274ed9541915ab8a433b4f2464fd392b9a0e6478e269
 size 1474

+ 1 - 1
Assets/CardBaseEntity/BT8/Red/Digimon/BT8_013_P4.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f0a383121d2c8a004b9640599c55a2be0513dbce83971fc9e00b91bb42000fe2
+oid sha256:419cd4e725aee4859c08dedc167c28cbedc820b7c4f7197b9bf9a77697ec718f
 size 1145

+ 1 - 1
Assets/CardBaseEntity/BT8/Red/Digimon/BT8_013_P5.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b2ee9286b52ddf910c2e839f0418ed2d90bc1e481119a2ee8cb79199dea78d67
+oid sha256:caccb94d90cbf9767b125a32d806603a77c9b298077072c58027ecdfc991f379
 size 1145

+ 1 - 1
Assets/CardBaseEntity/CardEntity_JSONLoader.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fdbf0144a5c0498d8ae2ecca8814d91d087e776e13b5dccf31cdb115ec9db583
+oid sha256:f73c7a2ce60c7317e5507a4b7d98d256944fc36d7199d2dc597e7f58ffa9ac41
 size 477

+ 3 - 0
Assets/CardBaseEntity/EX3/Red/Digimon/EX3_010_P2.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:38139ee65bbea6273fd6e9df162416450d2c85c505da12918fd787683adca582
+size 2755

+ 8 - 0
Assets/CardBaseEntity/EX3/Red/Digimon/EX3_010_P2.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c7d01e791c676a542b2bf76141be38dc
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/EX3/Red/Digimon/EX3_010_P3.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fefa0c61c2aa9403acf0d72aec9b224d2ce3480ffc25e428502913a6fd448ff1
+size 2755

+ 8 - 0
Assets/CardBaseEntity/EX3/Red/Digimon/EX3_010_P3.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 53c85600dfbbbd24a96c695f27909526
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 12 - 36
Assets/CardEffect/EX8/Blue/EX8_027.cs

@@ -298,45 +298,21 @@ namespace DCGO.CardEffects.EX8
 
                                         if (DNADigivolved)
                                         {
-                                            List<SelectionElement<bool>> selectionElements = new List<SelectionElement<bool>>()
+                                            if (selectedCard.PermanentOfThisCard() != null)
                                             {
-                                                new SelectionElement<bool>(message: $"Yes", value: true, spriteIndex: 0),
-                                                new SelectionElement<bool>(message: $"No", value: false, spriteIndex: 1),
-                                            };
-
-                                            string selectPlayerMessage = "Attack?";
-                                            string notSelectPlayerMessage = "The opponent is choosing effects.";
-
-                                            GManager.instance.userSelectionManager.SetBoolSelection(
-                                                selectionElements: selectionElements, selectPlayer: card.Owner,
-                                                selectPlayerMessage: selectPlayerMessage,
-                                                notSelectPlayerMessage: notSelectPlayerMessage);
-
-                                            yield return ContinuousController.instance.StartCoroutine(GManager.instance
-                                                .userSelectionManager.WaitForEndSelect());
+                                                if (selectedCard.PermanentOfThisCard().CanAttack(activateClass))
+                                                {
+                                                    SelectAttackEffect selectAttackEffect =
+                                                        GManager.instance.GetComponent<SelectAttackEffect>();
 
-                                            bool willAttack = GManager.instance.userSelectionManager.SelectedBoolValue;
+                                                    selectAttackEffect.SetUp(
+                                                        attacker: selectedCard.PermanentOfThisCard(),
+                                                        canAttackPlayerCondition: () => true,
+                                                        defenderCondition: (permanent) => true,
+                                                        cardEffect: activateClass);
 
-                                            if (willAttack)
-                                            {
-                                                if (selectedCard.PermanentOfThisCard() != null)
-                                                {
-                                                    if (selectedCard.PermanentOfThisCard().CanAttack(activateClass))
-                                                    {
-                                                        SelectAttackEffect selectAttackEffect =
-                                                            GManager.instance.GetComponent<SelectAttackEffect>();
-
-                                                        selectAttackEffect.SetUp(
-                                                            attacker: selectedCard.PermanentOfThisCard(),
-                                                            canAttackPlayerCondition: () => true,
-                                                            defenderCondition: (permanent) => true,
-                                                            cardEffect: activateClass);
-
-                                                        selectAttackEffect.SetCanNotSelectNotAttack();
-
-                                                        yield return ContinuousController.instance.StartCoroutine(selectAttackEffect
-                                                            .Activate());
-                                                    }
+                                                    yield return ContinuousController.instance.StartCoroutine(selectAttackEffect
+                                                        .Activate());
                                                 }
                                             }
                                         }

+ 13 - 37
Assets/CardEffect/EX8/Purple/EX8_060.cs

@@ -291,47 +291,23 @@ namespace DCGO.CardEffects.EX8
                                 
                                 if (DNADigivolved)
                                 {
-                                    /*List<SelectionElement<bool>> selectionElements = new List<SelectionElement<bool>>()
+                                    if (selectedCard.PermanentOfThisCard() != null)
                                     {
-                                        new SelectionElement<bool>(message: $"Yes", value: true, spriteIndex: 0),
-                                        new SelectionElement<bool>(message: $"No", value: false, spriteIndex: 1),
-                                    };
-
-                                    string selectPlayerMessage = "Attack?";
-                                    string notSelectPlayerMessage = "The opponent is choosing effects.";
-
-                                    GManager.instance.userSelectionManager.SetBoolSelection(
-                                        selectionElements: selectionElements, selectPlayer: card.Owner,
-                                        selectPlayerMessage: selectPlayerMessage,
-                                        notSelectPlayerMessage: notSelectPlayerMessage);
-
-                                    yield return ContinuousController.instance.StartCoroutine(GManager.instance
-                                        .userSelectionManager.WaitForEndSelect());
+                                        if (selectedCard.PermanentOfThisCard().CanAttack(activateClass))
+                                        {
+                                            SelectAttackEffect selectAttackEffect =
+                                                GManager.instance.GetComponent<SelectAttackEffect>();
 
-                                    bool willAttack = GManager.instance.userSelectionManager.SelectedBoolValue;*/
+                                            selectAttackEffect.SetUp(
+                                                attacker: selectedCard.PermanentOfThisCard(),
+                                                canAttackPlayerCondition: () => true,
+                                                defenderCondition: (permanent) => true,
+                                                cardEffect: activateClass);
 
-                                    //if (willAttack)
-                                    //{
-                                        if (selectedCard.PermanentOfThisCard() != null)
-                                        {
-                                            if (selectedCard.PermanentOfThisCard().CanAttack(activateClass))
-                                            {
-                                                SelectAttackEffect selectAttackEffect =
-                                                    GManager.instance.GetComponent<SelectAttackEffect>();
-
-                                                selectAttackEffect.SetUp(
-                                                    attacker: selectedCard.PermanentOfThisCard(),
-                                                    canAttackPlayerCondition: () => true,
-                                                    defenderCondition: (permanent) => true,
-                                                    cardEffect: activateClass);
-
-                                                //selectAttackEffect.SetCanNotSelectNotAttack();
-
-                                                yield return ContinuousController.instance.StartCoroutine(selectAttackEffect
-                                                    .Activate());
-                                            }
+                                            yield return ContinuousController.instance.StartCoroutine(selectAttackEffect
+                                                .Activate());
                                         }
-                                    //}
+                                    }
                                 }
                             }
                         }

+ 6 - 0
Assets/Scenes/ContinuousControllerScene.unity

@@ -757,6 +757,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: ea02c945c1bf6504f936aa0895da40af, type: 2}
   - {fileID: 11400000, guid: 0acde2c5417b88c4c97159118bcdd0b5, type: 2}
   - {fileID: 11400000, guid: 282caa79be880394d9976071363b501c, type: 2}
+  - {fileID: 11400000, guid: 86e13217dbf70134898aba851f6df309, type: 2}
   - {fileID: 11400000, guid: 75d72d7abdc9ec1489571de0317867fc, type: 2}
   - {fileID: 11400000, guid: d6547a94a914caf4087d9e08b3de4bfa, type: 2}
   - {fileID: 11400000, guid: 988a50164fb0fe3448bdedb66a35e541, type: 2}
@@ -4934,6 +4935,8 @@ MonoBehaviour:
   - {fileID: 11400000, guid: ae677eb1e3ccb6c45a54ea294afda78c, type: 2}
   - {fileID: 11400000, guid: 96848a29564d75f4ebb02b0851651248, type: 2}
   - {fileID: 11400000, guid: c57104c22df3c9c4e939ccc1f62d1bac, type: 2}
+  - {fileID: 11400000, guid: c7d01e791c676a542b2bf76141be38dc, type: 2}
+  - {fileID: 11400000, guid: 53c85600dfbbbd24a96c695f27909526, type: 2}
   - {fileID: 11400000, guid: 5242fbe2b29d57948a7748a5e30f3b47, type: 2}
   - {fileID: 11400000, guid: 359e6b495ec77e24daef0cad7782d697, type: 2}
   - {fileID: 11400000, guid: 11b45d0e274a16b4fbaa0bd0f6074ea3, type: 2}
@@ -11844,6 +11847,9 @@ MonoBehaviour:
   - {fileID: 11400000, guid: a79ba93ef02da3b48ab5d34fbb7cbb03, type: 2}
   - {fileID: 11400000, guid: e1c152cce2030e74a988eaa61d13b541, type: 2}
   - {fileID: 11400000, guid: c400b8edbe3c83d45bf44eb3f92aa13e, type: 2}
+  - {fileID: 11400000, guid: 86e13217dbf70134898aba851f6df309, type: 2}
+  - {fileID: 11400000, guid: c7d01e791c676a542b2bf76141be38dc, type: 2}
+  - {fileID: 11400000, guid: 53c85600dfbbbd24a96c695f27909526, type: 2}
   - {fileID: 11400000, guid: b00372efcf5658c42ad76bf91c5df4c3, type: 2}
   - {fileID: 11400000, guid: 35c6ca847a511834abee752dd8e012f5, type: 2}
   - {fileID: 11400000, guid: ede9619666b7b9e42885a1e9736445c5, type: 2}