Pasha/Fruitomation
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fixed Scene Transitions

Browse Source
This commit is contained in:
Pasha Bibko
2026-04-14 14:11:47 +01:00
parent cb15a73319
commit c81e90589f
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Assets/Scripts/Game/SceneController.cs
View File

@@ -32,6 +32,8 @@ namespace Fruitomation.Game
Transition.OnCreation(canvas);
}
private const float FadeMultiplier = 4f;
private IEnumerator StartLoadInternal(string scene)
{
AsyncOperation operation = SceneManager.LoadSceneAsync(scene);
@@ -50,10 +52,10 @@ namespace Fruitomation.Game
while (lerp < 1f)
{
lerp += Time.unscaledDeltaTime;
lerp += Time.unscaledDeltaTime * FadeMultiplier;
Transition.LerpValue = Mathf.Clamp01(lerp);
yield return null; // Waits for next frame
yield return new WaitForEndOfFrame();
}
operation.allowSceneActivation = true;
@@ -61,14 +63,17 @@ namespace Fruitomation.Game
private IEnumerator EndLoadInternal()
{
yield return new WaitForSecondsRealtime(0.2f);
Transition.GoingUp = true;
float lerp = 0f;
while (lerp < 1f)
{
lerp += Time.unscaledDeltaTime;
Transition.LerpValue = Mathf.Clamp01(lerp);
lerp += Time.unscaledDeltaTime * FadeMultiplier;
Transition.LerpValue = Mathf.Clamp01(1f - lerp);
yield return null; // Waits for next frame
yield return new WaitForEndOfFrame(); // Waits for next frame
}
Time.timeScale = 1f;

1
Assets/Scripts/Game/SceneControllerTransition.cs
View File

@@ -16,6 +16,7 @@ namespace Fruitomation.Game
{
Image img = gameObject.AddComponent<Image>();
img.color = Color.black;
img.raycastTarget = true;
CanvasRect = canvas.GetComponent<RectTransform>();
Rect = transform.GetComponent<RectTransform>();