From 56672f2f14773fe2472362ec44843b9f6fc4d223 Mon Sep 17 00:00:00 2001 From: MuHua-123 <2960208585@qq.com> Date: Tue, 14 Jan 2025 21:19:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A1=86=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ModuleCore/ModuleAssets/ModuleAssets.cs | 5 +++-- Assets/ModuleCore/ModuleCore.cs | 10 ++++++++++ .../ModuleCore.cs.meta} | 2 +- .../ModuleUIControl/ModuleUIControl.cs | 6 ++++-- Assets/ModuleCoreUI/ModuleUIItem/ModuleUIItem.cs | 15 ++++++--------- Assets/ModuleCoreUI/ModuleUIPage/ModuleUIPage.cs | 7 ++++--- Assets/ModuleCoreUI/ModuleUIPage/UIGlobalPage.cs | 14 -------------- .../ModuleCoreUI/ModuleUIPanel/ModuleUIPanel.cs | 4 +++- .../ModuleCoreUI/ModuleUIPanel/UIGlobalPage.meta | 8 -------- .../ModuleCoreUI/ModuleUIWindow/ModuleUIWindow.cs | 10 ++++++++-- 10 files changed, 39 insertions(+), 42 deletions(-) create mode 100644 Assets/ModuleCore/ModuleCore.cs rename Assets/{ModuleCoreUI/ModuleUIPage/UIGlobalPage.cs.meta => ModuleCore/ModuleCore.cs.meta} (83%) delete mode 100644 Assets/ModuleCoreUI/ModuleUIPage/UIGlobalPage.cs delete mode 100644 Assets/ModuleCoreUI/ModuleUIPanel/UIGlobalPage.meta diff --git a/Assets/ModuleCore/ModuleAssets/ModuleAssets.cs b/Assets/ModuleCore/ModuleAssets/ModuleAssets.cs index dadf57c..9f19ff9 100644 --- a/Assets/ModuleCore/ModuleAssets/ModuleAssets.cs +++ b/Assets/ModuleCore/ModuleAssets/ModuleAssets.cs @@ -6,9 +6,10 @@ using UnityEngine; /// /// 资源模块 /// -public class ModuleAssets : Module> { - /// 数据列表 +public class ModuleAssets { protected List datas = new List(); + /// 核心模块 + protected virtual ModuleCore ModuleCore => ModuleCore.I; /// 更改事件 public virtual event Action OnChange; diff --git a/Assets/ModuleCore/ModuleCore.cs b/Assets/ModuleCore/ModuleCore.cs new file mode 100644 index 0000000..3b2ae4f --- /dev/null +++ b/Assets/ModuleCore/ModuleCore.cs @@ -0,0 +1,10 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 核心模块，实现业务逻辑 +/// +public class ModuleCore : Module { + +} diff --git a/Assets/ModuleCoreUI/ModuleUIPage/UIGlobalPage.cs.meta b/Assets/ModuleCore/ModuleCore.cs.meta similarity index 83% rename from Assets/ModuleCoreUI/ModuleUIPage/UIGlobalPage.cs.meta rename to Assets/ModuleCore/ModuleCore.cs.meta index c293cc2..9975d8c 100644 --- a/Assets/ModuleCoreUI/ModuleUIPage/UIGlobalPage.cs.meta +++ b/Assets/ModuleCore/ModuleCore.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6f0700aede140c44fb927acc112b9998 +guid: b61954fdf7766ae4eba3f4b79c307057 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ModuleCoreUI/ModuleUIControl/ModuleUIControl.cs b/Assets/ModuleCoreUI/ModuleUIControl/ModuleUIControl.cs index 02b41cc..3da2fc2 100644 --- a/Assets/ModuleCoreUI/ModuleUIControl/ModuleUIControl.cs +++ b/Assets/ModuleCoreUI/ModuleUIControl/ModuleUIControl.cs @@ -6,9 +6,11 @@ using UnityEngine.UIElements; /// /// UI控件 /// -public abstract class ModuleUIControl { +public class ModuleUIControl { + /// 核心模块 + protected virtual ModuleCore ModuleCore => ModuleCore.I; /// 绑定的元素 public readonly VisualElement element; - /// 基础实例 + /// UI控件 public ModuleUIControl(VisualElement element) => this.element = element; } diff --git a/Assets/ModuleCoreUI/ModuleUIItem/ModuleUIItem.cs b/Assets/ModuleCoreUI/ModuleUIItem/ModuleUIItem.cs index 5b7650f..b92ad88 100644 --- a/Assets/ModuleCoreUI/ModuleUIItem/ModuleUIItem.cs +++ b/Assets/ModuleCoreUI/ModuleUIItem/ModuleUIItem.cs @@ -7,19 +7,16 @@ using UnityEngine.UIElements; /// /// UI项 /// -public abstract class ModuleUIItem { +public abstract class ModuleUIItem : ModuleUIControl { /// 绑定的数据 public readonly Data value; - /// 绑定的元素 - public readonly VisualElement element; - /// 基础实例 - public ModuleUIItem(Data value, VisualElement element) { + /// UI项 + public ModuleUIItem(Data value, VisualElement element) : base(element) { this.value = value; - this.element = element; - OnSelect += UIItem_OnSelect; + OnSelect += UnitUIPanelItem_OnSelect; } /// 侦听选择事件 - public virtual void UIItem_OnSelect(Data obj) { + public virtual void UnitUIPanelItem_OnSelect(Data obj) { if (value.Equals(obj)) { SelectState(); } else { DefaultState(); } } @@ -35,5 +32,5 @@ public abstract class ModuleUIItem { /// 选中状态 public virtual void SelectState() { } /// 释放 - public virtual void Release() => OnSelect -= UIItem_OnSelect; + public virtual void Release() => OnSelect -= UnitUIPanelItem_OnSelect; } diff --git a/Assets/ModuleCoreUI/ModuleUIPage/ModuleUIPage.cs b/Assets/ModuleCoreUI/ModuleUIPage/ModuleUIPage.cs index 62c3ef8..a8b16e8 100644 --- a/Assets/ModuleCoreUI/ModuleUIPage/ModuleUIPage.cs +++ b/Assets/ModuleCoreUI/ModuleUIPage/ModuleUIPage.cs @@ -6,11 +6,12 @@ using UnityEngine.UIElements; /// /// UI页面 /// -public abstract class ModuleUIPage : ModuleSingle { - /// 文档 +public abstract class ModuleUIPage : 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元素 diff --git a/Assets/ModuleCoreUI/ModuleUIPage/UIGlobalPage.cs b/Assets/ModuleCoreUI/ModuleUIPage/UIGlobalPage.cs deleted file mode 100644 index 4e61f46..0000000 --- a/Assets/ModuleCoreUI/ModuleUIPage/UIGlobalPage.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class UIGlobalPage : ModuleUIPage { - protected override void Awake() { } - - private void Start() { - string url = "https://neiyihuizhouilabtest.zgfzjy.cn/api/client/color/categroies"; - DataRequestGet request = new DataRequestGet(url); - request.OnCallback = (obj) => { Debug.Log(obj); }; - WebRequest.Send(request); - } -} diff --git a/Assets/ModuleCoreUI/ModuleUIPanel/ModuleUIPanel.cs b/Assets/ModuleCoreUI/ModuleUIPanel/ModuleUIPanel.cs index dd4be82..5421d4c 100644 --- a/Assets/ModuleCoreUI/ModuleUIPanel/ModuleUIPanel.cs +++ b/Assets/ModuleCoreUI/ModuleUIPanel/ModuleUIPanel.cs @@ -9,7 +9,9 @@ using UnityEngine.UIElements; /// public abstract class ModuleUIPanel : MonoBehaviour { /// 绑定的页面 - public ModuleUIPage UIPage; + public ModuleUIPage ModuleUIPage; + /// 核心模块 + protected virtual ModuleCore ModuleCore => ModuleCore.I; /// 绑定的根元素 public abstract VisualElement Element { get; } } \ No newline at end of file diff --git a/Assets/ModuleCoreUI/ModuleUIPanel/UIGlobalPage.meta b/Assets/ModuleCoreUI/ModuleUIPanel/UIGlobalPage.meta deleted file mode 100644 index 6531580..0000000 --- a/Assets/ModuleCoreUI/ModuleUIPanel/UIGlobalPage.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2c6f02c8edd5f1241b53b0c7e538e84a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCoreUI/ModuleUIWindow/ModuleUIWindow.cs b/Assets/ModuleCoreUI/ModuleUIWindow/ModuleUIWindow.cs index 35693aa..cec789c 100644 --- a/Assets/ModuleCoreUI/ModuleUIWindow/ModuleUIWindow.cs +++ b/Assets/ModuleCoreUI/ModuleUIWindow/ModuleUIWindow.cs @@ -6,9 +6,15 @@ using UnityEngine.UIElements; /// /// UI窗口 /// -public abstract class ModuleUIWindow : ModuleSingle { +public abstract class ModuleUIWindow : MonoBehaviour { /// 绑定的页面 - public ModuleUIPage UIPage; + public ModuleUIPage ModuleUIPage; + /// 核心模块 + protected virtual ModuleCore ModuleCore => ModuleCore.I; /// 绑定的根元素 public abstract VisualElement Element { get; } + /// 打开窗口，并且传进参数 + public abstract void Open(Data data); + /// 关闭窗口 + public abstract void Close(); }