1

Assets/ModuleCore/ModuleAttribute/Editor/AttributeContainerConstEditor.cs

@@ -0,0 +1,56 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+using UnityEngine.UIElements;
+
+namespace MuHuaEditor {
+	/// <summary>
+	/// 属性容器 - 自定义编辑器
+	/// </summary>
+	[CustomEditor(typeof(AttributeContainerConst))]
+	public class AttributeContainerConstEditor : ModuleUIEditor<AttributeContainerConst> {
+
+		public VisualTreeAsset AttributeTemplate = default;
+
+		private UIAttributeList attributeList;
+
+		public VisualElement AttributeList => Q<VisualElement>("AttributeList");
+
+		public override void Initial() {
+			attributeList = new UIAttributeList(AttributeList, AttributeTemplate);
+			attributeList.Initial(value.instances);
+			AddControl(attributeList);
+		}
+
+
+		// public override void OnInspectorGUI() {
+		// 	base.OnInspectorGUI();
+		// 	if (GUILayout.Button("创建属性")) { GenerateAttribute(); }
+		// 	if (GUILayout.Button("删除属性")) { DeleteInstance(); }
+		// }
+
+		/// <summary> 创建属性实例 </summary>
+		// private void GenerateAttribute() {
+		// 	AttributeInstanceConst instance = CreateInstance<AttributeInstanceConst>();
+		// 	instance.container = container;
+		// 	// 加入容器
+		// 	container.instances.Add(instance);
+		// 	AssetDatabase.AddObjectToAsset(instance, container);
+		// 	EditorUtility.SetDirty(instance);
+		// 	EditorUtility.SetDirty(container);
+		// 	AssetDatabase.SaveAssets();
+		// }
+		/// <summary> 删除全部实例 </summary>
+		// private void DeleteInstance() {
+		// 	for (int i = container.instances.Count; i-- > 0;) {
+		// 		AttributeInstanceConst instance = container.instances[i];
+		// 		container.instances.Remove(instance);
+		// 		Undo.DestroyObjectImmediate(instance);
+		// 	}
+		// 	EditorUtility.SetDirty(container);
+		// 	AssetDatabase.SaveAssets();
+		// }
+
+	}
+}

Assets/ModuleCore/ModuleAttribute/Editor/AttributeContainerConstEditor.cs.meta

@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+guid: d8ae6bbae674e19448216fd6b41cd012
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences:
+  - VisualTreeAsset: {fileID: 9197481963319205126, guid: 95527f76fc8930d4ab47213114a5952b, type: 3}
+  - AttributeTemplate: {fileID: 9197481963319205126, guid: 1749a10e5ffdea045b442dfa323e4028, type: 3}
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ModuleCore/ModuleAttribute/Editor/AttributeInstanceConstEditor.cs

@@ -0,0 +1,46 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+
+namespace MuHuaEditor {
+	/// <summary>
+	/// 属性实例 - 自定义编辑器
+	/// </summary>
+	[CustomEditor(typeof(AttributeInstanceConst))]
+	public class AttributeInstanceConstEditor : Editor {
+
+		private AttributeInstanceConst instance;
+
+		private void Awake() => instance = target as AttributeInstanceConst;
+
+		public override void OnInspectorGUI() {
+			base.OnInspectorGUI();
+			if (instance.container == null) { return; }
+			EditorGUILayout.Space(20);
+
+			// 输入字段修改 name
+			EditorGUI.BeginChangeCheck();
+			string newName = EditorGUILayout.TextField("属性名称", instance.name);
+			if (EditorGUI.EndChangeCheck()) { ModifyName(newName); }
+			// 按钮功能
+			if (GUILayout.Button("删除属性")) { DeleteInstance(); }
+		}
+
+		/// <summary> 修改名字 </summary>
+		private void ModifyName(string newName) {
+			instance.name = newName;
+			Undo.RecordObject(instance, "修改属性名称");
+			EditorUtility.SetDirty(instance);
+			AssetDatabase.SaveAssets();
+		}
+		/// <summary> 删除实例 </summary>
+		private void DeleteInstance() {
+			AttributeContainerConst container = instance.container;
+			container.instances.Remove(instance);
+			EditorUtility.SetDirty(container);
+			Undo.DestroyObjectImmediate(instance);
+			AssetDatabase.SaveAssets();
+		}
+	}
+}

