This commit is contained in:
CortexCore
2023-10-24 23:37:59 +08:00
parent 325f63d6bc
commit 3e39e627bc
388 changed files with 29043 additions and 889 deletions

View File

@@ -40,13 +40,13 @@ namespace BITFALL.Entities.Armor
public override void OnAwake()
{
base.OnAwake();
_health.OnDamage += OnDamage;
_inventory.OnUsed += OnUsed;
_health.OnDamageFactory += OnDamageFactory;
_inventory.OnUsedItem += OnUsedItem;
_equipmentContainer.OnEquip += OnEquip;
_equipmentContainer.OnDeEquip += OnDeEquip;
_playerEquipSelector.OnTryEquip += OnTryEquip;
_playerEquipSelector.TryEquipFactory += OnTryEquip;
}
private bool OnTryEquip(IBasicItem arg)
@@ -81,7 +81,7 @@ namespace BITFALL.Entities.Armor
OnEquipArmor?.Invoke(arg2);
}
private void OnUsed(IBasicItem obj)
private void OnUsedItem(IBasicItem obj)
{
if (_currentArmor?.GetAssetable() is not AssetableArmor assetableArmor) return;
if (obj.GetAssetable().TryGetProperty<AddArmor>(out var addArmor))
@@ -89,7 +89,7 @@ namespace BITFALL.Entities.Armor
Armor = Mathf.Clamp(Armor + addArmor.Armor, 0, assetableArmor.MaxArmor);
}
}
private int OnDamage(DamageMessage arg1, int damage)
private int OnDamageFactory(DamageMessage arg1, int damage)
{
if (_currentArmor is null) return damage;
if (Armor is 0) return damage;