1

Assets/ModuleCore/ModuleEquipment/EquipmentColumn.cs

@@ -14,26 +14,43 @@ public class EquipmentColumn {
 	public EquipmentSlot this[string key] => dictionary[key];
 
 	public EquipmentColumn() {
-		AddSlot(new EquipmentSlot(EquipmentSlotType.主手, VerifyWeapon));
-		AddSlot(new EquipmentSlot(EquipmentSlotType.副手, VerifyDeputy));
+		AddSlot(WeaponSlot());
+		AddSlot(DeputySlot());
 
-		AddSlot(new EquipmentSlot(EquipmentSlotType.上衣, (equipment) => VerifyCommon(equipment, ArmorType.上衣.ToString())));
-		AddSlot(new EquipmentSlot(EquipmentSlotType.头盔, (equipment) => VerifyCommon(equipment, ArmorType.头盔.ToString())));
-		AddSlot(new EquipmentSlot(EquipmentSlotType.手套, (equipment) => VerifyCommon(equipment, ArmorType.手套.ToString())));
-		AddSlot(new EquipmentSlot(EquipmentSlotType.腰带, (equipment) => VerifyCommon(equipment, ArmorType.腰带.ToString())));
-		AddSlot(new EquipmentSlot(EquipmentSlotType.鞋子, (equipment) => VerifyCommon(equipment, ArmorType.鞋子.ToString())));
+		AddSlot(ArmorSlot(EquipmentSlotType.上衣, ArmorType.上衣));
+		AddSlot(ArmorSlot(EquipmentSlotType.头盔, ArmorType.头盔));
+		AddSlot(ArmorSlot(EquipmentSlotType.手套, ArmorType.手套));
+		AddSlot(ArmorSlot(EquipmentSlotType.腰带, ArmorType.腰带));
+		AddSlot(ArmorSlot(EquipmentSlotType.鞋子, ArmorType.鞋子));
 
-		AddSlot(new EquipmentSlot(EquipmentSlotType.项链, (equipment) => VerifyCommon(equipment, AccessoryType.项链.ToString())));
-		AddSlot(new EquipmentSlot(EquipmentSlotType.戒指1, (equipment) => VerifyCommon(equipment, AccessoryType.戒指.ToString())));
-		AddSlot(new EquipmentSlot(EquipmentSlotType.戒指2, (equipment) => VerifyCommon(equipment, AccessoryType.戒指.ToString())));
-		AddSlot(new EquipmentSlot(EquipmentSlotType.手镯1, (equipment) => VerifyCommon(equipment, AccessoryType.手镯.ToString())));
-		AddSlot(new EquipmentSlot(EquipmentSlotType.手镯2, (equipment) => VerifyCommon(equipment, AccessoryType.手镯.ToString())));
+		AddSlot(AccessorySlot(EquipmentSlotType.项链, AccessoryType.项链));
+		AddSlot(AccessorySlot(EquipmentSlotType.戒指1, AccessoryType.戒指));
+		AddSlot(AccessorySlot(EquipmentSlotType.戒指2, AccessoryType.戒指));
+		AddSlot(AccessorySlot(EquipmentSlotType.手镯1, AccessoryType.手镯));
+		AddSlot(AccessorySlot(EquipmentSlotType.手镯2, AccessoryType.手镯));
 	}
 
 	public bool ContainsKey(string key) => dictionary.ContainsKey(key);
 	/// <summary> 添加插槽 </summary>
 	public void AddSlot(EquipmentSlot slot) => dictionary.Add(slot.name, slot);
 
+	/// <summary> 武器插槽 </summary>
+	public EquipmentSlot WeaponSlot() {
+		return new EquipmentSlot(EquipmentSlotType.主手, VerifyWeapon);
+	}
+	/// <summary> 副手插槽 </summary>
+	public EquipmentSlot DeputySlot() {
+		return new EquipmentSlot(EquipmentSlotType.副手, VerifyDeputy);
+	}
+	/// <summary> 护甲插槽 </summary>
+	public EquipmentSlot ArmorSlot(EquipmentSlotType type, ArmorType armor) {
+		return new EquipmentSlot(type, (equipment) => VerifyCommon(equipment, armor.ToString()));
+	}
+	/// <summary> 饰品插槽 </summary>
+	public EquipmentSlot AccessorySlot(EquipmentSlotType type, AccessoryType accessory) {
+		return new EquipmentSlot(type, (equipment) => VerifyCommon(equipment, accessory.ToString()));
+	}
+
 	/// <summary> 通用校验 </summary>
 	public static bool VerifyCommon(Equipment equipment, string type) {
 		string[] types = equipment.type.Split("/");

Assets/ModuleCore/ModuleEquipment/ModuleConst/ConstWeapon.cs

@@ -9,18 +9,26 @@ public enum WeaponType {
 	单手, 副手, 双手
 }
 /// <summary>
+/// 武器类别
+/// </summary>
+public enum WeaponCategory {
+	剑, 刀, 枪, 弓, 法杖, 斧头, 锤子
+}
+/// <summary>
 /// 武器 - 物品常量
 /// </summary>
 [CreateAssetMenu(menuName = "MuHua/物品系统/武器")]
 public class ConstWeapon : ConstEquipment {
 	/// <summary> 武器类型 </summary>
 	public WeaponType type;
+	/// <summary> 武器类别 </summary>
+	public WeaponCategory category;
 
 	public override InventoryItem To() {
 		Equipment item = new Equipment();
 		item.name = name;
 		item.sprite = sprite;
-		item.type = type.ToString();
+		item.type = $"{type}/{category}";
 		return item;
 	}
 }

Assets/ModuleCore/ModuleEquipment/ModuleUIPanel/UIEquipmentTip.cs

@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UIElements;
+using MuHua;
+
+/// <summary>
+/// 装备提示
+/// </summary>
+public class UIEquipmentTip : ModuleUIPanel {
+	public UIEquipmentTip(VisualElement element) : base(element) {
+
+	}
+}

Assets/ModuleCore/ModuleEquipment/ModuleUIPanel/UIEquipmentTip.cs.meta

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

Assets/ModuleCore/ModuleInventory/ModuleUIPanel/UIInventoryTip.cs

@@ -0,0 +1,16 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UIElements;
+using MuHua;
+
+/// <summary>
+/// 库存提示
+/// </summary>
+public class UIInventoryTip : ModuleUIPanel {
+
+	public UIInventoryTip(VisualElement element) : base(element) {
+
+	}
+
+}

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

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

Assets/ModuleCore/ModuleUI/ModuleUIPage/UIBackpackPage.cs

@@ -15,11 +15,11 @@ public class UIBackpackPage : ModuleUIPage {
 
 	public override VisualElement Element => root.Q<VisualElement>("BackpackPage");
 
-	public VisualElement Equipment => Q<VisualElement>("Equipment");
 	public VisualElement Inventory => Q<VisualElement>("Inventory");
+	public VisualElement EquipmentColumn => Q<VisualElement>("EquipmentColumn");
 
 	protected void Awake() {
-		equipment = new UIEquipmentColumn(Equipment);
+		equipment = new UIEquipmentColumn(EquipmentColumn);
 		inventory = new UIInventory(Inventory, inventorySlot);
 
 		ModuleUI.OnJumpPage += ModuleUI_OnJumpPage;