更新快捷菜单

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 {
 	/// <summary> 鼠标左键 </summary>
 	public void OnMouseLeft(InputValue inputValue) {
 		if (inputValue.isPressed) return;
-		UIShortcutMenu.I.Close();
+		ShortcutMenu.I.Close();
 	}
 	/// <summary> 鼠标右键 </summary>
 	public void OnMouseRight(InputValue inputValue) {
-		UIShortcutMenu.I.Add("测试1/测试11", () => { Debug.Log("测试1/测试11"); });
+		ShortcutMenu.I.Open();
-		UIShortcutMenu.I.Add("测试1/测试12", () => { Debug.Log("测试1/测试12"); });
-
-		UIShortcutMenu.I.Add("测试2", () => { Debug.Log("测试2"); });
-
-		UIShortcutMenu.I.Open();
 	}
 	#endregion
 }

Assets/ModuleCore/ModuleUI/ModuleUISingle/UIShortcutMenu.cs

@@ -1,169 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UIElements;
-using MuHua;
-
-/// <summary>
-/// UI快捷菜单
-/// </summary>
-public class UIShortcutMenu : ModuleUISingle<UIShortcutMenu> {
-	/// <summary> 菜单模板 </summary>
-	public VisualTreeAsset menuTreeAsset;
-	/// <summary> 项目模板 </summary>
-	public VisualTreeAsset itemTreeAsset;
-
-	/// <summary> 数据列表 </summary>
-	public List<DataMenuItem> datas = new List<DataMenuItem>();
-	/// <summary> 控件列表 </summary>
-	public static List<UIControl> controls = new List<UIControl>();
-
-	public override VisualElement Element => root.Q<VisualElement>("ShortcutMenu");
-
-	protected override void Awake() => NoReplace(false);
-
-	private void Update() => controls.ForEach(control => control.Update());
-
-	private void OnDestroy() => controls.ForEach(control => control.Dispose());
-
-	/// <summary> 打开菜单 </summary>
-	public void Open() {
-		Close();
-		Vector3 position = UITool.GetMousePosition(Element);
-		UIMenuPanel menuPanel = Create();
-		menuPanel.Settings(position, datas);
-	}
-	/// <summary> 关闭菜单 </summary>
-	public void Close() {
-		controls.ForEach(control => control.Dispose());
-		controls.Clear();
-		Element.Clear();
-	}
-	/// <summary> 创建子菜单 </summary>
-	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;
-	}
-
-	/// <summary> 添加菜单项(方法) </summary> 
-	public void Add(string name, Action callback) {
-		string[] names = name.Split('/');
-
-		List<DataMenuItem> 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;
-		}
-	}
-	/// <summary> 移除菜单项 </summary>
-	public void Remove(string name) {
-		string[] names = name.Split('/');
-		List<DataMenuItem> 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;
-		}
-	}
-}
-/// <summary> 
-/// UI快捷菜单面板
-/// </summary>
-public class UIMenuPanel : ModuleUIPanel, UIControl {
-
-	public UIMenuPanel menuPanel;
-	public VisualElement submenu;
-	public ModuleUIItems<UIItem, DataMenuItem> items;
-
-	public VisualElement Container => Q<VisualElement>("Container");
-
-	public UIMenuPanel(VisualElement element, VisualTreeAsset templateAsset) : base(element) {
-		items = new ModuleUIItems<UIItem, DataMenuItem>(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<DataMenuItem> datas) {
-		items.Create(datas);
-		element.transform.position = position;
-	}
-
-	/// <summary> 打开子菜单 </summary>
-	public void Open(VisualElement submenu, List<DataMenuItem> 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);
-	}
-
-	/// <summary> UI项目 </summary>
-	public class UIItem : ModuleUIItem<DataMenuItem> {
-		public readonly UIMenuPanel parent;
-
-		public Label Name => element.Q<Label>("Name");
-		public VisualElement Arrow => element.Q<VisualElement>("Arrow");
-
-		public UIItem(DataMenuItem value, VisualElement element, UIMenuPanel parent) : base(value, element) {
-			this.parent = parent;
-			Name.text = value.name;
-			Arrow.EnableInClassList("menu-arrow-hide", value.items == null || value.items.Count == 0);
-			element.RegisterCallback<MouseDownEvent>(MouseDownEvent);
-			element.RegisterCallback<MouseMoveEvent>(MouseMoveEvent);
-		}
-		private void MouseDownEvent(MouseDownEvent evt) {
-			value.callback?.Invoke();
-			UIShortcutMenu.I.Close();
-		}
-		private void MouseMoveEvent(MouseMoveEvent evt) {
-			parent.Open(element, value.items);
-		}
-	}
-}
-/// <summary>
-/// 菜单项目
-/// </summary>
-public class DataMenuItem {
-	/// <summary> 名称 </summary>
-	public string name;
-	/// <summary> 回调 </summary>
-	public Action callback;
-	/// <summary> 子菜单项 </summary>
-	public List<DataMenuItem> items = new List<DataMenuItem>();
-}

