diff --git a/Assets/Scenes/Reparation.unity b/Assets/Scenes/Reparation.unity index a730d97..0b294dd 100644 --- a/Assets/Scenes/Reparation.unity +++ b/Assets/Scenes/Reparation.unity @@ -16055,6 +16055,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1285577524151521393, guid: 6bacecc4f3df9584198879c73a6b6c36, type: 3} + propertyPath: minimap + value: + objectReference: {fileID: 1521861653} - target: {fileID: 1285577524151521393, guid: 6bacecc4f3df9584198879c73a6b6c36, type: 3} propertyPath: maxOxygen value: 50 diff --git a/Assets/Scripts/WaterLogic.cs b/Assets/Scripts/WaterLogic.cs index 6cb0128..2fdde00 100644 --- a/Assets/Scripts/WaterLogic.cs +++ b/Assets/Scripts/WaterLogic.cs @@ -19,6 +19,7 @@ public class WaterLogic : MonoBehaviour public AudioClip oxygenWarning2; public AudioClip oxygenWarning3; public Image blackFadeImage; + public Image minimap; public TextMeshProUGUI oxygenWarningText; public AudioClip enterWaterSound; @@ -40,6 +41,7 @@ private void Start() _audioSource = GetComponent(); blackFadeImage.color = new Color(0f, 0f, 0f, 0f); _audioSource.volume = 1.0f; + minimap.color = new Color(minimap.color.r, minimap.color.g, minimap.color.b, 1f); } private void Update() @@ -190,10 +192,12 @@ private IEnumerator FadeInBlackCanvas() timeElapsed += Time.deltaTime; var alpha = Mathf.Clamp01(timeElapsed / duration); blackFadeImage.color = new Color(0, 0, 0, alpha); + minimap.color = new Color(minimap.color.r, minimap.color.g, minimap.color.b, 1 - alpha); yield return null; } blackFadeImage.color = new Color(0, 0, 0, 1); + minimap.color = new Color(minimap.color.r, minimap.color.g, minimap.color.b, 0); _isFadingIn = false; } @@ -204,16 +208,19 @@ private IEnumerator FadeOutBlackCanvas() var timeElapsed = 0f; blackFadeImage.color = new Color(0, 0, 0, 1); + minimap.color = new Color(minimap.color.r, minimap.color.g, minimap.color.b, 0); while (timeElapsed < duration) { timeElapsed += Time.deltaTime; var alpha = Mathf.Clamp01(1 - (timeElapsed / duration)); blackFadeImage.color = new Color(0, 0, 0, alpha); + minimap.color = new Color(minimap.color.r, minimap.color.g, minimap.color.b, alpha); yield return null; } blackFadeImage.color = new Color(0, 0, 0, 0); + minimap.color = new Color(minimap.color.r, minimap.color.g, minimap.color.b, 1); _isFadingIn = false; }