diff --git a/Assets/Prefabs/Game Manager.prefab b/Assets/Prefabs/Game Manager.prefab index db516fd..c00b00e 100644 --- a/Assets/Prefabs/Game Manager.prefab +++ b/Assets/Prefabs/Game Manager.prefab @@ -1494,8 +1494,8 @@ MonoBehaviour: gameTimer: {fileID: 4832072825095962115} spawnPosition: {x: -10.25, y: 20} hatSpawnPositions: [] - LeaderboardCanvas: {fileID: 0} - TimerCanvas: {fileID: 0} + LeaderboardCanvas: {fileID: 7061268803878077000} + TimerCanvas: {fileID: 2989920920269489744} hatObject: {fileID: 8102114527039450581} --- !u!114 &5255884573950249540 MonoBehaviour: diff --git a/Assets/Scenes/Platformer With Headroom.unity b/Assets/Scenes/Platformer With Headroom.unity index 2554b4f..8a70126 100644 --- a/Assets/Scenes/Platformer With Headroom.unity +++ b/Assets/Scenes/Platformer With Headroom.unity @@ -4545,14 +4545,6 @@ PrefabInstance: propertyPath: time value: 30 objectReference: {fileID: 0} - - target: {fileID: 2396754106601062846, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} - propertyPath: TimerCanvas - value: - objectReference: {fileID: 6442071445436727404} - - target: {fileID: 2396754106601062846, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} - propertyPath: LeaderboardCanvas - value: - objectReference: {fileID: 6442071445436727405} - target: {fileID: 2396754106601062846, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} propertyPath: hatSpawnPositions.Array.size value: 5 @@ -4763,16 +4755,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} ---- !u!223 &6442071445436727404 stripped -Canvas: - m_CorrespondingSourceObject: {fileID: 2989920920269489744, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} - m_PrefabInstance: {fileID: 6442071445436727402} - m_PrefabAsset: {fileID: 0} ---- !u!223 &6442071445436727405 stripped -Canvas: - m_CorrespondingSourceObject: {fileID: 7061268803878077000, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} - m_PrefabInstance: {fileID: 6442071445436727402} - m_PrefabAsset: {fileID: 0} --- !u!1001 &8682934954266721942 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Game/GameManager.cs b/Assets/Scripts/Game/GameManager.cs index 62e44ad..10a0b69 100644 --- a/Assets/Scripts/Game/GameManager.cs +++ b/Assets/Scripts/Game/GameManager.cs @@ -53,10 +53,13 @@ public class GameManager : MonoBehaviour { if (gameOver) return; - foreach (var player in players) + if (gameMode == GameMode.keepAway) { - float holdTime = GetPlayerHoldTime(player); - UpdatePlayerHoldTime(player, holdTime); + foreach (var player in players) + { + float holdTime = GetPlayerHoldTime(player); + UpdatePlayerHoldTime(player, holdTime); + } } } @@ -135,7 +138,7 @@ public class GameManager : MonoBehaviour } if (gameMode == GameMode.obstacleCourse) { - + RespawnPlayer(player.gameObject); } }