From 27aed5f68428f9cc456df7bc1d0091105de09019 Mon Sep 17 00:00:00 2001 From: MuHua-123 <136542559+MuHua-123@users.noreply.github.com> Date: Mon, 10 Feb 2025 09:29:30 +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 --- ...duleUIControl.meta => ModuleDocument.meta} | 2 +- .../ModuleDocument/ModuleDocument.cs | 20 +++++++++++++++++++ .../ModuleDocument.cs.meta} | 2 +- .../ModuleUIControl/ModuleUIControl.cs | 16 --------------- .../ModuleUIControl/ModuleUIControl.cs.meta | 11 ---------- .../ModuleCoreUI/ModuleUIItem/ModuleUIItem.cs | 2 +- Assets/ModuleCoreUI/ModuleUIPage.meta | 2 +- .../ModuleCoreUI/ModuleUIPage/ModuleUIPage.cs | 14 ++++++------- .../ModuleUIPage/ModuleUIPage.cs.meta | 2 +- .../ModuleUIPanel/ModuleUIPanel.cs | 15 +++++++------- .../ModuleUIPanel/ModuleUIPanel.cs.meta | 2 +- Assets/ModuleCoreUI/ModuleUIWindow.meta | 8 -------- .../ModuleUIWindow/ModuleUIWindow.cs | 20 ------------------- 13 files changed, 39 insertions(+), 77 deletions(-) rename Assets/ModuleCoreUI/{ModuleUIControl.meta => ModuleDocument.meta} (77%) create mode 100644 Assets/ModuleCoreUI/ModuleDocument/ModuleDocument.cs rename Assets/ModuleCoreUI/{ModuleUIWindow/ModuleUIWindow.cs.meta => ModuleDocument/ModuleDocument.cs.meta} (83%) delete mode 100644 Assets/ModuleCoreUI/ModuleUIControl/ModuleUIControl.cs delete mode 100644 Assets/ModuleCoreUI/ModuleUIControl/ModuleUIControl.cs.meta delete mode 100644 Assets/ModuleCoreUI/ModuleUIWindow.meta delete mode 100644 Assets/ModuleCoreUI/ModuleUIWindow/ModuleUIWindow.cs diff --git a/Assets/ModuleCoreUI/ModuleUIControl.meta b/Assets/ModuleCoreUI/ModuleDocument.meta similarity index 77% rename from Assets/ModuleCoreUI/ModuleUIControl.meta rename to Assets/ModuleCoreUI/ModuleDocument.meta index 3c368c6..6bb1318 100644 --- a/Assets/ModuleCoreUI/ModuleUIControl.meta +++ b/Assets/ModuleCoreUI/ModuleDocument.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3e5a783a4eff92d4da56483985f0a2a1 +guid: 1dd7861df30473e4380411dd72fc32c3 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ModuleCoreUI/ModuleDocument/ModuleDocument.cs b/Assets/ModuleCoreUI/ModuleDocument/ModuleDocument.cs new file mode 100644 index 0000000..b0bab41 --- /dev/null +++ b/Assets/ModuleCoreUI/ModuleDocument/ModuleDocument.cs @@ -0,0 +1,20 @@ +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/ModuleUIWindow/ModuleUIWindow.cs.meta b/Assets/ModuleCoreUI/ModuleDocument/ModuleDocument.cs.meta similarity index 83% rename from Assets/ModuleCoreUI/ModuleUIWindow/ModuleUIWindow.cs.meta rename to Assets/ModuleCoreUI/ModuleDocument/ModuleDocument.cs.meta index 6a1e81f..efb6678 100644 --- a/Assets/ModuleCoreUI/ModuleUIWindow/ModuleUIWindow.cs.meta +++ b/Assets/ModuleCoreUI/ModuleDocument/ModuleDocument.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2f97b2c9b7073ea4b8e1409d50d9e4c0 +guid: e65ff460c221dd142a18c295f562ac80 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ModuleCoreUI/ModuleUIControl/ModuleUIControl.cs b/Assets/ModuleCoreUI/ModuleUIControl/ModuleUIControl.cs deleted file mode 100644 index 3da2fc2..0000000 --- a/Assets/ModuleCoreUI/ModuleUIControl/ModuleUIControl.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UIElements; - -/// -/// UI控件 -/// -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/ModuleUIControl/ModuleUIControl.cs.meta b/Assets/ModuleCoreUI/ModuleUIControl/ModuleUIControl.cs.meta deleted file mode 100644 index f5ea9b1..0000000 --- a/Assets/ModuleCoreUI/ModuleUIControl/ModuleUIControl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 634630f2be3c7074db93baa4289bf093 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCoreUI/ModuleUIItem/ModuleUIItem.cs b/Assets/ModuleCoreUI/ModuleUIItem/ModuleUIItem.cs index b92ad88..c620463 100644 --- a/Assets/ModuleCoreUI/ModuleUIItem/ModuleUIItem.cs +++ b/Assets/ModuleCoreUI/ModuleUIItem/ModuleUIItem.cs @@ -7,7 +7,7 @@ using UnityEngine.UIElements; /// /// UI项 /// -public abstract class ModuleUIItem : ModuleUIControl { +public abstract class ModuleUIItem : ModuleUIPanel { /// 绑定的数据 public readonly Data value; /// UI项 diff --git a/Assets/ModuleCoreUI/ModuleUIPage.meta b/Assets/ModuleCoreUI/ModuleUIPage.meta index 6bb1318..d19d61b 100644 --- a/Assets/ModuleCoreUI/ModuleUIPage.meta +++ b/Assets/ModuleCoreUI/ModuleUIPage.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1dd7861df30473e4380411dd72fc32c3 +guid: b27b5ad3c5e2b1f4bb02957f1388fc49 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ModuleCoreUI/ModuleUIPage/ModuleUIPage.cs b/Assets/ModuleCoreUI/ModuleUIPage/ModuleUIPage.cs index a8b16e8..b57a338 100644 --- a/Assets/ModuleCoreUI/ModuleUIPage/ModuleUIPage.cs +++ b/Assets/ModuleCoreUI/ModuleUIPage/ModuleUIPage.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -7,13 +8,10 @@ using UnityEngine.UIElements; /// UI页面 /// public abstract class ModuleUIPage : MonoBehaviour { - public UIDocument document; - /// 根目录文档 - public VisualElement root => document.rootVisualElement; + /// 绑定的页面 + public ModuleDocument document; /// 核心模块 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); -} + /// 绑定的根元素 + 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 index 3fe61a0..6f62e5f 100644 --- a/Assets/ModuleCoreUI/ModuleUIPage/ModuleUIPage.cs.meta +++ b/Assets/ModuleCoreUI/ModuleUIPage/ModuleUIPage.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1fbdc8f1003e52b42b71c1679a3b8e3c +guid: 111d6ab3c7a28a2449502de7f9804ca3 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ModuleCoreUI/ModuleUIPanel/ModuleUIPanel.cs b/Assets/ModuleCoreUI/ModuleUIPanel/ModuleUIPanel.cs index 5421d4c..2ec7db9 100644 --- a/Assets/ModuleCoreUI/ModuleUIPanel/ModuleUIPanel.cs +++ b/Assets/ModuleCoreUI/ModuleUIPanel/ModuleUIPanel.cs @@ -1,17 +1,16 @@ -using System; using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UIElements; /// -/// UI面板 +/// UI控件 /// -public abstract class ModuleUIPanel : MonoBehaviour { - /// 绑定的页面 - public ModuleUIPage ModuleUIPage; +public class ModuleUIPanel { /// 核心模块 protected virtual ModuleCore ModuleCore => ModuleCore.I; - /// 绑定的根元素 - public abstract VisualElement Element { get; } -} \ No newline at end of file + /// 绑定的元素 + 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 index 3ac5615..7d08ff9 100644 --- a/Assets/ModuleCoreUI/ModuleUIPanel/ModuleUIPanel.cs.meta +++ b/Assets/ModuleCoreUI/ModuleUIPanel/ModuleUIPanel.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ff06370808b1ecd46b161a402c6c171e +guid: 9585f762b800e57488473c776cc49fa5 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ModuleCoreUI/ModuleUIWindow.meta b/Assets/ModuleCoreUI/ModuleUIWindow.meta deleted file mode 100644 index 01f2ca1..0000000 --- a/Assets/ModuleCoreUI/ModuleUIWindow.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: da0641a5e1f51fd4f8eb2aeeb34d02fa -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCoreUI/ModuleUIWindow/ModuleUIWindow.cs b/Assets/ModuleCoreUI/ModuleUIWindow/ModuleUIWindow.cs deleted file mode 100644 index cec789c..0000000 --- a/Assets/ModuleCoreUI/ModuleUIWindow/ModuleUIWindow.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UIElements; - -/// -/// UI窗口 -/// -public abstract class ModuleUIWindow : MonoBehaviour { - /// 绑定的页面 - public ModuleUIPage ModuleUIPage; - /// 核心模块 - protected virtual ModuleCore ModuleCore => ModuleCore.I; - /// 绑定的根元素 - public abstract VisualElement Element { get; } - /// 打开窗口，并且传进参数 - public abstract void Open(Data data); - /// 关闭窗口 - public abstract void Close(); -}