From 31fc9960215988835144ef27075d3b7ef211512d Mon Sep 17 00:00:00 2001
From: MuHua-123 <136542559+MuHua-123@users.noreply.github.com>
Date: Sat, 11 Oct 2025 12:11:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BF=AB=E6=8D=B7=E8=8F=9C?=
=?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ModuleInput/InputControl/InputMenu.cs | 27 ++-
.../ModuleUI/ModuleUISingle/UIShortcutMenu.cs | 169 ------------------
Assets/ModuleCore/ModuleUISMenu.meta | 8 +
Assets/ModuleCore/ModuleUISMenu/Runtime.meta | 8 +
.../ModuleUISMenu/Runtime/MenuItem.cs | 16 ++
.../ModuleUISMenu/Runtime/MenuItem.cs.meta | 11 ++
.../ModuleUISMenu/Runtime/ShortcutMenu.cs | 50 ++++++
.../Runtime/ShortcutMenu.cs.meta | 11 ++
.../ModuleUISMenu/Runtime/UIMenuPanel.cs | 75 ++++++++
.../ModuleUISMenu/Runtime/UIMenuPanel.cs.meta | 11 ++
.../ModuleUISMenu/Runtime/UIShortcutMenu.cs | 51 ++++++
.../Runtime}/UIShortcutMenu.cs.meta | 0
.../ModuleCore/ModuleUISMenu/UI Toolkit.meta | 8 +
.../ModuleUISMenu/UI Toolkit/MenuPanel.meta | 8 +
.../UI Toolkit/MenuPanel/MenuPanel.uss} | 15 +-
.../UI Toolkit/MenuPanel/MenuPanel.uss.meta | 11 ++
.../UI Toolkit/MenuPanel/MenuPanel.uxml | 11 ++
.../UI Toolkit/MenuPanel/MenuPanel.uxml.meta} | 0
.../UI Toolkit/MenuPanel/MenuTemplate.uxml} | 6 +-
.../MenuPanel/MenuTemplate.uxml.meta} | 0
.../UI Toolkit}/ShortcutMenu.meta | 0
.../UI Toolkit/ShortcutMenu/ShortcutMenu.uss | 7 +
.../ShortcutMenu/ShortcutMenu.uss.meta | 0
.../ShortcutMenu/ShortcutMenu.uxml | 0
.../ShortcutMenu/ShortcutMenu.uxml.meta | 0
.../SampleScene/SampleScene.unity | 2 +-
Assets/UI Toolkit/Document/MainDocument.uxml | 5 +-
.../GamePanel/ShortcutMenu/MenuTemplate.uxml | 11 --
28 files changed, 319 insertions(+), 202 deletions(-)
delete mode 100644 Assets/ModuleCore/ModuleUI/ModuleUISingle/UIShortcutMenu.cs
create mode 100644 Assets/ModuleCore/ModuleUISMenu.meta
create mode 100644 Assets/ModuleCore/ModuleUISMenu/Runtime.meta
create mode 100644 Assets/ModuleCore/ModuleUISMenu/Runtime/MenuItem.cs
create mode 100644 Assets/ModuleCore/ModuleUISMenu/Runtime/MenuItem.cs.meta
create mode 100644 Assets/ModuleCore/ModuleUISMenu/Runtime/ShortcutMenu.cs
create mode 100644 Assets/ModuleCore/ModuleUISMenu/Runtime/ShortcutMenu.cs.meta
create mode 100644 Assets/ModuleCore/ModuleUISMenu/Runtime/UIMenuPanel.cs
create mode 100644 Assets/ModuleCore/ModuleUISMenu/Runtime/UIMenuPanel.cs.meta
create mode 100644 Assets/ModuleCore/ModuleUISMenu/Runtime/UIShortcutMenu.cs
rename Assets/ModuleCore/{ModuleUI/ModuleUISingle => ModuleUISMenu/Runtime}/UIShortcutMenu.cs.meta (100%)
create mode 100644 Assets/ModuleCore/ModuleUISMenu/UI Toolkit.meta
create mode 100644 Assets/ModuleCore/ModuleUISMenu/UI Toolkit/MenuPanel.meta
rename Assets/{UI Toolkit/GamePanel/ShortcutMenu/ShortcutMenu.uss => ModuleCore/ModuleUISMenu/UI Toolkit/MenuPanel/MenuPanel.uss} (85%)
create mode 100644 Assets/ModuleCore/ModuleUISMenu/UI Toolkit/MenuPanel/MenuPanel.uss.meta
create mode 100644 Assets/ModuleCore/ModuleUISMenu/UI Toolkit/MenuPanel/MenuPanel.uxml
rename Assets/{UI Toolkit/GamePanel/ShortcutMenu/MenuTemplate.uxml.meta => ModuleCore/ModuleUISMenu/UI Toolkit/MenuPanel/MenuPanel.uxml.meta} (100%)
rename Assets/{UI Toolkit/GamePanel/ShortcutMenu/ItemTemplate.uxml => ModuleCore/ModuleUISMenu/UI Toolkit/MenuPanel/MenuTemplate.uxml} (65%)
rename Assets/{UI Toolkit/GamePanel/ShortcutMenu/ItemTemplate.uxml.meta => ModuleCore/ModuleUISMenu/UI Toolkit/MenuPanel/MenuTemplate.uxml.meta} (100%)
rename Assets/{UI Toolkit/GamePanel => ModuleCore/ModuleUISMenu/UI Toolkit}/ShortcutMenu.meta (100%)
create mode 100644 Assets/ModuleCore/ModuleUISMenu/UI Toolkit/ShortcutMenu/ShortcutMenu.uss
rename Assets/{UI Toolkit/GamePanel => ModuleCore/ModuleUISMenu/UI Toolkit}/ShortcutMenu/ShortcutMenu.uss.meta (100%)
rename Assets/{UI Toolkit/GamePanel => ModuleCore/ModuleUISMenu/UI Toolkit}/ShortcutMenu/ShortcutMenu.uxml (100%)
rename Assets/{UI Toolkit/GamePanel => ModuleCore/ModuleUISMenu/UI Toolkit}/ShortcutMenu/ShortcutMenu.uxml.meta (100%)
delete mode 100644 Assets/UI Toolkit/GamePanel/ShortcutMenu/MenuTemplate.uxml
diff --git a/Assets/ModuleCore/ModuleInput/InputControl/InputMenu.cs b/Assets/ModuleCore/ModuleInput/InputControl/InputMenu.cs
index 59a6e37..cddf390 100644
--- a/Assets/ModuleCore/ModuleInput/InputControl/InputMenu.cs
+++ b/Assets/ModuleCore/ModuleInput/InputControl/InputMenu.cs
@@ -11,6 +11,24 @@ public class InputMenu : InputControl {
private UIMenuPanel menu;
+ private void Start() {
+ ShortcutMenu.I.Add("测试1/测试11", () => { Debug.Log("测试1/测试11"); });
+ ShortcutMenu.I.Add("测试1/测试12", () => { Debug.Log("测试1/测试12"); });
+
+ ShortcutMenu.I.Add("删除测试5", () => {
+ ShortcutMenu.I.Remove("测试5");
+ });
+ ShortcutMenu.I.Add("删除测试51", () => {
+ ShortcutMenu.I.Remove("测试5/测试51");
+ });
+ ShortcutMenu.I.Add("删除测试52", () => {
+ ShortcutMenu.I.Remove("测试5/测试52");
+ });
+
+ ShortcutMenu.I.Add("测试5/测试51", () => { Debug.Log("测试51"); });
+ ShortcutMenu.I.Add("测试5/测试52", () => { Debug.Log("测试52"); });
+ }
+
protected override void ModuleInput_OnInputMode(InputMode mode) {
// throw new System.NotImplementedException();
}
@@ -19,16 +37,11 @@ public class InputMenu : InputControl {
/// 鼠标左键
public void OnMouseLeft(InputValue inputValue) {
if (inputValue.isPressed) return;
- UIShortcutMenu.I.Close();
+ ShortcutMenu.I.Close();
}
/// 鼠标右键
public void OnMouseRight(InputValue inputValue) {
- UIShortcutMenu.I.Add("测试1/测试11", () => { Debug.Log("测试1/测试11"); });
- UIShortcutMenu.I.Add("测试1/测试12", () => { Debug.Log("测试1/测试12"); });
-
- UIShortcutMenu.I.Add("测试2", () => { Debug.Log("测试2"); });
-
- UIShortcutMenu.I.Open();
+ ShortcutMenu.I.Open();
}
#endregion
}
diff --git a/Assets/ModuleCore/ModuleUI/ModuleUISingle/UIShortcutMenu.cs b/Assets/ModuleCore/ModuleUI/ModuleUISingle/UIShortcutMenu.cs
deleted file mode 100644
index efe6aff..0000000
--- a/Assets/ModuleCore/ModuleUI/ModuleUISingle/UIShortcutMenu.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UIElements;
-using MuHua;
-
-///
-/// UI快捷菜单
-///
-public class UIShortcutMenu : ModuleUISingle {
- /// 菜单模板
- public VisualTreeAsset menuTreeAsset;
- /// 项目模板
- public VisualTreeAsset itemTreeAsset;
-
- /// 数据列表
- public List datas = new List();
- /// 控件列表
- public static List controls = new List();
-
- public override VisualElement Element => root.Q("ShortcutMenu");
-
- protected override void Awake() => NoReplace(false);
-
- private void Update() => controls.ForEach(control => control.Update());
-
- private void OnDestroy() => controls.ForEach(control => control.Dispose());
-
- /// 打开菜单
- public void Open() {
- Close();
- Vector3 position = UITool.GetMousePosition(Element);
- UIMenuPanel menuPanel = Create();
- menuPanel.Settings(position, datas);
- }
- /// 关闭菜单
- public void Close() {
- controls.ForEach(control => control.Dispose());
- controls.Clear();
- Element.Clear();
- }
- /// 创建子菜单
- public UIMenuPanel Create() {
- // 创建菜单元素
- VisualElement element = menuTreeAsset.Instantiate();
- element.EnableInClassList("menu", true);
- Element.Add(element);
- UIMenuPanel menuPanel = new UIMenuPanel(element, itemTreeAsset);
- controls.Add(menuPanel);
- return menuPanel;
- }
-
- /// 添加菜单项(方法)
- public void Add(string name, Action callback) {
- string[] names = name.Split('/');
-
- List datas = this.datas;
- for (int i = 0; i < names.Length; i++) {
- string menu = names[i];
- DataMenuItem item = datas.Find(obj => obj.name == menu);
- if (item == null) {
- item = new DataMenuItem { name = menu };
- if (i == names.Length - 1) { item.callback = callback; }
- datas.Add(item);
- }
- datas = item.items;
- }
- }
- /// 移除菜单项
- public void Remove(string name) {
- string[] names = name.Split('/');
- List datas = this.datas;
- DataMenuItem parent = null;
- DataMenuItem target = null;
-
- for (int i = 0; i < names.Length; i++) {
- string menu = names[i];
- target = datas.Find(obj => obj.name == menu);
- if (target == null) return; // 未找到，直接返回
- if (i == names.Length - 1) {
- // 找到要移除的项
- datas.Remove(target);
- return;
- }
- parent = target;
- datas = target.items;
- }
- }
-}
-///
-/// UI快捷菜单面板
-///
-public class UIMenuPanel : ModuleUIPanel, UIControl {
-
- public UIMenuPanel menuPanel;
- public VisualElement submenu;
- public ModuleUIItems items;
-
- public VisualElement Container => Q("Container");
-
- public UIMenuPanel(VisualElement element, VisualTreeAsset templateAsset) : base(element) {
- items = new ModuleUIItems(Container, templateAsset,
- (data, element) => new UIItem(data, element, this));
- }
- public void Update() {
- // throw new NotImplementedException();
- }
- public void Dispose() {
- items.Release();
- }
-
- public void Settings(Vector3 position, List datas) {
- items.Create(datas);
- element.transform.position = position;
- }
-
- /// 打开子菜单
- public void Open(VisualElement submenu, List datas) {
- if (this.submenu == submenu) { return; }
- // 更新子菜单
- this.submenu = submenu;
- if (menuPanel == null) { menuPanel = UIShortcutMenu.I.Create(); }
- float x = submenu.worldBound.position.x + submenu.resolvedStyle.width;
- float y = submenu.worldBound.position.y - 5;
- Vector3 position = new Vector3(x, y, 0);
- menuPanel.Settings(position, datas);
- bool isEnable = datas != null && datas.Count > 0;
- menuPanel.OpenSubmenu(isEnable);
- }
- public void OpenSubmenu(bool open) {
- element.EnableInClassList("menu-hide", !open);
- menuPanel?.OpenSubmenu(false);
- }
-
- /// UI项目
- public class UIItem : ModuleUIItem {
- public readonly UIMenuPanel parent;
-
- public Label Name => element.Q