Merge pull request 'bug修复' (#122) from dev-0520-yjm1 into dev-1217

Reviewed-on: #122

ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset

@@ -26,5 +26,5 @@ MonoBehaviour:
   canColorCount: 20
   castRange: 2
   money: 10000
-  forgingPoint: 50
+  forgingPoint: 10000
   priceMultiplier: 1

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/Plugins/Microsoft.CSharp.dll.meta

@@ -0,0 +1,27 @@
+fileFormatVersion: 2
+guid: a94cf6fef2879da4c91e5ef768aadf4e
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -752,13 +752,14 @@ public class ForgintPointManager : Singleton<ForgintPointManager>
     public void ChangeCardColorCaseVal(KeyValuePair<string, string> kvp,string originFun,string position)
     {
         string cardID = null;
-        if (chooseCardEntity.cardOriginalData.CardId .StartsWith ("2"))
+        if (chooseCardEntity.cardOriginalData.CardId .StartsWith ("1"))
         {
-            cardID = CardManager.Instance.switchCardFunAndVal(chooseCardEntity.cardOriginalData, kvp, position, originFun);      
+            cardID = CardManager.Instance.switchCardFunAndValForDyeingCard(chooseCardEntity.cardOriginalData, kvp, originFun);
+                 
         }
         else
         {
-            cardID = CardManager.Instance.switchCardFunAndValForDyeingCard(chooseCardEntity.cardOriginalData, kvp, originFun);
+            cardID = CardManager.Instance.switchCardFunAndVal(chooseCardEntity.cardOriginalData, kvp, position, originFun);
         }
         newEffectCardID = cardID;
         Debug.Log(cardID);

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

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

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

@@ -578,6 +578,9 @@ public static class Name
             case CardFunction.Invisible:
                 basicval = data.Invisible;
                 break;
+            case CardFunction.agile:
+                basicval = data.Agile;
+                break;
         }
         result=basicval;
 /*        if (fun.Equals(CardFunction.damagexy))