MuHua/MuHua-UIElements
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
MuHua-123
2025-09-22 18:02:44 +08:00
parent 217afaa20e
commit 1efe18db95
14 changed files with 175 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/ModuleCore/ModuleInventory/ModuleConst/ConstEquipment/ConstAccessory.cs
+1 -1
View File
@@ -6,7 +6,7 @@ using UnityEngine;
/// 饰品 - 物品常量 /// 饰品 - 物品常量
/// </summary> /// </summary>
[CreateAssetMenu(menuName = "MuHua/物品系统/饰品")] [CreateAssetMenu(menuName = "MuHua/物品系统/饰品")]
public class ConstAccessory : ConstItem { public class ConstAccessory : ConstEquipment {
/// <summary> 饰品类型 </summary> /// <summary> 饰品类型 </summary>
public AccessoryType type; public AccessoryType type;
Assets/ModuleCore/ModuleInventory/ModuleConst/ConstEquipment/ConstArmor.cs
+1 -1
View File
@@ -6,7 +6,7 @@ using UnityEngine;
/// 护甲 - 物品常量 /// 护甲 - 物品常量
/// </summary> /// </summary>
[CreateAssetMenu(menuName = "MuHua/物品系统/护甲")] [CreateAssetMenu(menuName = "MuHua/物品系统/护甲")]
public class ConstArmor : ConstItem { public class ConstArmor : ConstEquipment {
/// <summary> 护甲类型 </summary> /// <summary> 护甲类型 </summary>
public ArmorType type; public ArmorType type;
Assets/ModuleCore/ModuleInventory/ModuleConst/ConstEquipment/ConstEquipment.cs
-10
View File
@@ -5,16 +5,6 @@ using UnityEngine;
/// <summary> /// <summary>
/// 装备 - 物品常量 /// 装备 - 物品常量
/// </summary> /// </summary>
[CreateAssetMenu(menuName = "MuHua/物品系统/装备")]
public class ConstEquipment : ConstItem { 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
+1 -1
View File
@@ -6,7 +6,7 @@ using UnityEngine;
/// 武器 - 物品常量 /// 武器 - 物品常量
/// </summary> /// </summary>
[CreateAssetMenu(menuName = "MuHua/物品系统/武器")] [CreateAssetMenu(menuName = "MuHua/物品系统/武器")]
public class ConstWeapon : ConstItem { public class ConstWeapon : ConstEquipment {
/// <summary> 武器类型 </summary> /// <summary> 武器类型 </summary>
public WeaponType type; public WeaponType type;
Assets/ModuleCore/ModuleInventory/ModuleUIPanel/UIDragItem.cs
+2 -5
View File
@@ -37,10 +37,7 @@ public class UIDragItem : ModuleUIPanel, UIControl {
container?.Cancel(); container?.Cancel();
element.EnableInClassList("document-page-hide", !isEnable); element.EnableInClassList("document-page-hide", !isEnable);
if (container == null || targetContainer == null) { return; } if (container == null || targetContainer == null) { return; }
int count = container.Count; container.Exchange(targetContainer);
DataItem item = container.Item;
container.Exchange(targetContainer.Item, targetContainer.Count);
targetContainer.Exchange(item, count);
} }
private void FloatingFunc(MouseMoveEvent evt) { private void FloatingFunc(MouseMoveEvent evt) {
mousePosition = evt.mousePosition; mousePosition = evt.mousePosition;
@@ -94,5 +91,5 @@ public interface DragContainer {
/// <summary> 取消拖拽 </summary> /// <summary> 取消拖拽 </summary>
public void Cancel(); public void Cancel();
/// <summary> 交换物品 </summary> /// <summary> 交换物品 </summary>
public void Exchange(DataItem item, int count); public void Exchange(DragContainer container);
} }
Assets/ModuleCore/ModuleInventory/ModuleUIPanel/UIEquipment.cs
+87
View File
@@ -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
+11
View File
@@ -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
+10 -3
View File
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.UIElements; using UnityEngine.UIElements;
using MuHua; using MuHua;
using System;
/// <summary> /// <summary>
/// UI库存 /// UI库存
@@ -71,12 +70,20 @@ public class UIInventory : ModuleUIPanel {
public void Cancel() { public void Cancel() {
Image.EnableInClassList("inventory-image-drag", false); 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); value.Settings(item, count);
UpdatePreview(); UpdatePreview();
} }
private void UpdatePreview() { public void UpdatePreview() {
CountLabel.text = value.count.ToString(); CountLabel.text = value.count.ToString();
CountLabel.EnableInClassList("inventory-count-hide", value.count <= 1); CountLabel.EnableInClassList("inventory-count-hide", value.count <= 1);
Image.style.backgroundImage = new StyleBackground(value.Sprite); Image.style.backgroundImage = new StyleBackground(value.Sprite);
Assets/ModuleCore/ModuleSingle/SingleManager.cs
+8 -2
View File
@@ -19,8 +19,14 @@ public class SingleManager : ModuleSingle<SingleManager> {
private void Start() { private void Start() {
inventory = new Inventory(40); inventory = new Inventory(40);
equipment = new Equipment(); equipment = new Equipment();
equipment.AddSlot(new WeaponSlot("主手"));
equipment.AddSlot(new DeputySlot("副手")); WeaponSlot weaponSlot = new WeaponSlot("主手");
DeputySlot deputySlot = new DeputySlot("副手");
weaponSlot.deputy = deputySlot;
deputySlot.weapon = weaponSlot;
equipment.AddSlot(weaponSlot);
equipment.AddSlot(deputySlot);
equipment.AddSlot(new ArmorSlot("上衣")); equipment.AddSlot(new ArmorSlot("上衣"));
equipment.AddSlot(new ArmorSlot("头盔")); equipment.AddSlot(new ArmorSlot("头盔"));
Assets/SceneManager/SampleScene/SampleScene.unity
+10 -20
View File
@@ -696,26 +696,16 @@ MonoBehaviour:
- {fileID: 11400000, guid: 3730099e2e68c3542b98c0dfb4021852, type: 2} - {fileID: 11400000, guid: 3730099e2e68c3542b98c0dfb4021852, type: 2}
- {fileID: 11400000, guid: cc75bbd52a24b2444be229933da52925, type: 2} - {fileID: 11400000, guid: cc75bbd52a24b2444be229933da52925, type: 2}
equipments: equipments:
- {fileID: 11400000, guid: b4dd2503d40847148bc0372ce8540434, type: 2} - {fileID: 11400000, guid: 03acc552c7399334f989ab93c1c4cc29, type: 2}
- {fileID: 11400000, guid: 77e96b5a3bb6e4e4b8686c10418bfe33, type: 2} - {fileID: 11400000, guid: 905c298f3d6d27a40a2ca6a5f6339091, type: 2}
- {fileID: 11400000, guid: 90d6899d05f419b4d82b03f1593e2a16, type: 2} - {fileID: 11400000, guid: 0520edca39c851c48869ed5ad1deda12, type: 2}
- {fileID: 11400000, guid: 4912e9a5e3f916542947fa3cd18cb099, type: 2} - {fileID: 11400000, guid: 3a01e30774752ae4ea9c99adeda7306c, type: 2}
- {fileID: 11400000, guid: 8e06b3ab4dc51de40a783defb2d0c4e6, type: 2} - {fileID: 11400000, guid: 433706ae807310b428ba904f4e45bd00, type: 2}
- {fileID: 11400000, guid: 7d057f8a77adf3e40878c13575c99b65, type: 2} - {fileID: 11400000, guid: 3f16688385cc5a942b38ebd5c494e8a0, type: 2}
- {fileID: 11400000, guid: dce96b3eaf3a3b64c8b34baf4d051ceb, type: 2} - {fileID: 11400000, guid: 4d73e6b89d2b7d04597040d7382d0b7b, type: 2}
- {fileID: 11400000, guid: c7932029040fdf5458c6ea5a386327d3, type: 2} - {fileID: 11400000, guid: fdcfee59ea451c640a2c5143f2ca510e, type: 2}
- {fileID: 11400000, guid: 50c2e6f3e7d20fb4b837929a4f07ea7e, type: 2} - {fileID: 11400000, guid: 05cab84fa5dac6749b6376921d9014be, type: 2}
- {fileID: 11400000, guid: 50f2a96404c294047a76274e4e8c63a8, type: 2} - {fileID: 11400000, guid: 494400ddbdab4494d83ef345199369e0, type: 2}
- {fileID: 11400000, guid: a5a398a8698d6ef4697be903010fde09, type: 2}
- {fileID: 11400000, guid: d4ff4189e79f2be4da73bc51bf4d4788, type: 2}
- {fileID: 11400000, guid: 8e0377d816573294c9f43c1c20f03b77, type: 2}
- {fileID: 11400000, guid: 143cc31636628c142ae40dde036ce86f, type: 2}
- {fileID: 11400000, guid: 35f15def0891d614bae0ff09779fa1ee, type: 2}
- {fileID: 11400000, guid: c60ffdf8ff1353445ac21bb4b7f13866, type: 2}
- {fileID: 11400000, guid: bca85124ea467a94abeae327f357c667, type: 2}
- {fileID: 11400000, guid: 73e9e7768b54e6345874c5b7253711e2, type: 2}
- {fileID: 11400000, guid: cf288ac6585b28c43a51318a3ca62622, type: 2}
- {fileID: 11400000, guid: 17b8cc7fd08e4dc46908afd685c1bffa, type: 2}
--- !u!1 &1532585503 --- !u!1 &1532585503
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
Assets/UI Toolkit/GamePanel/Equipment/Equipment.uss
+28
View File
@@ -0,0 +1,28 @@
.equipment-image {
flex-grow: 1;
}
.equipment-image-drag {
-unity-background-image-tint-color: rgba(255, 255, 255, 0.4);
}
.equipment-count {
margin-top: 0;
margin-right: 5px;
margin-bottom: 0;
margin-left: 5px;
padding-top: 0;
padding-right: 0;
padding-bottom: 0;
padding-left: 0;
-unity-text-align: upper-right;
color: rgb(255, 255, 255);
position: absolute;
bottom: 0;
left: 0;
right: 0;
}
.equipment-count-hide {
display: none;
}
Assets/UI Toolkit/GamePanel/Equipment/Equipment.uxml
+12 -12
View File
@@ -3,29 +3,29 @@
<Style src="project://database/Assets/UI%20Toolkit/GamePanel/Equipment/Equipment.uss?fileID=7433441132597879392&amp;guid=ea431661362425a4e9b547f470789774&amp;type=3#Equipment" /> <Style src="project://database/Assets/UI%20Toolkit/GamePanel/Equipment/Equipment.uss?fileID=7433441132597879392&amp;guid=ea431661362425a4e9b547f470789774&amp;type=3#Equipment" />
<ui:VisualElement> <ui:VisualElement>
<ui:VisualElement style="flex-direction: row;"> <ui:VisualElement style="flex-direction: row;">
<ui:Instance template="EquipmentTemplate" name="EquipmentTemplate" /> <ui:Instance template="EquipmentTemplate" name="EquipmentSlot1" />
<ui:Instance template="EquipmentTemplate" name="EquipmentTemplate" /> <ui:Instance template="EquipmentTemplate" name="EquipmentSlot2" />
<ui:Instance template="EquipmentTemplate" name="EquipmentTemplate" /> <ui:Instance template="EquipmentTemplate" name="EquipmentSlot3" />
<ui:Instance template="EquipmentTemplate" name="EquipmentTemplate" /> <ui:Instance template="EquipmentTemplate" name="EquipmentSlot4" />
</ui:VisualElement> </ui:VisualElement>
<ui:VisualElement style="flex-direction: row;"> <ui:VisualElement style="flex-direction: row;">
<ui:VisualElement> <ui:VisualElement>
<ui:Instance template="EquipmentTemplate" name="EquipmentTemplate" /> <ui:Instance template="EquipmentTemplate" name="EquipmentSlot5" />
<ui:Instance template="EquipmentTemplate" name="EquipmentTemplate" /> <ui:Instance template="EquipmentTemplate" name="EquipmentSlot6" />
</ui:VisualElement> </ui:VisualElement>
<ui:VisualElement style="flex-grow: 1;"> <ui:VisualElement style="flex-grow: 1;">
<ui:VisualElement style="width: 190px; height: 190px; margin-top: 5px; margin-right: 5px; margin-bottom: 5px; margin-left: 5px; background-color: rgb(102, 102, 102); border-top-left-radius: 8px; border-top-right-radius: 8px; border-bottom-right-radius: 8px; border-bottom-left-radius: 8px;" /> <ui:VisualElement style="width: 190px; height: 190px; margin-top: 5px; margin-right: 5px; margin-bottom: 5px; margin-left: 5px; background-color: rgb(102, 102, 102); border-top-left-radius: 8px; border-top-right-radius: 8px; border-bottom-right-radius: 8px; border-bottom-left-radius: 8px;" />
</ui:VisualElement> </ui:VisualElement>
<ui:VisualElement> <ui:VisualElement>
<ui:Instance template="EquipmentTemplate" name="EquipmentTemplate" /> <ui:Instance template="EquipmentTemplate" name="EquipmentSlot7" />
<ui:Instance template="EquipmentTemplate" name="EquipmentTemplate" /> <ui:Instance template="EquipmentTemplate" name="EquipmentSlot8" />
</ui:VisualElement> </ui:VisualElement>
</ui:VisualElement> </ui:VisualElement>
<ui:VisualElement style="flex-direction: row;"> <ui:VisualElement style="flex-direction: row;">
<ui:Instance template="EquipmentTemplate" name="EquipmentTemplate" /> <ui:Instance template="EquipmentTemplate" name="EquipmentSlot9" />
<ui:Instance template="EquipmentTemplate" name="EquipmentTemplate" /> <ui:Instance template="EquipmentTemplate" name="EquipmentSlot10" />
<ui:Instance template="EquipmentTemplate" name="EquipmentTemplate" /> <ui:Instance template="EquipmentTemplate" name="EquipmentSlot11" />
<ui:Instance template="EquipmentTemplate" name="EquipmentTemplate" /> <ui:Instance template="EquipmentTemplate" name="EquipmentSlot12" />
</ui:VisualElement> </ui:VisualElement>
</ui:VisualElement> </ui:VisualElement>
<ui:VisualElement style="flex-grow: 1;"> <ui:VisualElement style="flex-grow: 1;">
Assets/UI Toolkit/GamePanel/Equipment/EquipmentTemplate.uxml → Assets/UI Toolkit/GamePanel/Equipment/EquipmentSlot.uxml
+4 -1
View File
@@ -1,4 +1,7 @@
<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: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/Equipment/Equipment.uss?fileID=7433441132597879392&amp;guid=ea431661362425a4e9b547f470789774&amp;type=3#Equipment" /> <Style src="project://database/Assets/UI%20Toolkit/GamePanel/Equipment/Equipment.uss?fileID=7433441132597879392&amp;guid=ea431661362425a4e9b547f470789774&amp;type=3#Equipment" />
<ui:VisualElement style="width: 90px; height: 90px; margin-top: 5px; margin-right: 5px; margin-bottom: 5px; margin-left: 5px; background-color: rgb(102, 102, 102); border-top-left-radius: 8px; border-top-right-radius: 8px; border-bottom-right-radius: 8px; border-bottom-left-radius: 8px;" /> <ui:VisualElement style="width: 90px; height: 90px; margin-top: 5px; margin-right: 5px; margin-bottom: 5px; margin-left: 5px; background-color: rgb(102, 102, 102); border-top-left-radius: 8px; border-top-right-radius: 8px; border-bottom-right-radius: 8px; border-bottom-left-radius: 8px;">
<ui:VisualElement name="Image" class="equipment-image" />
<ui:Label tabindex="-1" text="999" parse-escape-sequences="true" display-tooltip-when-elided="true" enable-rich-text="true" name="Count" class="equipment-count" />
</ui:VisualElement>
</ui:UXML> </ui:UXML>
Assets/UI Toolkit/GamePanel/Equipment/EquipmentTemplate.uxml.meta → Assets/UI Toolkit/GamePanel/Equipment/EquipmentSlot.uxml.meta
View File