1

Assets/ModuleCore/ModuleInventory/ModuleConst/ConstEquipment/ConstAccessory.cs

@@ -6,7 +6,7 @@ using UnityEngine;
 /// 饰品 - 物品常量
 /// </summary>
 [CreateAssetMenu(menuName = "MuHua/物品系统/饰品")]
-public class ConstAccessory : ConstItem {
+public class ConstAccessory : ConstEquipment {
 	/// <summary> 饰品类型 </summary>
 	public AccessoryType type;
 

Assets/ModuleCore/ModuleInventory/ModuleConst/ConstEquipment/ConstArmor.cs

@@ -6,7 +6,7 @@ using UnityEngine;
 /// 护甲 - 物品常量
 /// </summary>
 [CreateAssetMenu(menuName = "MuHua/物品系统/护甲")]
-public class ConstArmor : ConstItem {
+public class ConstArmor : ConstEquipment {
 	/// <summary> 护甲类型 </summary>
 	public ArmorType type;
 

Assets/ModuleCore/ModuleInventory/ModuleConst/ConstEquipment/ConstEquipment.cs

@@ -5,16 +5,6 @@ using UnityEngine;
 /// <summary>
 /// 装备 - 物品常量
 /// </summary>
-[CreateAssetMenu(menuName = "MuHua/物品系统/装备")]
 public class ConstEquipment : ConstItem {
-	/// <summary> 装备类型 </summary>
-	public string type;
 
-	public override DataItem To() {
-		DataEquipment item = new DataEquipment();
-		item.name = name;
-		item.sprite = sprite;
-		item.type = type;
-		return item;
-	}
 }

Assets/ModuleCore/ModuleInventory/ModuleConst/ConstEquipment/ConstWeapon.cs

@@ -6,7 +6,7 @@ using UnityEngine;
 /// 武器 - 物品常量
 /// </summary>
 [CreateAssetMenu(menuName = "MuHua/物品系统/武器")]
-public class ConstWeapon : ConstItem {
+public class ConstWeapon : ConstEquipment {
 	/// <summary> 武器类型 </summary>
 	public WeaponType type;
 

Assets/ModuleCore/ModuleInventory/ModuleUIPanel/UIDragItem.cs

@@ -37,10 +37,7 @@ public class UIDragItem : ModuleUIPanel, UIControl {
 		container?.Cancel();
 		element.EnableInClassList("document-page-hide", !isEnable);
 		if (container == null || targetContainer == null) { return; }
-		int count = container.Count;
-		DataItem item = container.Item;
-		container.Exchange(targetContainer.Item, targetContainer.Count);
-		targetContainer.Exchange(item, count);
+		container.Exchange(targetContainer);
 	}
 	private void FloatingFunc(MouseMoveEvent evt) {
 		mousePosition = evt.mousePosition;
@@ -94,5 +91,5 @@ public interface DragContainer {
 	/// <summary> 取消拖拽 </summary>
 	public void Cancel();
 	/// <summary> 交换物品 </summary>
-	public void Exchange(DataItem item, int count);
+	public void Exchange(DragContainer container);
 }

Assets/ModuleCore/ModuleInventory/ModuleUIPanel/UIEquipment.cs

@@ -0,0 +1,87 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UIElements;
+using MuHua;
+
+/// <summary>
+/// UI装备栏
+/// </summary>
+public class UIEquipment : ModuleUIPanel {
+
+	public VisualElement EquipmentSlot1 => Q<VisualElement>("EquipmentSlot1");// 主手
+	public VisualElement EquipmentSlot2 => Q<VisualElement>("EquipmentSlot2");// 副手
+	public VisualElement EquipmentSlot3 => Q<VisualElement>("EquipmentSlot3");// 衣服
+	public VisualElement EquipmentSlot4 => Q<VisualElement>("EquipmentSlot4");// 项链
+	public VisualElement EquipmentSlot5 => Q<VisualElement>("EquipmentSlot5");// 戒指1
+	public VisualElement EquipmentSlot6 => Q<VisualElement>("EquipmentSlot6");// 戒指2
+	public VisualElement EquipmentSlot7 => Q<VisualElement>("EquipmentSlot7");// 手镯1
+	public VisualElement EquipmentSlot8 => Q<VisualElement>("EquipmentSlot8");// 手镯2
+	public VisualElement EquipmentSlot9 => Q<VisualElement>("EquipmentSlot9");// 头盔
+	public VisualElement EquipmentSlot10 => Q<VisualElement>("EquipmentSlot10");// 手套
+	public VisualElement EquipmentSlot11 => Q<VisualElement>("EquipmentSlot11");// 腰带
+	public VisualElement EquipmentSlot12 => Q<VisualElement>("EquipmentSlot12");// 鞋子
+
+	public UIEquipment(VisualElement element) : base(element) {
+
+	}
+}
+/// <summary>
+/// UI装备插槽
+/// </summary>
+public class UIEquipmentSlot : ModuleUIPanel, DragContainer {
+
+	public EquipmentSlot value;
+
+	public Label CountLabel => Q<Label>("Count");
+	public VisualElement Image => Q<VisualElement>("Image");
+
+	public int Count => 1;
+	public DataItem Item => value.item;
+	public VisualElement Anchor => element;
+
+	public UIEquipmentSlot(VisualElement element) : base(element) {
+		element.RegisterCallback<MouseDownEvent>(MouseDownEvent);
+		element.RegisterCallback<MouseOverEvent>(MouseOverEvent);
+		element.RegisterCallback<MouseLeaveEvent>(MouseLeaveEvent);
+		element.RegisterCallback<ClickEvent>(ClickEvent);
+	}
+	private void MouseDownEvent(MouseDownEvent evt) {
+		UIPopupManager.I.dragItem.Settings(this);
+		Image.EnableInClassList("equipment-image-drag", true);
+	}
+	private void MouseOverEvent(MouseOverEvent evt) {
+		UIPopupManager.I.dragItem.EnterContainer(this);
+	}
+	private void MouseLeaveEvent(MouseLeaveEvent evt) {
+		UIPopupManager.I.dragItem.ExitContainer(this);
+	}
+	private void ClickEvent(ClickEvent evt) {
+		// Debug.Log("sss");
+	}
+
+	public void Settings(EquipmentSlot value) {
+		this.value = value;
+		UpdatePreview();
+	}
+	public void Cancel() {
+		Image.EnableInClassList("equipment-image-drag", false);
+	}
+	public void Exchange(DragContainer container) {
+		int count = container.Count;
+		DataEquipment item = container.Item as DataEquipment;
+
+		if (container is UIInventory.UIItem inventoryItem) {
+			inventoryItem.value.Settings(value.item, 1);
+			inventoryItem.UpdatePreview();
+		}
+
+		value.item = item;
+		UpdatePreview();
+	}
+
+	private void UpdatePreview() {
+		Sprite sprite = value == null || value.item == null ? null : value.item.sprite;
+		Image.style.backgroundImage = new StyleBackground(sprite);
+	}
+}

Assets/ModuleCore/ModuleInventory/ModuleUIPanel/UIEquipment.cs.meta

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

Assets/ModuleCore/ModuleInventory/ModuleUIPanel/UIInventory.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UIElements;
 using MuHua;
-using System;
 
 /// <summary>
 /// UI库存
@@ -71,12 +70,20 @@ public class UIInventory : ModuleUIPanel {
 		public void Cancel() {
 			Image.EnableInClassList("inventory-image-drag", false);
 		}
-		public void Exchange(DataItem item, int count) {
+		public void Exchange(DragContainer container) {
+			int count = container.Count;
+			DataItem item = container.Item;
+
+			if (container is UIItem inventoryItem) {
+				inventoryItem.value.Settings(value.item, value.count);
+				inventoryItem.UpdatePreview();
+			}
+
 			value.Settings(item, count);
 			UpdatePreview();
 		}
 
-		private void UpdatePreview() {
+		public void UpdatePreview() {
 			CountLabel.text = value.count.ToString();
 			CountLabel.EnableInClassList("inventory-count-hide", value.count <= 1);
 			Image.style.backgroundImage = new StyleBackground(value.Sprite);