Assets/ModuleCore/ModuleAttribute/Editor/ModuleUIPanel.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 01e61c86999f6aa40aa7742bb891014e
+guid: dbe28b450df84584cb523a09c813e59b
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/ModuleCore/ModuleAttribute/Editor/ModuleUIPanel/UIAttributeList.cs

@@ -0,0 +1,126 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UIElements;
+using MuHua;
+
+namespace MuHuaEditor {
+	/// <summary>
+	/// 属性 - UI列表
+	/// </summary>
+	public class UIAttributeList : ModuleUIPanel, UIControl {
+		/// <summary> 拖拽预览 </summary>
+		public VisualElement preview;
+		/// <summary> 鼠标位置 </summary>
+		public Vector2 mousePosition;
+		/// <summary> 偏移位置 </summary>
+		public Vector2 offsetPosition;
+		/// <summary> 项目列表 </summary>
+		public ModuleUIItems<UIItem, AttributeInstanceConst> items;
+
+		public UIAttributeList(VisualElement element, VisualTreeAsset templateAsset) : base(element) {
+			items = new ModuleUIItems<UIItem, AttributeInstanceConst>(element, templateAsset,
+			(data, element) => new UIItem(data, element, this));
+
+			element.RegisterCallback<MouseMoveEvent>(FloatingFunc);
+		}
+		private void FloatingFunc(MouseMoveEvent evt) {
+			mousePosition = evt.mousePosition;
+		}
+
+		public void Update() {
+			if (preview == null) { return; }
+			preview.transform.position = mousePosition - offsetPosition;
+		}
+
+		public void Dispose() => items.Release();
+
+		/// <summary> 初始化 </summary>
+		public void Initial(List<AttributeInstanceConst> list) {
+			items.Create(list);
+		}
+		/// <summary> 设置值 </summary>
+		// public void Settings(T value) => callback?.Invoke(value);
+
+		public void MouseDownEvent(VisualElement element) {
+			preview = element;
+			offsetPosition = mousePosition;
+			// Debug.Log($"{preview.worldBound.position} - {mousePosition}");
+			// offsetPosition = preview.worldBound.position - mousePosition;
+			// Debug.Log($"{preview.worldBound.position} = {mousePosition} + {offsetPosition}");
+		}
+		public void MouseUpEvent() {
+			if (preview == null) { return; }
+			preview.transform.position = Vector2.zero;
+
+			int insertIndex = GetInsertIndex(element, preview);
+			int oldIndex = element.IndexOf(preview);
+
+			// 修正插入索引
+			// if (insertIndex > oldIndex) insertIndex--;
+			Debug.Log($"插入位置 {insertIndex} - 旧位置 {oldIndex}");
+			// 重新排序UI和数据
+			if (oldIndex != insertIndex) { MovePreviewElement(oldIndex, insertIndex); }
+			preview = null;
+		}
+
+		/// <summary>
+		/// 获取插入索引
+		/// </summary>
+		private int GetInsertIndex(VisualElement parent, VisualElement preview) {
+			Vector2 previewCenter = preview.worldBound.center;
+			int insertIndex = 0;
+			for (int i = 0; i < parent.childCount; i++) {
+				var child = parent[i];
+				if (child == preview) continue;
+				if (previewCenter.y < child.worldBound.center.y) {
+					insertIndex = i;
+					break;
+				}
+				insertIndex = i + 1;
+			}
+			return insertIndex;
+		}
+
+		/// <summary>
+		/// 移动预览元素到新位置
+		/// </summary>
+		private void MovePreviewElement(int oldIndex, int newIndex) {
+			VisualElement temp = element[oldIndex];
+			// element.RemoveAt(oldIndex);
+			element.Insert(newIndex, temp);
+		}
+
+		/// <summary> UI项 </summary>
+		public class UIItem : ModuleUIItem<AttributeInstanceConst> {
+			public readonly UIAttributeList parent;
+
+			public Label Range => Q<Label>("Range");
+			public TextField Name => Q<TextField>("Name");
+			public EnumField Type => Q<EnumField>("Type");
+			public FloatField Value => Q<FloatField>("Value");
+
+			public UIItem(AttributeInstanceConst value, VisualElement element, UIAttributeList parent) : base(value, element) {
+				this.parent = parent;
+				Name.SetValueWithoutNotify(value.name);
+				Type.Init(value.type);
+				Type.SetValueWithoutNotify(value.type);
+				Value.SetValueWithoutNotify(value.defaultValue);
+				Range.text = $"{value.minValue} ~ {value.maxValue}";
+				element.RegisterCallback<MouseDownEvent>(MouseDownEvent);
+				element.RegisterCallback<MouseUpEvent>(MouseUpEvent);
+			}
+			public override void DefaultState() {
+				// Button.EnableInClassList("button-s", false);
+			}
+			public override void SelectState() {
+				// parent.Settings(value);
+				// Button.EnableInClassList("button-s", true);
+			}
+
+			private void MouseDownEvent(MouseDownEvent evt) => parent.MouseDownEvent(element);
+
+			private void MouseUpEvent(MouseUpEvent evt) => parent.MouseUpEvent();
+		}
+	}
+}