Assets/ModuleCore/ModuleUISMenu.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d73f0702f68e73243ab4c6940caafa59
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ModuleCore/ModuleUISMenu/Runtime.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6477bb920cf3e3a4fbaf3e01082e3ae3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ModuleCore/ModuleUISMenu/Runtime/MenuItem.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// 菜单项目
+/// </summary>
+public class MenuItem {
+	/// <summary> 名称 </summary>
+	public string name;
+	/// <summary> 回调 </summary>
+	public Action callback;
+	/// <summary> 子菜单项 </summary>
+	public List<MenuItem> menuItems = new List<MenuItem>();
+}

Assets/ModuleCore/ModuleUISMenu/Runtime/MenuItem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: fac2916b09800194a8389027d4b54ce8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ModuleCore/ModuleUISMenu/Runtime/ShortcutMenu.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using MuHua;
+
+/// <summary>
+/// 快捷菜单
+/// </summary>
+public class ShortcutMenu : Module<ShortcutMenu> {
+	/// <summary> 数据列表 </summary>
+	public List<MenuItem> menuItems = new List<MenuItem>();
+
+	/// <summary> 打开菜单 </summary>
+	public void Open() => UIShortcutMenu.I?.Open();
+
+	/// <summary> 关闭菜单 </summary>
+	public void Close() => UIShortcutMenu.I?.Close();
+
+	/// <summary> 添加菜单项(1级菜单/2级菜单/3级菜单) </summary> 
+	public void Add(string name, Action callback) {
+		string[] names = name.Split('/');
+		MenuItem item = Find(names[0], menuItems, true);
+		for (int i = 1; i < names.Length; i++) {
+			item = Find(names[i], item.menuItems, true);
+		}
+		item.callback = callback;
+	}
+	/// <summary> 移除菜单项(???/???/子级菜单) </summary>
+	public void Remove(string name) {
+		string[] names = name.Split('/');
+		List<MenuItem> menuItems = this.menuItems;
+		MenuItem item = Find(names[0], menuItems, false);
+		for (int i = 1; i < names.Length; i++) {
+			if (item == null) return;
+			menuItems = item.menuItems;
+			item = Find(names[i], menuItems, false);
+		}
+		menuItems.Remove(item);
+	}
+
+	/// <summary> 子项目查找 </summary> 
+	private MenuItem Find(string menu, List<MenuItem> menuItems, bool isCreate) {
+		MenuItem item = menuItems.Find(obj => obj.name == menu);
+		if (item != null || !isCreate) { return item; }
+		item = new MenuItem { name = menu };
+		menuItems.Add(item);
+		return item;
+	}
+}

Assets/ModuleCore/ModuleUISMenu/Runtime/ShortcutMenu.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 23732e20aab811a4eba63cc0f810d659
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ModuleCore/ModuleUISMenu/Runtime/UIMenuPanel.cs

@@ -0,0 +1,75 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UIElements;
+using MuHua;
+
+/// <summary> 
+/// UI快捷菜单面板
+/// </summary>
+public class UIMenuPanel : ModuleUIPanel, UIControl {
+
+	public UIMenuPanel menuPanel;
+	public VisualElement submenu;
+	public ModuleUIItems<UIItem, MenuItem> items;
+
+	public VisualElement Container => Q<VisualElement>("Container");
+
+	public UIMenuPanel(VisualElement element, VisualTreeAsset templateAsset) : base(element) {
+		items = new ModuleUIItems<UIItem, MenuItem>(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<MenuItem> datas) {
+		items.Create(datas);
+		element.transform.position = position;
+	}
+
+	/// <summary> 打开子菜单 </summary>
+	public void Open(VisualElement submenu, List<MenuItem> 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 - 4;
+		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);
+	}
+
+	/// <summary> UI项目 </summary>
+	public class UIItem : ModuleUIItem<MenuItem> {
+		public readonly UIMenuPanel parent;
+
+		public Label Name => element.Q<Label>("Name");
+		public VisualElement Arrow => element.Q<VisualElement>("Arrow");
+
+		public UIItem(MenuItem value, VisualElement element, UIMenuPanel parent) : base(value, element) {
+			this.parent = parent;
+			Name.text = value.name;
+			Arrow.EnableInClassList("menu-arrow-hide", value.menuItems == null || value.menuItems.Count == 0);
+			element.RegisterCallback<MouseDownEvent>(MouseDownEvent);
+			element.RegisterCallback<MouseMoveEvent>(MouseMoveEvent);
+		}
+		private void MouseDownEvent(MouseDownEvent evt) {
+			value.callback?.Invoke();
+			UIShortcutMenu.I.Close();
+		}
+		private void MouseMoveEvent(MouseMoveEvent evt) {
+			parent.Open(element, value.menuItems);
+		}
+	}
+}

