冲突修改

ColorlessWorld-2024-4-2/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 5b07afdbcf13e43438545d591cfd2e4b
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs

@@ -89,7 +89,7 @@ public class ForgintPointManager : Singleton<ForgintPointManager>
     //效果对应费用目前字典里只有获得效果，没有输出效果
     static int getEffectCost = -5;
     public Dictionary<string, int> effectForgingCost = new Dictionary<string, int> { 
-     {CardFunction.cardShield,getEffectCost},{CardFunction.costRestore,getEffectCost},{CardFunction.drawCard,getEffectCost},{CardFunction.discard,getEffectCost},{CardFunction.ember,getEffectCost},{CardFunction.enhanceShield,getEffectCost},
+     {CardFunction.cardShield,getEffectCost},{CardFunction.costRestore,getEffectCost},{CardFunction.drawCard,getEffectCost},{CardFunction.discard,getEffectCost},{CardFunction.ember,getEffectCost},{CardFunction.agile,getEffectCost},
      {CardFunction.firm,getEffectCost},{CardFunction.extraDrawCardsNum,getEffectCost},{CardFunction.banDrawCard,getEffectCost},{CardFunction.upSpeed,getEffectCost},{CardFunction.consumePlayerNodesForHealth,getEffectCost},{CardFunction.consumePlayerNodesForDoubleHealth,getEffectCost},
      {CardFunction.immunity,getEffectCost},{CardFunction.nodesForCost,getEffectCost},{CardFunction.fireShield,getEffectCost},{CardFunction.reduceCost,getEffectCost},{CardFunction.doubleSettle,getEffectCost},{CardFunction.nextTurnExtraOneCost,getEffectCost},{CardFunction.costStep,getEffectCost},{CardFunction.settleAgain,getEffectCost},{CardFunction.clearAllAbnormalConditons,getEffectCost},{CardFunction.step,getEffectCost},{CardFunction.randomAttactCardToHand,getEffectCost},{CardFunction.recoverHp,getEffectCost},{CardFunction.placeTrees,getEffectCost},
      {CardFunction.turnYellowNodesToShield,getEffectCost},{CardFunction.turnHalfYellowNodesToShield,getEffectCost},{CardFunction.turn2RedNodesToEmber,getEffectCost},{CardFunction.turn3RedNodesToEmber,getEffectCost},{CardFunction.halfHpShield,getEffectCost},{CardFunction.bleedHeal,getEffectCost},{CardFunction.bleed3TurnCost,getEffectCost},{CardFunction.bleed4TurnCost,getEffectCost},{CardFunction.nextCardCostHp,getEffectCost},{CardFunction.nextCardCostMinusOne,getEffectCost},{CardFunction.nextEffectCardDoubleSettle,getEffectCost},

ColorlessWorld-2024-4-2/Assets/Scripts/Tool/CardFunction.cs

@@ -202,7 +202,7 @@ public static class CardFunction
     public static readonly HashSet<string> BuffList = new() { bleed, vulnerable, downSpeed, ember, deathMark, tempCastRange, calm , agile
     ,weak,bleedDamage,immunity,thorn,Invisible};
 
-    public static readonly HashSet<string> ActList = new() { damagexy, cardDamage, cardShield, repel, recoverHp, step, reduceCost,costRestore
+    public static readonly HashSet<string> ActList = new() { damagexy, cardDamage, cardShield, repel, recoverHp, step,costRestore
     ,drawCard,drawDyeingCard,drawEffectCard};
 
 }