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

Merge branch 'EX10-MyotisLine' into EX10

mbunch_kascope 11 месяцев назад
Родитель
Сommit
81a6d6ee19
2 измененных файлов с 2 добавлено и 7 удалено
  1. 0 1
      Assets/CardEffect/EX10/Purple/EX10_048.cs
  2. 2 6
      Assets/CardEffect/EX10/Purple/EX10_051.cs

+ 0 - 1
Assets/CardEffect/EX10/Purple/EX10_048.cs

@@ -19,7 +19,6 @@ namespace DCGO.CardEffects.EX10
                 ActivateClass activateClass = new ActivateClass();
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Delete 1 of your Myotis-in-text Digimon to get Play Cost -4", CanUseCondition, card);
                 activateClass.SetUpICardEffect("Delete 1 of your Myotis-in-text Digimon to get Play Cost -4", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDescription());
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDescription());
-                activateClass.SetHashString("PlayCost-4_EX10_048");
                 cardEffects.Add(activateClass);
                 cardEffects.Add(activateClass);
 
 
                 activateClass.SetIsDigimonEffect(true);
                 activateClass.SetIsDigimonEffect(true);

+ 2 - 6
Assets/CardEffect/EX10/Purple/EX10_051.cs

@@ -77,8 +77,6 @@ namespace DCGO.CardEffects.EX10
                     // If the player discarded a card, continue with the rest of the effect
                     // If the player discarded a card, continue with the rest of the effect
                     if (discarded && CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                     if (discarded && CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                     {
                     {
-                        int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
-
                         SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
                         SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
 
 
                         selectPermanentEffect.SetUp(
                         selectPermanentEffect.SetUp(
@@ -86,7 +84,7 @@ namespace DCGO.CardEffects.EX10
                             canTargetCondition: CanSelectPermanentCondition,
                             canTargetCondition: CanSelectPermanentCondition,
                             canTargetCondition_ByPreSelecetedList: null,
                             canTargetCondition_ByPreSelecetedList: null,
                             canEndSelectCondition: CanEndSelectCondition,
                             canEndSelectCondition: CanEndSelectCondition,
-                            maxCount: maxCount,
+                            maxCount: 1,
                             canNoSelect: false,
                             canNoSelect: false,
                             canEndNotMax: false,
                             canEndNotMax: false,
                             selectPermanentCoroutine: SelectPermanentCoroutine,
                             selectPermanentCoroutine: SelectPermanentCoroutine,
@@ -179,8 +177,6 @@ namespace DCGO.CardEffects.EX10
 
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
                 {
-                    int maxCount = 1;
-
                     List<CardSource> selectedCards = new List<CardSource>();
                     List<CardSource> selectedCards = new List<CardSource>();
 
 
                     SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
                     SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
@@ -193,7 +189,7 @@ namespace DCGO.CardEffects.EX10
                         selectCardCoroutine: SelectCardCoroutine,
                         selectCardCoroutine: SelectCardCoroutine,
                         afterSelectCardCoroutine: null,
                         afterSelectCardCoroutine: null,
                         message: "Select 1 card to play.",
                         message: "Select 1 card to play.",
-                        maxCount: maxCount,
+                        maxCount: 1,
                         canEndNotMax: false,
                         canEndNotMax: false,
                         isShowOpponent: true,
                         isShowOpponent: true,
                         mode: SelectCardEffect.Mode.Custom,
                         mode: SelectCardEffect.Mode.Custom,