Assets/ModuleCore/ModuleAttribute/Editor/ModuleUIPanel/UIAttributeList.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d8ae6bbae674e19448216fd6b41cd012
+guid: 82adca68fa56cb14382ebd547a8bf044
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/ModuleCore/ModuleAttribute/ModuleConst/Editor/ConstAttributeContainerEditor.cs

@@ -1,43 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEditor;
-
-/// <summary>
-/// 属性容器 - 自定义编辑器
-/// </summary>
-[CustomEditor(typeof(ConstAttributeContainer))]
-public class ConstAttributeContainerEditor : Editor {
-
-	private ConstAttributeContainer container;
-
-	private void Awake() => container = target as ConstAttributeContainer;
-
-	public override void OnInspectorGUI() {
-		base.OnInspectorGUI();
-		if (GUILayout.Button("创建属性")) { GenerateAttribute(); }
-		if (GUILayout.Button("删除属性")) { DeleteInstance(); }
-	}
-
-	/// <summary> 创建属性实例 </summary>
-	private void GenerateAttribute() {
-		ConstAttributeInstance instance = CreateInstance<ConstAttributeInstance>();
-		instance.container = container;
-		// 加入容器
-		container.instances.Add(instance);
-		AssetDatabase.AddObjectToAsset(instance, container);
-		EditorUtility.SetDirty(instance);
-		EditorUtility.SetDirty(container);
-		AssetDatabase.SaveAssets();
-	}
-	/// <summary> 删除全部实例 </summary>
-	private void DeleteInstance() {
-		for (int i = container.instances.Count; i-- > 0;) {
-			ConstAttributeInstance instance = container.instances[i];
-			container.instances.Remove(instance);
-			Undo.DestroyObjectImmediate(instance);
-		}
-		EditorUtility.SetDirty(container);
-		AssetDatabase.SaveAssets();
-	}
-}

Assets/ModuleCore/ModuleAttribute/ModuleConst/Editor/ConstAttributeInstanceEditor.cs

