Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@
"temp/": true,
"Temp/": true
},
"dotnet.defaultSolution": "obg.slnx"
"dotnet.defaultSolution": "obstacle_dodge_game.slnx"
}
100 changes: 100 additions & 0 deletions Assets/GameOverSceneManager.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.SceneManagement;
using TMPro;

public class GameOverSceneManager : MonoBehaviour
{
[Header("Scene Names")]
public string gameSceneName = "MainGame";
public string mainMenuSceneName = "MainMenu";

[Header("UI Buttons")]
public Button restartFromCheckpointButton;
public Button restartFromBeginningButton;
public Button mainMenuButton;

public TextMeshProUGUI checkpointButtonText;

void Start()
{
if (SessionManager.Instance == null)
{
Debug.LogError("SessionManager not found! Cannot check for checkpoints.");
if (restartFromCheckpointButton != null)
{
restartFromCheckpointButton.gameObject.SetActive(false);
}
}
else
{
if (SessionManager.Instance.CurrentLives > 0 && SessionManager.Instance.LastCheckpointDistance > 0)
{
if (restartFromCheckpointButton != null)
{
restartFromCheckpointButton.gameObject.SetActive(true);
}

if (checkpointButtonText != null)
{
checkpointButtonText.text = $"Restart from Checkpoint (Lives: {SessionManager.Instance.CurrentLives})";
}
}
else
{
if (restartFromCheckpointButton != null)
{
restartFromCheckpointButton.gameObject.SetActive(false);
}
}
}

if (restartFromCheckpointButton != null)
{
restartFromCheckpointButton.onClick.AddListener(OnRestartFromCheckpoint);
}

if (restartFromBeginningButton != null)
{
restartFromBeginningButton.onClick.AddListener(OnRestartFromBeginning);
}

if (mainMenuButton != null)
{
mainMenuButton.onClick.AddListener(OnMainMenu);
}
}

public void OnRestartFromCheckpoint()
{
if (SessionManager.Instance != null)
{
SessionManager.Instance.SpendLife();
}

Time.timeScale = 1;
SceneManager.LoadScene(gameSceneName);
}

public void OnRestartFromBeginning()
{
if (SessionManager.Instance != null)
{
SessionManager.Instance.ResetSession();
}

Time.timeScale = 1;
SceneManager.LoadScene(gameSceneName);
}

public void OnMainMenu()
{
if (SessionManager.Instance != null)
{
SessionManager.Instance.ResetSession();
}

Time.timeScale = 1;
SceneManager.LoadScene(mainMenuSceneName);
}
}
2 changes: 2 additions & 0 deletions Assets/GameOverSceneManager.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Scenes/.MainMenu.unity.swp
Binary file not shown.
Binary file added Assets/Scenes/.MainMenu_BASE_159.unity.swp
Binary file not shown.
Binary file added Assets/Scenes/.MainMenu_LOCAL_159.unity.swp
Binary file not shown.
Binary file added Assets/Scenes/.MainMenu_REMOTE_159.unity.swp
Binary file not shown.
69 changes: 63 additions & 6 deletions Assets/Scenes/GameOver.unity
Original file line number Diff line number Diff line change
Expand Up @@ -335,17 +335,23 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Version: 3
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 2
m_LightLayerMask: 1
m_RenderingLayers: 1
m_CustomShadowLayers: 0
m_ShadowLayerMask: 1
m_ShadowRenderingLayers: 1
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
m_SoftShadowQuality: 0
m_RenderingLayersMask:
serializedVersion: 0
m_Bits: 1
m_ShadowRenderingLayersMask:
serializedVersion: 0
m_Bits: 1
m_Version: 4
m_LightLayerMask: 1
m_ShadowLayerMask: 1
m_RenderingLayers: 1
m_ShadowRenderingLayers: 1
--- !u!1 &263816787
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -491,14 +497,14 @@ MonoBehaviour:
m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
m_RequiresDepthTexture: 0
m_RequiresColorTexture: 0
m_Version: 2
m_TaaSettings:
m_Quality: 3
m_FrameInfluence: 0.1
m_JitterScale: 1
m_MipBias: 0
m_VarianceClampScale: 0.9
m_ContrastAdaptiveSharpening: 0
m_Version: 2
--- !u!1 &442650871
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1361,6 +1367,56 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1915832383
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1915832385}
- component: {fileID: 1915832384}
m_Layer: 0
m_Name: Gameover
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1915832384
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1915832383}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c846ded251ff7e84086235844f839fe3, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::GameOverSceneManager
gameSceneName: MainGame
mainMenuSceneName: MainMenu
restartFromCheckpointButton: {fileID: 0}
restartFromBeginningButton: {fileID: 944635826}
mainMenuButton: {fileID: 2002443025}
checkpointButtonText: {fileID: 0}
--- !u!4 &1915832385
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1915832383}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.08952, y: 0, z: -1.58957}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2002443023
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1503,3 +1559,4 @@ SceneRoots:
- {fileID: 17068334}
- {fileID: 1394071638}
- {fileID: 1787307106}
- {fileID: 1915832385}
Loading
Loading