mark/sota
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Compare commits

base: mark:d4a9fe0ae5f5dfa98f1e212784b9da3386cdf532
Branches Tags
mark:main
mark:vfinal
..
compare: mark:d909230e6c107c0e9e9a1f614dc2cb4436ea78c4
Branches Tags
mark:main
mark:vfinal

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

3 changed files with 24 additions and 4 deletions
Show stats Expand all files Collapse all files

12
RunningLateGame/Assets/Scripts/GameManager.cs
View file

@ -1,6 +1,6 @@
/* /*
* author: mark joshwel * author: mark joshwel
* date: 11/8/2024 * date: 29/5/2024
* description: game manager singleton for a single source of truth state management * description: game manager singleton for a single source of truth state management
*/ */
@ -20,9 +20,10 @@ public class GameManager : MonoBehaviour
Game, Game,
ScreenMainMenu, ScreenMainMenu,
ScreenOptionsMenu, ScreenOptionsMenu,
OverlayPauseMenu, ScreenCreditsMenu,
OverlayCompleteUnderTimeMenu, ScreenPauseMenu,
OverlayFailedOverTimeMenu, ScreenCaughtMenu,
ScreenEscapedMenu,
UnassociatedState UnassociatedState
} }
@ -213,6 +214,9 @@ public class GameManager : MonoBehaviour
else else
{ {
Debug.Log($"GameManager.SetDisplayState({displayState}): pre-pause helper"); 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); PauseGameHelper(displayState);
} }

8
RunningLateGame/Assets/UI/Font.meta Normal file
View file

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

8
RunningLateGame/Assets/Whitebox.meta Normal file
View file

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