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

+ 1 - 2
Assets/CardEffect/EX9/Blue/EX9_014.cs

@@ -156,8 +156,7 @@ namespace DCGO.CardEffects.EX9
                         if (selectedPermanent != null)
                         {
                             yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddExecutingCard(selectedCard));
-                            selectedCard.SetReverse();
-                            yield return ContinuousController.instance.StartCoroutine(selectedPermanent.AddDigivolutionCardsBottom(new List<CardSource>() { selectedCard }, activateClass));
+                            yield return ContinuousController.instance.StartCoroutine(selectedPermanent.AddDigivolutionCardsBottom(new List<CardSource>() { selectedCard }, activateClass, isFacedown: true));
                         }
                     }
                 }

+ 4 - 6
Assets/CardEffect/EX9/Blue/EX9_017.cs

@@ -53,7 +53,7 @@ namespace DCGO.CardEffects.EX9
             if (timing == EffectTiming.OnEnterFieldAnyone)
             {
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("Place 1 digimon in hand as source, to delete digimon", CanUseCondition, card);
+                activateClass.SetUpICardEffect("Place 1 digimon in hand as source, to trash digimon sources", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDescription());
                 cardEffects.Add(activateClass);
 
@@ -123,9 +123,8 @@ namespace DCGO.CardEffects.EX9
                     if (selectedCard)
                     {
                         yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddExecutingCard(selectedCard));
-                        selectedCard.SetReverse();
                         yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard()
-                            .AddDigivolutionCardsBottom(new List<CardSource>() { selectedCard }, activateClass));
+                            .AddDigivolutionCardsBottom(new List<CardSource>() { selectedCard }, activateClass, isFacedown: true));
 
                         yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.SelectTrashDigivolutionCards(
                             permanentCondition: CanSelectPermanentCondition,
@@ -146,7 +145,7 @@ namespace DCGO.CardEffects.EX9
             if (timing == EffectTiming.OnEnterFieldAnyone)
             {
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("Place 1 digimon in hand as source, to delete digimon", CanUseCondition, card);
+                activateClass.SetUpICardEffect("Place 1 digimon in hand as source, to trash digimon sources", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDescription());
                 cardEffects.Add(activateClass);
 
@@ -216,9 +215,8 @@ namespace DCGO.CardEffects.EX9
                     if (selectedCard)
                     {
                         yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddExecutingCard(selectedCard));
-                        selectedCard.SetReverse();
                         yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard()
-                            .AddDigivolutionCardsBottom(new List<CardSource>() { selectedCard }, activateClass));
+                            .AddDigivolutionCardsBottom(new List<CardSource>() { selectedCard }, activateClass, isFacedown: true));
 
                         yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.SelectTrashDigivolutionCards(
                             permanentCondition: CanSelectPermanentCondition,

+ 1 - 2
Assets/CardEffect/EX9/Red/EX9_007.cs

@@ -146,8 +146,7 @@ namespace DCGO.CardEffects.EX9
                         if (selectedPermanent != null)
                         {
                             yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddExecutingCard(selectedCard));
-                            selectedCard.SetReverse();
-                            yield return ContinuousController.instance.StartCoroutine(selectedPermanent.AddDigivolutionCardsBottom(new List<CardSource>() { selectedCard }, activateClass));
+                            yield return ContinuousController.instance.StartCoroutine(selectedPermanent.AddDigivolutionCardsBottom(new List<CardSource>() { selectedCard }, activateClass, isFacedown: true));
                         }
                     }
                 }

+ 2 - 3
Assets/CardEffect/EX9/Red/EX9_009.cs

@@ -96,10 +96,9 @@ namespace DCGO.CardEffects.EX9
                     {
                         var selectedCard = card.Owner.LibraryCards[0];
                         yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddExecutingCard(selectedCard));
-                        selectedCard.SetReverse();
-                        yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(new List<CardSource>() { selectedCard }, activateClass));
+                        yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(new List<CardSource>() { selectedCard }, activateClass, isFacedown: true));
 