@@ -1,44 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEditor;
-
-/// <summary>
-/// 属性实例 - 自定义编辑器
-/// </summary>
-[CustomEditor(typeof(ConstAttributeInstance))]
-public class ConstAttributeInstanceEditor : Editor {
-
-	private ConstAttributeInstance instance;
-
-	private void Awake() => instance = target as ConstAttributeInstance;
-
-	public override void OnInspectorGUI() {
-		base.OnInspectorGUI();
-		if (instance.container == null) { return; }
-		EditorGUILayout.Space(20);
-
-		// 输入字段修改 name
-		EditorGUI.BeginChangeCheck();
-		string newName = EditorGUILayout.TextField("属性名称", instance.name);
-		if (EditorGUI.EndChangeCheck()) { ModifyName(newName); }
-		// 按钮功能
-		if (GUILayout.Button("删除属性")) { DeleteInstance(); }
-	}
-
-	/// <summary> 修改名字 </summary>
-	private void ModifyName(string newName) {
-		instance.name = newName;
-		Undo.RecordObject(instance, "修改属性名称");
-		EditorUtility.SetDirty(instance);
-		AssetDatabase.SaveAssets();
-	}
-	/// <summary> 删除实例 </summary>
-	private void DeleteInstance() {
-		ConstAttributeContainer container = instance.container;
-		container.instances.Remove(instance);
-		EditorUtility.SetDirty(container);
-		Undo.DestroyObjectImmediate(instance);
-		AssetDatabase.SaveAssets();
-	}
-}

Assets/ModuleCore/ModuleAttribute/Runtime.meta

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

Assets/ModuleCore/ModuleAttribute/Runtime/AttributeContainerConst.cs

@@ -6,10 +6,10 @@ using UnityEngine;
 /// 属性容器 - 常量
 /// </summary>
 [CreateAssetMenu(menuName = "MuHua/属性模块/属性容器")]
