From 9c29e3d9b16277cd64be74d84867c7938fc1711f Mon Sep 17 00:00:00 2001 From: orsolya-st Date: Sat, 6 Jun 2026 17:11:05 +0200 Subject: [PATCH] md, droplet --- Game/Assets/Prefabs/MiniDroplet.prefab | 2 +- Game/Assets/Scripts/DamageHandler.cs | 17 +++++------------ Game/Assets/Scripts/MiniDroplet.cs | 6 ------ Game/ProjectSettings/TagManager.asset | 1 + 4 files changed, 7 insertions(+), 19 deletions(-) diff --git a/Game/Assets/Prefabs/MiniDroplet.prefab b/Game/Assets/Prefabs/MiniDroplet.prefab index fa24032..4c55f5e 100644 --- a/Game/Assets/Prefabs/MiniDroplet.prefab +++ b/Game/Assets/Prefabs/MiniDroplet.prefab @@ -16,7 +16,7 @@ GameObject: - component: {fileID: 8211840801622381919} m_Layer: 0 m_Name: MiniDroplet - m_TagString: Untagged + m_TagString: Minidrop m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Game/Assets/Scripts/DamageHandler.cs b/Game/Assets/Scripts/DamageHandler.cs index 3cac9f7..951de68 100644 --- a/Game/Assets/Scripts/DamageHandler.cs +++ b/Game/Assets/Scripts/DamageHandler.cs @@ -26,11 +26,11 @@ public class DamageHandler : MonoBehaviour private void Start() { - threshold = 10f; - multiplier = 0.1f; + threshold = 10f; + multiplier = 0.1f; - maxHealth = 1f; - minSize = 0.8f; + maxHealth = 1f; + minSize = 0.8f; health = maxHealth; } @@ -64,13 +64,7 @@ public class DamageHandler : MonoBehaviour if (fallSpeed < -threshold) { float fallDamage = (-fallSpeed - threshold) * multiplier; - // Debug.Log($"Fell with velocity:{fallSpeed}. Fall damage{fallDamage}"); UpdateHealth(health - fallDamage); - // Debug.Log($"New health:{health - fallDamage}"); - } - else - { - // Debug.Log($"Fell with velocity:{fallSpeed}. No fall damage"); } } @@ -80,12 +74,11 @@ public class DamageHandler : MonoBehaviour this.health = health; Transform transform = GetComponent(); float healthScaling = minSize + (1 - minSize) * (this.health / maxHealth); + //adjust size based on health transform.localScale = new Vector3(healthScaling,healthScaling,healthScaling); - // Debug.Log("UpdatedScale and health"); if(this.health <= 0f) { - // Debug.Log("Die"); Die(); } } diff --git a/Game/Assets/Scripts/MiniDroplet.cs b/Game/Assets/Scripts/MiniDroplet.cs index 39ee944..0aac007 100644 --- a/Game/Assets/Scripts/MiniDroplet.cs +++ b/Game/Assets/Scripts/MiniDroplet.cs @@ -11,10 +11,4 @@ public class MiniDroplet : MonoBehaviour transform.localScale = targetSize; } - - // Update is called once per frame - void Update() - { - - } } diff --git a/Game/ProjectSettings/TagManager.asset b/Game/ProjectSettings/TagManager.asset index f4a2fa8..a1f1fa5 100644 --- a/Game/ProjectSettings/TagManager.asset +++ b/Game/ProjectSettings/TagManager.asset @@ -6,6 +6,7 @@ TagManager: tags: - Border - Hole + - Minidrop layers: - Default - TransparentFX