修复框架

2025-01-16 17:58:49 +08:00
parent 9cbea6702f
commit 98187f2ced
8 changed files with 82 additions and 21 deletions
@@ -0,0 +1,35 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using UnityEngine;
+
+/// <summary>json解析与保存</summary>
+public static class JsonTool {
+    /// <summary> 内部包装类 </summary>
+    private class Pack<T> { public T data; }
+    /// <summary> 把对象转换为Json字符串 </summary>
+    /// <param name="obj">对象</param>
+    public static string ToJson<T>(T obj) {
+        if (obj == null) return "null";
+        if (obj.GetType().GetInterface("IList") != null) {
+            Pack<T> pack = new Pack<T>();
+            pack.data = obj;
+            string json = JsonUtility.ToJson(pack);
+            return json.Substring(8, json.Length - 9);
+        }
+        return JsonUtility.ToJson(obj);
+    }
+    /// <summary> 解析Json </summary>
+    /// <typeparam name="T">类型</typeparam>
+    /// <param name="json">Json字符串</param>
+    public static T FromJson<T>(string json) {
+        if (json == "null" && typeof(T).IsClass) return default(T);
+        if (typeof(T).GetInterface("IList") != null) {
+            json = "{\"data\":{data}}".Replace("{data}", json);
+            Pack<T> Pack = JsonUtility.FromJson<Pack<T>>(json);
+            return Pack.data;
+        }
+        return JsonUtility.FromJson<T>(json);
+    }
+}
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: fdd231128f69bd54a915b218d734fef6
+guid: 007e3acdca87e1b49b38f504938206cb
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
@@ -6,14 +6,16 @@ using UnityEngine;
 /// <summary>
 /// 单例模块
 /// </summary>
