Explorar o código

Some meta data, fix EX12_018 issues and fix EX12_047 OD

x89rt2 hai 2 meses
pai
achega
fd2f1125f3

+ 11 - 0
Assets/Scripts/CardEffect/EX12/Blue/EX12_029.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e0f380c50fdd5d74a8441182a5296a9d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 11 - 0
Assets/Scripts/CardEffect/EX12/Red/EX12_012.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 73b8c83cbec60144eab572acf63eb217
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 13 - 5
Assets/Scripts/CardEffect/EX12/Red/EX12_018.cs

@@ -84,7 +84,7 @@ namespace DCGO.CardEffects.EX12
                 {
                     List<CardSource> cardSources = new List<CardSource>();
 
-                    while (cardSources < 2)
+                    while (cardSources.Count < 2)
                     {
                         #region Setup Location Selection
                         List<SelectionElement<int>> selectionElements = new List<SelectionElement<int>>();
@@ -180,9 +180,16 @@ namespace DCGO.CardEffects.EX12
                         #endregion
 
                         bool isTop = GManager.instance.userSelectionManager.SelectedBoolValue;
-                        if (isTop) yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsTop(
-                            addedDigivolutionCards: cardSources.Reverse(),
+                        if (isTop)
+                        {
+                            List<CardSource> fixedCards = new List<CardSource>();
+                            fixedCards = cardSources.Clone();
+                            fixedCards.Reverse();
+
+                            yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsTop(
+                            addedDigivolutionCards: fixedCards,
                             cardEffect: activateClass));
+                        }
                         else yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(
                             addedDigivolutionCards: cardSources,
                             cardEffect: activateClass));
@@ -257,7 +264,8 @@ namespace DCGO.CardEffects.EX12
                     => CardEffectCommons.IsMaxDP(permanent, card.Owner.Enemy, null);
 
                 bool CanSelectOwnerPermamentCondition(Permanent permanent)
-                    => CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card);
+                    => CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card)
+                    && permanent.CanAttack(activateClass);
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 {
@@ -289,7 +297,7 @@ namespace DCGO.CardEffects.EX12
 
                         selectPermanentEffect.SetUp(
                             selectPlayer: card.Owner,
-                            canTargetCondition: YourDigimonThatCanAttack,
+                            canTargetCondition: CanSelectOwnerPermamentCondition,
                             canTargetCondition_ByPreSelecetedList: null,
                             canEndSelectCondition: null,
                             maxCount: 1,

+ 11 - 0
Assets/Scripts/CardEffect/EX12/Yellow/EX12_046.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c5d282456ae70c241b651171416a423c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 2
Assets/Scripts/CardEffect/EX12/Yellow/EX12_047.cs

@@ -194,12 +194,12 @@ namespace DCGO.CardEffects.EX12
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card)
+                    return CardEffectCommons.CanActivateOnDeletion(card, activateClass)
                         && (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectReturnCardCondition)
                             || CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectPlayCardCondition));
                 }

+ 11 - 0
Assets/Scripts/CardEffect/EX12/Yellow/EX12_047.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 72e24759d4ddd1143829fade10b81e56
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 11 - 0
Assets/Scripts/CardEffect/P/Black/P_244.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: db135bfd31da135438fbf99562156963
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: