Compare commits

..

No commits in common. "d4a9fe0ae5f5dfa98f1e212784b9da3386cdf532" and "d909230e6c107c0e9e9a1f614dc2cb4436ea78c4" have entirely different histories.

3 changed files with 24 additions and 4 deletions

View file

@ -1,6 +1,6 @@
/*
* author: mark joshwel
* date: 11/8/2024
* date: 29/5/2024
* description: game manager singleton for a single source of truth state management
*/
@ -20,9 +20,10 @@ public class GameManager : MonoBehaviour
Game,
ScreenMainMenu,
ScreenOptionsMenu,
OverlayPauseMenu,
OverlayCompleteUnderTimeMenu,
OverlayFailedOverTimeMenu,
ScreenCreditsMenu,
ScreenPauseMenu,
ScreenCaughtMenu,
ScreenEscapedMenu,
UnassociatedState
}
@ -213,6 +214,9 @@ public class GameManager : MonoBehaviour
else
{
Debug.Log($"GameManager.SetDisplayState({displayState}): pre-pause helper");
// if we're transitioning to the main menu, load the main menu scene
if (transitioning && displayState == DisplayState.ScreenMainMenu)
SceneManager.LoadScene("S2 World");
PauseGameHelper(displayState);
}

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 41be94ffee1b24a4fb8e45242c216745
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: cf6cc1506a223e64fbc912cfcbf521fb
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: