From bd27595b0d1ed9fc20f8470905fa1e6f0498010f Mon Sep 17 00:00:00 2001 From: MuHua-123 <136542559+MuHua-123@users.noreply.github.com> Date: Thu, 9 Oct 2025 15:04:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConstMaterial.cs | 0 .../ConstMaterial.cs.meta | 0 .../InventoryItemConst.cs | 0 .../InventoryItemConst.cs.meta | 0 .../Runtime/Equipment/Accessory.cs | 18 ------------------ .../Runtime/Equipment/Accessory.cs.meta | 11 ----------- .../Runtime/Equipment/Armor.cs | 18 ------------------ .../Runtime/Equipment/Armor.cs.meta | 11 ----------- .../Runtime/Equipment/Equipment.cs | 13 ------------- .../Runtime/Equipment/Weapon.cs | 18 ------------------ .../Runtime/Equipment/Weapon.cs.meta | 11 ----------- .../Equipment.meta | 2 +- .../ModuleInventory/Equipment/Equipment.cs | 19 +++++++++++++++++++ .../Equipment/Equipment.cs.meta | 0 .../Equipment}/EquipmentColumn.cs | 0 .../Equipment}/EquipmentColumn.cs.meta | 0 .../Equipment}/EquipmentSlot.cs | 0 .../Equipment}/EquipmentSlot.cs.meta | 0 .../Formula.meta} | 0 .../Formula}/DataMaterial.cs | 0 .../Formula}/DataMaterial.cs.meta | 0 .../ModuleValue/Runtime/ValueInstance.cs | 14 ++++++++------ .../ModuleValue/Runtime/ValueInstanceConst.cs | 2 +- 23 files changed, 29 insertions(+), 108 deletions(-) rename Assets/ModuleCore/{ModuleFormula => ModuleEquipment}/ConstMaterial.cs (100%) rename Assets/ModuleCore/{ModuleFormula => ModuleEquipment}/ConstMaterial.cs.meta (100%) rename Assets/ModuleCore/{ModuleInventory => ModuleEquipment}/InventoryItemConst.cs (100%) rename Assets/ModuleCore/{ModuleInventory => ModuleEquipment}/InventoryItemConst.cs.meta (100%) delete mode 100644 Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Accessory.cs delete mode 100644 Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Accessory.cs.meta delete mode 100644 Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Armor.cs delete mode 100644 Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Armor.cs.meta delete mode 100644 Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Equipment.cs delete mode 100644 Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Weapon.cs delete mode 100644 Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Weapon.cs.meta rename Assets/ModuleCore/{ModuleEquipment/Runtime => ModuleInventory}/Equipment.meta (77%) create mode 100644 Assets/ModuleCore/ModuleInventory/Equipment/Equipment.cs rename Assets/ModuleCore/{ModuleEquipment/Runtime => ModuleInventory}/Equipment/Equipment.cs.meta (100%) rename Assets/ModuleCore/{ModuleEquipment/Runtime => ModuleInventory/Equipment}/EquipmentColumn.cs (100%) rename Assets/ModuleCore/{ModuleEquipment/Runtime => ModuleInventory/Equipment}/EquipmentColumn.cs.meta (100%) rename Assets/ModuleCore/{ModuleEquipment/Runtime => ModuleInventory/Equipment}/EquipmentSlot.cs (100%) rename Assets/ModuleCore/{ModuleEquipment/Runtime => ModuleInventory/Equipment}/EquipmentSlot.cs.meta (100%) rename Assets/ModuleCore/{ModuleFormula.meta => ModuleInventory/Formula.meta} (100%) rename Assets/ModuleCore/{ModuleFormula => ModuleInventory/Formula}/DataMaterial.cs (100%) rename Assets/ModuleCore/{ModuleFormula => ModuleInventory/Formula}/DataMaterial.cs.meta (100%) diff --git a/Assets/ModuleCore/ModuleFormula/ConstMaterial.cs b/Assets/ModuleCore/ModuleEquipment/ConstMaterial.cs similarity index 100% rename from Assets/ModuleCore/ModuleFormula/ConstMaterial.cs rename to Assets/ModuleCore/ModuleEquipment/ConstMaterial.cs diff --git a/Assets/ModuleCore/ModuleFormula/ConstMaterial.cs.meta b/Assets/ModuleCore/ModuleEquipment/ConstMaterial.cs.meta similarity index 100% rename from Assets/ModuleCore/ModuleFormula/ConstMaterial.cs.meta rename to Assets/ModuleCore/ModuleEquipment/ConstMaterial.cs.meta diff --git a/Assets/ModuleCore/ModuleInventory/InventoryItemConst.cs b/Assets/ModuleCore/ModuleEquipment/InventoryItemConst.cs similarity index 100% rename from Assets/ModuleCore/ModuleInventory/InventoryItemConst.cs rename to Assets/ModuleCore/ModuleEquipment/InventoryItemConst.cs diff --git a/Assets/ModuleCore/ModuleInventory/InventoryItemConst.cs.meta b/Assets/ModuleCore/ModuleEquipment/InventoryItemConst.cs.meta similarity index 100% rename from Assets/ModuleCore/ModuleInventory/InventoryItemConst.cs.meta rename to Assets/ModuleCore/ModuleEquipment/InventoryItemConst.cs.meta diff --git a/Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Accessory.cs b/Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Accessory.cs deleted file mode 100644 index 56b7a8f..0000000 --- a/Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Accessory.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Accessory : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Accessory.cs.meta b/Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Accessory.cs.meta deleted file mode 100644 index ccd1062..0000000 --- a/Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Accessory.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7cfcaecd119af2f48adf5a4649d88360 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Armor.cs b/Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Armor.cs deleted file mode 100644 index 13118ce..0000000 --- a/Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Armor.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Armor : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Armor.cs.meta b/Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Armor.cs.meta deleted file mode 100644 index 379bef5..0000000 --- a/Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Armor.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: de8ae08be418e3c48a7f938b6b842caa -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Equipment.cs b/Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Equipment.cs deleted file mode 100644 index ab3582f..0000000 --- a/Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Equipment.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// 装备 -/// -public class Equipment : InventoryItem { - /// 装备类型 （类型1/类型2） - public string type; - /// 词缀列表 - public List affixes = new List(); -} \ No newline at end of file diff --git a/Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Weapon.cs b/Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Weapon.cs deleted file mode 100644 index 4108eb5..0000000 --- a/Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Weapon.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Weapon : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Weapon.cs.meta b/Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Weapon.cs.meta deleted file mode 100644 index 0db1dae..0000000 --- a/Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Weapon.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4fdef6696992dc94f977f5ca3a2cc528 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ModuleCore/ModuleEquipment/Runtime/Equipment.meta b/Assets/ModuleCore/ModuleInventory/Equipment.meta similarity index 77% rename from Assets/ModuleCore/ModuleEquipment/Runtime/Equipment.meta rename to Assets/ModuleCore/ModuleInventory/Equipment.meta index 6029b08..860bd59 100644 --- a/Assets/ModuleCore/ModuleEquipment/Runtime/Equipment.meta +++ b/Assets/ModuleCore/ModuleInventory/Equipment.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fa01c7c9647ebd6468b17280d5065639 +guid: 0d2605ccaa6985d4e9296b749694fc1d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ModuleCore/ModuleInventory/Equipment/Equipment.cs b/Assets/ModuleCore/ModuleInventory/Equipment/Equipment.cs new file mode 100644 index 0000000..1963e24 --- /dev/null +++ b/Assets/ModuleCore/ModuleInventory/Equipment/Equipment.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 装备 +/// +public class Equipment : InventoryItem { + /// + /// 装备类型：稀有度/装备类型/次级类型/种类 + ///
稀有度：普通，精良，稀有，史诗，传奇，神话 + ///
装备类型：武器，护甲，饰品 + ///
次级类型：单手，副手，双手，上衣，头盔，手套，腰带，鞋子，项链，戒指，手镯 + ///
装备种类：剑，锤，枪，弓，斧头，盾牌，法杖，魔杖 + /// + public string type; + /// 词缀列表 + public List affixes = new List(); +} \ No newline at end of file diff --git a/Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Equipment.cs.meta b/Assets/ModuleCore/ModuleInventory/Equipment/Equipment.cs.meta similarity index 100% rename from Assets/ModuleCore/ModuleEquipment/Runtime/Equipment/Equipment.cs.meta rename to Assets/ModuleCore/ModuleInventory/Equipment/Equipment.cs.meta diff --git a/Assets/ModuleCore/ModuleEquipment/Runtime/EquipmentColumn.cs b/Assets/ModuleCore/ModuleInventory/Equipment/EquipmentColumn.cs similarity index 100% rename from Assets/ModuleCore/ModuleEquipment/Runtime/EquipmentColumn.cs rename to Assets/ModuleCore/ModuleInventory/Equipment/EquipmentColumn.cs diff --git a/Assets/ModuleCore/ModuleEquipment/Runtime/EquipmentColumn.cs.meta b/Assets/ModuleCore/ModuleInventory/Equipment/EquipmentColumn.cs.meta similarity index 100% rename from Assets/ModuleCore/ModuleEquipment/Runtime/EquipmentColumn.cs.meta rename to Assets/ModuleCore/ModuleInventory/Equipment/EquipmentColumn.cs.meta diff --git a/Assets/ModuleCore/ModuleEquipment/Runtime/EquipmentSlot.cs b/Assets/ModuleCore/ModuleInventory/Equipment/EquipmentSlot.cs similarity index 100% rename from Assets/ModuleCore/ModuleEquipment/Runtime/EquipmentSlot.cs rename to Assets/ModuleCore/ModuleInventory/Equipment/EquipmentSlot.cs diff --git a/Assets/ModuleCore/ModuleEquipment/Runtime/EquipmentSlot.cs.meta b/Assets/ModuleCore/ModuleInventory/Equipment/EquipmentSlot.cs.meta similarity index 100% rename from Assets/ModuleCore/ModuleEquipment/Runtime/EquipmentSlot.cs.meta rename to Assets/ModuleCore/ModuleInventory/Equipment/EquipmentSlot.cs.meta diff --git a/Assets/ModuleCore/ModuleFormula.meta b/Assets/ModuleCore/ModuleInventory/Formula.meta similarity index 100% rename from Assets/ModuleCore/ModuleFormula.meta rename to Assets/ModuleCore/ModuleInventory/Formula.meta diff --git a/Assets/ModuleCore/ModuleFormula/DataMaterial.cs b/Assets/ModuleCore/ModuleInventory/Formula/DataMaterial.cs similarity index 100% rename from Assets/ModuleCore/ModuleFormula/DataMaterial.cs rename to Assets/ModuleCore/ModuleInventory/Formula/DataMaterial.cs diff --git a/Assets/ModuleCore/ModuleFormula/DataMaterial.cs.meta b/Assets/ModuleCore/ModuleInventory/Formula/DataMaterial.cs.meta similarity index 100% rename from Assets/ModuleCore/ModuleFormula/DataMaterial.cs.meta rename to Assets/ModuleCore/ModuleInventory/Formula/DataMaterial.cs.meta diff --git a/Assets/ModuleCore/ModuleValue/Runtime/ValueInstance.cs b/Assets/ModuleCore/ModuleValue/Runtime/ValueInstance.cs index 769112f..cb32461 100644 --- a/Assets/ModuleCore/ModuleValue/Runtime/ValueInstance.cs +++ b/Assets/ModuleCore/ModuleValue/Runtime/ValueInstance.cs @@ -16,14 +16,16 @@ public class ValueInstance { /// 最大值 public float maxValue; + /// 最终数值 + public float value; + /// 默认值 + public float defaultValue; /// 基础值 public float baseValue; /// 附加值% public float addedValue; /// 当前值 public float currentValue; - /// 最终数值 - public float value; /// 修改器列表 public List modifiers = new List(); @@ -53,15 +55,15 @@ public class ValueInstance { /// 重新计算值 public void RecalculateValue() { addedValue = 1; - currentValue = baseValue; + baseValue = defaultValue; modifiers.ForEach(Modify); } /// 修改 public void Modify(ValueModifier modifier) { + baseValue += modifier.FixedValue; addedValue += modifier.AddedValue; - currentValue += modifier.FixedValue; - value = currentValue * addedValue; - value = Mathf.Clamp(currentValue, minValue, maxValue); + float temp = baseValue * addedValue; + value = Mathf.Clamp(temp, minValue, maxValue); } } diff --git a/Assets/ModuleCore/ModuleValue/Runtime/ValueInstanceConst.cs b/Assets/ModuleCore/ModuleValue/Runtime/ValueInstanceConst.cs index d72ee2b..c797daa 100644 --- a/Assets/ModuleCore/ModuleValue/Runtime/ValueInstanceConst.cs +++ b/Assets/ModuleCore/ModuleValue/Runtime/ValueInstanceConst.cs @@ -52,7 +52,7 @@ public class ValueInstanceConst : ScriptableObject { ValueInstance instance = new ValueInstance(type, name); instance.minValue = minValue; instance.maxValue = maxValue; - instance.baseValue = baseValue; + instance.defaultValue = baseValue; instance.RecalculateValue(); return instance; }