From 98f0713ebea7ab7cb8b1141258a58bdc2c1e04eb Mon Sep 17 00:00:00 2001 From: djkellerman Date: Thu, 17 Apr 2025 17:19:02 -0400 Subject: [PATCH] Few bug fixes Fixed `Time Left!` display. Added obstacle course ends for all 4 maps. Sets obstacle course end goals to only work on the correct gamemode. Set correct time limits for keep away in every map. --- Assets/Scenes/ObstanceWIP.unity | 55 ++++++++++++++- Assets/Scenes/Platform3 (MOUNTAIN).unity | 50 +++++++++++++- Assets/Scenes/Platformer With Headroom.unity | 67 ++++++++++++++++++- Assets/Scenes/Q2_(CITY) Keep_Away2.unity | 42 +++++++++++- Assets/Scenes/QQ_ObstanceWIP.unity | 55 ++++++++++++++- Assets/Scenes/Title Screen.unity | 10 +-- .../Scenes/[OUTDATED](CITY) Keep_Away2.unity | 50 +++++++++++++- Assets/Scripts/{ => Game}/AudioManager.cs | 0 .../Scripts/{ => Game}/AudioManager.cs.meta | 0 Assets/Scripts/{ => Game}/ObstacleCourse.cs | 0 .../Scripts/{ => Game}/ObstacleCourse.cs.meta | 0 Assets/Scripts/Game/ObstacleEnd.cs | 27 ++++++++ Assets/Scripts/Game/ObstacleEnd.cs.meta | 2 + 13 files changed, 346 insertions(+), 12 deletions(-) rename Assets/Scripts/{ => Game}/AudioManager.cs (100%) rename Assets/Scripts/{ => Game}/AudioManager.cs.meta (100%) rename Assets/Scripts/{ => Game}/ObstacleCourse.cs (100%) rename Assets/Scripts/{ => Game}/ObstacleCourse.cs.meta (100%) create mode 100644 Assets/Scripts/Game/ObstacleEnd.cs create mode 100644 Assets/Scripts/Game/ObstacleEnd.cs.meta diff --git a/Assets/Scenes/ObstanceWIP.unity b/Assets/Scenes/ObstanceWIP.unity index d6d4d4f..fad01e2 100644 --- a/Assets/Scenes/ObstanceWIP.unity +++ b/Assets/Scenes/ObstanceWIP.unity @@ -4455,8 +4455,48 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1757615392802054825, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + insertIndex: -1 + addedObject: {fileID: 1133819047} + - targetCorrespondingSourceObject: {fileID: 7624412048159175855, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + insertIndex: -1 + addedObject: {fileID: 1133819049} m_SourcePrefab: {fileID: 100100000, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} +--- !u!1 &1133819046 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1757615392802054825, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + m_PrefabInstance: {fileID: 1133819045} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1133819047 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1133819046} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 34a52816a1c62984ea622bbf50849c68, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1133819048 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7624412048159175855, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + m_PrefabInstance: {fileID: 1133819045} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1133819049 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1133819048} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 69fc903d39ac3d24aab4ce7a68dba447, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1164411982 GameObject: m_ObjectHideFlags: 0 @@ -8985,6 +9025,7 @@ GameObject: m_Component: - component: {fileID: 1815355877} - component: {fileID: 1815355876} + - component: {fileID: 1815355878} m_Layer: 0 m_Name: GOAL m_TagString: Untagged @@ -9062,6 +9103,18 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1815355878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1815355875} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 69fc903d39ac3d24aab4ce7a68dba447, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1972151283 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Platform3 (MOUNTAIN).unity b/Assets/Scenes/Platform3 (MOUNTAIN).unity index 28582dd..83cf738 100644 --- a/Assets/Scenes/Platform3 (MOUNTAIN).unity +++ b/Assets/Scenes/Platform3 (MOUNTAIN).unity @@ -882,6 +882,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3280152006050152854, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + propertyPath: m_LocalPosition.x + value: 3338.17 + objectReference: {fileID: 0} + - target: {fileID: 3280152006050152854, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + propertyPath: m_LocalPosition.y + value: -1187.98 + objectReference: {fileID: 0} - target: {fileID: 3636379526195672734, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} propertyPath: m_text value: 3:00 @@ -1078,7 +1086,13 @@ PrefabInstance: m_RemovedGameObjects: - {fileID: 4148327129846918965, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1757615392802054825, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + insertIndex: -1 + addedObject: {fileID: 447660841} + - targetCorrespondingSourceObject: {fileID: 7624412048159175855, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + insertIndex: -1 + addedObject: {fileID: 514716509} m_SourcePrefab: {fileID: 100100000, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} --- !u!223 &447660837 stripped Canvas: @@ -1101,6 +1115,23 @@ Canvas: m_CorrespondingSourceObject: {fileID: 7061268803878077000, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} m_PrefabInstance: {fileID: 447660836} m_PrefabAsset: {fileID: 0} +--- !u!1 &447660840 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1757615392802054825, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + m_PrefabInstance: {fileID: 447660836} + m_PrefabAsset: {fileID: 0} +--- !u!114 &447660841 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 447660840} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 34a52816a1c62984ea622bbf50849c68, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &449193300 GameObject: m_ObjectHideFlags: 0 @@ -1188,6 +1219,23 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &514716508 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7624412048159175855, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + m_PrefabInstance: {fileID: 447660836} + m_PrefabAsset: {fileID: 0} +--- !u!114 &514716509 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 514716508} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 69fc903d39ac3d24aab4ce7a68dba447, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &547927776 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Platformer With Headroom.unity b/Assets/Scenes/Platformer With Headroom.unity index 8a70126..08d8b62 100644 --- a/Assets/Scenes/Platformer With Headroom.unity +++ b/Assets/Scenes/Platformer With Headroom.unity @@ -234,6 +234,17 @@ Transform: - {fileID: 1919996325} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &425968085 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3857858006081045191, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + m_PrefabInstance: {fileID: 6442071445436727402} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a80b536f823e50142b142b4e0b64ea97, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &612903695 PrefabInstance: m_ObjectHideFlags: 0 @@ -4543,8 +4554,12 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2396754106601062846, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} propertyPath: time - value: 30 + value: 180 objectReference: {fileID: 0} + - target: {fileID: 2396754106601062846, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + propertyPath: healthBarManager + value: + objectReference: {fileID: 425968085} - target: {fileID: 2396754106601062846, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} propertyPath: hatSpawnPositions.Array.size value: 5 @@ -4613,6 +4628,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3280152006050152854, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + propertyPath: m_LocalPosition.x + value: 29.85 + objectReference: {fileID: 0} + - target: {fileID: 3280152006050152854, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + propertyPath: m_LocalPosition.y + value: 10.81 + objectReference: {fileID: 0} - target: {fileID: 3636379526195672734, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} propertyPath: m_margin.w value: 1357.2593 @@ -4753,8 +4776,48 @@ PrefabInstance: m_RemovedGameObjects: - {fileID: 4148327129846918965, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1757615392802054825, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + insertIndex: -1 + addedObject: {fileID: 6442071445436727404} + - targetCorrespondingSourceObject: {fileID: 7624412048159175855, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + insertIndex: -1 + addedObject: {fileID: 6442071445436727406} m_SourcePrefab: {fileID: 100100000, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} +--- !u!1 &6442071445436727403 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1757615392802054825, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + m_PrefabInstance: {fileID: 6442071445436727402} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6442071445436727404 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6442071445436727403} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 34a52816a1c62984ea622bbf50849c68, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &6442071445436727405 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7624412048159175855, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + m_PrefabInstance: {fileID: 6442071445436727402} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6442071445436727406 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6442071445436727405} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 69fc903d39ac3d24aab4ce7a68dba447, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &8682934954266721942 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Q2_(CITY) Keep_Away2.unity b/Assets/Scenes/Q2_(CITY) Keep_Away2.unity index 29f622c..0bedd04 100644 --- a/Assets/Scenes/Q2_(CITY) Keep_Away2.unity +++ b/Assets/Scenes/Q2_(CITY) Keep_Away2.unity @@ -1260,7 +1260,13 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1757615392802054825, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + insertIndex: -1 + addedObject: {fileID: 1095679076} + - targetCorrespondingSourceObject: {fileID: 7624412048159175855, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + insertIndex: -1 + addedObject: {fileID: 1095679078} m_SourcePrefab: {fileID: 100100000, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} --- !u!114 &1095679074 stripped MonoBehaviour: @@ -1273,6 +1279,40 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1095679075 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1757615392802054825, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + m_PrefabInstance: {fileID: 1095679073} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1095679076 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1095679075} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 34a52816a1c62984ea622bbf50849c68, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1095679077 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7624412048159175855, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + m_PrefabInstance: {fileID: 1095679073} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1095679078 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1095679077} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 69fc903d39ac3d24aab4ce7a68dba447, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1125342871 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/QQ_ObstanceWIP.unity b/Assets/Scenes/QQ_ObstanceWIP.unity index 196a888..d73a2d9 100644 --- a/Assets/Scenes/QQ_ObstanceWIP.unity +++ b/Assets/Scenes/QQ_ObstanceWIP.unity @@ -3513,8 +3513,48 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1757615392802054825, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + insertIndex: -1 + addedObject: {fileID: 1133819047} + - targetCorrespondingSourceObject: {fileID: 7624412048159175855, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + insertIndex: -1 + addedObject: {fileID: 1133819049} m_SourcePrefab: {fileID: 100100000, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} +--- !u!1 &1133819046 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1757615392802054825, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + m_PrefabInstance: {fileID: 1133819045} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1133819047 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1133819046} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 34a52816a1c62984ea622bbf50849c68, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1133819048 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7624412048159175855, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + m_PrefabInstance: {fileID: 1133819045} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1133819049 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1133819048} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 69fc903d39ac3d24aab4ce7a68dba447, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1178732237 GameObject: m_ObjectHideFlags: 0 @@ -7535,6 +7575,7 @@ GameObject: m_Component: - component: {fileID: 1815355877} - component: {fileID: 1815355876} + - component: {fileID: 1815355878} m_Layer: 0 m_Name: GOAL m_TagString: Untagged @@ -7612,6 +7653,18 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1815355878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1815355875} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 69fc903d39ac3d24aab4ce7a68dba447, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1866956648 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Title Screen.unity b/Assets/Scenes/Title Screen.unity index 70cf44c..7dcaa83 100644 --- a/Assets/Scenes/Title Screen.unity +++ b/Assets/Scenes/Title Screen.unity @@ -2744,11 +2744,11 @@ MonoBehaviour: players\nKeep away map\n#Join screen titles\n#Implement music\n#Mountain music\n#Make city playable\n#One way platform mountain\nLeaderboard scaling city obstacle course\n#Get rid of placeholder start stop obstacle course\nPlatform friction\nFacing - angle not velocity-based\nDead player constant velocity\n\nDylan will do:\nFix - Time Left! text\nObstacle course end only works on correct gamemode\nObstacle - course end for mountain\nCorrect time limits for keep away maps\nRespawn after - game over (keep away)\n\nWill try to complete: \nObstacle course flag\nHealth - bar persists after death\n" + angle not velocity-based\nDead player constant velocity\n\nDylan will do:\n#Fix + Time Left! text\n#Obstacle course end only works on correct gamemode\n#Obstacle + course end for mountain\n#Correct time limits for keep away maps\n\n*needs help* + Respawn after game over (ALL GAMEMODES)\n\nWill try to complete: \nObstacle course + flag\nHealth bar persists after death\n" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} diff --git a/Assets/Scenes/[OUTDATED](CITY) Keep_Away2.unity b/Assets/Scenes/[OUTDATED](CITY) Keep_Away2.unity index 7a0354c..a7db4d8 100644 --- a/Assets/Scenes/[OUTDATED](CITY) Keep_Away2.unity +++ b/Assets/Scenes/[OUTDATED](CITY) Keep_Away2.unity @@ -806,6 +806,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3280152006050152854, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + propertyPath: m_LocalPosition.x + value: 4.47 + objectReference: {fileID: 0} + - target: {fileID: 3280152006050152854, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + propertyPath: m_LocalPosition.y + value: -13.08 + objectReference: {fileID: 0} - target: {fileID: 4832072825095962115, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} propertyPath: timer value: @@ -913,7 +921,13 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1757615392802054825, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + insertIndex: -1 + addedObject: {fileID: 1095679076} + - targetCorrespondingSourceObject: {fileID: 7624412048159175855, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + insertIndex: -1 + addedObject: {fileID: 1095679078} m_SourcePrefab: {fileID: 100100000, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} --- !u!114 &1095679074 stripped MonoBehaviour: @@ -926,6 +940,40 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1095679075 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1757615392802054825, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + m_PrefabInstance: {fileID: 1095679073} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1095679076 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1095679075} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 34a52816a1c62984ea622bbf50849c68, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1095679077 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7624412048159175855, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + m_PrefabInstance: {fileID: 1095679073} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1095679078 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1095679077} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 69fc903d39ac3d24aab4ce7a68dba447, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1125342871 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/AudioManager.cs b/Assets/Scripts/Game/AudioManager.cs similarity index 100% rename from Assets/Scripts/AudioManager.cs rename to Assets/Scripts/Game/AudioManager.cs diff --git a/Assets/Scripts/AudioManager.cs.meta b/Assets/Scripts/Game/AudioManager.cs.meta similarity index 100% rename from Assets/Scripts/AudioManager.cs.meta rename to Assets/Scripts/Game/AudioManager.cs.meta diff --git a/Assets/Scripts/ObstacleCourse.cs b/Assets/Scripts/Game/ObstacleCourse.cs similarity index 100% rename from Assets/Scripts/ObstacleCourse.cs rename to Assets/Scripts/Game/ObstacleCourse.cs diff --git a/Assets/Scripts/ObstacleCourse.cs.meta b/Assets/Scripts/Game/ObstacleCourse.cs.meta similarity index 100% rename from Assets/Scripts/ObstacleCourse.cs.meta rename to Assets/Scripts/Game/ObstacleCourse.cs.meta diff --git a/Assets/Scripts/Game/ObstacleEnd.cs b/Assets/Scripts/Game/ObstacleEnd.cs new file mode 100644 index 0000000..b90f10d --- /dev/null +++ b/Assets/Scripts/Game/ObstacleEnd.cs @@ -0,0 +1,27 @@ +using Game; +using UnityEngine; + +public class ObstacleEnd : MonoBehaviour +{ + void Start() + { + UpdateVisibility(); + } + + void Update() + { + UpdateVisibility(); + } + + private void UpdateVisibility() // Sets object active if playing obstacle course + { + if (GameManager.gameMode == GameManager.GameMode.obstacleCourse) + { + gameObject.SetActive(true); + } + else + { + gameObject.SetActive(false); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Game/ObstacleEnd.cs.meta b/Assets/Scripts/Game/ObstacleEnd.cs.meta new file mode 100644 index 0000000..5e111f8 --- /dev/null +++ b/Assets/Scripts/Game/ObstacleEnd.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 69fc903d39ac3d24aab4ce7a68dba447 \ No newline at end of file