Assets/ModuleCore/ModuleUISMenu/Runtime/UIMenuPanel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cbfff4523d382a14eb835f39d022b39d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ModuleCore/ModuleUISMenu/Runtime/UIShortcutMenu.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UIElements;
+using MuHua;
+
+/// <summary>
+/// UI快捷菜单
+/// </summary>
+public class UIShortcutMenu : ModuleUISingle<UIShortcutMenu> {
+	/// <summary> 菜单模板 </summary>
+	public VisualTreeAsset menuTreeAsset;
+	/// <summary> 项目模板 </summary>
+	public VisualTreeAsset itemTreeAsset;
+
+	/// <summary> 控件列表 </summary>
+	public static List<UIControl> controls = new List<UIControl>();
+
+	public override VisualElement Element => root.Q<VisualElement>("ShortcutMenu");
+
+	protected override void Awake() => NoReplace(false);
+
+	private void Update() => controls.ForEach(control => control.Update());
+
+	private void OnDestroy() => controls.ForEach(control => control.Dispose());
+
+	/// <summary> 打开菜单 </summary>
+	public void Open() {
+		Close();
+		Vector3 position = UITool.GetMousePosition(Element);
+		UIMenuPanel menuPanel = Create();
+		menuPanel.Settings(position, ShortcutMenu.I.menuItems);
+	}
+	/// <summary> 关闭菜单 </summary>
+	public void Close() {
+		controls.ForEach(control => control.Dispose());
+		controls.Clear();
+		Element.Clear();
+	}
+	/// <summary> 创建子菜单 </summary>
+	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;
+	}
+}

Assets/ModuleCore/ModuleUISMenu/UI Toolkit.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 32fa60a7591d8e149b02b5fac56adfb4
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ModuleCore/ModuleUISMenu/UI Toolkit/MenuPanel.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f405743ede2617b4c92bf64862e7402e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ModuleCore/ModuleUISMenu/UI Toolkit/MenuPanel/MenuPanel.uss