-                        var flippedCards = card.PermanentOfThisCard().DigivolutionCards.Select(x => x.IsFlipped).Count();
+                        var flippedCards = card.PermanentOfThisCard().DigivolutionCards.Count(x => x.IsFlipped);
                         var dpBonus = flippedCards * 1000;
                         yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonDP(targetPermanent: card.PermanentOfThisCard(), changeValue: dpBonus, effectDuration: EffectDuration.UntilOpponentTurnEnd, activateClass: activateClass));
                     }

+ 2 - 4
Assets/CardEffect/EX9/Red/EX9_011.cs

@@ -299,8 +299,7 @@ namespace DCGO.CardEffects.EX9
                     if (selectedCard != null)
                     {
                         yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddExecutingCard(selectedCard));
-                        selectedCard.SetReverse();
-                        yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(new List<CardSource>() { selectedCard }, activateClass));
+                        yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(new List<CardSource>() { selectedCard }, activateClass, isFacedown: true));
 
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectDeletePermanentCondition))
                         {
@@ -467,8 +466,7 @@ namespace DCGO.CardEffects.EX9
                     if (selectedCard != null)
                     {
                         yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddExecutingCard(selectedCard));
-                        selectedCard.SetReverse();
-                        yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(new List<CardSource>() { selectedCard }, activateClass));
+                        yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(new List<CardSource>() { selectedCard }, activateClass, isFacedown: true));
 
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectDeletePermanentCondition))
                         {

+ 2 - 4
Assets/CardEffect/EX9/Yellow/EX9_030.cs

@@ -231,8 +231,7 @@ namespace DCGO.CardEffects.EX9
                     if (selectedCard != null)
                     {
                         yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddExecutingCard(selectedCard));
-                        selectedCard.SetReverse();
-                        yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(new List<CardSource>() { selectedCard }, activateClass));
+                        yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(new List<CardSource>() { selectedCard }, activateClass, isFacedown: true));
 
                         int maxCountDPReduction = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
 
@@ -347,8 +346,7 @@ namespace DCGO.CardEffects.EX9
                     if (selectedCard != null)
                     {
                         yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddExecutingCard(selectedCard));
-                        selectedCard.SetReverse();
-                        yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(new List<CardSource>() { selectedCard }, activateClass));
+                        yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(new List<CardSource>() { selectedCard }, activateClass, isFacedown: true));
 
                         int maxCountDPReduction = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
 

+ 1 - 1
Assets/Scripts/CardEffectFactory/KeyWordEffects/Training.cs

@@ -11,7 +11,7 @@ public partial class CardEffectFactory
     {
         ActivateClass activateClass = new ActivateClass();
         activateClass.SetUpICardEffect("Training", CanUseCondition, card);
-        activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, DataBase.SaveEffectDiscription());
+        activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, DataBase.TrainingEffectDiscription());
 
         bool CanUseCondition(Hashtable hashtable)
         {

+ 1 - 1
Assets/Scripts/CardInfo.cs

@@ -140,7 +140,7 @@ public class CardInfo : MonoBehaviour
 
     public void OnClick()
     {
-        if (cardSource.IsFlipped && cardSource.Owner.isYou)
+        if (cardSource.IsFlipped && !cardSource.Owner.isYou)
         {
             return;
         }

+ 6 - 4
Assets/Scripts/Permanent.cs

@@ -929,9 +929,6 @@ public class Permanent
 
         foreach (CardSource addedDigivolutionCard in addedDigivolutionCards)
         {
-            if(isFacedown)
-                addedDigivolutionCard.SetReverse();
-
             if (addedDigivolutionCard.PermanentOfThisCard() != null)
             {
                 if (addedDigivolutionCard.PermanentOfThisCard() != this)
@@ -979,7 +976,12 @@ public class Permanent
             if (!IsToken && !addedDigivolutionCard.IsToken)
             {
                 cardSources.Add(addedDigivolutionCard);
-                addedDigivolutionCard.SetFace("Permanent.AddDigivolutionCardsBottom");
+
+                if (isFacedown)
+                    addedDigivolutionCard.SetReverse();
+                else
+                    addedDigivolutionCard.SetFace("Permanent.AddDigivolutionCardsBottom");
+
                 addedCards.Add(addedDigivolutionCard);
             }
         }