diff --git a/Assets/ModuleCore/ModuleAssets.meta b/Assets/ModuleCore/ModuleAssets.meta deleted file mode 100644 index 864bc85..0000000 --- a/Assets/ModuleCore/ModuleAssets.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 66fc15151bdec0642aa0d9f313f50e72 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCore/ModuleAssets/ModuleAssets.cs b/Assets/ModuleCore/ModuleAssets/ModuleAssets.cs deleted file mode 100644 index 1249f76..0000000 --- a/Assets/ModuleCore/ModuleAssets/ModuleAssets.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// 资源模块 -/// -public class ModuleAssets { - protected List datas = new List(); - /// 核心模块 - protected virtual ModuleCore ModuleCore => ModuleCore.I; - - /// 更改事件 - public virtual event Action OnChange; - /// 数据列表 - public virtual List Datas => datas; - /// 数据计数 - public virtual int Count => Datas.Count; - /// 数据计数 Datas[index]; - - /// 添加数据 - public virtual void Add(Data data) { Datas.Add(data); OnChange?.Invoke(); } - /// 添加数据 - public virtual void AddRange(IList data) { Datas.AddRange(data); OnChange?.Invoke(); } - /// 删除数据 - public virtual void Remove(Data data) { Datas.Remove(data); OnChange?.Invoke(); } - - /// 保存数据 - public virtual void Save() { throw new NotImplementedException(); } - /// 加载数据 - public virtual void Load() { throw new NotImplementedException(); } - - /// 循环列表 - public virtual void ForEach(Action action) => Datas.ForEach(action); -} -/// -/// 资源模块工具 -/// -public static class ModuleAssetsTool { - /// 头尾循环标准化索引 - public static Data LoopIndex(this ModuleAssets assets, int index) { - return assets[LoopIndex(index, assets.Count)]; - } - /// 头尾循环标准化索引 - public static Data LoopIndex(this List list, int index) { - return list[LoopIndex(index, list.Count)]; - } - /// 头尾循环标准化索引 - public static Data LoopIndex(this Data[] array, int index) { - return array[LoopIndex(index, array.Length)]; - } - /// 头尾循环标准化索引 - public static int LoopIndex(int index, int maxIndex) { - return index % maxIndex; - } -} \ No newline at end of file diff --git a/Assets/ModuleCore/ModuleCamera.meta b/Assets/ModuleCore/ModuleCamera.meta deleted file mode 100644 index cb520ab..0000000 --- a/Assets/ModuleCore/ModuleCamera.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e145339febf0e6f469eb3a650e52f3d9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCore/ModuleCamera/ModuleCamera.cs b/Assets/ModuleCore/ModuleCamera/ModuleCamera.cs deleted file mode 100644 index 11da97f..0000000 --- a/Assets/ModuleCore/ModuleCamera/ModuleCamera.cs +++ /dev/null @@ -1,85 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// 相机模块 -/// -public abstract class ModuleCamera : MonoBehaviour { - /// 默认图层遮罩 - public static readonly LayerMask DefaultLayerMask = ~(1 << 0) | 1 << 0; - /// 必须要初始化 - protected abstract void Awake(); - - /// 相机位置 - public abstract Vector3 Position { get; set; } - /// 相机旋转 - public abstract Vector3 EulerAngles { get; set; } - /// 相机视野 - public abstract float VisualField { get; set; } - /// 当前相机 - public abstract Camera ViewCamera { get; } - - /// 渲染纹理 - public virtual RenderTexture RenderTexture { get; } - /// 更新渲染纹理 - public virtual void UpdateRenderTexture(int x, int y) { } - - #region 坐标转换 - /// 屏幕坐标转换视图坐标(0-1) - public virtual Vector3 ScreenToViewPosition(Vector3 screenPosition) { - return ViewCamera.ScreenToViewportPoint(screenPosition); - } - /// 屏幕坐标转换世界坐标 - public virtual Vector3 ScreenToWorldPosition(Vector3 screenPosition) { - return ViewCamera.ScreenToWorldPoint(screenPosition); - } - /// 视图坐标(0-1)转换屏幕坐标 - public virtual Vector3 ViewToScreenPosition(Vector3 screenPosition) { - return ViewCamera.ViewportToScreenPoint(screenPosition); - } - /// 视图坐标(0-1)转换世界坐标 - public virtual Vector3 ViewToWorldPosition(Vector3 screenPosition) { - return ViewCamera.ViewportToWorldPoint(screenPosition); - } - /// 世界坐标转换屏幕坐标 - public virtual Vector3 WorldToScreenPosition(Vector3 screenPosition) { - return ViewCamera.WorldToScreenPoint(screenPosition); - } - /// 世界坐标转换视图坐标(0-1) - public virtual Vector3 WorldToViewPosition(Vector3 screenPosition) { - return ViewCamera.WorldToViewportPoint(screenPosition); - } - #endregion - - #region 射线检测 - private Ray ray; - private RaycastHit hitInfo; - /// 屏幕坐标获取世界对象 - public virtual bool ScreenToWorldObject(Vector3 screenPosition, out T value) where T : Object { - return ScreenToWorldObject(screenPosition, out value, DefaultLayerMask); - } - /// 屏幕坐标获取世界对象 - public virtual bool ScreenToWorldObject(Vector3 screenPosition, out T value, LayerMask planeLayerMask) where T : Object { - ray = ViewCamera.ScreenPointToRay(screenPosition); - Physics.Raycast(ray, out hitInfo, 200, planeLayerMask); - value = hitInfo.transform?.GetComponent(); - return value != null; - } - /// 屏幕坐标获取世界对象的父对象 - public virtual bool ScreenToWorldObjectParent(Vector3 screenPosition, out T value) where T : Object { - return ScreenToWorldObjectParent(screenPosition, out value, DefaultLayerMask); - } - /// 屏幕坐标获取世界对象的父对象 - public virtual bool ScreenToWorldObjectParent(Vector3 screenPosition, out T value, LayerMask planeLayerMask) where T : Object { - ray = ViewCamera.ScreenPointToRay(screenPosition); - Physics.Raycast(ray, out hitInfo, 200, planeLayerMask); - value = hitInfo.transform?.GetComponentInParent(); - return value != null; - } - #endregion - - protected virtual void Update() { - Debug.DrawRay(ray.origin, ray.direction * 10, Color.yellow); - } -} diff --git a/Assets/ModuleCore/ModuleCore.cs b/Assets/ModuleCore/ModuleCore.cs deleted file mode 100644 index 0c021f0..0000000 --- a/Assets/ModuleCore/ModuleCore.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// 核心模块，实现业务逻辑 -/// -public class ModuleCore : Module { - -} -/// -/// 模块基类 -/// -/// -public class Module where ModuleCore : Module, new() { - /// 模块单例 - public static ModuleCore I => Instantiate(); - - private static ModuleCore core; - private static ModuleCore Instantiate() => core == null ? core = new ModuleCore() : core; -} \ No newline at end of file diff --git a/Assets/ModuleCore/ModuleExecute.meta b/Assets/ModuleCore/ModuleExecute.meta deleted file mode 100644 index 4a78940..0000000 --- a/Assets/ModuleCore/ModuleExecute.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9939a58498acfda448d6f494f52e8da4 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCore/ModuleExecute/ExecuteWebRequest.cs b/Assets/ModuleCore/ModuleExecute/ExecuteWebRequest.cs deleted file mode 100644 index 7d1a791..0000000 --- a/Assets/ModuleCore/ModuleExecute/ExecuteWebRequest.cs +++ /dev/null @@ -1,182 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.Networking; -using System.Runtime.CompilerServices; -using System.Threading.Tasks; - -/// -/// Web请求执行模块 -/// -public class ExecuteWebRequest : ModuleExecute { - /// 发送请求 - public void Execute(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); - } -} -/// -/// Web请求执行模块工具 -/// -public static class ExecuteWebRequestTool { - public static TaskAwaiter GetAwaiter(this UnityWebRequestAsyncOperation op) { - var tcs = new TaskCompletionSource(); - op.completed += (obj) => { tcs.SetResult(null); }; - return tcs.Task.GetAwaiter(); - } -} -/// -/// Web请求类型 -/// -public enum WebRequestType { - /// GET - GET = 0, - /// POST 表单 - PostForm = 1, - /// POST Json - PostJson = 2, - /// GET 获取图片 - Texture = 3 -} -/// -/// 请求数据 -/// -public abstract class DataRequest { - /// Web请求地址 - public abstract string Url { get; } - /// Web请求类型 - public abstract WebRequestType RequestType { get; } - /// 提交json数据 - public virtual string Json { get; } - /// 提交Form表单数据 - public virtual WWWForm Form { get; } - - /// Web请求结果处理 - public abstract void RequestResultHandle(bool isDone, DownloadHandler downloadHandler); -} -/// -/// Get请求数据 -/// -public class DataRequestGet : DataRequest { - public readonly string url; - - public Action OnError; - public Action OnCallback; - - public override string Url => url; - public override WebRequestType RequestType => WebRequestType.GET; - - /// Web Get请求数据 - public DataRequestGet(string url, Action 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); - } -} -/// -/// Post请求数据 -/// -public class DataRequestPost : DataRequest { - public readonly string url; - public readonly string json; - public readonly WWWForm form; - public readonly WebRequestType type; - - public Action OnError; - public Action OnCallback; - - public override string Url => url; - public override WebRequestType RequestType => type; - public override string Json => json; - public override WWWForm Form => form; - - /// Web Post请求 提交json数据 - public DataRequestPost(string url, string json, Action OnCallback = null) { - this.url = url; - this.json = json; - this.OnCallback = OnCallback; - type = WebRequestType.PostJson; - } - /// Web Post请求 提交WWWForm数据 - public DataRequestPost(string url, WWWForm form, Action 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); - } -} -/// -/// Get下载 Texture -/// -public class DataRequestTexture : DataRequest { - public readonly string url; - - public Action OnError; - public Action OnCallback; - - public override string Url => url; - public override WebRequestType RequestType => WebRequestType.Texture; - - /// Web Get请求 Texture - public DataRequestTexture(string url, Action 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); - } -} \ No newline at end of file diff --git a/Assets/ModuleCore/ModuleExecute/ModuleExecute.cs b/Assets/ModuleCore/ModuleExecute/ModuleExecute.cs deleted file mode 100644 index a32bba9..0000000 --- a/Assets/ModuleCore/ModuleExecute/ModuleExecute.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// 执行模块 -/// -public interface ModuleExecute { - /// 执行 - public void Execute(Data data); -} diff --git a/Assets/ModuleCore/ModuleExecute/ModuleExecute.cs.meta b/Assets/ModuleCore/ModuleExecute/ModuleExecute.cs.meta deleted file mode 100644 index 36e32bb..0000000 --- a/Assets/ModuleCore/ModuleExecute/ModuleExecute.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4661df0b8dac9f640a09daa01cac9ea1 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCore/ModuleFixed.meta b/Assets/ModuleCore/ModuleFixed.meta deleted file mode 100644 index ff10e49..0000000 --- a/Assets/ModuleCore/ModuleFixed.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b0dab98b9033323428c3db1f2c7946c0 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCore/ModuleFixed/ModuleFixed.cs b/Assets/ModuleCore/ModuleFixed/ModuleFixed.cs deleted file mode 100644 index d2c0ec1..0000000 --- a/Assets/ModuleCore/ModuleFixed/ModuleFixed.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// 场景中的固定模块 -/// -public abstract class ModuleFixed : MonoBehaviour { - /// 核心模块 - protected virtual ModuleCore ModuleCore => ModuleCore.I; -} diff --git a/Assets/ModuleCore/ModuleFixed/ModuleFixed.cs.meta b/Assets/ModuleCore/ModuleFixed/ModuleFixed.cs.meta deleted file mode 100644 index 9b7a292..0000000 --- a/Assets/ModuleCore/ModuleFixed/ModuleFixed.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 529fed83b6e5fff43b7bdf3eca7dbd0e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCore/ModuleHandle.meta b/Assets/ModuleCore/ModuleHandle.meta deleted file mode 100644 index 11a74f8..0000000 --- a/Assets/ModuleCore/ModuleHandle.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ce17d4a855942e747b3a1a85af3fbf7b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCore/ModuleHandle/ModuleHandle.cs b/Assets/ModuleCore/ModuleHandle/ModuleHandle.cs deleted file mode 100644 index b30ad09..0000000 --- a/Assets/ModuleCore/ModuleHandle/ModuleHandle.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// 数据处理器模块 -/// -public class ModuleHandle { - /// 数据 - protected Data value; - - /// 当前数据 - public virtual Data Current => value; - /// 当前数据是否有效 - public virtual bool IsValid => Current != null; - - /// 改变当前数据 Event - public virtual event Action OnChange; - /// 改变当前数据 - public virtual void Change() => OnChange?.Invoke(value); - /// 改变当前数据 - public virtual void Change(Data value) { this.value = value; OnChange?.Invoke(value); } -} diff --git a/Assets/ModuleCore/ModuleHandle/ModuleHandle.cs.meta b/Assets/ModuleCore/ModuleHandle/ModuleHandle.cs.meta deleted file mode 100644 index 55d3b62..0000000 --- a/Assets/ModuleCore/ModuleHandle/ModuleHandle.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 73ab810e12f76f449ba3e6351467ebcb -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCore/ModulePrefab.meta b/Assets/ModuleCore/ModulePrefab.meta deleted file mode 100644 index 79655c9..0000000 --- a/Assets/ModuleCore/ModulePrefab.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b8989716a20d28b4180f6cceee0898f7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCore/ModulePrefab/ModulePrefab.cs b/Assets/ModuleCore/ModulePrefab/ModulePrefab.cs deleted file mode 100644 index a1f1843..0000000 --- a/Assets/ModuleCore/ModulePrefab/ModulePrefab.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// 预制件模块 -/// -public abstract class ModulePrefab : MonoBehaviour { - /// 关联的数据 - protected Data value; - - /// 关联的数据 - public virtual Data Value => value; - /// 更新可视化内容 - public virtual void UpdateVisual(Data value) => this.value = value; -} diff --git a/Assets/ModuleCore/ModulePrefab/ModulePrefab.cs.meta b/Assets/ModuleCore/ModulePrefab/ModulePrefab.cs.meta deleted file mode 100644 index 7b1e8b7..0000000 --- a/Assets/ModuleCore/ModulePrefab/ModulePrefab.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 84ffbf591cb4c0e4483f5c577ba37d68 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCore/ModuleSingle.meta b/Assets/ModuleCore/ModuleSingle.meta deleted file mode 100644 index 85ed934..0000000 --- a/Assets/ModuleCore/ModuleSingle.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fcb15023389a9c141b1b07fe53f06e5c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCore/ModuleSingle/ModuleSingle.cs b/Assets/ModuleCore/ModuleSingle/ModuleSingle.cs deleted file mode 100644 index 5457c05..0000000 --- a/Assets/ModuleCore/ModuleSingle/ModuleSingle.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// 单例模块 -/// -public abstract class ModuleSingle : MonoBehaviour where T : ModuleSingle { - /// 模块单例 - public static T I => instance; - /// 模块单例 - protected static T instance; - /// 核心模块 - protected virtual ModuleCore ModuleCore => ModuleCore.I; - /// 初始化 - protected abstract void Awake(); - - /// 替换 - protected virtual void Replace(bool isDontDestroy = true) { - if (instance != null) { Destroy(instance.gameObject); } - instance = (T)this; - if (isDontDestroy) { DontDestroyOnLoad(gameObject); } - } - /// 不替换 - protected virtual void NoReplace(bool isDontDestroy = true) { - if (isDontDestroy) { DontDestroyOnLoad(gameObject); } - if (instance == null) { instance = (T)this; } - else { Destroy(gameObject); } - } -} diff --git a/Assets/ModuleCore/ModuleSingle/ModuleSingle.cs.meta b/Assets/ModuleCore/ModuleSingle/ModuleSingle.cs.meta deleted file mode 100644 index 5f4cd9c..0000000 --- a/Assets/ModuleCore/ModuleSingle/ModuleSingle.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 121ca341c2100df4b94d707ed24452f5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCore/ModuleTools.meta b/Assets/ModuleCore/ModuleTools.meta deleted file mode 100644 index fe8d336..0000000 --- a/Assets/ModuleCore/ModuleTools.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3161d7f50e461bf4896cdd13d8b508be -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCore/ModuleTools/JsonTool.cs b/Assets/ModuleCore/ModuleTools/JsonTool.cs deleted file mode 100644 index db9b90e..0000000 --- a/Assets/ModuleCore/ModuleTools/JsonTool.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.IO; -using UnityEngine; - -/// json解析与保存 -public static class JsonTool { - /// 内部包装类 - private class Pack { public T data; } - /// 把对象转换为Json字符串 - /// 对象 - public static string ToJson(T obj) { - if (obj == null) return "null"; - if (obj.GetType().GetInterface("IList") != null) { - Pack pack = new Pack(); - pack.data = obj; - string json = JsonUtility.ToJson(pack); - return json.Substring(8, json.Length - 9); - } - return JsonUtility.ToJson(obj); - } - /// 解析Json - /// 类型 - /// Json字符串 - public static T FromJson(string json) { - if (json == "null" && typeof(T).IsClass) return default(T); - if (typeof(T).GetInterface("IList") != null) { - json = "{\"data\":{data}}".Replace("{data}", json); - Pack Pack = JsonUtility.FromJson>(json); - return Pack.data; - } - return JsonUtility.FromJson(json); - } -} diff --git a/Assets/ModuleCore/ModuleTools/JsonTool.cs.meta b/Assets/ModuleCore/ModuleTools/JsonTool.cs.meta deleted file mode 100644 index 3f21419..0000000 --- a/Assets/ModuleCore/ModuleTools/JsonTool.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 007e3acdca87e1b49b38f504938206cb -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCore/ModuleTools/LayerMaskTool.cs b/Assets/ModuleCore/ModuleTools/LayerMaskTool.cs deleted file mode 100644 index 764124f..0000000 --- a/Assets/ModuleCore/ModuleTools/LayerMaskTool.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// 图层遮罩工具 -/// -public static class LayerMaskTool { - ///// 板片 - //public static readonly LayerMask Plate = 1 << LayerMask.NameToLayer("Plate"); - ///// 形状 - //public static readonly LayerMask Shape = 1 << LayerMask.NameToLayer("Shape"); - ///// 安排点 - //public static readonly LayerMask Arrange = 1 << LayerMask.NameToLayer("Arrange"); - ///// 模特 - //public static readonly LayerMask Model = 1 << LayerMask.NameToLayer("Model"); -} diff --git a/Assets/ModuleCore/ModuleTools/LayerMaskTool.cs.meta b/Assets/ModuleCore/ModuleTools/LayerMaskTool.cs.meta deleted file mode 100644 index becfc83..0000000 --- a/Assets/ModuleCore/ModuleTools/LayerMaskTool.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d32659481db1a124c9b564f885ee75a8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCore/ModuleVisual.meta b/Assets/ModuleCore/ModuleVisual.meta deleted file mode 100644 index 8bad160..0000000 --- a/Assets/ModuleCore/ModuleVisual.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6f35188dbbe4cee4b823e88d78deef5a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCore/ModuleVisual/ModuleVisual.cs b/Assets/ModuleCore/ModuleVisual/ModuleVisual.cs deleted file mode 100644 index 47d9b0f..0000000 --- a/Assets/ModuleCore/ModuleVisual/ModuleVisual.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// 生成可视化内容模块 -/// -public interface ModuleVisual { - /// 更新可视化内容 - public void UpdateVisual(Data data); - /// 释放可视化内容 - public void ReleaseVisual(Data data); -} -/// -/// 生成可视化内容模块工具 -/// -public static class VisualTool { - /// 创建可视化内容 - public static void Create(ref T value, Transform original, Transform parent) { - if (value != null) { return; } - Transform temp = CreateTransform(original, parent); - value = temp.GetComponent(); - } - /// 创建Transform - public static Transform CreateTransform(Transform original, Transform parent) { - Transform temp = Transform.Instantiate(original, parent); - temp.gameObject.SetActive(true); - return temp; - } -} \ No newline at end of file diff --git a/Assets/ModuleCore/ModuleVisual/ModuleVisual.cs.meta b/Assets/ModuleCore/ModuleVisual/ModuleVisual.cs.meta deleted file mode 100644 index bb9c1a5..0000000 --- a/Assets/ModuleCore/ModuleVisual/ModuleVisual.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1681bcfa66dacbd4e810d15939fa7e04 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCoreUI/ModuleDocument.meta b/Assets/ModuleCoreUI/ModuleDocument.meta deleted file mode 100644 index 6bb1318..0000000 --- a/Assets/ModuleCoreUI/ModuleDocument.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1dd7861df30473e4380411dd72fc32c3 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCoreUI/ModuleDocument/ModuleDocument.cs b/Assets/ModuleCoreUI/ModuleDocument/ModuleDocument.cs deleted file mode 100644 index b0bab41..0000000 --- a/Assets/ModuleCoreUI/ModuleDocument/ModuleDocument.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UIElements; - -/// -/// 文档模块 -/// -public abstract class ModuleDocument : MonoBehaviour { - /// 绑定文档 - public UIDocument document; - /// 根目录文档 - public VisualElement root => document.rootVisualElement; - /// 核心模块 - protected virtual ModuleCore ModuleCore => ModuleCore.I; - /// 添加UI元素 - public void Add(VisualElement child) => root.Add(child); - /// 查询UI元素 - public T Q(string name = null, string className = null) where T : VisualElement => root.Q(name, className); -} diff --git a/Assets/ModuleCoreUI/ModuleDocument/ModuleDocument.cs.meta b/Assets/ModuleCoreUI/ModuleDocument/ModuleDocument.cs.meta deleted file mode 100644 index efb6678..0000000 --- a/Assets/ModuleCoreUI/ModuleDocument/ModuleDocument.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e65ff460c221dd142a18c295f562ac80 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCoreUI/ModuleUIItem.meta b/Assets/ModuleCoreUI/ModuleUIItem.meta deleted file mode 100644 index f0af745..0000000 --- a/Assets/ModuleCoreUI/ModuleUIItem.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5213b7240a67ca7489050d7d0bc8a935 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCoreUI/ModuleUIItem/ModuleUIItem.cs b/Assets/ModuleCoreUI/ModuleUIItem/ModuleUIItem.cs deleted file mode 100644 index c620463..0000000 --- a/Assets/ModuleCoreUI/ModuleUIItem/ModuleUIItem.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UIElements; - -/// -/// UI项 -/// -public abstract class ModuleUIItem : ModuleUIPanel { - /// 绑定的数据 - public readonly Data value; - /// UI项 - public ModuleUIItem(Data value, VisualElement element) : base(element) { - this.value = value; - OnSelect += UnitUIPanelItem_OnSelect; - } - /// 侦听选择事件 - public virtual void UnitUIPanelItem_OnSelect(Data obj) { - if (value.Equals(obj)) { SelectState(); } - else { DefaultState(); } - } - - /// 选择事件 - public static event Action OnSelect; - /// 触发事件 - public static void Select(Data data) => OnSelect?.Invoke(data); - /// 触发选择事件 - public virtual void Select() => OnSelect?.Invoke(value); - /// 默认状态 - public virtual void DefaultState() { } - /// 选中状态 - public virtual void SelectState() { } - /// 释放 - public virtual void Release() => OnSelect -= UnitUIPanelItem_OnSelect; -} diff --git a/Assets/ModuleCoreUI/ModuleUIItem/ModuleUIItem.cs.meta b/Assets/ModuleCoreUI/ModuleUIItem/ModuleUIItem.cs.meta deleted file mode 100644 index 61c2fe4..0000000 --- a/Assets/ModuleCoreUI/ModuleUIItem/ModuleUIItem.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6b31786a09cb95646a3068a93ad21834 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCoreUI/ModuleUIPage.meta b/Assets/ModuleCoreUI/ModuleUIPage.meta deleted file mode 100644 index d19d61b..0000000 --- a/Assets/ModuleCoreUI/ModuleUIPage.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b27b5ad3c5e2b1f4bb02957f1388fc49 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCoreUI/ModuleUIPage/ModuleUIPage.cs b/Assets/ModuleCoreUI/ModuleUIPage/ModuleUIPage.cs deleted file mode 100644 index b57a338..0000000 --- a/Assets/ModuleCoreUI/ModuleUIPage/ModuleUIPage.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UIElements; - -/// -/// UI页面 -/// -public abstract class ModuleUIPage : MonoBehaviour { - /// 绑定的页面 - public ModuleDocument document; - /// 核心模块 - protected virtual ModuleCore ModuleCore => ModuleCore.I; - /// 绑定的根元素 - public abstract VisualElement Element { get; } -} \ No newline at end of file diff --git a/Assets/ModuleCoreUI/ModuleUIPage/ModuleUIPage.cs.meta b/Assets/ModuleCoreUI/ModuleUIPage/ModuleUIPage.cs.meta deleted file mode 100644 index 6f62e5f..0000000 --- a/Assets/ModuleCoreUI/ModuleUIPage/ModuleUIPage.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 111d6ab3c7a28a2449502de7f9804ca3 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCoreUI/ModuleUIPanel.meta b/Assets/ModuleCoreUI/ModuleUIPanel.meta deleted file mode 100644 index 5fbbc06..0000000 --- a/Assets/ModuleCoreUI/ModuleUIPanel.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 13ff0e5edf2a0e74098836968a2ea47e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCoreUI/ModuleUIPanel/ModuleUIPanel.cs b/Assets/ModuleCoreUI/ModuleUIPanel/ModuleUIPanel.cs deleted file mode 100644 index 2ec7db9..0000000 --- a/Assets/ModuleCoreUI/ModuleUIPanel/ModuleUIPanel.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UIElements; - -/// -/// UI控件 -/// -public class ModuleUIPanel { - /// 核心模块 - protected virtual ModuleCore ModuleCore => ModuleCore.I; - /// 绑定的元素 - public readonly VisualElement element; - /// UI控件 - public ModuleUIPanel(VisualElement element) => this.element = element; -} diff --git a/Assets/ModuleCoreUI/ModuleUIPanel/ModuleUIPanel.cs.meta b/Assets/ModuleCoreUI/ModuleUIPanel/ModuleUIPanel.cs.meta deleted file mode 100644 index 7d08ff9..0000000 --- a/Assets/ModuleCoreUI/ModuleUIPanel/ModuleUIPanel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9585f762b800e57488473c776cc49fa5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleData.meta b/Assets/ModuleTest.meta similarity index 100% rename from Assets/ModuleData.meta rename to Assets/ModuleTest.meta diff --git a/Assets/Test/TestUI.cs b/Assets/ModuleTest/TestUI.cs similarity index 100% rename from Assets/Test/TestUI.cs rename to Assets/ModuleTest/TestUI.cs diff --git a/Assets/Test/TestUI.cs.meta b/Assets/ModuleTest/TestUI.cs.meta similarity index 100% rename from Assets/Test/TestUI.cs.meta rename to Assets/ModuleTest/TestUI.cs.meta diff --git a/Assets/Test/TestUI.uxml b/Assets/ModuleTest/TestUI.uxml similarity index 100% rename from Assets/Test/TestUI.uxml rename to Assets/ModuleTest/TestUI.uxml diff --git a/Assets/Test/TestUI.uxml.meta b/Assets/ModuleTest/TestUI.uxml.meta similarity index 100% rename from Assets/Test/TestUI.uxml.meta rename to Assets/ModuleTest/TestUI.uxml.meta diff --git a/Assets/FontLibrary/TMP/SourceHanSansCN-Medium SDF.asset b/Assets/MuHua/UITool/FontLibrary/SourceHanSansCN-Medium SDF.asset similarity index 100% rename from Assets/FontLibrary/TMP/SourceHanSansCN-Medium SDF.asset rename to Assets/MuHua/UITool/FontLibrary/SourceHanSansCN-Medium SDF.asset diff --git a/Assets/FontLibrary/TMP/SourceHanSansCN-Medium SDF.asset.meta b/Assets/MuHua/UITool/FontLibrary/SourceHanSansCN-Medium SDF.asset.meta similarity index 100% rename from Assets/FontLibrary/TMP/SourceHanSansCN-Medium SDF.asset.meta rename to Assets/MuHua/UITool/FontLibrary/SourceHanSansCN-Medium SDF.asset.meta diff --git a/Assets/Test.meta b/Assets/Test.meta deleted file mode 100644 index 06ffcb9..0000000 --- a/Assets/Test.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 255179b9440614542b26d46561680a31 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/Character/Runtime/Character/Character.cs b/Packages/Character/Runtime/Character/Character.cs index b90739a..f987f83 100644 --- a/Packages/Character/Runtime/Character/Character.cs +++ b/Packages/Character/Runtime/Character/Character.cs @@ -2,17 +2,18 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class Character : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } +namespace MuHua { + public abstract class Character : MonoBehaviour { - // Update is called once per frame - void Update() - { - + public Movement movement; // 运动控制器 + public Animator animator; // 动画控制器 + + /// 更新移动 + public abstract bool UpdateMove(Vector3 position); + + /// 动画触发 + public abstract void AnimationTrigger(string value); + /// 动画结束 + public abstract void AnimationEnd(); } -} +} \ No newline at end of file diff --git a/Assets/FontLibrary.meta b/Packages/Character/Runtime/Character/FSM.meta similarity index 77% rename from Assets/FontLibrary.meta rename to Packages/Character/Runtime/Character/FSM.meta index 03ab75e..84a9592 100644 --- a/Assets/FontLibrary.meta +++ b/Packages/Character/Runtime/Character/FSM.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c045b08c6480e344493104ad36e0db40 +guid: 91660569267b53545ab6e688c384eae2 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Packages/FSM/Runtime/Machine.cs b/Packages/Character/Runtime/Character/FSM/Machine.cs similarity index 55% rename from Packages/FSM/Runtime/Machine.cs rename to Packages/Character/Runtime/Character/FSM/Machine.cs index bd71c50..1e76e7f 100644 --- a/Packages/FSM/Runtime/Machine.cs +++ b/Packages/Character/Runtime/Character/FSM/Machine.cs @@ -2,36 +2,40 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -namespace MuHua -{ - public abstract class Machine : MonoBehaviour - { +namespace MuHua { + /// + /// 有限状态机 + /// + public abstract class Machine : Character { protected MachineState currentState; protected Dictionary states = new Dictionary(); protected virtual void Start() => InitializeStates(); - protected virtual void Update() => currentState?.Update(); + #region 状态机功能 protected abstract void InitializeStates(); - - protected virtual void RegisterState(string stateType, MachineState state) - { + protected virtual void RegisterState(string stateType, MachineState state) { if (!states.ContainsKey(stateType)) { states.Add(stateType, state); } } - - public virtual void ChangeState(string stateType) - { - if (states.ContainsKey(stateType)) - { + public virtual void ChangeState(string stateType) { + if (states.ContainsKey(stateType)) { currentState?.Exit(); currentState = states[stateType]; currentState.Enter(); } - else - { + else { Debug.LogWarning($"State {stateType} is not registered."); } } + #endregion + + public override bool UpdateMove(Vector3 position) { + return movement.UpdateMove(position); + } + public override void AnimationTrigger(string value) { + throw new System.NotImplementedException(); + } + public override void AnimationEnd() => currentState?.Trigger(); } -} +} \ No newline at end of file diff --git a/Packages/FSM/Runtime/Machine.cs.meta b/Packages/Character/Runtime/Character/FSM/Machine.cs.meta similarity index 100% rename from Packages/FSM/Runtime/Machine.cs.meta rename to Packages/Character/Runtime/Character/FSM/Machine.cs.meta diff --git a/Packages/Character/Runtime/Character/FSM/MachineState.cs b/Packages/Character/Runtime/Character/FSM/MachineState.cs new file mode 100644 index 0000000..f301b9a --- /dev/null +++ b/Packages/Character/Runtime/Character/FSM/MachineState.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace MuHua { + /// + /// 状态接口 + /// + public abstract class MachineState { + protected readonly Machine machine; + + public MachineState(Machine machine) => this.machine = machine; + + /// 进入状态 + public abstract void Enter(); + /// 更新状态 + public abstract void Update(); + /// 退出状态 + public abstract void Exit(); + /// 触发状态 + public abstract void Trigger(); + } +} \ No newline at end of file diff --git a/Packages/FSM/Runtime/MachineState.cs.meta b/Packages/Character/Runtime/Character/FSM/MachineState.cs.meta similarity index 100% rename from Packages/FSM/Runtime/MachineState.cs.meta rename to Packages/Character/Runtime/Character/FSM/MachineState.cs.meta diff --git a/Packages/Character/Runtime/Character/PlayerController.cs b/Packages/Character/Runtime/Character/PlayerController.cs new file mode 100644 index 0000000..407d80b --- /dev/null +++ b/Packages/Character/Runtime/Character/PlayerController.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace MuHua { + public class PlayerController : Character { + public override bool UpdateMove(Vector3 position) { + return movement.UpdateMove(position); + } + + public override void AnimationTrigger(string value) { + throw new System.NotImplementedException(); + } + public override void AnimationEnd() { + throw new System.NotImplementedException(); + } + } +} \ No newline at end of file diff --git a/Assets/ModuleCore/ModuleAssets/ModuleAssets.cs.meta b/Packages/Character/Runtime/Character/PlayerController.cs.meta similarity index 83% rename from Assets/ModuleCore/ModuleAssets/ModuleAssets.cs.meta rename to Packages/Character/Runtime/Character/PlayerController.cs.meta index 4d4cc93..ce278f9 100644 --- a/Assets/ModuleCore/ModuleAssets/ModuleAssets.cs.meta +++ b/Packages/Character/Runtime/Character/PlayerController.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 96fa067856f57984e975772061a248ca +guid: 73bafdf07b08fc246ab173a5e555629e MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/FontLibrary/Fonts.meta b/Packages/Character/Runtime/EffectsLaunch.meta similarity index 77% rename from Assets/FontLibrary/Fonts.meta rename to Packages/Character/Runtime/EffectsLaunch.meta index 68f49f8..1b6e720 100644 --- a/Assets/FontLibrary/Fonts.meta +++ b/Packages/Character/Runtime/EffectsLaunch.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 060f769c3cafe9443afbe1ad7dca0ed3 +guid: 7cd21ba4756d406468a37fe882d097ae folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Packages/Character/Runtime/EffectsLaunch/EffectsLaunch.cs b/Packages/Character/Runtime/EffectsLaunch/EffectsLaunch.cs new file mode 100644 index 0000000..a0ce196 --- /dev/null +++ b/Packages/Character/Runtime/EffectsLaunch/EffectsLaunch.cs @@ -0,0 +1,9 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace MuHua { + public abstract class EffectsLaunch : MonoBehaviour { + + } +} \ No newline at end of file diff --git a/Assets/ModuleCore/ModuleCamera/ModuleCamera.cs.meta b/Packages/Character/Runtime/EffectsLaunch/EffectsLaunch.cs.meta similarity index 83% rename from Assets/ModuleCore/ModuleCamera/ModuleCamera.cs.meta rename to Packages/Character/Runtime/EffectsLaunch/EffectsLaunch.cs.meta index ff5bffd..759864a 100644 --- a/Assets/ModuleCore/ModuleCamera/ModuleCamera.cs.meta +++ b/Packages/Character/Runtime/EffectsLaunch/EffectsLaunch.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8f795d0a53fb35641be9b8bc9aab0f58 +guid: 36eaafdfeb2c4f44f82504e36afe1cda MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/FontLibrary/TMP.meta b/Packages/Character/Runtime/Movement.meta similarity index 77% rename from Assets/FontLibrary/TMP.meta rename to Packages/Character/Runtime/Movement.meta index ab0fca1..3c2befd 100644 --- a/Assets/FontLibrary/TMP.meta +++ b/Packages/Character/Runtime/Movement.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cef6cef9eda7f6340ac1cea1203e223a +guid: a359f8431aa19b846b623d9dd066bae3 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Packages/Character/Runtime/Movement/Movement.cs b/Packages/Character/Runtime/Movement/Movement.cs new file mode 100644 index 0000000..518b1e1 --- /dev/null +++ b/Packages/Character/Runtime/Movement/Movement.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace MuHua { + /// + /// 运动控制器 + /// + public abstract class Movement : MonoBehaviour { + public float moveSpeed = 5.0f; // 最大移动速度 + public float acceleration = 20.0f; // 加速度 + public float currentSpeed = 0.0f; // 当前速度 + public Vector3 front; // 面向 + + public abstract bool UpdateMove(Vector3 position); + public abstract Vector3 RandomTargetPosition(); + public abstract void StopMoving(); + } +} \ No newline at end of file diff --git a/Assets/ModuleCore/ModuleCore.cs.meta b/Packages/Character/Runtime/Movement/Movement.cs.meta similarity index 83% rename from Assets/ModuleCore/ModuleCore.cs.meta rename to Packages/Character/Runtime/Movement/Movement.cs.meta index 9975d8c..7629f89 100644 --- a/Assets/ModuleCore/ModuleCore.cs.meta +++ b/Packages/Character/Runtime/Movement/Movement.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b61954fdf7766ae4eba3f4b79c307057 +guid: d034bee659058394d8641aad1f9e7023 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Packages/Character/Runtime/Movement/MovementNavigation.cs b/Packages/Character/Runtime/Movement/MovementNavigation.cs new file mode 100644 index 0000000..c089eef --- /dev/null +++ b/Packages/Character/Runtime/Movement/MovementNavigation.cs @@ -0,0 +1,17 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace MuHua { + public class MovementNavigation : MonoBehaviour { + // Start is called before the first frame update + void Start() { + + } + + // Update is called once per frame + void Update() { + + } + } +} diff --git a/Assets/ModuleCore/ModuleExecute/ExecuteWebRequest.cs.meta b/Packages/Character/Runtime/Movement/MovementNavigation.cs.meta similarity index 83% rename from Assets/ModuleCore/ModuleExecute/ExecuteWebRequest.cs.meta rename to Packages/Character/Runtime/Movement/MovementNavigation.cs.meta index 8656657..244ea81 100644 --- a/Assets/ModuleCore/ModuleExecute/ExecuteWebRequest.cs.meta +++ b/Packages/Character/Runtime/Movement/MovementNavigation.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 031fdf250828c30419ed1a945eb538f8 +guid: 9eb06e286a5289a439f220c0a3656568 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Packages/Character/Runtime/Movement/MovementStandard.cs b/Packages/Character/Runtime/Movement/MovementStandard.cs new file mode 100644 index 0000000..630c2c4 --- /dev/null +++ b/Packages/Character/Runtime/Movement/MovementStandard.cs @@ -0,0 +1,52 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace MuHua { + /// + /// 标准运动实现 + /// + public class MovementStandard : Movement { + public override bool UpdateMove(Vector3 position) { + // 计算相对于世界坐标系的移动方向 + Vector3 moveDirection = (position - transform.position).normalized; + float distance = Vector3.Distance(transform.position, position); + + // 平滑加速和减速 + currentSpeed = distance > 0.2f + ? Mathf.MoveTowards(currentSpeed, moveSpeed, acceleration * Time.deltaTime) + : Mathf.MoveTowards(currentSpeed, 0, acceleration * Time.deltaTime); + + // 移动玩家 + transform.Translate(moveDirection * currentSpeed * Time.deltaTime, Space.World); + + // 如果有移动输入，则更新玩家的朝向 + if (distance != 0) { + Quaternion toRotation = Quaternion.LookRotation(moveDirection, Vector3.up); + transform.rotation = Quaternion.RotateTowards(transform.rotation, toRotation, moveSpeed * Time.deltaTime * 100); + } + + // 计算转向向量 + Vector3 localMoveDirection = transform.InverseTransformDirection(moveDirection * currentSpeed); + localMoveDirection = localMoveDirection.normalized; + // 对localMoveDirection的x和z进行分类处理 + float moveX = Convert.ToInt32(localMoveDirection.x); + float moveZ = Convert.ToInt32(localMoveDirection.z); + front = new Vector3(moveX, 0, moveZ); + + // 如果到达目标位置，返回 true + distance = Vector3.Distance(transform.position, position); + + return distance < 0.05f; + } + public override Vector3 RandomTargetPosition() { + float randomX = UnityEngine.Random.Range(-10.0f, 10.0f); + float randomZ = UnityEngine.Random.Range(-10.0f, 10.0f); + return transform.position + new Vector3(randomX, 0, randomZ); + } + public override void StopMoving() { + currentSpeed = 0; + } + } +} \ No newline at end of file diff --git a/Packages/Character/Runtime/Movement/MovementStandard.cs.meta b/Packages/Character/Runtime/Movement/MovementStandard.cs.meta new file mode 100644 index 0000000..eedfa82 --- /dev/null +++ b/Packages/Character/Runtime/Movement/MovementStandard.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 699b617ae51a79a4390529e4e03405a2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/Character/Runtime/MuHua.Character.asmdef b/Packages/Character/Runtime/MuHua.Character.asmdef new file mode 100644 index 0000000..0de2626 --- /dev/null +++ b/Packages/Character/Runtime/MuHua.Character.asmdef @@ -0,0 +1,3 @@ +{ + "name": "MuHua.Character" +} diff --git a/Packages/FSM/Runtime/MuHua.FSM.asmdef.meta b/Packages/Character/Runtime/MuHua.Character.asmdef.meta similarity index 76% rename from Packages/FSM/Runtime/MuHua.FSM.asmdef.meta rename to Packages/Character/Runtime/MuHua.Character.asmdef.meta index ed802f3..c4b9a2b 100644 --- a/Packages/FSM/Runtime/MuHua.FSM.asmdef.meta +++ b/Packages/Character/Runtime/MuHua.Character.asmdef.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 856a56044e2bfce4dbc2d22bfb5a926f +guid: f71c71a343ef5c8459a9f7773cc07460 AssemblyDefinitionImporter: externalObjects: {} userData: diff --git a/Assets/FontLibrary/UIToolkit.meta b/Packages/Character/Runtime/VisualField.meta similarity index 77% rename from Assets/FontLibrary/UIToolkit.meta rename to Packages/Character/Runtime/VisualField.meta index 69187ab..222698d 100644 --- a/Assets/FontLibrary/UIToolkit.meta +++ b/Packages/Character/Runtime/VisualField.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 486ec7d219c795b4f82614d02f4e8e58 +guid: 1c84ca502025179419c2b8afb29080aa folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Packages/Character/Runtime/VisualField/VisualField.cs b/Packages/Character/Runtime/VisualField/VisualField.cs new file mode 100644 index 0000000..061f566 --- /dev/null +++ b/Packages/Character/Runtime/VisualField/VisualField.cs @@ -0,0 +1,9 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace MuHua { + public abstract class VisualField : MonoBehaviour { + + } +} diff --git a/Packages/Character/Runtime/VisualField/VisualField.cs.meta b/Packages/Character/Runtime/VisualField/VisualField.cs.meta new file mode 100644 index 0000000..9c3824c --- /dev/null +++ b/Packages/Character/Runtime/VisualField/VisualField.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e4d36e9e525a8a7429e5a7d9edf17cb2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/Character/Runtime/VisualField/VisualFieldStandard.cs b/Packages/Character/Runtime/VisualField/VisualFieldStandard.cs new file mode 100644 index 0000000..810c30c --- /dev/null +++ b/Packages/Character/Runtime/VisualField/VisualFieldStandard.cs @@ -0,0 +1,9 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace MuHua { + public abstract class VisualFieldStandard : VisualField { + + } +} diff --git a/Packages/Character/Runtime/VisualField/VisualFieldStandard.cs.meta b/Packages/Character/Runtime/VisualField/VisualFieldStandard.cs.meta new file mode 100644 index 0000000..9eb293a --- /dev/null +++ b/Packages/Character/Runtime/VisualField/VisualFieldStandard.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3595d54d26ddd5c47b4d4a3025935ecb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/FSM/Runtime.meta b/Packages/FSM/Runtime.meta deleted file mode 100644 index 37f4728..0000000 --- a/Packages/FSM/Runtime.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: abc53960d2470184c807cea21744653e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/FSM/Runtime/MachineState.cs b/Packages/FSM/Runtime/MachineState.cs deleted file mode 100644 index da756de..0000000 --- a/Packages/FSM/Runtime/MachineState.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -namespace MuHua -{ - public abstract class MachineState - { - protected Machine machine; - - public MachineState(Machine machine) => this.machine = machine; - - public abstract void Enter(); - public abstract void Update(); - public abstract void Exit(); - } -} \ No newline at end of file diff --git a/Packages/FSM/Runtime/MuHua.FSM.asmdef b/Packages/FSM/Runtime/MuHua.FSM.asmdef deleted file mode 100644 index 15dc4ca..0000000 --- a/Packages/FSM/Runtime/MuHua.FSM.asmdef +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "MuHua.FSM", - "rootNamespace": "", - "references": [], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Packages/FSM/Samples.meta b/Packages/FSM/Samples.meta deleted file mode 100644 index b8cc497..0000000 --- a/Packages/FSM/Samples.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3e92c6f04caccae40bb8e24b5307132d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/FSM/package.json b/Packages/FSM/package.json deleted file mode 100644 index 836426f..0000000 --- a/Packages/FSM/package.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "muhua-fsm", - "version": "1.0.0", - "displayName": "MuHua FSM", - "description": "FiniteStateMachine\u6709\u9650\u72b6\u6001\u673a\u6846\u67b6", - "author": { - "name": "MuHua", - "email": "muhua233@qq.com" - }, - "type": "tool", - "samples": [ - { - "displayName": "示例", - "description": "", - "path": "Samples" - } - ] -} \ No newline at end of file diff --git a/Packages/FSM/package.json.meta b/Packages/FSM/package.json.meta deleted file mode 100644 index 72791a8..0000000 --- a/Packages/FSM/package.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ab0f2027431743d43afe689084dcd33c -PackageManifestImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/LabelFollow/Samples/Sample.unitypackage.meta b/Packages/UITool/Samples/Outline.unitypackage.meta similarity index 74% rename from Packages/LabelFollow/Samples/Sample.unitypackage.meta rename to Packages/UITool/Samples/Outline.unitypackage.meta index 2ad091d..e7c29ab 100644 --- a/Packages/LabelFollow/Samples/Sample.unitypackage.meta +++ b/Packages/UITool/Samples/Outline.unitypackage.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 004a039923c4e3845b77cdbaae4fae09 +guid: 1a2850bc9ac8725479e46f5d43a2304c DefaultImporter: externalObjects: {} userData: diff --git a/Packages/UITool/Samples/Sample.unitypackage.meta b/Packages/UITool/Samples/Sample.unitypackage.meta deleted file mode 100644 index 6eb7b31..0000000 --- a/Packages/UITool/Samples/Sample.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f76a1c2d2c424dd4a9bbb9ddf5f95eb9 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 29ba02c..7bdffc9 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -221,12 +221,6 @@ "source": "embedded", "dependencies": {} }, - "muhua-fsm": { - "version": "file:FSM", - "depth": 0, - "source": "embedded", - "dependencies": {} - }, "muhua-label-follow": { "version": "file:LabelFollow", "depth": 0,