Skip to content

Commit

Permalink
feat: minimap fading
Browse files Browse the repository at this point in the history
  • Loading branch information
pyoneerC committed Sep 25, 2024
1 parent 3ad831d commit 8428bc1
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
4 changes: 4 additions & 0 deletions Assets/Scenes/Reparation.unity
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions Assets/Scripts/WaterLogic.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -40,6 +41,7 @@ private void Start()
_audioSource = GetComponent<AudioSource>();
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()
Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down

0 comments on commit 8428bc1

Please sign in to comment.