diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity index c7c6c3326892ad7bf51b08be7086e18623518920..2a019e8d4591b3c3eee6c4f13a08f39e57b1b279 100644 --- a/Assets/Scenes/Level_01.unity +++ b/Assets/Scenes/Level_01.unity @@ -1058,6 +1058,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: playerHealth: {fileID: 1509913240} + warningText: {fileID: 1086032144} restartDelay: 5 canvasAnimator: {fileID: 360206200} --- !u!4 &688119341 @@ -1694,8 +1695,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 223.3319, y: 110.9384} + m_AnchoredPosition: {x: 2, y: -0.25} + m_SizeDelta: {x: 455.6358, y: 110.9384} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1086032144 MonoBehaviour: @@ -1718,8 +1719,8 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 90 + m_Font: {fileID: 12800000, guid: 46238fb1ad7a7a84ba8954c1c860994c, type: 3} + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -1730,7 +1731,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: '!' + m_Text: '! 20 m' --- !u!222 &1086032145 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Managers/GameOverManager.cs b/Assets/Scripts/Managers/GameOverManager.cs index 5107fbecfbcd4ac496524ac75d62002f26acb61e..d5248cc5189a02f5aee94b4a2e54c29aac6c5d17 100644 --- a/Assets/Scripts/Managers/GameOverManager.cs +++ b/Assets/Scripts/Managers/GameOverManager.cs @@ -1,9 +1,11 @@ using UnityEngine; using UnityEngine.SceneManagement; +using UnityEngine.UI; public class GameOverManager : MonoBehaviour { public PlayerHealth playerHealth; + public Text warningText; public float restartDelay = 5f; @@ -36,12 +38,14 @@ public class GameOverManager : MonoBehaviour } } - public void ShowWarning() + public void ShowWarning(float distance) { if (isGameOver) { return; } + var text = $"! {Mathf.RoundToInt(distance)}m"; + warningText.text = text; canvasAnimator.SetTrigger("Warning"); } diff --git a/Assets/Scripts/Player/PlayerDetector.cs b/Assets/Scripts/Player/PlayerDetector.cs index 3ed5e9fe0b9839643c8b0ea37ef8f144dc94599f..2dc1a628831c75acd9bbcb119d8b6f85af8ae348 100644 --- a/Assets/Scripts/Player/PlayerDetector.cs +++ b/Assets/Scripts/Player/PlayerDetector.cs @@ -9,7 +9,8 @@ public class PlayerDetector : MonoBehaviour if (other.tag == "Enemy" && !other.isTrigger) { - gameOverManager.ShowWarning(); + float distance = Vector3.Distance(transform.position, other.transform.position); + gameOverManager.ShowWarning(distance); } } } \ No newline at end of file