Skip to content

Commit a41e4b9

Browse files
committed
Merge branch 'main' into Lune-Blocking
2 parents 1c948d4 + cb3184f commit a41e4b9

6 files changed

Lines changed: 13 additions & 1 deletion

File tree

Binary file not shown.

Assets/Scripts/GameManager.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ public void ExitGame()
1515

1616
public static void LoadNextLevel()
1717
{
18+
//TODO: Show old workflow
19+
1820
Addressables.LoadSceneAsync("LoadingScene", UnityEngine.SceneManagement.LoadSceneMode.Single, true);
1921
}
2022

Assets/Scripts/Loading.cs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
public class Loading : MonoBehaviour
77
{
8+
private bool m_LoadingComplete = false;
9+
810
[SerializeField]
911
private Slider m_LoadingSlider;
1012

@@ -30,6 +32,8 @@ private void OnSceneLoaded(AsyncOperationHandle obj)
3032
{
3133
// The scene is loaded, show the button and now turn the scene on?
3234
m_PlayButton.SetActive(true);
35+
36+
//m_LoadingComplete = true;
3337
}
3438

3539
public void GoToNextLevel()
@@ -39,6 +43,12 @@ public void GoToNextLevel()
3943

4044
private void Update()
4145
{
42-
m_LoadingSlider.value = m_SceneHandle.PercentComplete;
46+
// TODO: Comment the range of the percentcomplete
47+
//if (!m_LoadingComplete)
48+
{
49+
m_LoadingSlider.value = m_SceneHandle.PercentComplete;
50+
}
4351
}
52+
53+
//Make the oncomplete
4454
}
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)