-public abstract class ModuleSingle<Data> : MonoBehaviour {
+public abstract class ModuleSingle<T> : MonoBehaviour where T : ModuleSingle<T> {
    /// <summary> 模块单例 </summary>
-    public static ModuleSingle<Data> I => instance;
+    public static T I => instance;
    /// <summary> 模块单例 </summary>
-    protected static ModuleSingle<Data> instance;
+    protected static T instance;
+    /// <summary> 核心模块 </summary>
+    protected virtual ModuleCore ModuleCore => ModuleCore.I;
    /// <summary> 初始化 </summary>
    protected virtual void Awake() {
        if (instance != null) { Destroy(instance.gameObject); }
-        instance = this;
+        instance = (T)this;
    }
 }
@@ -1,177 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.Networking;
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
-
-/// <summary>
-/// 网络请求工具
-/// </summary>
-public static class WebRequest {
-    public static TaskAwaiter<object> GetAwaiter(this UnityWebRequestAsyncOperation op) {
-        var tcs = new TaskCompletionSource<object>();
-        op.completed += (obj) => { tcs.SetResult(null); };
-        return tcs.Task.GetAwaiter();
-    }
-    /// <summary> 发送请求 </summary>
-    public static void Send(DataRequest request) {
-        if (request.RequestType == WebRequestType.GET) { Get(request); }
-        if (request.RequestType == WebRequestType.POSTFORM) { PostForm(request); }
-        if (request.RequestType == WebRequestType.POSTJSON) { PostJson(request); }
-        if (request.RequestType == WebRequestType.Texture) { Texture(request); }
-    }
-    public static async void Get(DataRequest request) {
-        string url = request.Url;
-        using UnityWebRequest web = UnityWebRequest.Get(url);
-        await web.SendWebRequest();
-        bool isDone = web.isDone && web.result == UnityWebRequest.Result.Success;
-        request.RequestResultHandle(isDone, web.downloadHandler);
-    }
-    public static async void PostForm(DataRequest request) {
-        string url = request.Url;
-        WWWForm form = request.Form;
-        using UnityWebRequest web = UnityWebRequest.Post(url, form);
-        await web.SendWebRequest();
-        bool isDone = web.isDone && web.result == UnityWebRequest.Result.Success;
-        request.RequestResultHandle(isDone, web.downloadHandler);
-    }
-    public static async void PostJson(DataRequest request) {
-        string url = request.Url;
-        string json = request.Json;
-        byte[] postBytes = System.Text.Encoding.Default.GetBytes(json);
-#if UNITY_2022
-        using UnityWebRequest web = UnityWebRequest.PostWwwForm(url, "POST");
-#else
-        using UnityWebRequest web = UnityWebRequest.Post(url, "POST");
-#endif
-        web.uploadHandler.Dispose();
-        web.uploadHandler = new UploadHandlerRaw(postBytes);
-        web.SetRequestHeader("Content-Type", "application/json");
-        await web.SendWebRequest();
-        bool isDone = web.isDone && web.result == UnityWebRequest.Result.Success;
-        request.RequestResultHandle(isDone, web.downloadHandler);
-
-    }
-    public static async void Texture(DataRequest request) {
-        string url = request.Url;
-        using UnityWebRequest web = UnityWebRequestTexture.GetTexture(url);
-        await web.SendWebRequest();
-        bool isDone = web.isDone && web.result == UnityWebRequest.Result.Success;
-        request.RequestResultHandle(isDone, web.downloadHandler);
-    }
-}
-/// <summary>
-/// Web请求类型
-/// </summary>
-public enum WebRequestType {
-    /// <summary> GET </summary>
-    GET = 0,
-    /// <summary> POST 表单 </summary>
-    POSTFORM = 1,
-    /// <summary> POST Json </summary>
-    POSTJSON = 2,
-    /// <summary> GET 获取图片 </summary>
-    Texture = 3
-}
-/// <summary>
-/// 请求数据
-/// </summary>
-public abstract class DataRequest {
-    /// <summary> Web请求地址 </summary>
-    public abstract string Url { get; }
-    /// <summary> Web请求类型 </summary>
-    public abstract WebRequestType RequestType { get; }
-    /// <summary> 提交json数据 </summary>
-    public virtual string Json { get; }
-    /// <summary> 提交Form表单数据 </summary>
-    public virtual WWWForm Form { get; }
-
-    /// <summary> Web请求结果处理 </summary>
-    public abstract void RequestResultHandle(bool isDone, DownloadHandler downloadHandler);
-}
-/// <summary>
-/// Get请求数据
-/// </summary>
-public class DataRequestGet : DataRequest {
-    public readonly string url;
-
-    public Action<string> OnError;
-    public Action<string> OnCallback;
-
-    public override string Url => url;
-    public override WebRequestType RequestType => WebRequestType.GET;
-
-    /// <summary> Web Get请求数据 </summary>
-    public DataRequestGet(string url, Action<string> OnCallback = null) {
-        this.url = url;
-        this.OnCallback = OnCallback;
-    }
-
-    public override void RequestResultHandle(bool isDone, DownloadHandler downloadHandler) {
-        if (!isDone) { OnError?.Invoke(downloadHandler.text); return; }
-        OnCallback?.Invoke(downloadHandler.text);
-    }
-}
-/// <summary>
-/// Post请求数据
-/// </summary>
-public class DataRequestPost : DataRequest {
-    public readonly string url;
-    public readonly string json;
-    public readonly WWWForm form;
-    public readonly WebRequestType type;
-
-    public Action<string> OnError;
-    public Action<string> OnCallback;
-
-    public override string Url => url;
-    public override WebRequestType RequestType => type;
-    public override string Json => json;
-    public override WWWForm Form => form;
-
-    /// <summary> Web Post请求 提交json数据 </summary>
-    public DataRequestPost(string url, string json, Action<string> OnCallback = null) {
-        this.url = url;
-        this.json = json;
-        this.OnCallback = OnCallback;
-        type = WebRequestType.POSTJSON;
-    }
-    /// <summary> Web Post请求 提交WWWForm数据 </summary>
-    public DataRequestPost(string url, WWWForm form, Action<string> OnCallback = null) {
-        this.url = url;
-        this.form = form;
-        this.OnCallback = OnCallback;
-        type = WebRequestType.POSTFORM;
-    }
-
-    public override void RequestResultHandle(bool isDone, DownloadHandler downloadHandler) {
-        if (!isDone) { OnError?.Invoke(downloadHandler.text); return; }
-        OnCallback?.Invoke(downloadHandler.text);
-    }
-}
-/// <summary>
-/// Get下载 Texture
-/// </summary>
-public class DataRequestTexture : DataRequest {
-    public readonly string url;
-
-    public Action<string> OnError;
-    public Action<Texture2D> OnCallback;
-
-    public override string Url => url;
-    public override WebRequestType RequestType => WebRequestType.Texture;
-
-    /// <summary> Web Get请求 Texture </summary>
-    public DataRequestTexture(string url, Action<Texture2D> OnCallback = null) {
-        this.url = url;
-        this.OnCallback = OnCallback;
-    }
-
-    public override void RequestResultHandle(bool isDone, DownloadHandler downloadHandler) {
-        if (!isDone) { OnError?.Invoke(downloadHandler.text); return; }
-        DownloadHandlerTexture dht = downloadHandler as DownloadHandlerTexture;
-        OnCallback?.Invoke(dht.texture);
-    }
-}