From d68d1a6d013f0dfd56689a23fbbe0d1dd15bf35d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B5=B7?= <1464576565@qq.com> Date: Mon, 17 Nov 2025 20:27:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=8D=E5=BF=85=E8=A6=81?= =?UTF-8?q?=E7=9A=84=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Editor/Toolbar/Helpers/UserSettingsPrefs.cs | 8 ++++---- ...gsFileMainToolbarElementOverrideRepository.cs | 16 ++++++++-------- .../Paps.UnityToolbarExtenderUIToolkit.asmdef | 4 +--- ...zationMainToolbarElementVariableSerializer.cs | 13 ++++++------- .../UnitySerializationValueSerializer.cs | 6 +++--- package.json | 3 --- 6 files changed, 22 insertions(+), 28 deletions(-) diff --git a/Editor/Toolbar/Helpers/UserSettingsPrefs.cs b/Editor/Toolbar/Helpers/UserSettingsPrefs.cs index 9b8c024..7b87732 100644 --- a/Editor/Toolbar/Helpers/UserSettingsPrefs.cs +++ b/Editor/Toolbar/Helpers/UserSettingsPrefs.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.IO; -using Unity.Serialization.Json; +using Newtonsoft.Json; using UnityEngine; namespace Paps.UnityToolbarExtenderUIToolkit @@ -99,18 +99,18 @@ namespace Paps.UnityToolbarExtenderUIToolkit Directory.CreateDirectory(DIRECTORY); if (!File.Exists(FILE)) - return JsonSerialization.FromJson>("{}"); + return JsonConvert.DeserializeObject>("{}"); var json = File.ReadAllText(FILE); - var serializedDictionary = JsonSerialization.FromJson>(json); + var serializedDictionary = JsonConvert.DeserializeObject>(json); return serializedDictionary; } private static void Save() { - var json = JsonSerialization.ToJson(Prefs); + var json = JsonConvert.SerializeObject(Prefs); File.WriteAllText(FILE, json); } diff --git a/Editor/Toolbar/Override/UserSettingsFileMainToolbarElementOverrideRepository.cs b/Editor/Toolbar/Override/UserSettingsFileMainToolbarElementOverrideRepository.cs index 3429a9d..0021a08 100644 --- a/Editor/Toolbar/Override/UserSettingsFileMainToolbarElementOverrideRepository.cs +++ b/Editor/Toolbar/Override/UserSettingsFileMainToolbarElementOverrideRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using Unity.Serialization.Json; +using Newtonsoft.Json; using UnityEngine; namespace Paps.UnityToolbarExtenderUIToolkit @@ -56,9 +56,9 @@ namespace Paps.UnityToolbarExtenderUIToolkit private SerializableOverride ToSerialized(MainToolbarElementOverride mainToolbarElementOverride) { - return new SerializableOverride() { - ElementId = mainToolbarElementOverride.ElementId, - Visible = mainToolbarElementOverride.Visible + return new SerializableOverride() { + ElementId = mainToolbarElementOverride.ElementId, + Visible = mainToolbarElementOverride.Visible }; } @@ -73,11 +73,11 @@ namespace Paps.UnityToolbarExtenderUIToolkit Directory.CreateDirectory(DIRECTORY); if (!File.Exists(FILE)) - return JsonSerialization.FromJson>("{}"); + return JsonConvert.DeserializeObject>("{}"); var json = File.ReadAllText(FILE); - var serializedDictionary = JsonSerialization.FromJson>(json); + var serializedDictionary = JsonConvert.DeserializeObject>(json); return serializedDictionary.Values .ToDictionary(serializedOverride => serializedOverride.ElementId, @@ -91,9 +91,9 @@ namespace Paps.UnityToolbarExtenderUIToolkit mainToolbarElementOverride => ToSerialized(mainToolbarElementOverride) ); - var json = JsonSerialization.ToJson(serializableDictionary); + var json = JsonConvert.SerializeObject(serializableDictionary); File.WriteAllText(FILE, json); } } -} \ No newline at end of file +} diff --git a/Editor/Toolbar/Paps.UnityToolbarExtenderUIToolkit.asmdef b/Editor/Toolbar/Paps.UnityToolbarExtenderUIToolkit.asmdef index 0217154..1fde311 100644 --- a/Editor/Toolbar/Paps.UnityToolbarExtenderUIToolkit.asmdef +++ b/Editor/Toolbar/Paps.UnityToolbarExtenderUIToolkit.asmdef @@ -1,9 +1,7 @@ { "name": "Paps.UnityToolbarExtenderUIToolkit", "rootNamespace": "Paps.UnityToolbarExtenderUIToolkit", - "references": [ - "Unity.Serialization" - ], + "references": [], "includePlatforms": [ "Editor" ], diff --git a/Editor/Toolbar/SerializableValues/UnitySerializationMainToolbarElementVariableSerializer.cs b/Editor/Toolbar/SerializableValues/UnitySerializationMainToolbarElementVariableSerializer.cs index 9149683..e5e0821 100644 --- a/Editor/Toolbar/SerializableValues/UnitySerializationMainToolbarElementVariableSerializer.cs +++ b/Editor/Toolbar/SerializableValues/UnitySerializationMainToolbarElementVariableSerializer.cs @@ -2,8 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using Unity.Serialization.Json; -using UnityEditor; +using Newtonsoft.Json; namespace Paps.UnityToolbarExtenderUIToolkit { @@ -30,7 +29,7 @@ namespace Paps.UnityToolbarExtenderUIToolkit private IValueSerializer _valuesSerializer; private MethodInfo _serializeValueMethod, _deserializeValueMethod; - + public UnitySerializationMainToolbarElementVariableSerializer(IValueSerializer valuesSerializer) { _valuesSerializer = valuesSerializer; @@ -43,12 +42,12 @@ namespace Paps.UnityToolbarExtenderUIToolkit { var dto = ToDTO(serializableElementGroup); - return JsonSerialization.ToJson(dto, new JsonSerializationParameters() { Minified = true }); + return JsonConvert.SerializeObject(dto); } public SerializableElementGroup Deserialize(string serializedElementGroup) { - var dto = JsonSerialization.FromJson(serializedElementGroup); + var dto = JsonConvert.DeserializeObject(serializedElementGroup); return FromDTO(dto); } @@ -66,8 +65,8 @@ namespace Paps.UnityToolbarExtenderUIToolkit { return new SerializableElementGroup() { - SerializableElements = dto.SerializableElements == null ? - new Dictionary() : + SerializableElements = dto.SerializableElements == null ? + new Dictionary() : dto.SerializableElements.ToDictionary(e => e.Key, e => FromDTO(e.Value)) }; } diff --git a/Editor/Toolbar/SerializableValues/UnitySerializationValueSerializer.cs b/Editor/Toolbar/SerializableValues/UnitySerializationValueSerializer.cs index 3bafa22..48288bc 100644 --- a/Editor/Toolbar/SerializableValues/UnitySerializationValueSerializer.cs +++ b/Editor/Toolbar/SerializableValues/UnitySerializationValueSerializer.cs @@ -1,4 +1,4 @@ -using Unity.Serialization.Json; +using Newtonsoft.Json; namespace Paps.UnityToolbarExtenderUIToolkit { @@ -6,12 +6,12 @@ namespace Paps.UnityToolbarExtenderUIToolkit { public T Deserialize(string serializedValue) { - return JsonSerialization.FromJson(serializedValue); + return JsonConvert.DeserializeObject(serializedValue); } public string Serialize(T value) { - return JsonSerialization.ToJson(value, new JsonSerializationParameters() { Minified = true } ); + return JsonConvert.SerializeObject(value, Formatting.Indented); } } } diff --git a/package.json b/package.json index aec4ac9..e48bf74 100644 --- a/package.json +++ b/package.json @@ -16,8 +16,5 @@ "author": { "name": "Yuliuren", "email": "yuliuren00@gmail.com" - }, - "dependencies": { - "com.unity.serialization": "3.1.2" } } \ No newline at end of file