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
8 changes: 8 additions & 0 deletions Assets/_Project/Art/UI/GameOverScreen.meta

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

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
127 changes: 127 additions & 0 deletions Assets/_Project/Art/UI/GameOverScreen/RestartButtonUI.png.meta

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

30 changes: 25 additions & 5 deletions Assets/_Project/Scenes/MainPrototype.unity
Original file line number Diff line number Diff line change
Expand Up @@ -2327,6 +2327,7 @@ GameObject:
- component: {fileID: 904751786}
- component: {fileID: 904751788}
- component: {fileID: 904751787}
- component: {fileID: 904751789}
m_Layer: 5
m_Name: GameOver
m_TagString: Untagged
Expand Down Expand Up @@ -2379,7 +2380,7 @@ MonoBehaviour:



Press Space - Restart'
Tap Restart (Press Space)'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
Expand All @@ -2393,8 +2394,8 @@ MonoBehaviour:
m_enableVertexGradient: 1
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
topLeft: {r: 0, g: 0, b: 0, a: 0.87058824}
topRight: {r: 0.8113208, g: 0.16456035, b: 0.16456035, a: 1}
bottomLeft: {r: 0.4528302, g: 0.41651833, b: 0.41651833, a: 1}
bottomRight: {r: 0.5188679, g: 0.5017355, b: 0.5017355, a: 1}
m_fontColorGradientPreset: {fileID: 0}
Expand Down Expand Up @@ -2456,6 +2457,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 904751785}
m_CullTransparentMesh: 1
--- !u!114 &904751789
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 904751785}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cf6ef566c2404d7caf4f7f8838fd3e9d, type: 3}
m_Name:
m_EditorClassIdentifier:
restartButton: {fileID: 0}
restartButtonSprite: {fileID: 21300000, guid: b2831b7f6899ee944a13fa562e3b84df, type: 3}
restartButtonText: Rise Again
restartButtonTextColor: {r: 0.84, g: 0.95, b: 1, a: 1}
--- !u!1 &977390122
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -3787,8 +3804,8 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.8018868, g: 0.22316661, b: 0.22316661, a: 0}
m_RaycastTarget: 0
Expand Down Expand Up @@ -4694,6 +4711,8 @@ MonoBehaviour:
movementZone: {fileID: 3001000004}
aimAttackZone: {fileID: 3002000004}
repairButton: {fileID: 3003000004}
playerInput: {fileID: 0}
baseAttackRate: 1.5
--- !u!114 &3000000003
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -4797,6 +4816,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d7f83b5a6c1a8934d915b999993b5326, type: 3}
m_Name:
m_EditorClassIdentifier:
maxRadius: 75
--- !u!1 &3002000000
GameObject:
m_ObjectHideFlags: 0
Expand Down
20 changes: 19 additions & 1 deletion Assets/_Project/Scenes/SampleScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -1259,6 +1259,7 @@ GameObject:
- component: {fileID: 904751786}
- component: {fileID: 904751788}
- component: {fileID: 904751787}
- component: {fileID: 904751789}
m_Layer: 5
m_Name: GameOver
m_TagString: Untagged
Expand Down Expand Up @@ -1311,7 +1312,7 @@ MonoBehaviour:



Press Space - Restart'
Tap Restart (Space also works)'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
Expand Down Expand Up @@ -1388,6 +1389,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 904751785}
m_CullTransparentMesh: 1
--- !u!114 &904751789
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 904751785}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cf6ef566c2404d7caf4f7f8838fd3e9d, type: 3}
m_Name:
m_EditorClassIdentifier:
restartButton: {fileID: 0}
restartButtonSprite: {fileID: 0}
restartButtonText: Rise Again
restartButtonTextColor: {r: 0.84, g: 0.95, b: 1, a: 1}
--- !u!1 &969171467
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -3207,3 +3224,4 @@ SceneRoots:
- {fileID: 833814061}
- {fileID: 1027969717}
- {fileID: 751719342}

55 changes: 50 additions & 5 deletions Assets/_Project/Scripts/_Project.Gameplay/Managers/GameManager.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
using UnityEngine;
using UnityEngine.SceneManagement;
using Castlebound.Gameplay.UI;
#if ENABLE_INPUT_SYSTEM
using UnityEngine.InputSystem;
#endif
using Random = System.Random;

public class GameManager : MonoBehaviour
Expand All @@ -10,31 +14,72 @@ public class GameManager : MonoBehaviour
public Random LootRng { get; private set; }

bool gameOver;
GameOverScreenController gameOverScreenController;

void Awake()
{
if (I && I != this) { Destroy(gameObject); return; }
I = this;
LootRng = new Random();
ResolveGameOverScreenController();
}

public void OnPlayerDied()
{
if (gameOver) return;
gameOver = true;
if (gameOverUI) gameOverUI.SetActive(true);

if (gameOverScreenController != null)
{
gameOverScreenController.Show();
}
else if (gameOverUI)
{
gameOverUI.SetActive(true);
}

// Freeze time if you like:
// Time.timeScale = 0f;
}

public void RequestRestart()
{
// Time.timeScale = 1f;
SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex);
}

void Update()
{
if (!gameOver) return;
// Space = restart scene
if (Input.GetKeyDown(KeyCode.Space))

if (WasRestartKeyPressed())
{
// Time.timeScale = 1f;
SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex);
RequestRestart();
}
}

bool WasRestartKeyPressed()
{
#if ENABLE_INPUT_SYSTEM
if (Keyboard.current != null && Keyboard.current.spaceKey.wasPressedThisFrame)
return true;
#endif
#if ENABLE_LEGACY_INPUT_MANAGER
if (Input.GetKeyDown(KeyCode.Space))
return true;
#endif
return false;
}

void ResolveGameOverScreenController()
{
if (gameOverUI == null)
return;

gameOverScreenController = gameOverUI.GetComponent<GameOverScreenController>();
if (gameOverScreenController == null)
gameOverScreenController = gameOverUI.AddComponent<GameOverScreenController>();

gameOverScreenController.SetRestartHandler(RequestRestart);
}
}
Loading