修复 错误的情景文件反序列化

Author: MakesYT

Core/SDKs/CustomScenario/CustomScenarioManger.cs

@@ -84,31 +84,31 @@ public static void Load(FileInfo fileInfo)
         try
         {
             var deserializeObject = JsonSerializer.Deserialize<CustomScenario>(json, ConfigManger.DefaultOptions);
-            for (var index = 0; index < deserializeObject.InputValue.Count; index++)
-            {
-                var (key, value) = deserializeObject.InputValue[index];
-                if (value is JsonElement jsonElement)
-                {
-                    if (jsonElement.ValueKind == JsonValueKind.Object)
-                    {
-                        deserializeObject.InputValue.SetValueWithoutNotify(deserializeObject.InputValue[index].Key,
-                            new object());
-                    }
-                }
-            }
-
-            for (var index = 0; index < deserializeObject.Values.Count; index++)
-            {
-                var (key, value) = deserializeObject.Values[index];
-                if (value is JsonElement jsonElement)
-                {
-                    if (jsonElement.ValueKind == JsonValueKind.Object)
-                    {
-                        deserializeObject.Values.SetValueWithoutNotify(deserializeObject.Values[index].Key,
-                            new object());
-                    }
-                }
-            }
+            // for (var index = 0; index < deserializeObject.InputValue.Count; index++)
+            // {
+            //     var (key, value) = deserializeObject.InputValue[index];
+            //     if (value is JsonElement jsonElement)
+            //     {
+            //         if (jsonElement.ValueKind == JsonValueKind.Object)
+            //         {
+            //             deserializeObject.InputValue[deserializeObject.InputValue[index].Key]= new object();
+            //            
+            //         }
+            //     }
+            // }
+            //
+            // for (var index = 0; index < deserializeObject.Values.Count; index++)
+            // {
+            //     var (key, value) = deserializeObject.Values[index];
+            //     if (value is JsonElement jsonElement)
+            //     {
+            //         if (jsonElement.ValueKind == JsonValueKind.Object)
+            //         {
+            //             deserializeObject.Values[deserializeObject.Values[index].Key]= new object();
+            //             
+            //         }
+            //     }
+            // }
 
             deserializeObject.OnDeserialized();
 

Core/SDKs/Services/Config/ConfigManger.cs

@@ -28,7 +28,8 @@ public static class ConfigManger
         IncludeFields = true,
         WriteIndented = true,
         ReferenceHandler = ReferenceHandler.Preserve,
-        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+        Converters = { new ObjectJsonConverter() }
+        // DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
     };
 
     public static void Init()

Core/SDKs/Services/Config/ObjectJsonConverter.cs

@@ -0,0 +1,38 @@
+using System.Dynamic;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Core.SDKs.Services.Config;
+
+public class ObjectJsonConverter : JsonConverter<object>
+{
+    public override object Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        // 根据ValueKind判断数据类型
+        if (reader.TokenType ==
+            // 若为JsonElement类型，再根据ValueKind属性判断
+            JsonTokenType.StartObject)
+        {
+            JsonSerializer.Deserialize<ExpandoObject>(ref reader, options);
+            return new object();
+        }
+
+        if (reader.TokenType == JsonTokenType.Number)
+            return reader.TryGetInt64(out long l) ? l : reader.GetDouble();
+        if (reader.TokenType == JsonTokenType.String)
+            return reader.TryGetDateTime(out DateTime datetime) ? datetime : reader.GetString();
+        if (reader.TokenType == JsonTokenType.True)
+            return true;
+        if (reader.TokenType == JsonTokenType.False)
+            return false;
+        if (reader.TokenType == JsonTokenType.Null)
+            return null;
+        // 这里可以根据需要添加更多的数据类型判断
+        return JsonSerializer.Deserialize<JsonElement>(ref reader);
+    }
+
+    public override void Write(Utf8JsonWriter writer, object value, JsonSerializerOptions options)
+    {
+        JsonSerializer.Serialize(writer, value, value.GetType(), options);
+    }
+}

Core/SDKs/Services/Plugin/AssemblyLoadContextH.cs

@@ -36,7 +36,8 @@ public AssemblyLoadContextH(string pluginPath, string name) : base(isCollectible
                 IncludeFields = true,
                 WriteIndented = true,
                 ReferenceHandler = ReferenceHandler.Preserve,
-                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+                Converters = { new ObjectJsonConverter() }
+                //DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
             };
             _assembly = null;
             AvaloniaPropertyRegistry.Instance.UnregisterByModule(sender.Assemblies.First()