diff --git a/Assets/Prefabs/Vampire.prefab b/Assets/Prefabs/Vampire.prefab index 7737c13..f79f76e 100644 --- a/Assets/Prefabs/Vampire.prefab +++ b/Assets/Prefabs/Vampire.prefab @@ -80,10 +80,10 @@ MonoBehaviour: k__BackingField: 0 attackCooldown: 0 target: {fileID: 0} - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 3061273954050112714} halo: {fileID: 0} deadColor: {r: 1, g: 0, b: 0, a: 1} - emptyColor: {r: 1, g: 0, b: 0, a: 1} + emptyColor: {r: 0.25490198, g: 0.25490198, b: 0.25490198, a: 0.7019608} animator: {fileID: 0} playerStats: {fileID: 11400000, guid: 12a626b5a296d934ba078d222ad6ba98, type: 2} playerMovement: {fileID: 0} diff --git a/Assets/Scripts/Entity.cs b/Assets/Scripts/Entity.cs index c4cf519..8d5b42d 100644 --- a/Assets/Scripts/Entity.cs +++ b/Assets/Scripts/Entity.cs @@ -16,8 +16,7 @@ public class Entity : MonoBehaviour { public Arena arena = null!; - [SerializeField] - [Required] + [SerializeField] [Required] public GameFlowManager gameFlowManager = null!; [field: SerializeField] public float Health { get; private set; } @@ -38,7 +37,7 @@ public class Entity : MonoBehaviour { public Vector3 direction { get; set; } public Rigidbody2D rb { get; private set; } = null!; public new Collider2D collider { get; private set; } = null!; - [field: SerializeField]public new SpriteRenderer renderer { get; private set; } + [field: SerializeField] [field: Required]public new SpriteRenderer renderer { get; private set; } [SerializeField] GameObject halo; [SerializeField] protected Color deadColor = Color.red; [SerializeField] protected Color emptyColor = Color.grey; diff --git a/Assets/Scripts/VampireEntity.cs b/Assets/Scripts/VampireEntity.cs index 8ef4bff..f5159be 100644 --- a/Assets/Scripts/VampireEntity.cs +++ b/Assets/Scripts/VampireEntity.cs @@ -34,5 +34,8 @@ public class VampireEntity : Entity { public bool IsInSafeZone() => playerMovement.IsInSafeZone; - protected override void OnDied() => gameFlowManager.GameOver(); + protected override void OnDied() { + OnEmpty(); + gameFlowManager.GameOver(); + } } \ No newline at end of file