From f99a20c88699209d8a9506f43643e392780702b6 Mon Sep 17 00:00:00 2001 From: yjm484 <171359351@qq.com> Date: Tue, 20 May 2025 21:44:32 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/GameDate/PlayerState.asset | 2 +- .../Upgrade for URP.unitypackage.meta | 7 ----- .../Assets/Plugins/Microsoft.CSharp.dll.meta | 27 +++++++++++++++++++ .../ForgingPoint/ForgintPointManager.cs | 7 ++--- .../Assets/Scripts/Tool/CardFunction.cs | 4 +-- .../Assets/Scripts/Tool/Name.cs | 3 +++ 6 files changed, 37 insertions(+), 13 deletions(-) delete mode 100644 ColorlessWorld-2024-4-2/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Plugins/Microsoft.CSharp.dll.meta diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset index ee024c23..71e15139 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset +++ b/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 diff --git a/ColorlessWorld-2024-4-2/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta b/ColorlessWorld-2024-4-2/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta deleted file mode 100644 index 1d182472..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5b07afdbcf13e43438545d591cfd2e4b -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Plugins/Microsoft.CSharp.dll.meta b/ColorlessWorld-2024-4-2/Assets/Plugins/Microsoft.CSharp.dll.meta new file mode 100644 index 00000000..17bba4e5 --- /dev/null +++ b/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: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs index 0819e678..32bbe02f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs @@ -752,13 +752,14 @@ public class ForgintPointManager : Singleton public void ChangeCardColorCaseVal(KeyValuePair 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); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/CardFunction.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/CardFunction.cs index eb258bea..db96c23f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/CardFunction.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/CardFunction.cs @@ -222,8 +222,8 @@ public static class CardFunction - public static readonly HashSet BuffList = new() { bleed, vulnerable, downSpeed, ember, calm , agile - ,weak,bleedDamage,immunity,thorn,Invisible,disable}; + public static readonly HashSet BuffList = new() { bleed, vulnerable, ember, calm , agile + ,weak,bleedDamage,thorn,Invisible,disable}; public static readonly HashSet ActList = new() { damagexy, cardDamage, cardShield, step,costRestore ,drawCard,drawDyeingCard,drawEffectCard}; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs index 4a8e2224..484c2e98 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs +++ b/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)) -- 2.30.2