Merge pull request #247 from LSDust/main

添加json设置参数, 适配Newtonsoft Json

Author: Alex-Rachel

UnityProject/Assets/TEngine/Runtime/Extension/Json/DefaultJsonHelper.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using UnityEngine;
 
 namespace TEngine
@@ -12,8 +12,9 @@ public class DefaultJsonHelper : Utility.Json.IJsonHelper
         /// 将对象序列化为 JSON 字符串。
         /// </summary>
         /// <param name="obj">要序列化的对象。</param>
+        /// <param name="settings">序列化设置。</param>
         /// <returns>序列化后的 JSON 字符串。</returns>
-        public string ToJson(object obj)
+        public string ToJson(object obj, object settings = null)
         {
             return JsonUtility.ToJson(obj);
         }
@@ -23,8 +24,9 @@ public string ToJson(object obj)
         /// </summary>
         /// <typeparam name="T">对象类型。</typeparam>
         /// <param name="json">要反序列化的 JSON 字符串。</param>
+        /// <param name="settings">序列化设置。</param>
         /// <returns>反序列化后的对象。</returns>
-        public T ToObject<T>(string json)
+        public T ToObject<T>(string json, object settings = null)
         {
             return JsonUtility.FromJson<T>(json);
         }
@@ -34,8 +36,9 @@ public T ToObject<T>(string json)
         /// </summary>
         /// <param name="objectType">对象类型。</param>
         /// <param name="json">要反序列化的 JSON 字符串。</param>
+        /// <param name="settings">序列化设置。</param>
         /// <returns>反序列化后的对象。</returns>
-        public object ToObject(Type objectType, string json)
+        public object ToObject(Type objectType, string json, object settings = null)
         {
             return JsonUtility.FromJson(json, objectType);
         }

UnityProject/Assets/TEngine/Runtime/Extension/Json/Utility.Json.IJsonHelper.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace TEngine
 {
@@ -15,24 +15,27 @@ public interface IJsonHelper
                 /// 将对象序列化为 JSON 字符串。
                 /// </summary>
                 /// <param name="obj">要序列化的对象。</param>
+                /// <param name="settings">序列化设置。</param>
                 /// <returns>序列化后的 JSON 字符串。</returns>
-                string ToJson(object obj);
+                string ToJson(object obj, object settings = null);
 
                 /// <summary>
                 /// 将 JSON 字符串反序列化为对象。
                 /// </summary>
                 /// <typeparam name="T">对象类型。</typeparam>
                 /// <param name="json">要反序列化的 JSON 字符串。</param>
+                /// <param name="settings">序列化设置。</param>
                 /// <returns>反序列化后的对象。</returns>
-                T ToObject<T>(string json);
+                T ToObject<T>(string json, object settings = null);
 
                 /// <summary>
                 /// 将 JSON 字符串反序列化为对象。
                 /// </summary>
                 /// <param name="objectType">对象类型。</param>
                 /// <param name="json">要反序列化的 JSON 字符串。</param>
+                /// <param name="settings">序列化设置。</param>
                 /// <returns>反序列化后的对象。</returns>
-                object ToObject(Type objectType, string json);
+                object ToObject(Type objectType, string json, object settings = null);
             }
         }
     }

UnityProject/Assets/TEngine/Runtime/Extension/Json/Utility.Json.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace TEngine
 {
@@ -24,8 +24,9 @@ public static void SetJsonHelper(IJsonHelper jsonHelper)
             /// 将对象序列化为 JSON 字符串。
             /// </summary>
             /// <param name="obj">要序列化的对象。</param>
+            /// <param name="settings">序列化设置。</param>
             /// <returns>序列化后的 JSON 字符串。</returns>
-            public static string ToJson(object obj)
+            public static string ToJson(object obj, object settings = null)
             {
                 if (_jsonHelper == null)
                 {
@@ -34,7 +35,7 @@ public static string ToJson(object obj)
 
                 try
                 {
-                    return _jsonHelper.ToJson(obj);
+                    return _jsonHelper.ToJson(obj, settings);
                 }
                 catch (Exception exception)
                 {
@@ -52,8 +53,9 @@ public static string ToJson(object obj)
             /// </summary>
             /// <typeparam name="T">对象类型。</typeparam>
             /// <param name="json">要反序列化的 JSON 字符串。</param>
+            /// <param name="settings">序列化设置。</param>
             /// <returns>反序列化后的对象。</returns>
-            public static T ToObject<T>(string json)
+            public static T ToObject<T>(string json, object settings = null)
             {
                 if (_jsonHelper == null)
                 {
@@ -62,7 +64,7 @@ public static T ToObject<T>(string json)
 
                 try
                 {
-                    return _jsonHelper.ToObject<T>(json);
+                    return _jsonHelper.ToObject<T>(json, settings);
                 }
                 catch (Exception exception)
                 {
@@ -80,8 +82,9 @@ public static T ToObject<T>(string json)
             /// </summary>
             /// <param name="objectType">对象类型。</param>
             /// <param name="json">要反序列化的 JSON 字符串。</param>
+            /// <param name="settings">序列化设置。</param>
             /// <returns>反序列化后的对象。</returns>
-            public static object ToObject(Type objectType, string json)
+            public static object ToObject(Type objectType, string json, object settings = null)
             {
                 if (_jsonHelper == null)
                 {
@@ -95,7 +98,7 @@ public static object ToObject(Type objectType, string json)
 
                 try
                 {
-                    return _jsonHelper.ToObject(objectType, json);
+                    return _jsonHelper.ToObject(objectType, json, settings);
                 }
                 catch (Exception exception)
                 {