mbunch_kascope 1 year ago
parent
commit
3a31965814

+ 1 - 12
Assets/CardEffect/BT4/Red/BT4_011.cs

@@ -136,24 +136,13 @@ public class BT4_011 : CEntity_Effect
 
                 foreach (Func<EffectTiming, ICardEffect> getCardEffect in getCardEffects)
                 {
-                    card.Owner.PermanentEffects.Add(getCardEffect);
+                   card.Owner.UntilCalculateFixedCostEffect.Add(getCardEffect);
                 }
 
                 yield return null;
             }
         }
 
-        if(timing == EffectTiming.AfterPayCost)
-        {
-            if(getCardEffects.Count > 0)
-            {
-                foreach (Func<EffectTiming, ICardEffect> getCardEffect in getCardEffects)
-                {
-                    card.Owner.PermanentEffects.Remove(getCardEffect);
-                }
-            }
-        }
-
         return cardEffects;
     }
 }

+ 2 - 4
Assets/Scripts/CardController.cs

@@ -4641,11 +4641,9 @@ public class SuspendPermanentsClass
             #endregion
 
             if (IsAttack)
-            {
-                yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.RuleProcess());
                 yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.StackSkillInfos(_hashtable, EffectTiming.OnTappedAnyone));
-            }
-            else yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.StackSkillInfos(_hashtable, EffectTiming.OnTappedAnyone));
+            else 
+                yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.StackSkillInfos(_hashtable, EffectTiming.OnTappedAnyone));
 
             #endregion
 

+ 2 - 19
Assets/Scripts/CardSource.cs

@@ -1129,23 +1129,6 @@ public class CardSource : MonoBehaviour
     }
     #endregion
 
-    #region CardNameRules 
-    bool CardNameRules(string name)
-    {
-        bool passTest = true;
-
-        string testName = name.Replace(" ", "").ToLower();
-
-        if (testName.Contains("greymon"))
-            return testName != "dorugreymon" && testName != "burninggreymon" && testName != "dexdorugreymon";
-
-        if (testName.Contains("argomon") && !testName.Contains("gargomon"))
-            return testName != "gargomon" && testName != "megagargomon" && testName != "blackmegagargomon";
-
-        return passTest;
-    }
-    #endregion
-
     #region Whether target other card's name has same name as this
     public bool HasSameCardName(CardSource cardSource) => cardSource.CardNames.Count((cardName) => EqualsCardName(cardName)) >= 1;
     //public bool HasSameCardName(CardSource cardSource) => cardSource.CardNames.Count((cardName) => CardNames.Contains(cardName)) >= 1;
@@ -1193,10 +1176,10 @@ public class CardSource : MonoBehaviour
         string lower = name.ToLower();
 
         return CardNames.Some((cardName) =>
-        ( cardName.Contains(name)
+        cardName.Contains(name)
         || cardName.Contains(replaced)
         || cardName.Contains(lower)
-        || cardName.ToLower().Contains(lower)) && CardNameRules(cardName));
+        || cardName.ToLower().Contains(lower));
     }
     #endregion
 

+ 2 - 0
Assets/Scripts/SelectDigiXrosClass.cs

@@ -898,6 +898,8 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
                                 yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().RemoveDigivolveRootEffect(cardSource, cardSource.PermanentOfThisCard()));
                                 yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(new List<CardSource>() { cardSource }, null));
                             }
+
+                            cardSource.cEntity_EffectController.InitUseCountThisTurn();
                         }
                     }
                 }