diff --git a/.idea/.idea.Continentis/.idea/copilot.data.migration.agent.xml b/.idea/.idea.Continentis/.idea/copilot.data.migration.agent.xml new file mode 100644 index 00000000..4ea72a91 --- /dev/null +++ b/.idea/.idea.Continentis/.idea/copilot.data.migration.agent.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Item/CardData_Basic_CommomHolyWater.asset b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Item/CardData_Basic_CommonHolyWater.asset similarity index 97% rename from Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Item/CardData_Basic_CommomHolyWater.asset rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Item/CardData_Basic_CommonHolyWater.asset index be8c82bc..2cf39733 100644 --- a/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Item/CardData_Basic_CommomHolyWater.asset +++ b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Item/CardData_Basic_CommonHolyWater.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9a4129cdd7011ca46b83d8c17d9f3623, type: 3} - m_Name: CardData_Basic_CommomHolyWater + m_Name: CardData_Basic_CommonHolyWater m_EditorClassIdentifier: Assembly-CSharp::Continentis.MainGame.Card.CardData modName: Basic className: CommonHolyWater diff --git a/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Item/CardData_Basic_CommomHolyWater.asset.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Item/CardData_Basic_CommonHolyWater.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Item/CardData_Basic_CommomHolyWater.asset.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Item/CardData_Basic_CommonHolyWater.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Cleric/CardData_Basic_BlessedHolyWater.asset b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Cleric/CardData_Basic_BlessedHolyWater.asset index 47b04114..b41d2691 100644 --- a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Cleric/CardData_Basic_BlessedHolyWater.asset +++ b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Cleric/CardData_Basic_BlessedHolyWater.asset @@ -55,5 +55,5 @@ MonoBehaviour: customDescriptions: [] prefabRefs: [] derivativeCardDataRefs: - - CardData_Basic_CommomHolyWater + - CardData_Basic_CommonHolyWater derivativeCharacterDataRefs: [] diff --git a/Assets/Scripts/MainGame/Buff/BuffSubmodules.cs b/Assets/Scripts/MainGame/Buff/BuffSubmodules.cs index ce297866..db437851 100644 --- a/Assets/Scripts/MainGame/Buff/BuffSubmodules.cs +++ b/Assets/Scripts/MainGame/Buff/BuffSubmodules.cs @@ -139,7 +139,7 @@ namespace Continentis.MainGame public OrderedDictionary>> onOtherBuffApplied; //Buff被添加时，参数为被添加的Buff实例 public OrderedDictionary>> onOtherBuffFirstApplied; //Buff被新添加时，参数为被添加的Buff实例 - public OrderedDictionary>> onOtherBuffRemoved; //Buff被移除时，参数为被移除的Buff实例 + public OrderedDictionary>> onOtherBuffRemoved; //Buff被移除后，参数为被移除的Buff实例 public OrderedDictionary> onOpponentDecideAction; //对手AI决定行动时，参数为对手，和原定的目标角色 diff --git a/Assets/Scripts/Mod/Manifests/ModManifest.cs b/Assets/Scripts/Mod/Manifests/ModManifest.cs index efefe3a3..96d2e019 100644 --- a/Assets/Scripts/Mod/Manifests/ModManifest.cs +++ b/Assets/Scripts/Mod/Manifests/ModManifest.cs @@ -97,7 +97,7 @@ namespace Continentis.Mods } } - Debug.Log($"Collected {collectedDataIDList.Count} CardData assets."); + Debug.Log($"Collected {collectedDataIDList.Count} {typeof(T).Name} assets."); return collectedDataIDList; } diff --git a/Assets/Scripts/ScriptExtensions/StorySystem/Editor/DialogEditor/Nodes/DialogGraphNode.cs b/Assets/Scripts/ScriptExtensions/StorySystem/Editor/DialogEditor/Nodes/DialogGraphNode.cs index 447b7b2f..59b517c3 100644 --- a/Assets/Scripts/ScriptExtensions/StorySystem/Editor/DialogEditor/Nodes/DialogGraphNode.cs +++ b/Assets/Scripts/ScriptExtensions/StorySystem/Editor/DialogEditor/Nodes/DialogGraphNode.cs @@ -34,10 +34,10 @@ namespace SLSFramework.StorySystem.Dialog // -- 角色名 -- _characterField = new ObjectField("Character") { - objectType = typeof(CharacterData), + objectType = typeof(StoryCharacterData), allowSceneObjects = false }; - _characterField.SetValueWithoutNotify(_data.characterData); + _characterField.SetValueWithoutNotify(_data.storyCharacterData); _characterField.RegisterValueChangedCallback(OnCharacterDataChanged); extensionContainer.Add(_characterField); @@ -88,7 +88,7 @@ namespace SLSFramework.StorySystem.Dialog // --- 6. 核心逻辑：当 ObjectField 变化时调用 --- private void OnCharacterDataChanged(ChangeEvent evt) { - _data.characterData = evt.newValue as CharacterData; + _data.storyCharacterData = evt.newValue as StoryCharacterData; // 清空旧的表情 _data.expressionKey = null; @@ -110,7 +110,7 @@ namespace SLSFramework.StorySystem.Dialog // 清空旧选项 _expressionField.choices.Clear(); - if (_data.characterData == null) + if (_data.storyCharacterData == null) { // 如果没有角色，禁用下拉框 _expressionField.SetValueWithoutNotify(null); @@ -119,7 +119,7 @@ namespace SLSFramework.StorySystem.Dialog } // 从 CharacterData 中提取所有表情的 "name" - List expressionKeys = _data.characterData.expressions + List expressionKeys = _data.storyCharacterData.expressions .Select(expr => expr.key) .ToList(); diff --git a/Assets/Scripts/ScriptExtensions/StorySystem/Runtime/Data/Dialog/DialogNodeData.cs b/Assets/Scripts/ScriptExtensions/StorySystem/Runtime/Data/Dialog/DialogNodeData.cs index 1f757e1d..9d4980df 100644 --- a/Assets/Scripts/ScriptExtensions/StorySystem/Runtime/Data/Dialog/DialogNodeData.cs +++ b/Assets/Scripts/ScriptExtensions/StorySystem/Runtime/Data/Dialog/DialogNodeData.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using UnityEngine; +using UnityEngine.Serialization; namespace SLSFramework.StorySystem.Dialog { @@ -11,7 +12,7 @@ namespace SLSFramework.StorySystem.Dialog [Serializable] public class DialogNodeData : BaseNodeData { - public CharacterData characterData; + [FormerlySerializedAs("characterData")] public StoryCharacterData storyCharacterData; public string expressionKey; // 用于存储所选表情的 name public Vector2 characterPosition; [TextArea(3, 10)] public string dialogueText; diff --git a/Assets/Scripts/ScriptExtensions/StorySystem/Runtime/Data/Dialog/CharacterData.cs b/Assets/Scripts/ScriptExtensions/StorySystem/Runtime/Data/Dialog/StoryCharacterData.cs similarity index 74% rename from Assets/Scripts/ScriptExtensions/StorySystem/Runtime/Data/Dialog/CharacterData.cs rename to Assets/Scripts/ScriptExtensions/StorySystem/Runtime/Data/Dialog/StoryCharacterData.cs index 5683fa53..8df2f987 100644 --- a/Assets/Scripts/ScriptExtensions/StorySystem/Runtime/Data/Dialog/CharacterData.cs +++ b/Assets/Scripts/ScriptExtensions/StorySystem/Runtime/Data/Dialog/StoryCharacterData.cs @@ -2,17 +2,17 @@ using System; using System.Collections.Generic; using UnityEngine; -namespace SLSFramework.StorySystem.Dialog +namespace SLSFramework.StorySystem { - [CreateAssetMenu(fileName = "NewCharacterData", menuName = "StorySystem/Dialog/Character Data")] - public partial class CharacterData : ScriptableObject + [CreateAssetMenu(fileName = "NewCharacterData", menuName = "StorySystem/Character Data")] + public partial class StoryCharacterData : ScriptableObject { public string characterName; public List expressions = new List(); } - public partial class CharacterData + public partial class StoryCharacterData { [Serializable] public class Expression diff --git a/Assets/Scripts/ScriptExtensions/StorySystem/Runtime/Data/Dialog/CharacterData.cs.meta b/Assets/Scripts/ScriptExtensions/StorySystem/Runtime/Data/Dialog/StoryCharacterData.cs.meta similarity index 100% rename from Assets/Scripts/ScriptExtensions/StorySystem/Runtime/Data/Dialog/CharacterData.cs.meta rename to Assets/Scripts/ScriptExtensions/StorySystem/Runtime/Data/Dialog/StoryCharacterData.cs.meta