File tree Expand file tree Collapse file tree 2 files changed +13
-9
lines changed
Assets/BossRoom/Scripts/Client Expand file tree Collapse file tree 2 files changed +13
-9
lines changed Original file line number Diff line number Diff line change 3
3
4
4
public class ClientLoadingState : GameStateBehaviour
5
5
{
6
- public override GameState ActiveState { get { return GameState . Loading ; } }
6
+ public override GameState ActiveState => GameState . Loading ;
7
7
}
Original file line number Diff line number Diff line change @@ -29,15 +29,19 @@ void Awake()
29
29
30
30
void SceneManagerOnsceneLoaded ( Scene scene , LoadSceneMode loadSceneMode )
31
31
{
32
- var currentGameState = FindObjectOfType < GameStateBehaviour > ( ) ;
33
- if ( currentGameState != null )
32
+ // If switching to new scene, check current game state to determine quit mode
33
+ if ( loadSceneMode == LoadSceneMode . Single )
34
34
{
35
- m_QuitMode = ( currentGameState . ActiveState == GameState . MainMenu ) ;
36
- m_QuitButtonText . text = m_QuitMode ? "Exit Game?" : "Return to menu?" ;
37
- }
38
- else
39
- {
40
- Debug . LogError ( $ "Scene { scene . name } does not contain a GameStateBehavior") ;
35
+ var currentGameState = FindObjectOfType < GameStateBehaviour > ( ) ;
36
+ if ( currentGameState != null )
37
+ {
38
+ m_QuitMode = ( currentGameState . ActiveState == GameState . MainMenu ) ;
39
+ m_QuitButtonText . text = m_QuitMode ? "Exit Game?" : "Return to menu?" ;
40
+ }
41
+ else
42
+ {
43
+ Debug . LogError ( $ "Scene { scene . name } does not contain a GameStateBehavior") ;
44
+ }
41
45
}
42
46
}
43
47
You can’t perform that action at this time.
0 commit comments