From a18bea561a5329cf46ec0ed556053306a1292aa6 Mon Sep 17 00:00:00 2001
From: MuHua-123 <136542559+MuHua-123@users.noreply.github.com>
Date: Mon, 29 Sep 2025 17:58:53 +0800
Subject: [PATCH] 1
---
.../ModuleConst.meta => AssetsEquipment.meta} | 2 +-
.../ScriptableObject.meta} | 2 +-
.../ScriptableObject}/护甲.meta | 0
.../ScriptableObject/护甲/上衣.meta} | 2 +-
.../ScriptableObject/护甲/上衣}/上衣.asset | 0
.../护甲/上衣}/上衣.asset.meta | 0
.../ScriptableObject/护甲/头盔.meta | 8 ++
.../ScriptableObject/护甲/头盔}/头盔.asset | 0
.../护甲/头盔}/头盔.asset.meta | 0
.../ScriptableObject/护甲/手套.meta | 8 ++
.../ScriptableObject/护甲/手套}/手套.asset | 0
.../护甲/手套}/手套.asset.meta | 0
.../ScriptableObject/护甲/腰带.meta | 8 ++
.../ScriptableObject/护甲/腰带}/腰带.asset | 0
.../护甲/腰带}/腰带.asset.meta | 0
.../ScriptableObject/护甲/鞋子.meta | 8 ++
.../ScriptableObject/护甲/鞋子}/鞋子.asset | 0
.../护甲/鞋子}/鞋子.asset.meta | 0
.../ScriptableObject}/武器.meta | 0
.../ScriptableObject/武器/副手.meta | 8 ++
.../ScriptableObject/武器/副手}/盾牌.asset | 0
.../武器/副手}/盾牌.asset.meta | 0
.../ScriptableObject/武器/单手.meta | 8 ++
.../ScriptableObject/武器/单手/单手剑 1.asset | 16 +++
.../武器/单手/单手剑 1.asset.meta | 8 ++
.../ScriptableObject/武器/单手/单手剑 2.asset | 16 +++
.../武器/单手/单手剑 2.asset.meta | 8 ++
.../ScriptableObject/武器/单手}/单手剑.asset | 0
.../武器/单手}/单手剑.asset.meta | 0
.../ScriptableObject/武器/双手.meta | 8 ++
.../ScriptableObject/武器/双手}/弓.asset | 0
.../ScriptableObject/武器/双手}/弓.asset.meta | 0
.../ScriptableObject}/饰品.meta | 0
.../ScriptableObject/饰品/戒指.meta | 8 ++
.../ScriptableObject/饰品/戒指}/戒指.asset | 0
.../饰品/戒指}/戒指.asset.meta | 0
.../ScriptableObject/饰品/手镯.meta | 8 ++
.../ScriptableObject/饰品/项链.meta | 8 ++
.../ScriptableObject/饰品/项链}/项链.asset | 0
.../饰品/项链}/项链.asset.meta | 0
Assets/AssetsPackage/物品数据/属性容器.asset | 4 +-
.../{ModuleConst => }/Editor.meta | 0
.../Editor/AttributeContainerConstEditor.cs | 56 ++++++++
.../AttributeContainerConstEditor.cs.meta | 13 ++
.../Editor/AttributeInstanceConstEditor.cs | 46 +++++++
.../AttributeInstanceConstEditor.cs.meta} | 0
.../Editor}/ModuleUIPanel.meta | 2 +-
.../Editor/ModuleUIPanel/UIAttributeList.cs | 126 ++++++++++++++++++
.../ModuleUIPanel/UIAttributeList.cs.meta} | 2 +-
.../Editor/ConstAttributeContainerEditor.cs | 43 ------
.../Editor/ConstAttributeInstanceEditor.cs | 44 ------
.../ModuleCore/ModuleAttribute/Runtime.meta | 8 ++
.../{ => Runtime}/AttributeContainer.cs | 0
.../{ => Runtime}/AttributeContainer.cs.meta | 0
.../AttributeContainerConst.cs} | 4 +-
.../AttributeContainerConst.cs.meta} | 0
.../{ => Runtime}/AttributeInstance.cs | 0
.../{ => Runtime}/AttributeInstance.cs.meta | 0
.../AttributeInstanceConst.cs} | 6 +-
.../AttributeInstanceConst.cs.meta} | 0
.../{ => Runtime}/AttributeModifier.cs | 0
.../{ => Runtime}/AttributeModifier.cs.meta | 0
.../{ => Runtime}/AttributeSystem.cs | 0
.../{ => Runtime}/AttributeSystem.cs.meta | 0
.../{ => Runtime}/AttributeType.cs | 0
.../{ => Runtime}/AttributeType.cs.meta | 0
.../ModuleAttribute/UI Toolkit.meta | 8 ++
.../AttributeContainerConstEditor.meta | 8 ++
.../AttributeContainerConstEditor.uss | 0
.../AttributeContainerConstEditor.uss.meta} | 2 +-
.../AttributeContainerConstEditor.uxml | 16 +++
.../AttributeContainerConstEditor.uxml.meta} | 2 +-
.../AttributeTemplate.uxml | 9 ++
.../AttributeTemplate.uxml.meta | 10 ++
.../{ModuleConst => }/Editor.meta | 0
.../ModuleEquipment/Editor/EquipmentWindow.cs | 102 ++++++++++++++
.../Editor/EquipmentWindow.cs.meta | 14 ++
.../ModuleEquipment/Editor/ModuleUIPanel.meta | 8 ++
.../Editor/ModuleUIPanel/UIEquipmentEnum.cs | 59 ++++++++
.../ModuleUIPanel/UIEquipmentEnum.cs.meta} | 2 +-
.../Editor/ModuleUIPanel/UIEquipmentList.cs | 58 ++++++++
.../ModuleUIPanel/UIEquipmentList.cs.meta | 11 ++
.../Editor/WeaponConstEditor.cs | 15 +++
.../WeaponConstEditor.cs.meta} | 0
.../ModuleCore/ModuleEquipment/Runtime.meta | 8 ++
.../ModuleEquipment/Runtime/EnumType.meta | 8 ++
.../Runtime/EnumType/AccessoryType.cs | 12 ++
.../Runtime/EnumType/AccessoryType.cs.meta | 11 ++
.../Runtime/EnumType/ArmorType.cs | 14 ++
.../Runtime/EnumType/ArmorType.cs.meta | 11 ++
.../Runtime/EnumType/EquipmentSlotType.cs | 23 ++++
.../EnumType/EquipmentSlotType.cs.meta | 11 ++
.../Runtime/EnumType/EquipmentType.cs | 12 ++
.../Runtime/EnumType/EquipmentType.cs.meta | 11 ++
.../Runtime/EnumType/WeaponType.cs | 12 ++
.../Runtime/EnumType/WeaponType.cs.meta | 11 ++
.../ModuleEquipment/Runtime/Equipment.meta | 8 ++
.../Equipment/Accessory.cs} | 2 +-
.../Runtime/Equipment/Accessory.cs.meta | 11 ++
.../Runtime/Equipment/Armor.cs | 18 +++
.../Runtime/Equipment/Armor.cs.meta | 11 ++
.../{ => Runtime/Equipment}/Equipment.cs | 0
.../{ => Runtime/Equipment}/Equipment.cs.meta | 0
.../Runtime/Equipment/Weapon.cs | 18 +++
.../Runtime/Equipment/Weapon.cs.meta | 11 ++
.../{ => Runtime}/EquipmentAffix.cs | 0
.../{ => Runtime}/EquipmentAffix.cs.meta | 0
.../{ => Runtime}/EquipmentColumn.cs | 0
.../{ => Runtime}/EquipmentColumn.cs.meta | 0
.../EquipmentConst.meta} | 0
.../EquipmentConst/AccessoryConst.cs} | 8 +-
.../EquipmentConst/AccessoryConst.cs.meta} | 0
.../EquipmentConst/ArmorConst.cs} | 9 +-
.../EquipmentConst/ArmorConst.cs.meta} | 0
.../EquipmentConst/EquipmentConst.cs} | 2 +-
.../EquipmentConst/EquipmentConst.cs.meta} | 0
.../EquipmentConst/WeaponConst.cs} | 16 +--
.../EquipmentConst/WeaponConst.cs.meta} | 0
.../{ => Runtime}/EquipmentSlot.cs | 8 --
.../{ => Runtime}/EquipmentSlot.cs.meta | 0
.../ModuleEquipment/UI Toolkit.meta | 8 ++
.../ModuleEquipment/UI Toolkit/Button.meta | 8 ++
.../UI Toolkit/Button/ButtonTemplate.uss | 4 +
.../UI Toolkit/Button/ButtonTemplate.uss.meta | 11 ++
.../UI Toolkit/Button/ButtonTemplate.uxml | 4 +
.../Button/ButtonTemplate.uxml.meta | 10 ++
.../UI Toolkit/EquipmentWindow.meta | 8 ++
.../EquipmentWindow/EquipmentList.uxml | 21 +++
.../EquipmentWindow/EquipmentList.uxml.meta | 10 ++
.../EquipmentWindow/EquipmentTemplate.uxml | 3 +
.../EquipmentTemplate.uxml.meta | 10 ++
.../EquipmentWindow/EquipmentWindow.uss | 0
.../EquipmentWindow/EquipmentWindow.uss.meta | 11 ++
.../EquipmentWindow/EquipmentWindow.uxml | 32 +++++
.../EquipmentWindow/EquipmentWindow.uxml.meta | 10 ++
.../{ModuleConst => }/ConstMaterial.cs | 2 +-
.../{ModuleConst => }/ConstMaterial.cs.meta | 0
.../ModuleInventory/InventoryDrag.cs | 21 ---
...InventoryItem.cs => InventoryItemConst.cs} | 2 +-
...tem.cs.meta => InventoryItemConst.cs.meta} | 0
.../ModuleCore/ModuleSingle/AssetsManager.cs | 2 +-
Assets/ModuleCore/ModuleSingle/ManagerItem.cs | 4 +-
.../ModuleUI/ModuleUIPanel/Equipment.meta | 8 ++
.../Equipment}/UIEquipmentColumn.cs | 0
.../Equipment}/UIEquipmentColumn.cs.meta | 0
.../Equipment}/UIEquipmentSlot.cs | 0
.../Equipment}/UIEquipmentSlot.cs.meta | 0
.../Equipment}/UIEquipmentTip.cs | 0
.../Equipment}/UIEquipmentTip.cs.meta | 0
.../ModuleUIPanel/Inventory.meta} | 0
.../ModuleUIPanel/Inventory}/UIInventory.cs | 0
.../Inventory}/UIInventory.cs.meta | 0
.../Inventory}/UIInventoryDrag.cs | 16 +++
.../Inventory}/UIInventoryDrag.cs.meta | 0
.../Inventory}/UIInventorySlot.cs | 0
.../Inventory}/UIInventorySlot.cs.meta | 0
.../Inventory}/UIInventoryTip.cs | 0
.../Inventory}/UIInventoryTip.cs.meta | 0
.../Component/Dropdown/Dropdown.uxml | 2 +-
.../Component/Dropdown/DropdownTemplate.uxml | 2 +-
.../Component/ScrollView/ScrollView.uss | 4 +-
.../EditorWindow/TestEditorWindow.uss | 5 -
.../EditorWindow/TestEditorWindow.uxml | 12 --
.../GamePopup/Guidance/Guidance.uxml | 2 +-
.../GamePopup/ShortcutMenu/ItemTemplate.uxml | 2 +-
.../{DefaultTheme.meta => UnityThemes.meta} | 0
.../PanelSettings.asset | 0
.../PanelSettings.asset.meta | 0
.../UnityDefaultRuntimeTheme.tss | 0
.../UnityDefaultRuntimeTheme.tss.meta | 0
Packages/UITool/Editor.meta | 8 ++
Packages/UITool/Editor/ModuleUIEditor.cs | 65 +++++++++
Packages/UITool/Editor/ModuleUIEditor.cs.meta | 11 ++
.../UITool/Editor/ModuleUIEditorWindow.cs | 42 ++++++
.../Editor/ModuleUIEditorWindow.cs.meta | 11 ++
.../UITool/Editor/MuHuaEditor.UITool.asmdef | 18 +++
.../Editor/MuHuaEditor.UITool.asmdef.meta | 7 +
.../BurstAotSettings_StandaloneWindows.json | 18 +++
ProjectSettings/BurstAotSettings_WebGL.json | 16 +++
ProjectSettings/CommonBurstAotSettings.json | 6 +
180 files changed, 1325 insertions(+), 189 deletions(-)
rename Assets/{ModuleCore/ModuleAttribute/ModuleConst.meta => AssetsEquipment.meta} (77%)
rename Assets/{ModuleCore/ModuleInventory/ModuleConst.meta => AssetsEquipment/ScriptableObject.meta} (77%)
rename Assets/{AssetsPackage/物品数据 => AssetsEquipment/ScriptableObject}/护甲.meta (100%)
rename Assets/{ModuleCore/ModuleFormula/ModuleConst.meta => AssetsEquipment/ScriptableObject/护甲/上衣.meta} (77%)
rename Assets/{AssetsPackage/物品数据/护甲 => AssetsEquipment/ScriptableObject/护甲/上衣}/上衣.asset (100%)
rename Assets/{AssetsPackage/物品数据/护甲 => AssetsEquipment/ScriptableObject/护甲/上衣}/上衣.asset.meta (100%)
create mode 100644 Assets/AssetsEquipment/ScriptableObject/护甲/头盔.meta
rename Assets/{AssetsPackage/物品数据/护甲 => AssetsEquipment/ScriptableObject/护甲/头盔}/头盔.asset (100%)
rename Assets/{AssetsPackage/物品数据/护甲 => AssetsEquipment/ScriptableObject/护甲/头盔}/头盔.asset.meta (100%)
create mode 100644 Assets/AssetsEquipment/ScriptableObject/护甲/手套.meta
rename Assets/{AssetsPackage/物品数据/护甲 => AssetsEquipment/ScriptableObject/护甲/手套}/手套.asset (100%)
rename Assets/{AssetsPackage/物品数据/护甲 => AssetsEquipment/ScriptableObject/护甲/手套}/手套.asset.meta (100%)
create mode 100644 Assets/AssetsEquipment/ScriptableObject/护甲/腰带.meta
rename Assets/{AssetsPackage/物品数据/护甲 => AssetsEquipment/ScriptableObject/护甲/腰带}/腰带.asset (100%)
rename Assets/{AssetsPackage/物品数据/护甲 => AssetsEquipment/ScriptableObject/护甲/腰带}/腰带.asset.meta (100%)
create mode 100644 Assets/AssetsEquipment/ScriptableObject/护甲/鞋子.meta
rename Assets/{AssetsPackage/物品数据/护甲 => AssetsEquipment/ScriptableObject/护甲/鞋子}/鞋子.asset (100%)
rename Assets/{AssetsPackage/物品数据/护甲 => AssetsEquipment/ScriptableObject/护甲/鞋子}/鞋子.asset.meta (100%)
rename Assets/{AssetsPackage/物品数据 => AssetsEquipment/ScriptableObject}/武器.meta (100%)
create mode 100644 Assets/AssetsEquipment/ScriptableObject/武器/副手.meta
rename Assets/{AssetsPackage/物品数据/武器 => AssetsEquipment/ScriptableObject/武器/副手}/盾牌.asset (100%)
rename Assets/{AssetsPackage/物品数据/武器 => AssetsEquipment/ScriptableObject/武器/副手}/盾牌.asset.meta (100%)
create mode 100644 Assets/AssetsEquipment/ScriptableObject/武器/单手.meta
create mode 100644 Assets/AssetsEquipment/ScriptableObject/武器/单手/单手剑 1.asset
create mode 100644 Assets/AssetsEquipment/ScriptableObject/武器/单手/单手剑 1.asset.meta
create mode 100644 Assets/AssetsEquipment/ScriptableObject/武器/单手/单手剑 2.asset
create mode 100644 Assets/AssetsEquipment/ScriptableObject/武器/单手/单手剑 2.asset.meta
rename Assets/{AssetsPackage/物品数据/武器 => AssetsEquipment/ScriptableObject/武器/单手}/单手剑.asset (100%)
rename Assets/{AssetsPackage/物品数据/武器 => AssetsEquipment/ScriptableObject/武器/单手}/单手剑.asset.meta (100%)
create mode 100644 Assets/AssetsEquipment/ScriptableObject/武器/双手.meta
rename Assets/{AssetsPackage/物品数据/武器 => AssetsEquipment/ScriptableObject/武器/双手}/弓.asset (100%)
rename Assets/{AssetsPackage/物品数据/武器 => AssetsEquipment/ScriptableObject/武器/双手}/弓.asset.meta (100%)
rename Assets/{AssetsPackage/物品数据 => AssetsEquipment/ScriptableObject}/饰品.meta (100%)
create mode 100644 Assets/AssetsEquipment/ScriptableObject/饰品/戒指.meta
rename Assets/{AssetsPackage/物品数据/饰品 => AssetsEquipment/ScriptableObject/饰品/戒指}/戒指.asset (100%)
rename Assets/{AssetsPackage/物品数据/饰品 => AssetsEquipment/ScriptableObject/饰品/戒指}/戒指.asset.meta (100%)
create mode 100644 Assets/AssetsEquipment/ScriptableObject/饰品/手镯.meta
create mode 100644 Assets/AssetsEquipment/ScriptableObject/饰品/项链.meta
rename Assets/{AssetsPackage/物品数据/饰品 => AssetsEquipment/ScriptableObject/饰品/项链}/项链.asset (100%)
rename Assets/{AssetsPackage/物品数据/饰品 => AssetsEquipment/ScriptableObject/饰品/项链}/项链.asset.meta (100%)
rename Assets/ModuleCore/ModuleAttribute/{ModuleConst => }/Editor.meta (100%)
create mode 100644 Assets/ModuleCore/ModuleAttribute/Editor/AttributeContainerConstEditor.cs
create mode 100644 Assets/ModuleCore/ModuleAttribute/Editor/AttributeContainerConstEditor.cs.meta
create mode 100644 Assets/ModuleCore/ModuleAttribute/Editor/AttributeInstanceConstEditor.cs
rename Assets/ModuleCore/ModuleAttribute/{ModuleConst/Editor/ConstAttributeInstanceEditor.cs.meta => Editor/AttributeInstanceConstEditor.cs.meta} (100%)
rename Assets/ModuleCore/{ModuleEquipment => ModuleAttribute/Editor}/ModuleUIPanel.meta (77%)
create mode 100644 Assets/ModuleCore/ModuleAttribute/Editor/ModuleUIPanel/UIAttributeList.cs
rename Assets/ModuleCore/{ModuleInventory/InventoryDrag.cs.meta => ModuleAttribute/Editor/ModuleUIPanel/UIAttributeList.cs.meta} (83%)
delete mode 100644 Assets/ModuleCore/ModuleAttribute/ModuleConst/Editor/ConstAttributeContainerEditor.cs
delete mode 100644 Assets/ModuleCore/ModuleAttribute/ModuleConst/Editor/ConstAttributeInstanceEditor.cs
create mode 100644 Assets/ModuleCore/ModuleAttribute/Runtime.meta
rename Assets/ModuleCore/ModuleAttribute/{ => Runtime}/AttributeContainer.cs (100%)
rename Assets/ModuleCore/ModuleAttribute/{ => Runtime}/AttributeContainer.cs.meta (100%)
rename Assets/ModuleCore/ModuleAttribute/{ModuleConst/ConstAttributeContainer.cs => Runtime/AttributeContainerConst.cs} (82%)
rename Assets/ModuleCore/ModuleAttribute/{ModuleConst/ConstAttributeContainer.cs.meta => Runtime/AttributeContainerConst.cs.meta} (100%)
rename Assets/ModuleCore/ModuleAttribute/{ => Runtime}/AttributeInstance.cs (100%)
rename Assets/ModuleCore/ModuleAttribute/{ => Runtime}/AttributeInstance.cs.meta (100%)
rename Assets/ModuleCore/ModuleAttribute/{ModuleConst/ConstAttributeInstance.cs => Runtime/AttributeInstanceConst.cs} (85%)
rename Assets/ModuleCore/ModuleAttribute/{ModuleConst/ConstAttributeInstance.cs.meta => Runtime/AttributeInstanceConst.cs.meta} (100%)
rename Assets/ModuleCore/ModuleAttribute/{ => Runtime}/AttributeModifier.cs (100%)
rename Assets/ModuleCore/ModuleAttribute/{ => Runtime}/AttributeModifier.cs.meta (100%)
rename Assets/ModuleCore/ModuleAttribute/{ => Runtime}/AttributeSystem.cs (100%)
rename Assets/ModuleCore/ModuleAttribute/{ => Runtime}/AttributeSystem.cs.meta (100%)
rename Assets/ModuleCore/ModuleAttribute/{ => Runtime}/AttributeType.cs (100%)
rename Assets/ModuleCore/ModuleAttribute/{ => Runtime}/AttributeType.cs.meta (100%)
create mode 100644 Assets/ModuleCore/ModuleAttribute/UI Toolkit.meta
create mode 100644 Assets/ModuleCore/ModuleAttribute/UI Toolkit/AttributeContainerConstEditor.meta
create mode 100644 Assets/ModuleCore/ModuleAttribute/UI Toolkit/AttributeContainerConstEditor/AttributeContainerConstEditor.uss
rename Assets/{UI Toolkit/EditorWindow/TestEditorWindow.uss.meta => ModuleCore/ModuleAttribute/UI Toolkit/AttributeContainerConstEditor/AttributeContainerConstEditor.uss.meta} (87%)
create mode 100644 Assets/ModuleCore/ModuleAttribute/UI Toolkit/AttributeContainerConstEditor/AttributeContainerConstEditor.uxml
rename Assets/{UI Toolkit/EditorWindow/TestEditorWindow.uxml.meta => ModuleCore/ModuleAttribute/UI Toolkit/AttributeContainerConstEditor/AttributeContainerConstEditor.uxml.meta} (86%)
create mode 100644 Assets/ModuleCore/ModuleAttribute/UI Toolkit/AttributeContainerConstEditor/AttributeTemplate.uxml
create mode 100644 Assets/ModuleCore/ModuleAttribute/UI Toolkit/AttributeContainerConstEditor/AttributeTemplate.uxml.meta
rename Assets/ModuleCore/ModuleEquipment/{ModuleConst => }/Editor.meta (100%)
create mode 100644 Assets/ModuleCore/ModuleEquipment/Editor/EquipmentWindow.cs
create mode 100644 Assets/ModuleCore/ModuleEquipment/Editor/EquipmentWindow.cs.meta
create mode 100644 Assets/ModuleCore/ModuleEquipment/Editor/ModuleUIPanel.meta
create mode 100644 Assets/ModuleCore/ModuleEquipment/Editor/ModuleUIPanel/UIEquipmentEnum.cs
rename Assets/ModuleCore/{ModuleAttribute/ModuleConst/Editor/ConstAttributeContainerEditor.cs.meta => ModuleEquipment/Editor/ModuleUIPanel/UIEquipmentEnum.cs.meta} (83%)
create mode 100644 Assets/ModuleCore/ModuleEquipment/Editor/ModuleUIPanel/UIEquipmentList.cs
create mode 100644 Assets/ModuleCore/ModuleEquipment/Editor/ModuleUIPanel/UIEquipmentList.cs.meta
create mode 100644 Assets/ModuleCore/ModuleEquipment/Editor/WeaponConstEditor.cs
rename Assets/ModuleCore/ModuleEquipment/{ModuleConst/Editor/ConstWeaponEditor.cs.meta => Editor/WeaponConstEditor.cs.meta} (100%)
create mode 100644 Assets/ModuleCore/ModuleEquipment/Runtime.meta
create mode 100644 Assets/ModuleCore/ModuleEquipment/Runtime/EnumType.meta
create mode 100644 Assets/ModuleCore/ModuleEquipment/Runtime/EnumType/AccessoryType.cs
create mode 100644 Assets/ModuleCore/ModuleEquipment/Runtime/EnumType/AccessoryType.cs.meta
create mode 100644 Assets/ModuleCore/ModuleEquipment/Runtime/EnumType/ArmorType.cs
create mode 100644 Assets/ModuleCore/ModuleEquipment/Runtime/EnumType/ArmorType.cs.meta
create mode 100644 Assets/ModuleCore/ModuleEquipment/Runtime/EnumType/EquipmentSlotType.cs
create mode 100644 Assets/ModuleCore/ModuleEquipment/Runtime/EnumType/EquipmentSlotType.cs.meta
create mode 100644 Assets/ModuleCore/ModuleEquipment/Runtime/EnumType/EquipmentType.cs
create mode 100644 Assets/ModuleCore/ModuleEquipment/Runtime/EnumType/EquipmentType.cs.meta
create mode 100644 Assets/ModuleCore/ModuleEquipment/Runtime/EnumType/WeaponType.cs
create mode 100644 Assets/ModuleCore/ModuleEquipment/Runtime/EnumType/WeaponType.cs.meta
create mode 100644 Assets/ModuleCore/ModuleEquipment/Runtime/Equipment.meta
rename Assets/ModuleCore/ModuleEquipment/{ModuleConst/Editor/ConstWeaponEditor.cs => Runtime/Equipment/Accessory.cs} (84%)
create mode 100644 Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Accessory.cs.meta
create mode 100644 Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Armor.cs
create mode 100644 Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Armor.cs.meta
rename Assets/ModuleCore/ModuleEquipment/{ => Runtime/Equipment}/Equipment.cs (100%)
rename Assets/ModuleCore/ModuleEquipment/{ => Runtime/Equipment}/Equipment.cs.meta (100%)
create mode 100644 Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Weapon.cs
create mode 100644 Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Weapon.cs.meta
rename Assets/ModuleCore/ModuleEquipment/{ => Runtime}/EquipmentAffix.cs (100%)
rename Assets/ModuleCore/ModuleEquipment/{ => Runtime}/EquipmentAffix.cs.meta (100%)
rename Assets/ModuleCore/ModuleEquipment/{ => Runtime}/EquipmentColumn.cs (100%)
rename Assets/ModuleCore/ModuleEquipment/{ => Runtime}/EquipmentColumn.cs.meta (100%)
rename Assets/ModuleCore/ModuleEquipment/{ModuleConst.meta => Runtime/EquipmentConst.meta} (100%)
rename Assets/ModuleCore/ModuleEquipment/{ModuleConst/ConstAccessory.cs => Runtime/EquipmentConst/AccessoryConst.cs} (74%)
rename Assets/ModuleCore/ModuleEquipment/{ModuleConst/ConstAccessory.cs.meta => Runtime/EquipmentConst/AccessoryConst.cs.meta} (100%)
rename Assets/ModuleCore/ModuleEquipment/{ModuleConst/ConstArmor.cs => Runtime/EquipmentConst/ArmorConst.cs} (73%)
rename Assets/ModuleCore/ModuleEquipment/{ModuleConst/ConstArmor.cs.meta => Runtime/EquipmentConst/ArmorConst.cs.meta} (100%)
rename Assets/ModuleCore/ModuleEquipment/{ModuleConst/ConstEquipment.cs => Runtime/EquipmentConst/EquipmentConst.cs} (73%)
rename Assets/ModuleCore/ModuleEquipment/{ModuleConst/ConstEquipment.cs.meta => Runtime/EquipmentConst/EquipmentConst.cs.meta} (100%)
rename Assets/ModuleCore/ModuleEquipment/{ModuleConst/ConstWeapon.cs => Runtime/EquipmentConst/WeaponConst.cs} (61%)
rename Assets/ModuleCore/ModuleEquipment/{ModuleConst/ConstWeapon.cs.meta => Runtime/EquipmentConst/WeaponConst.cs.meta} (100%)
rename Assets/ModuleCore/ModuleEquipment/{ => Runtime}/EquipmentSlot.cs (78%)
rename Assets/ModuleCore/ModuleEquipment/{ => Runtime}/EquipmentSlot.cs.meta (100%)
create mode 100644 Assets/ModuleCore/ModuleEquipment/UI Toolkit.meta
create mode 100644 Assets/ModuleCore/ModuleEquipment/UI Toolkit/Button.meta
create mode 100644 Assets/ModuleCore/ModuleEquipment/UI Toolkit/Button/ButtonTemplate.uss
create mode 100644 Assets/ModuleCore/ModuleEquipment/UI Toolkit/Button/ButtonTemplate.uss.meta
create mode 100644 Assets/ModuleCore/ModuleEquipment/UI Toolkit/Button/ButtonTemplate.uxml
create mode 100644 Assets/ModuleCore/ModuleEquipment/UI Toolkit/Button/ButtonTemplate.uxml.meta
create mode 100644 Assets/ModuleCore/ModuleEquipment/UI Toolkit/EquipmentWindow.meta
create mode 100644 Assets/ModuleCore/ModuleEquipment/UI Toolkit/EquipmentWindow/EquipmentList.uxml
create mode 100644 Assets/ModuleCore/ModuleEquipment/UI Toolkit/EquipmentWindow/EquipmentList.uxml.meta
create mode 100644 Assets/ModuleCore/ModuleEquipment/UI Toolkit/EquipmentWindow/EquipmentTemplate.uxml
create mode 100644 Assets/ModuleCore/ModuleEquipment/UI Toolkit/EquipmentWindow/EquipmentTemplate.uxml.meta
create mode 100644 Assets/ModuleCore/ModuleEquipment/UI Toolkit/EquipmentWindow/EquipmentWindow.uss
create mode 100644 Assets/ModuleCore/ModuleEquipment/UI Toolkit/EquipmentWindow/EquipmentWindow.uss.meta
create mode 100644 Assets/ModuleCore/ModuleEquipment/UI Toolkit/EquipmentWindow/EquipmentWindow.uxml
create mode 100644 Assets/ModuleCore/ModuleEquipment/UI Toolkit/EquipmentWindow/EquipmentWindow.uxml.meta
rename Assets/ModuleCore/ModuleFormula/{ModuleConst => }/ConstMaterial.cs (89%)
rename Assets/ModuleCore/ModuleFormula/{ModuleConst => }/ConstMaterial.cs.meta (100%)
delete mode 100644 Assets/ModuleCore/ModuleInventory/InventoryDrag.cs
rename Assets/ModuleCore/ModuleInventory/{ModuleConst/ConstInventoryItem.cs => InventoryItemConst.cs} (88%)
rename Assets/ModuleCore/ModuleInventory/{ModuleConst/ConstInventoryItem.cs.meta => InventoryItemConst.cs.meta} (100%)
create mode 100644 Assets/ModuleCore/ModuleUI/ModuleUIPanel/Equipment.meta
rename Assets/ModuleCore/{ModuleEquipment/ModuleUIPanel => ModuleUI/ModuleUIPanel/Equipment}/UIEquipmentColumn.cs (100%)
rename Assets/ModuleCore/{ModuleEquipment/ModuleUIPanel => ModuleUI/ModuleUIPanel/Equipment}/UIEquipmentColumn.cs.meta (100%)
rename Assets/ModuleCore/{ModuleEquipment/ModuleUIPanel => ModuleUI/ModuleUIPanel/Equipment}/UIEquipmentSlot.cs (100%)
rename Assets/ModuleCore/{ModuleEquipment/ModuleUIPanel => ModuleUI/ModuleUIPanel/Equipment}/UIEquipmentSlot.cs.meta (100%)
rename Assets/ModuleCore/{ModuleEquipment/ModuleUIPanel => ModuleUI/ModuleUIPanel/Equipment}/UIEquipmentTip.cs (100%)
rename Assets/ModuleCore/{ModuleEquipment/ModuleUIPanel => ModuleUI/ModuleUIPanel/Equipment}/UIEquipmentTip.cs.meta (100%)
rename Assets/ModuleCore/{ModuleInventory/ModuleUIPanel.meta => ModuleUI/ModuleUIPanel/Inventory.meta} (100%)
rename Assets/ModuleCore/{ModuleInventory/ModuleUIPanel => ModuleUI/ModuleUIPanel/Inventory}/UIInventory.cs (100%)
rename Assets/ModuleCore/{ModuleInventory/ModuleUIPanel => ModuleUI/ModuleUIPanel/Inventory}/UIInventory.cs.meta (100%)
rename Assets/ModuleCore/{ModuleInventory/ModuleUIPanel => ModuleUI/ModuleUIPanel/Inventory}/UIInventoryDrag.cs (86%)
rename Assets/ModuleCore/{ModuleInventory/ModuleUIPanel => ModuleUI/ModuleUIPanel/Inventory}/UIInventoryDrag.cs.meta (100%)
rename Assets/ModuleCore/{ModuleInventory/ModuleUIPanel => ModuleUI/ModuleUIPanel/Inventory}/UIInventorySlot.cs (100%)
rename Assets/ModuleCore/{ModuleInventory/ModuleUIPanel => ModuleUI/ModuleUIPanel/Inventory}/UIInventorySlot.cs.meta (100%)
rename Assets/ModuleCore/{ModuleInventory/ModuleUIPanel => ModuleUI/ModuleUIPanel/Inventory}/UIInventoryTip.cs (100%)
rename Assets/ModuleCore/{ModuleInventory/ModuleUIPanel => ModuleUI/ModuleUIPanel/Inventory}/UIInventoryTip.cs.meta (100%)
delete mode 100644 Assets/UI Toolkit/EditorWindow/TestEditorWindow.uss
delete mode 100644 Assets/UI Toolkit/EditorWindow/TestEditorWindow.uxml
rename Assets/UI Toolkit/{DefaultTheme.meta => UnityThemes.meta} (100%)
rename Assets/UI Toolkit/{DefaultTheme => UnityThemes}/PanelSettings.asset (100%)
rename Assets/UI Toolkit/{DefaultTheme => UnityThemes}/PanelSettings.asset.meta (100%)
rename Assets/UI Toolkit/{DefaultTheme => UnityThemes}/UnityDefaultRuntimeTheme.tss (100%)
rename Assets/UI Toolkit/{DefaultTheme => UnityThemes}/UnityDefaultRuntimeTheme.tss.meta (100%)
create mode 100644 Packages/UITool/Editor.meta
create mode 100644 Packages/UITool/Editor/ModuleUIEditor.cs
create mode 100644 Packages/UITool/Editor/ModuleUIEditor.cs.meta
create mode 100644 Packages/UITool/Editor/ModuleUIEditorWindow.cs
create mode 100644 Packages/UITool/Editor/ModuleUIEditorWindow.cs.meta
create mode 100644 Packages/UITool/Editor/MuHuaEditor.UITool.asmdef
create mode 100644 Packages/UITool/Editor/MuHuaEditor.UITool.asmdef.meta
create mode 100644 ProjectSettings/BurstAotSettings_StandaloneWindows.json
create mode 100644 ProjectSettings/BurstAotSettings_WebGL.json
create mode 100644 ProjectSettings/CommonBurstAotSettings.json
diff --git a/Assets/ModuleCore/ModuleAttribute/ModuleConst.meta b/Assets/AssetsEquipment.meta
similarity index 77%
rename from Assets/ModuleCore/ModuleAttribute/ModuleConst.meta
rename to Assets/AssetsEquipment.meta
index 5e5c914..7f15c84 100644
--- a/Assets/ModuleCore/ModuleAttribute/ModuleConst.meta
+++ b/Assets/AssetsEquipment.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 01e61c86999f6aa40aa7742bb891014e
+guid: ca01e5dfb1bcb40409d89324b7b30e0c
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/ModuleCore/ModuleInventory/ModuleConst.meta b/Assets/AssetsEquipment/ScriptableObject.meta
similarity index 77%
rename from Assets/ModuleCore/ModuleInventory/ModuleConst.meta
rename to Assets/AssetsEquipment/ScriptableObject.meta
index b803457..e9d5387 100644
--- a/Assets/ModuleCore/ModuleInventory/ModuleConst.meta
+++ b/Assets/AssetsEquipment/ScriptableObject.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 48193b9c6d7c6af4088a00876ccaa1c3
+guid: 6c3f4d86bebc21a459dcdb9549d00c17
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/AssetsPackage/物品数据/护甲.meta b/Assets/AssetsEquipment/ScriptableObject/护甲.meta
similarity index 100%
rename from Assets/AssetsPackage/物品数据/护甲.meta
rename to Assets/AssetsEquipment/ScriptableObject/护甲.meta
diff --git a/Assets/ModuleCore/ModuleFormula/ModuleConst.meta b/Assets/AssetsEquipment/ScriptableObject/护甲/上衣.meta
similarity index 77%
rename from Assets/ModuleCore/ModuleFormula/ModuleConst.meta
rename to Assets/AssetsEquipment/ScriptableObject/护甲/上衣.meta
index f0a87f5..07eaf18 100644
--- a/Assets/ModuleCore/ModuleFormula/ModuleConst.meta
+++ b/Assets/AssetsEquipment/ScriptableObject/护甲/上衣.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 9871787cca5a9e54fab450c7d3674d69
+guid: 50ec3141d8da2214eacd8fcf7ea8428b
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/AssetsPackage/物品数据/护甲/上衣.asset b/Assets/AssetsEquipment/ScriptableObject/护甲/上衣/上衣.asset
similarity index 100%
rename from Assets/AssetsPackage/物品数据/护甲/上衣.asset
rename to Assets/AssetsEquipment/ScriptableObject/护甲/上衣/上衣.asset
diff --git a/Assets/AssetsPackage/物品数据/护甲/上衣.asset.meta b/Assets/AssetsEquipment/ScriptableObject/护甲/上衣/上衣.asset.meta
similarity index 100%
rename from Assets/AssetsPackage/物品数据/护甲/上衣.asset.meta
rename to Assets/AssetsEquipment/ScriptableObject/护甲/上衣/上衣.asset.meta
diff --git a/Assets/AssetsEquipment/ScriptableObject/护甲/头盔.meta b/Assets/AssetsEquipment/ScriptableObject/护甲/头盔.meta
new file mode 100644
index 0000000..6372512
--- /dev/null
+++ b/Assets/AssetsEquipment/ScriptableObject/护甲/头盔.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7f7ce98abf5cf1242bcaf87f8e07e3f9
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/AssetsPackage/物品数据/护甲/头盔.asset b/Assets/AssetsEquipment/ScriptableObject/护甲/头盔/头盔.asset
similarity index 100%
rename from Assets/AssetsPackage/物品数据/护甲/头盔.asset
rename to Assets/AssetsEquipment/ScriptableObject/护甲/头盔/头盔.asset
diff --git a/Assets/AssetsPackage/物品数据/护甲/头盔.asset.meta b/Assets/AssetsEquipment/ScriptableObject/护甲/头盔/头盔.asset.meta
similarity index 100%
rename from Assets/AssetsPackage/物品数据/护甲/头盔.asset.meta
rename to Assets/AssetsEquipment/ScriptableObject/护甲/头盔/头盔.asset.meta
diff --git a/Assets/AssetsEquipment/ScriptableObject/护甲/手套.meta b/Assets/AssetsEquipment/ScriptableObject/护甲/手套.meta
new file mode 100644
index 0000000..c0930b6
--- /dev/null
+++ b/Assets/AssetsEquipment/ScriptableObject/护甲/手套.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fd9b18780ad93c44dbede85c81c63d25
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/AssetsPackage/物品数据/护甲/手套.asset b/Assets/AssetsEquipment/ScriptableObject/护甲/手套/手套.asset
similarity index 100%
rename from Assets/AssetsPackage/物品数据/护甲/手套.asset
rename to Assets/AssetsEquipment/ScriptableObject/护甲/手套/手套.asset
diff --git a/Assets/AssetsPackage/物品数据/护甲/手套.asset.meta b/Assets/AssetsEquipment/ScriptableObject/护甲/手套/手套.asset.meta
similarity index 100%
rename from Assets/AssetsPackage/物品数据/护甲/手套.asset.meta
rename to Assets/AssetsEquipment/ScriptableObject/护甲/手套/手套.asset.meta
diff --git a/Assets/AssetsEquipment/ScriptableObject/护甲/腰带.meta b/Assets/AssetsEquipment/ScriptableObject/护甲/腰带.meta
new file mode 100644
index 0000000..4bcebaa
--- /dev/null
+++ b/Assets/AssetsEquipment/ScriptableObject/护甲/腰带.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 66704a169cf4fd94cb18d2c1d132173a
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/AssetsPackage/物品数据/护甲/腰带.asset b/Assets/AssetsEquipment/ScriptableObject/护甲/腰带/腰带.asset
similarity index 100%
rename from Assets/AssetsPackage/物品数据/护甲/腰带.asset
rename to Assets/AssetsEquipment/ScriptableObject/护甲/腰带/腰带.asset
diff --git a/Assets/AssetsPackage/物品数据/护甲/腰带.asset.meta b/Assets/AssetsEquipment/ScriptableObject/护甲/腰带/腰带.asset.meta
similarity index 100%
rename from Assets/AssetsPackage/物品数据/护甲/腰带.asset.meta
rename to Assets/AssetsEquipment/ScriptableObject/护甲/腰带/腰带.asset.meta
diff --git a/Assets/AssetsEquipment/ScriptableObject/护甲/鞋子.meta b/Assets/AssetsEquipment/ScriptableObject/护甲/鞋子.meta
new file mode 100644
index 0000000..4c2a660
--- /dev/null
+++ b/Assets/AssetsEquipment/ScriptableObject/护甲/鞋子.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f79ff4ff8b66add4a8beda06e918ea16
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/AssetsPackage/物品数据/护甲/鞋子.asset b/Assets/AssetsEquipment/ScriptableObject/护甲/鞋子/鞋子.asset
similarity index 100%
rename from Assets/AssetsPackage/物品数据/护甲/鞋子.asset
rename to Assets/AssetsEquipment/ScriptableObject/护甲/鞋子/鞋子.asset
diff --git a/Assets/AssetsPackage/物品数据/护甲/鞋子.asset.meta b/Assets/AssetsEquipment/ScriptableObject/护甲/鞋子/鞋子.asset.meta
similarity index 100%
rename from Assets/AssetsPackage/物品数据/护甲/鞋子.asset.meta
rename to Assets/AssetsEquipment/ScriptableObject/护甲/鞋子/鞋子.asset.meta
diff --git a/Assets/AssetsPackage/物品数据/武器.meta b/Assets/AssetsEquipment/ScriptableObject/武器.meta
similarity index 100%
rename from Assets/AssetsPackage/物品数据/武器.meta
rename to Assets/AssetsEquipment/ScriptableObject/武器.meta
diff --git a/Assets/AssetsEquipment/ScriptableObject/武器/副手.meta b/Assets/AssetsEquipment/ScriptableObject/武器/副手.meta
new file mode 100644
index 0000000..df371a4
--- /dev/null
+++ b/Assets/AssetsEquipment/ScriptableObject/武器/副手.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d59370b1224756a48aae056eac6abc05
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/AssetsPackage/物品数据/武器/盾牌.asset b/Assets/AssetsEquipment/ScriptableObject/武器/副手/盾牌.asset
similarity index 100%
rename from Assets/AssetsPackage/物品数据/武器/盾牌.asset
rename to Assets/AssetsEquipment/ScriptableObject/武器/副手/盾牌.asset
diff --git a/Assets/AssetsPackage/物品数据/武器/盾牌.asset.meta b/Assets/AssetsEquipment/ScriptableObject/武器/副手/盾牌.asset.meta
similarity index 100%
rename from Assets/AssetsPackage/物品数据/武器/盾牌.asset.meta
rename to Assets/AssetsEquipment/ScriptableObject/武器/副手/盾牌.asset.meta
diff --git a/Assets/AssetsEquipment/ScriptableObject/武器/单手.meta b/Assets/AssetsEquipment/ScriptableObject/武器/单手.meta
new file mode 100644
index 0000000..62719a4
--- /dev/null
+++ b/Assets/AssetsEquipment/ScriptableObject/武器/单手.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3196c223cc5a7014f8504b1056eb06b9
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/AssetsEquipment/ScriptableObject/武器/单手/单手剑 1.asset b/Assets/AssetsEquipment/ScriptableObject/武器/单手/单手剑 1.asset
new file mode 100644
index 0000000..bf5fa19
--- /dev/null
+++ b/Assets/AssetsEquipment/ScriptableObject/武器/单手/单手剑 1.asset
@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 45818eb64c9b04441b20b29f0230edb7, type: 3}
+ m_Name: "\u5355\u624B\u5251 1"
+ m_EditorClassIdentifier:
+ sprite: {fileID: 21300000, guid: 5fd50594014b70e48bd6993443d46b32, type: 3}
+ type: 0
diff --git a/Assets/AssetsEquipment/ScriptableObject/武器/单手/单手剑 1.asset.meta b/Assets/AssetsEquipment/ScriptableObject/武器/单手/单手剑 1.asset.meta
new file mode 100644
index 0000000..eb6c5c2
--- /dev/null
+++ b/Assets/AssetsEquipment/ScriptableObject/武器/单手/单手剑 1.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d1ab7394c601aff4797e854bd7be57f5
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/AssetsEquipment/ScriptableObject/武器/单手/单手剑 2.asset b/Assets/AssetsEquipment/ScriptableObject/武器/单手/单手剑 2.asset
new file mode 100644
index 0000000..d456b38
--- /dev/null
+++ b/Assets/AssetsEquipment/ScriptableObject/武器/单手/单手剑 2.asset
@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 45818eb64c9b04441b20b29f0230edb7, type: 3}
+ m_Name: "\u5355\u624B\u5251 2"
+ m_EditorClassIdentifier:
+ sprite: {fileID: 21300000, guid: 5fd50594014b70e48bd6993443d46b32, type: 3}
+ type: 0
diff --git a/Assets/AssetsEquipment/ScriptableObject/武器/单手/单手剑 2.asset.meta b/Assets/AssetsEquipment/ScriptableObject/武器/单手/单手剑 2.asset.meta
new file mode 100644
index 0000000..13f7f0c
--- /dev/null
+++ b/Assets/AssetsEquipment/ScriptableObject/武器/单手/单手剑 2.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2155d31e917f2eb45a9f62174a1698ea
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/AssetsPackage/物品数据/武器/单手剑.asset b/Assets/AssetsEquipment/ScriptableObject/武器/单手/单手剑.asset
similarity index 100%
rename from Assets/AssetsPackage/物品数据/武器/单手剑.asset
rename to Assets/AssetsEquipment/ScriptableObject/武器/单手/单手剑.asset
diff --git a/Assets/AssetsPackage/物品数据/武器/单手剑.asset.meta b/Assets/AssetsEquipment/ScriptableObject/武器/单手/单手剑.asset.meta
similarity index 100%
rename from Assets/AssetsPackage/物品数据/武器/单手剑.asset.meta
rename to Assets/AssetsEquipment/ScriptableObject/武器/单手/单手剑.asset.meta
diff --git a/Assets/AssetsEquipment/ScriptableObject/武器/双手.meta b/Assets/AssetsEquipment/ScriptableObject/武器/双手.meta
new file mode 100644
index 0000000..251858c
--- /dev/null
+++ b/Assets/AssetsEquipment/ScriptableObject/武器/双手.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 99034827463076243a095d6e0719166c
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/AssetsPackage/物品数据/武器/弓.asset b/Assets/AssetsEquipment/ScriptableObject/武器/双手/弓.asset
similarity index 100%
rename from Assets/AssetsPackage/物品数据/武器/弓.asset
rename to Assets/AssetsEquipment/ScriptableObject/武器/双手/弓.asset
diff --git a/Assets/AssetsPackage/物品数据/武器/弓.asset.meta b/Assets/AssetsEquipment/ScriptableObject/武器/双手/弓.asset.meta
similarity index 100%
rename from Assets/AssetsPackage/物品数据/武器/弓.asset.meta
rename to Assets/AssetsEquipment/ScriptableObject/武器/双手/弓.asset.meta
diff --git a/Assets/AssetsPackage/物品数据/饰品.meta b/Assets/AssetsEquipment/ScriptableObject/饰品.meta
similarity index 100%
rename from Assets/AssetsPackage/物品数据/饰品.meta
rename to Assets/AssetsEquipment/ScriptableObject/饰品.meta
diff --git a/Assets/AssetsEquipment/ScriptableObject/饰品/戒指.meta b/Assets/AssetsEquipment/ScriptableObject/饰品/戒指.meta
new file mode 100644
index 0000000..02c79fc
--- /dev/null
+++ b/Assets/AssetsEquipment/ScriptableObject/饰品/戒指.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0f196c0732ec0114cb37de3ec74740d9
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/AssetsPackage/物品数据/饰品/戒指.asset b/Assets/AssetsEquipment/ScriptableObject/饰品/戒指/戒指.asset
similarity index 100%
rename from Assets/AssetsPackage/物品数据/饰品/戒指.asset
rename to Assets/AssetsEquipment/ScriptableObject/饰品/戒指/戒指.asset
diff --git a/Assets/AssetsPackage/物品数据/饰品/戒指.asset.meta b/Assets/AssetsEquipment/ScriptableObject/饰品/戒指/戒指.asset.meta
similarity index 100%
rename from Assets/AssetsPackage/物品数据/饰品/戒指.asset.meta
rename to Assets/AssetsEquipment/ScriptableObject/饰品/戒指/戒指.asset.meta
diff --git a/Assets/AssetsEquipment/ScriptableObject/饰品/手镯.meta b/Assets/AssetsEquipment/ScriptableObject/饰品/手镯.meta
new file mode 100644
index 0000000..8e931f3
--- /dev/null
+++ b/Assets/AssetsEquipment/ScriptableObject/饰品/手镯.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 76925090c35dc5c4ca26c94995c00e71
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/AssetsEquipment/ScriptableObject/饰品/项链.meta b/Assets/AssetsEquipment/ScriptableObject/饰品/项链.meta
new file mode 100644
index 0000000..ecba802
--- /dev/null
+++ b/Assets/AssetsEquipment/ScriptableObject/饰品/项链.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7854296aa2daf7d45a34980e33061b75
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/AssetsPackage/物品数据/饰品/项链.asset b/Assets/AssetsEquipment/ScriptableObject/饰品/项链/项链.asset
similarity index 100%
rename from Assets/AssetsPackage/物品数据/饰品/项链.asset
rename to Assets/AssetsEquipment/ScriptableObject/饰品/项链/项链.asset
diff --git a/Assets/AssetsPackage/物品数据/饰品/项链.asset.meta b/Assets/AssetsEquipment/ScriptableObject/饰品/项链/项链.asset.meta
similarity index 100%
rename from Assets/AssetsPackage/物品数据/饰品/项链.asset.meta
rename to Assets/AssetsEquipment/ScriptableObject/饰品/项链/项链.asset.meta
diff --git a/Assets/AssetsPackage/物品数据/属性容器.asset b/Assets/AssetsPackage/物品数据/属性容器.asset
index c5ba3ae..5289e0a 100644
--- a/Assets/AssetsPackage/物品数据/属性容器.asset
+++ b/Assets/AssetsPackage/物品数据/属性容器.asset
@@ -15,7 +15,7 @@ MonoBehaviour:
type: 0
defaultValue: 0
minValue: 0
- maxValue: 3.4028235e+38
+ maxValue: 9999
container: {fileID: 11400000}
--- !u!114 &-1377547097575584075
MonoBehaviour:
@@ -32,7 +32,7 @@ MonoBehaviour:
type: 0
defaultValue: 0
minValue: 0
- maxValue: 3.4028235e+38
+ maxValue: 9999
container: {fileID: 11400000}
--- !u!114 &11400000
MonoBehaviour:
diff --git a/Assets/ModuleCore/ModuleAttribute/ModuleConst/Editor.meta b/Assets/ModuleCore/ModuleAttribute/Editor.meta
similarity index 100%
rename from Assets/ModuleCore/ModuleAttribute/ModuleConst/Editor.meta
rename to Assets/ModuleCore/ModuleAttribute/Editor.meta
diff --git a/Assets/ModuleCore/ModuleAttribute/Editor/AttributeContainerConstEditor.cs b/Assets/ModuleCore/ModuleAttribute/Editor/AttributeContainerConstEditor.cs
new file mode 100644
index 0000000..d8052a1
--- /dev/null
+++ b/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 {
+ ///
+ /// 属性容器 - 自定义编辑器
+ ///
+ [CustomEditor(typeof(AttributeContainerConst))]
+ public class AttributeContainerConstEditor : ModuleUIEditor {
+
+ public VisualTreeAsset AttributeTemplate = default;
+
+ private UIAttributeList attributeList;
+
+ public VisualElement AttributeList => Q("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(); }
+ // }
+
+ /// 创建属性实例
+ // private void GenerateAttribute() {
+ // AttributeInstanceConst instance = CreateInstance();
+ // instance.container = container;
+ // // 加入容器
+ // container.instances.Add(instance);
+ // AssetDatabase.AddObjectToAsset(instance, container);
+ // EditorUtility.SetDirty(instance);
+ // EditorUtility.SetDirty(container);
+ // AssetDatabase.SaveAssets();
+ // }
+ /// 删除全部实例
+ // 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();
+ // }
+
+ }
+}
\ No newline at end of file
diff --git a/Assets/ModuleCore/ModuleAttribute/Editor/AttributeContainerConstEditor.cs.meta b/Assets/ModuleCore/ModuleAttribute/Editor/AttributeContainerConstEditor.cs.meta
new file mode 100644
index 0000000..7a98cb0
--- /dev/null
+++ b/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:
diff --git a/Assets/ModuleCore/ModuleAttribute/Editor/AttributeInstanceConstEditor.cs b/Assets/ModuleCore/ModuleAttribute/Editor/AttributeInstanceConstEditor.cs
new file mode 100644
index 0000000..84248b2
--- /dev/null
+++ b/Assets/ModuleCore/ModuleAttribute/Editor/AttributeInstanceConstEditor.cs
@@ -0,0 +1,46 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+
+namespace MuHuaEditor {
+ ///
+ /// 属性实例 - 自定义编辑器
+ ///
+ [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(); }
+ }
+
+ /// 修改名字
+ private void ModifyName(string newName) {
+ instance.name = newName;
+ Undo.RecordObject(instance, "修改属性名称");
+ EditorUtility.SetDirty(instance);
+ AssetDatabase.SaveAssets();
+ }
+ /// 删除实例
+ private void DeleteInstance() {
+ AttributeContainerConst container = instance.container;
+ container.instances.Remove(instance);
+ EditorUtility.SetDirty(container);
+ Undo.DestroyObjectImmediate(instance);
+ AssetDatabase.SaveAssets();
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/ModuleCore/ModuleAttribute/ModuleConst/Editor/ConstAttributeInstanceEditor.cs.meta b/Assets/ModuleCore/ModuleAttribute/Editor/AttributeInstanceConstEditor.cs.meta
similarity index 100%
rename from Assets/ModuleCore/ModuleAttribute/ModuleConst/Editor/ConstAttributeInstanceEditor.cs.meta
rename to Assets/ModuleCore/ModuleAttribute/Editor/AttributeInstanceConstEditor.cs.meta
diff --git a/Assets/ModuleCore/ModuleEquipment/ModuleUIPanel.meta b/Assets/ModuleCore/ModuleAttribute/Editor/ModuleUIPanel.meta
similarity index 77%
rename from Assets/ModuleCore/ModuleEquipment/ModuleUIPanel.meta
rename to Assets/ModuleCore/ModuleAttribute/Editor/ModuleUIPanel.meta
index a00ce3d..dca33fe 100644
--- a/Assets/ModuleCore/ModuleEquipment/ModuleUIPanel.meta
+++ b/Assets/ModuleCore/ModuleAttribute/Editor/ModuleUIPanel.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: ce2626e82921eb14992661fc763dc7b5
+guid: dbe28b450df84584cb523a09c813e59b
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/ModuleCore/ModuleAttribute/Editor/ModuleUIPanel/UIAttributeList.cs b/Assets/ModuleCore/ModuleAttribute/Editor/ModuleUIPanel/UIAttributeList.cs
new file mode 100644
index 0000000..39f27cb
--- /dev/null
+++ b/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 {
+ ///
+ /// 属性 - UI列表
+ ///
+ public class UIAttributeList : ModuleUIPanel, UIControl {
+ /// 拖拽预览
+ public VisualElement preview;
+ /// 鼠标位置
+ public Vector2 mousePosition;
+ /// 偏移位置
+ public Vector2 offsetPosition;
+ /// 项目列表
+ public ModuleUIItems items;
+
+ public UIAttributeList(VisualElement element, VisualTreeAsset templateAsset) : base(element) {
+ items = new ModuleUIItems(element, templateAsset,
+ (data, element) => new UIItem(data, element, this));
+
+ element.RegisterCallback(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();
+
+ /// 初始化
+ public void Initial(List list) {
+ items.Create(list);
+ }
+ /// 设置值
+ // 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;
+ }
+
+ ///
+ /// 获取插入索引
+ ///
+ 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;
+ }
+
+ ///
+ /// 移动预览元素到新位置
+ ///
+ private void MovePreviewElement(int oldIndex, int newIndex) {
+ VisualElement temp = element[oldIndex];
+ // element.RemoveAt(oldIndex);
+ element.Insert(newIndex, temp);
+ }
+
+ /// UI项
+ public class UIItem : ModuleUIItem {
+ public readonly UIAttributeList parent;
+
+ public Label Range => Q