@@ -1,14 +1,9 @@
-.menu {
-    position: absolute;
-}
-
-.menu-hide {
-    display: none;
-}
-
 .menu-unit {
     flex-direction: row;
     align-self: flex-start;
+    flex-grow: 0;
+    width: 100%;
+    height: 25px;
 }
 
 .menu-unit:hover {
@@ -21,8 +16,8 @@
 
 .menu-arrow {
     flex-grow: 0;
-    height: 30px;
+    height: 25px;
-    width: 30px;
+    width: 25px;
     background-image: url("project://database/Assets/UI%20Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss?fileID=-1087164816274819069&guid=05f864e67ee1ecb4bbe67427564d394c&type=3#arrow-right@2x");
     -unity-background-image-tint-color: rgb(51, 51, 51);
 }

Assets/ModuleCore/ModuleUISMenu/UI Toolkit/MenuPanel/MenuPanel.uss.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4b1be5340ef21d843bdd2f0eb2375cfe
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0

Assets/ModuleCore/ModuleUISMenu/UI Toolkit/MenuPanel/MenuPanel.uxml

@@ -0,0 +1,11 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
+    <ui:Template name="Item" src="project://database/Assets/ModuleCore/ModuleUISMenu/UI%20Toolkit/MenuPanel/MenuTemplate.uxml?fileID=9197481963319205126&amp;guid=1ee167986f6e9a840a45450b4b6adfc2&amp;type=3#MenuTemplate" />
+    <Style src="project://database/Assets/ModuleCore/ModuleUISMenu/UI%20Toolkit/MenuPanel/MenuPanel.uss?fileID=7433441132597879392&amp;guid=4b1be5340ef21d843bdd2f0eb2375cfe&amp;type=3#MenuPanel" />
+    <ui:VisualElement name="Container" style="background-color: rgb(255, 255, 255); border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; padding-top: 3px; padding-right: 3px; padding-bottom: 3px; padding-left: 3px; align-self: flex-start; min-width: 150px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px; border-left-width: 1px; border-left-color: rgb(51, 51, 51); border-right-color: rgb(51, 51, 51); border-top-color: rgb(51, 51, 51); border-bottom-color: rgb(51, 51, 51);">
+        <ui:Instance template="Item" name="Item" />
+        <ui:Instance template="Item" name="Item" />
+        <ui:Instance template="Item" name="Item" />
+        <ui:Instance template="Item" name="Item" />
+        <ui:Instance template="Item" name="Item" />
+    </ui:VisualElement>
+</ui:UXML>

Assets/ModuleCore/ModuleUISMenu/UI Toolkit/MenuPanel/MenuTemplate.uxml

@@ -1,7 +1,9 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
-    <Style src="project://database/Assets/UI%20Toolkit/GamePanel/ShortcutMenu/ShortcutMenu.uss?fileID=7433441132597879392&amp;guid=a53da9fc389948e40ac96af14dd02c10&amp;type=3#ShortcutMenu" />
+    <Style src="project://database/Assets/ModuleCore/ModuleUISMenu/UI%20Toolkit/MenuPanel/MenuPanel.uss?fileID=7433441132597879392&amp;guid=4b1be5340ef21d843bdd2f0eb2375cfe&amp;type=3#MenuPanel" />
     <ui:VisualElement class="menu-unit">
-        <ui:Label tabindex="-1" text="Label" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Name" style="-unity-text-align: middle-center; margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; padding-top: 10px; padding-right: 10px; padding-bottom: 10px; padding-left: 10px; height: 30px;" />
+        <ui:VisualElement style="width: 30px;" />
+        <ui:Label tabindex="-1" text="Label" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Name" style="-unity-text-align: middle-center; margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; padding-top: 10px; padding-right: 10px; padding-bottom: 10px; padding-left: 10px;" />
+        <ui:VisualElement style="flex-grow: 1;" />
         <ui:VisualElement name="Arrow" class="menu-arrow" />
     </ui:VisualElement>
 </ui:UXML>

Assets/ModuleCore/ModuleUISMenu/UI Toolkit/ShortcutMenu/ShortcutMenu.uss

@@ -0,0 +1,7 @@
+.menu {
+    position: absolute;
+}
+
+.menu-hide {
+    display: none;
+}

Assets/SceneManager/SampleScene/SampleScene.unity

@@ -652,7 +652,7 @@ GameObject:
   - component: {fileID: 1922845063}
   - component: {fileID: 1922845064}
   m_Layer: 5
-  m_Name: UIMenuManager
+  m_Name: UIShortcutMenu
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/UI Toolkit/Document/MainDocument.uxml

@@ -1,4 +1,5 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
-    <ui:Template name="ShortcutMenu" src="project://database/Assets/UI%20Toolkit/GamePanel/ShortcutMenu/ShortcutMenu.uxml?fileID=9197481963319205126&amp;guid=531a74f84d51b5d49a048079629e13e0&amp;type=3#ShortcutMenu" />
+    <ui:Template name="ShortcutMenu" src="project://database/Assets/ModuleCore/ModuleUISMenu/UI%20Toolkit/ShortcutMenu/ShortcutMenu.uxml?fileID=9197481963319205126&amp;guid=531a74f84d51b5d49a048079629e13e0&amp;type=3#ShortcutMenu" />
-    <ui:Instance template="ShortcutMenu" name="ShortcutMenu" />
+    <Style src="project://database/Assets/UI%20Toolkit/Document/Document.uss?fileID=7433441132597879392&amp;guid=9205939af30a4394f8f2e34232b27890&amp;type=3#Document" />
+    <ui:Instance template="ShortcutMenu" name="ShortcutMenu" picking-mode="Ignore" class="document-page" />
 </ui:UXML>

Assets/UI Toolkit/GamePanel/ShortcutMenu/MenuTemplate.uxml

@@ -1,11 +0,0 @@
-<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
-    <ui:Template name="Item" src="project://database/Assets/UI%20Toolkit/GamePanel/ShortcutMenu/ItemTemplate.uxml?fileID=9197481963319205126&amp;guid=1ee167986f6e9a840a45450b4b6adfc2&amp;type=3#ItemTemplate" />
-    <Style src="project://database/Assets/UI%20Toolkit/GamePanel/ShortcutMenu/ShortcutMenu.uss?fileID=7433441132597879392&amp;guid=a53da9fc389948e40ac96af14dd02c10&amp;type=3#ShortcutMenu" />
-    <ui:VisualElement name="Container" style="background-color: rgb(255, 255, 255); border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; padding-top: 5px; padding-right: 5px; padding-bottom: 5px; padding-left: 5px; align-self: flex-start;">
-        <ui:Instance template="Item" name="Item" />
-        <ui:Instance template="Item" name="Item" />
-        <ui:Instance template="Item" name="Item" />
-        <ui:Instance template="Item" name="Item" />
-        <ui:Instance template="Item" name="Item" />
-    </ui:VisualElement>
-</ui:UXML>