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

Compare commits

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

2 commits
d909230e6c ... d4a9fe0ae5

Author SHA1 Message Date
Mark Joshwel d4a9fe0ae5 game(scripts/gm): finalise states 
one scene chump
 2024-08-11 02:04:05 +08:00
Mark Joshwel d8956596ef game: remove metas for currently empty dirs 2024-08-11 02:03:37 +08:00
3 changed files with 4 additions and 24 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: 29/5/2024 * date: 11/8/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,10 +20,9 @@ public enum DisplayState
Game, Game,
ScreenMainMenu, ScreenMainMenu,
ScreenOptionsMenu, ScreenOptionsMenu,
ScreenCreditsMenu, OverlayPauseMenu,
ScreenPauseMenu, OverlayCompleteUnderTimeMenu,
ScreenCaughtMenu, OverlayFailedOverTimeMenu,
ScreenEscapedMenu,
UnassociatedState UnassociatedState
} }
@ -214,9 +213,6 @@ public void SetDisplayState(DisplayState displayState)
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
View file

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

8
RunningLateGame/Assets/Whitebox.meta
View file

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