去掉不必要的依赖

This commit is contained in:
陈思海 2025-11-17 20:27:14 +08:00
parent d124be0855
commit d68d1a6d01
6 changed files with 22 additions and 28 deletions

View File

@ -1,7 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using Unity.Serialization.Json; using Newtonsoft.Json;
using UnityEngine; using UnityEngine;
namespace Paps.UnityToolbarExtenderUIToolkit namespace Paps.UnityToolbarExtenderUIToolkit
@ -99,18 +99,18 @@ namespace Paps.UnityToolbarExtenderUIToolkit
Directory.CreateDirectory(DIRECTORY); Directory.CreateDirectory(DIRECTORY);
if (!File.Exists(FILE)) if (!File.Exists(FILE))
return JsonSerialization.FromJson<Dictionary<string, object>>("{}"); return JsonConvert.DeserializeObject<Dictionary<string, object>>("{}");
var json = File.ReadAllText(FILE); var json = File.ReadAllText(FILE);
var serializedDictionary = JsonSerialization.FromJson<Dictionary<string, object>>(json); var serializedDictionary = JsonConvert.DeserializeObject<Dictionary<string, object>>(json);
return serializedDictionary; return serializedDictionary;
} }
private static void Save() private static void Save()
{ {
var json = JsonSerialization.ToJson(Prefs); var json = JsonConvert.SerializeObject(Prefs);
File.WriteAllText(FILE, json); File.WriteAllText(FILE, json);
} }

View File

@ -1,7 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using Unity.Serialization.Json; using Newtonsoft.Json;
using UnityEngine; using UnityEngine;
namespace Paps.UnityToolbarExtenderUIToolkit namespace Paps.UnityToolbarExtenderUIToolkit
@ -56,9 +56,9 @@ namespace Paps.UnityToolbarExtenderUIToolkit
private SerializableOverride ToSerialized(MainToolbarElementOverride mainToolbarElementOverride) private SerializableOverride ToSerialized(MainToolbarElementOverride mainToolbarElementOverride)
{ {
return new SerializableOverride() { return new SerializableOverride() {
ElementId = mainToolbarElementOverride.ElementId, ElementId = mainToolbarElementOverride.ElementId,
Visible = mainToolbarElementOverride.Visible Visible = mainToolbarElementOverride.Visible
}; };
} }
@ -73,11 +73,11 @@ namespace Paps.UnityToolbarExtenderUIToolkit
Directory.CreateDirectory(DIRECTORY); Directory.CreateDirectory(DIRECTORY);
if (!File.Exists(FILE)) if (!File.Exists(FILE))
return JsonSerialization.FromJson<Dictionary<string, MainToolbarElementOverride>>("{}"); return JsonConvert.DeserializeObject<Dictionary<string, MainToolbarElementOverride>>("{}");
var json = File.ReadAllText(FILE); var json = File.ReadAllText(FILE);
var serializedDictionary = JsonSerialization.FromJson<Dictionary<string, SerializableOverride>>(json); var serializedDictionary = JsonConvert.DeserializeObject<Dictionary<string, SerializableOverride>>(json);
return serializedDictionary.Values return serializedDictionary.Values
.ToDictionary(serializedOverride => serializedOverride.ElementId, .ToDictionary(serializedOverride => serializedOverride.ElementId,
@ -91,9 +91,9 @@ namespace Paps.UnityToolbarExtenderUIToolkit
mainToolbarElementOverride => ToSerialized(mainToolbarElementOverride) mainToolbarElementOverride => ToSerialized(mainToolbarElementOverride)
); );
var json = JsonSerialization.ToJson(serializableDictionary); var json = JsonConvert.SerializeObject(serializableDictionary);
File.WriteAllText(FILE, json); File.WriteAllText(FILE, json);
} }
} }
} }

View File

@ -1,9 +1,7 @@
{ {
"name": "Paps.UnityToolbarExtenderUIToolkit", "name": "Paps.UnityToolbarExtenderUIToolkit",
"rootNamespace": "Paps.UnityToolbarExtenderUIToolkit", "rootNamespace": "Paps.UnityToolbarExtenderUIToolkit",
"references": [ "references": [],
"Unity.Serialization"
],
"includePlatforms": [ "includePlatforms": [
"Editor" "Editor"
], ],

View File

@ -2,8 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using Unity.Serialization.Json; using Newtonsoft.Json;
using UnityEditor;
namespace Paps.UnityToolbarExtenderUIToolkit namespace Paps.UnityToolbarExtenderUIToolkit
{ {
@ -30,7 +29,7 @@ namespace Paps.UnityToolbarExtenderUIToolkit
private IValueSerializer _valuesSerializer; private IValueSerializer _valuesSerializer;
private MethodInfo _serializeValueMethod, _deserializeValueMethod; private MethodInfo _serializeValueMethod, _deserializeValueMethod;
public UnitySerializationMainToolbarElementVariableSerializer(IValueSerializer valuesSerializer) public UnitySerializationMainToolbarElementVariableSerializer(IValueSerializer valuesSerializer)
{ {
_valuesSerializer = valuesSerializer; _valuesSerializer = valuesSerializer;
@ -43,12 +42,12 @@ namespace Paps.UnityToolbarExtenderUIToolkit
{ {
var dto = ToDTO(serializableElementGroup); var dto = ToDTO(serializableElementGroup);
return JsonSerialization.ToJson(dto, new JsonSerializationParameters() { Minified = true }); return JsonConvert.SerializeObject(dto);
} }
public SerializableElementGroup Deserialize(string serializedElementGroup) public SerializableElementGroup Deserialize(string serializedElementGroup)
{ {
var dto = JsonSerialization.FromJson<SerializableElementGroupDTO>(serializedElementGroup); var dto = JsonConvert.DeserializeObject<SerializableElementGroupDTO>(serializedElementGroup);
return FromDTO(dto); return FromDTO(dto);
} }
@ -66,8 +65,8 @@ namespace Paps.UnityToolbarExtenderUIToolkit
{ {
return new SerializableElementGroup() return new SerializableElementGroup()
{ {
SerializableElements = dto.SerializableElements == null ? SerializableElements = dto.SerializableElements == null ?
new Dictionary<string, SerializableElement>() : new Dictionary<string, SerializableElement>() :
dto.SerializableElements.ToDictionary(e => e.Key, e => FromDTO(e.Value)) dto.SerializableElements.ToDictionary(e => e.Key, e => FromDTO(e.Value))
}; };
} }

View File

@ -1,4 +1,4 @@
using Unity.Serialization.Json; using Newtonsoft.Json;
namespace Paps.UnityToolbarExtenderUIToolkit namespace Paps.UnityToolbarExtenderUIToolkit
{ {
@ -6,12 +6,12 @@ namespace Paps.UnityToolbarExtenderUIToolkit
{ {
public T Deserialize<T>(string serializedValue) public T Deserialize<T>(string serializedValue)
{ {
return JsonSerialization.FromJson<T>(serializedValue); return JsonConvert.DeserializeObject<T>(serializedValue);
} }
public string Serialize<T>(T value) public string Serialize<T>(T value)
{ {
return JsonSerialization.ToJson(value, new JsonSerializationParameters() { Minified = true } ); return JsonConvert.SerializeObject(value, Formatting.Indented);
} }
} }
} }

View File

@ -16,8 +16,5 @@
"author": { "author": {
"name": "Yuliuren", "name": "Yuliuren",
"email": "yuliuren00@gmail.com" "email": "yuliuren00@gmail.com"
},
"dependencies": {
"com.unity.serialization": "3.1.2"
} }
} }