-public class ConstAttributeContainer : ScriptableObject {
+public class AttributeContainerConst : ScriptableObject {
 	/// <summary> 属性列表 </summary>
 	[HideInInspector]
-	public List<ConstAttributeInstance> instances;
+	public List<AttributeInstanceConst> instances;
 
 	/// <summary> 转换数据 </summary>
 	public AttributeContainer To() {

Assets/ModuleCore/ModuleAttribute/Runtime/AttributeInstanceConst.cs

@@ -6,7 +6,7 @@ using UnityEngine;
 /// 属性实例 - 常量
 /// </summary>
 [CreateAssetMenu(menuName = "MuHua/属性模块/属性实例")]
-public class ConstAttributeInstance : ScriptableObject {
+public class AttributeInstanceConst : ScriptableObject {
 	/// <summary> 属性类型 </summary>
 	public AttributeType type;
 	/// <summary> 默认值 </summary>
@@ -14,11 +14,11 @@ public class ConstAttributeInstance : ScriptableObject {
 	/// <summary> 最小值 </summary>
 	public float minValue;
 	/// <summary> 最大值 </summary>
-	public float maxValue = float.MaxValue;
+	public float maxValue = 9999;
 
 	/// <summary> 属性容器 </summary>
 	[HideInInspector]
-	public ConstAttributeContainer container;
+	public AttributeContainerConst container;
 
 	/// <summary> 转换数据 </summary>
 	public AttributeInstance To() {

Assets/ModuleCore/ModuleAttribute/UI Toolkit.meta

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

Assets/ModuleCore/ModuleAttribute/UI Toolkit/AttributeContainerConstEditor.meta

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

Assets/ModuleCore/ModuleAttribute/UI Toolkit/AttributeContainerConstEditor/AttributeContainerConstEditor.uss.meta

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

Assets/ModuleCore/ModuleAttribute/UI Toolkit/AttributeContainerConstEditor/AttributeContainerConstEditor.uxml

@@ -0,0 +1,16 @@
+<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="AttributeTemplate" src="project://database/Assets/ModuleCore/ModuleAttribute/UI%20Toolkit/AttributeContainerConstEditor/AttributeTemplate.uxml?fileID=9197481963319205126&amp;guid=1749a10e5ffdea045b442dfa323e4028&amp;type=3#AttributeTemplate" />
+    <Style src="project://database/Assets/ModuleCore/ModuleAttribute/UI%20Toolkit/AttributeContainerConstEditor/AttributeContainerConstEditor.uss?fileID=7433441132597879392&amp;guid=6f6de86e3bf3ec348a2cfde1e36e77bd&amp;type=3#AttributeContainerConstEditor" />
+    <ui:VisualElement name="AttributeList" style="flex-grow: 1;">
+        <ui:Instance template="AttributeTemplate" name="AttributeTemplate" />
+        <ui:Instance template="AttributeTemplate" name="AttributeTemplate" />
+        <ui:Instance template="AttributeTemplate" name="AttributeTemplate" />
+        <ui:Instance template="AttributeTemplate" name="AttributeTemplate" />
+    </ui:VisualElement>
+    <ui:VisualElement name="ButtonGroup" style="flex-direction: row;">
+        <ui:Button text="创建属性" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Button1" style="margin-top: 2px; margin-right: 2px; margin-bottom: 2px; margin-left: 2px; padding-top: 5px; padding-right: 5px; padding-bottom: 5px; padding-left: 5px;" />
+        <ui:Button text="删除全部属性" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Button2" style="margin-top: 2px; margin-right: 2px; margin-bottom: 2px; margin-left: 2px; padding-top: 5px; padding-right: 5px; padding-bottom: 5px; padding-left: 5px;" />
+        <ui:VisualElement style="flex-grow: 1;" />
+        <ui:Button text="删除属性" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Button3" style="margin-top: 2px; margin-right: 2px; margin-bottom: 2px; margin-left: 2px; padding-top: 5px; padding-right: 5px; padding-bottom: 5px; padding-left: 5px;" />
+    </ui:VisualElement>
+</ui:UXML>

Assets/ModuleCore/ModuleAttribute/UI Toolkit/AttributeContainerConstEditor/AttributeContainerConstEditor.uxml.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 95527f76fc8930d4ab47213114a5952b
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}

Assets/ModuleCore/ModuleAttribute/UI Toolkit/AttributeContainerConstEditor/AttributeTemplate.uxml

@@ -0,0 +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/ModuleCore/ModuleAttribute/UI%20Toolkit/AttributeContainerConstEditor/AttributeContainerConstEditor.uss?fileID=7433441132597879392&amp;guid=6f6de86e3bf3ec348a2cfde1e36e77bd&amp;type=3#AttributeContainerConstEditor" />
+    <ui:VisualElement style="flex-direction: row; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; background-color: rgb(51, 51, 51); margin-top: 1px; margin-right: 1px; margin-bottom: 1px; margin-left: 1px; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 5px; border-bottom-left-radius: 5px;">
+        <ui:TextField picking-mode="Ignore" value="filler text" keyboard-type="Default" name="Name" style="margin-top: 2px; margin-right: 2px; margin-bottom: 2px; margin-left: 2px; width: 100px;" />
+        <ui:EnumField type="UnityEngine.TextAlignment, UnityEngine.TextRenderingModule" value="Center" name="Type" style="margin-top: 2px; margin-right: 2px; margin-bottom: 2px; margin-left: 2px; width: 100px;" />
+        <ui:FloatField value="42.2" name="Value" style="flex-grow: 1; margin-top: 2px; margin-right: 2px; margin-bottom: 2px; margin-left: 2px;" />
+        <ui:Label tabindex="-1" text="0-9999" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Range" style="width: 100px; -unity-text-align: middle-center; margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0;" />
+    </ui:VisualElement>
+</ui:UXML>

Assets/ModuleCore/ModuleAttribute/UI Toolkit/AttributeContainerConstEditor/AttributeTemplate.uxml.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 1749a10e5ffdea045b442dfa323e4028
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}