修改属性系统
This commit is contained in:
MuHua-123
@@ -16,41 +16,38 @@ namespace MuHuaEditor {
|
||||
private UIAttributeList attributeList;
|
||||
|
||||
public VisualElement AttributeList => Q<VisualElement>("AttributeList");
|
||||
public Button Button1 => Q<Button>("Button1");// 创建属性
|
||||
public Button Button2 => Q<Button>("Button2");// 删除全部
|
||||
|
||||
public override void Initial() {
|
||||
attributeList = new UIAttributeList(AttributeList, AttributeTemplate);
|
||||
attributeList.Initial(value.instances);
|
||||
attributeList.Initial(value);
|
||||
AddControl(attributeList);
|
||||
|
||||
Button1.clicked += GenerateAttribute;
|
||||
Button2.clicked += DeleteInstance;
|
||||
}
|
||||
|
||||
|
||||
// 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();
|
||||
// }
|
||||
private void GenerateAttribute() {
|
||||
AttributeInstanceConst instance = CreateInstance<AttributeInstanceConst>();
|
||||
instance.container = value;
|
||||
// 加入容器
|
||||
value.instances.Add(instance);
|
||||
AssetDatabase.AddObjectToAsset(instance, value);
|
||||
EditorUtility.SetDirty(instance);
|
||||
EditorUtility.SetDirty(value);
|
||||
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();
|
||||
// }
|
||||
|
||||
private void DeleteInstance() {
|
||||
for (int i = value.instances.Count; i-- > 0;) {
|
||||
AttributeInstanceConst instance = value.instances[i];
|
||||
value.instances.Remove(instance);
|
||||
Undo.DestroyObjectImmediate(instance);
|
||||
}
|
||||
EditorUtility.SetDirty(value);
|
||||
AssetDatabase.SaveAssets();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,46 +1,54 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UIElements;
|
||||
using UnityEditor;
|
||||
using MuHua;
|
||||
|
||||
namespace MuHuaEditor {
|
||||
/// <summary>
|
||||
/// 属性实例 - 自定义编辑器
|
||||
/// </summary>
|
||||
[CustomEditor(typeof(AttributeInstanceConst))]
|
||||
public class AttributeInstanceConstEditor : Editor {
|
||||
public class AttributeInstanceConstEditor : ModuleUIEditor<AttributeInstanceConst> {
|
||||
|
||||
private AttributeInstanceConst instance;
|
||||
public UIAttributePanel attributePanel;
|
||||
|
||||
private void Awake() => instance = target as AttributeInstanceConst;
|
||||
public VisualElement AttributePanel => Q<VisualElement>("AttributePanel");
|
||||
public FloatField Min => Q<FloatField>("Min");
|
||||
public FloatField Max => Q<FloatField>("Max");
|
||||
public Button button => Q<Button>("Button");
|
||||
|
||||
public override void OnInspectorGUI() {
|
||||
base.OnInspectorGUI();
|
||||
if (instance.container == null) { return; }
|
||||
EditorGUILayout.Space(20);
|
||||
public override void Initial() {
|
||||
attributePanel = new UIAttributePanel(value, AttributePanel);
|
||||
|
||||
// 输入字段修改 name
|
||||
EditorGUI.BeginChangeCheck();
|
||||
string newName = EditorGUILayout.TextField("属性名称", instance.name);
|
||||
if (EditorGUI.EndChangeCheck()) { ModifyName(newName); }
|
||||
// 按钮功能
|
||||
if (GUILayout.Button("删除属性")) { DeleteInstance(); }
|
||||
Min.SetValueWithoutNotify(value.minValue);
|
||||
Max.SetValueWithoutNotify(value.maxValue);
|
||||
|
||||
Min.RegisterCallback<FocusOutEvent>(evt => ModifyMin());
|
||||
Max.RegisterCallback<FocusOutEvent>(evt => ModifyMax());
|
||||
|
||||
button.clicked += DeleteInstance;
|
||||
}
|
||||
|
||||
/// <summary> 修改名字 </summary>
|
||||
private void ModifyName(string newName) {
|
||||
instance.name = newName;
|
||||
Undo.RecordObject(instance, "修改属性名称");
|
||||
EditorUtility.SetDirty(instance);
|
||||
/// <summary> 修改最小值 </summary>
|
||||
private void ModifyMin() { value.minValue = Min.value; Dirty(); }
|
||||
/// <summary> 修改最大值 </summary>
|
||||
private void ModifyMax() { value.maxValue = Max.value; Dirty(); }
|
||||
|
||||
/// <summary> 保存资源 </summary>
|
||||
private void Dirty() {
|
||||
EditorUtility.SetDirty(value);
|
||||
AssetDatabase.SaveAssets();
|
||||
}
|
||||
|
||||
/// <summary> 删除实例 </summary>
|
||||
private void DeleteInstance() {
|
||||
AttributeContainerConst container = instance.container;
|
||||
container.instances.Remove(instance);
|
||||
AttributeContainerConst container = value.container;
|
||||
container.instances.Remove(value);
|
||||
EditorUtility.SetDirty(container);
|
||||
Undo.DestroyObjectImmediate(instance);
|
||||
Undo.DestroyObjectImmediate(value);
|
||||
AssetDatabase.SaveAssets();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,8 @@ guid: 1e2db82f02928494990b89396707863b
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
defaultReferences:
|
||||
- VisualTreeAsset: {fileID: 9197481963319205126, guid: 01bc614c0c779d148afa254dbde22ec8, type: 3}
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
|
||||
@@ -2,6 +2,7 @@ using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UIElements;
|
||||
using UnityEditor;
|
||||
using MuHua;
|
||||
|
||||
namespace MuHuaEditor {
|
||||
@@ -9,106 +10,114 @@ namespace MuHuaEditor {
|
||||
/// 属性 - UI列表
|
||||
/// </summary>
|
||||
public class UIAttributeList : ModuleUIPanel, UIControl {
|
||||
/// <summary> 模板资源 </summary>
|
||||
public VisualTreeAsset templateAsset;
|
||||
/// <summary> 移动目标 </summary>
|
||||
public VisualElement moving;
|
||||
/// <summary> 拖拽预览 </summary>
|
||||
public VisualElement preview;
|
||||
/// <summary> 鼠标位置 </summary>
|
||||
/// <summary> 项目预览 </summary>
|
||||
public UIItem previewItem;
|
||||
/// <summary> 鼠标偏移 </summary>
|
||||
public Vector2 mousePosition;
|
||||
/// <summary> 位置偏移 </summary>
|
||||
public Vector2 positionOffset;
|
||||
/// <summary> 偏移位置 </summary>
|
||||
public Vector2 offsetPosition;
|
||||
public Vector2 mouseOffset;
|
||||
/// <summary> 属性列表 </summary>
|
||||
public AttributeContainerConst container;
|
||||
/// <summary> 项目列表 </summary>
|
||||
public ModuleUIItems<UIItem, AttributeInstanceConst> items;
|
||||
|
||||
public UIAttributeList(VisualElement element, VisualTreeAsset templateAsset) : base(element) {
|
||||
this.templateAsset = templateAsset;
|
||||
items = new ModuleUIItems<UIItem, AttributeInstanceConst>(element, templateAsset,
|
||||
(data, element) => new UIItem(data, element, this));
|
||||
|
||||
element.RegisterCallback<MouseUpEvent>(MouseUpEvent);
|
||||
element.RegisterCallback<MouseMoveEvent>(FloatingFunc);
|
||||
}
|
||||
private void MouseUpEvent(MouseUpEvent evt) {
|
||||
if (preview == null) { return; }
|
||||
preview.parent.Remove(preview);
|
||||
preview = null;
|
||||
moving.EnableInClassList("acce-hide", false);
|
||||
if (previewItem == null) { return; }
|
||||
previewItem.Dispose();
|
||||
|
||||
EditorUtility.SetDirty(container);
|
||||
AssetDatabase.SaveAssets();
|
||||
}
|
||||
private void FloatingFunc(MouseMoveEvent evt) {
|
||||
mousePosition = evt.mousePosition;
|
||||
}
|
||||
|
||||
public void Update() {
|
||||
if (preview == null) { return; }
|
||||
preview.transform.position = mousePosition - offsetPosition;
|
||||
preview.transform.position = positionOffset + mousePosition - mouseOffset;
|
||||
int insertIndex = GetInsertIndex(element, preview);
|
||||
int oldIndex = element.IndexOf(moving);
|
||||
// 修正插入索引
|
||||
// Debug.Log($"{insertIndex} , {oldIndex}");
|
||||
if (insertIndex > oldIndex) insertIndex--;
|
||||
if (oldIndex != insertIndex) { MovePreviewElement(oldIndex, insertIndex); }
|
||||
}
|
||||
|
||||
public void Dispose() => items.Release();
|
||||
|
||||
/// <summary> 初始化 </summary>
|
||||
public void Initial(List<AttributeInstanceConst> list) {
|
||||
items.Create(list);
|
||||
public void Initial(AttributeContainerConst container) {
|
||||
this.container = container;
|
||||
items.Create(container.instances);
|
||||
}
|
||||
/// <summary> 设置值 </summary>
|
||||
// public void Settings(T value) => callback?.Invoke(value);
|
||||
public void Settings(VisualElement moving, AttributeInstanceConst value) {
|
||||
this.moving = moving;
|
||||
moving.EnableInClassList("acce-hide", true);
|
||||
|
||||
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;
|
||||
preview = templateAsset.Instantiate();
|
||||
previewItem = new UIItem(value, preview);
|
||||
items.element.Add(preview);
|
||||
|
||||
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;
|
||||
preview.EnableInClassList("acce-preview", true);
|
||||
// Debug.Log($"{preview.transform.position} , {preview.worldBound.position} , {moving.worldBound.position}");
|
||||
mouseOffset = mousePosition;
|
||||
// preview.transform.position的默认值
|
||||
positionOffset = moving.worldBound.position - preview.worldBound.position;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取插入索引
|
||||
/// </summary>
|
||||
/// <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];
|
||||
for (int i = 0; i < parent.childCount - 1; i++) {
|
||||
VisualElement child = parent[i];
|
||||
if (child == preview) continue;
|
||||
if (previewCenter.y < child.worldBound.center.y) {
|
||||
insertIndex = i;
|
||||
break;
|
||||
}
|
||||
if (previewCenter.y - 10 < child.worldBound.center.y) { insertIndex = i; break; }
|
||||
insertIndex = i + 1;
|
||||
}
|
||||
return insertIndex;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 移动预览元素到新位置
|
||||
/// </summary>
|
||||
/// <summary> 移动预览元素到新位置 </summary>
|
||||
private void MovePreviewElement(int oldIndex, int newIndex) {
|
||||
VisualElement temp = element[oldIndex];
|
||||
// element.RemoveAt(oldIndex);
|
||||
element.Insert(newIndex, temp);
|
||||
|
||||
AttributeInstanceConst instanceConst = container.instances[oldIndex];
|
||||
container.instances.RemoveAt(oldIndex);
|
||||
container.instances.Insert(newIndex, instanceConst);
|
||||
}
|
||||
|
||||
/// <summary> UI项 </summary>
|
||||
public class UIItem : ModuleUIItem<AttributeInstanceConst> {
|
||||
public readonly UIAttributeList parent;
|
||||
public UIAttributePanel attributePanel;
|
||||
|
||||
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) : base(value, element) {
|
||||
attributePanel = new UIAttributePanel(value, element);
|
||||
}
|
||||
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}";
|
||||
attributePanel = new UIAttributePanel(value, element);
|
||||
element.RegisterCallback<MouseDownEvent>(MouseDownEvent);
|
||||
element.RegisterCallback<MouseUpEvent>(MouseUpEvent);
|
||||
}
|
||||
public override void DefaultState() {
|
||||
// Button.EnableInClassList("button-s", false);
|
||||
@@ -118,9 +127,7 @@ namespace MuHuaEditor {
|
||||
// Button.EnableInClassList("button-s", true);
|
||||
}
|
||||
|
||||
private void MouseDownEvent(MouseDownEvent evt) => parent.MouseDownEvent(element);
|
||||
|
||||
private void MouseUpEvent(MouseUpEvent evt) => parent.MouseUpEvent();
|
||||
private void MouseDownEvent(MouseDownEvent evt) => parent.Settings(element, value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UIElements;
|
||||
using UnityEditor;
|
||||
using MuHua;
|
||||
|
||||
/// <summary>
|
||||
/// 属性面板
|
||||
/// </summary>
|
||||
public class UIAttributePanel : ModuleUIPanel {
|
||||
|
||||
private AttributeInstanceConst value;
|
||||
|
||||
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 Toggle Boolean => Q<Toggle>("Boolean");
|
||||
|
||||
public UIAttributePanel(AttributeInstanceConst value, VisualElement element) : base(element) {
|
||||
this.value = value;
|
||||
Initial();
|
||||
Name.RegisterCallback<FocusOutEvent>(evt => ModifyName());
|
||||
Type.RegisterValueChangedCallback(evt => ModifyType((AttributeType)evt.newValue));
|
||||
Value.RegisterCallback<FocusOutEvent>(evt => ModifyValue());
|
||||
Boolean.RegisterValueChangedCallback(evt => ModifyBoolean());
|
||||
}
|
||||
|
||||
public void Initial() {
|
||||
Name.SetValueWithoutNotify(value.name);
|
||||
Type.Init(value.type);
|
||||
Value.SetValueWithoutNotify(value.defaultValue);
|
||||
Boolean.value = value.defaultValue > 0;
|
||||
|
||||
if (value.type == AttributeType.Boolean) {
|
||||
Value.style.display = DisplayStyle.None;
|
||||
}
|
||||
else { Boolean.style.display = DisplayStyle.None; }
|
||||
|
||||
if (value.type == AttributeType.Percentage) {
|
||||
Range.text = $"{value.minValue}% ~ {value.maxValue}%";
|
||||
}
|
||||
else { Range.text = $"{value.minValue} ~ {value.maxValue}"; }
|
||||
}
|
||||
|
||||
/// <summary> 修改名字 </summary>
|
||||
private void ModifyName() { value.name = Name.value; Dirty(); }
|
||||
/// <summary> 修改类型 </summary>
|
||||
private void ModifyType(AttributeType type) {
|
||||
if (type == AttributeType.Float) { value.InitialFloat(); }
|
||||
if (type == AttributeType.Integer) { value.InitialInteger(); }
|
||||
if (type == AttributeType.Boolean) { value.InitialBoolean(); }
|
||||
if (type == AttributeType.Percentage) { value.InitialPercentage(); }
|
||||
if (value.type == AttributeType.Boolean) {
|
||||
Value.style.display = DisplayStyle.None;
|
||||
}
|
||||
else { Boolean.style.display = DisplayStyle.None; }
|
||||
Dirty();
|
||||
}
|
||||
/// <summary> 修改默认值 </summary>
|
||||
private void ModifyValue() { value.defaultValue = Value.value; Dirty(); }
|
||||
/// <summary> 修改布尔值 </summary>
|
||||
private void ModifyBoolean() { value.defaultValue = Boolean.value ? 1 : 0; Dirty(); }
|
||||
|
||||
/// <summary> 保存资源 </summary>
|
||||
private void Dirty() {
|
||||
EditorUtility.SetDirty(value);
|
||||
AssetDatabase.SaveAssets();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4aeb4c96a0ef14c4f9cb2b8afdfc091c
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user