diff --git a/Assets/Scenes/Other/(CITY) Keep_Away2.unity b/Assets/Scenes/(CITY) Keep_Away2.unity similarity index 100% rename from Assets/Scenes/Other/(CITY) Keep_Away2.unity rename to Assets/Scenes/(CITY) Keep_Away2.unity diff --git a/Assets/Scenes/Other/(CITY) Keep_Away2.unity.meta b/Assets/Scenes/(CITY) Keep_Away2.unity.meta similarity index 100% rename from Assets/Scenes/Other/(CITY) Keep_Away2.unity.meta rename to Assets/Scenes/(CITY) Keep_Away2.unity.meta diff --git a/Assets/Scenes/Platform3 (MOUNTAIN).unity b/Assets/Scenes/Platform3 (MOUNTAIN).unity index 39fe0d0..f527742 100644 --- a/Assets/Scenes/Platform3 (MOUNTAIN).unity +++ b/Assets/Scenes/Platform3 (MOUNTAIN).unity @@ -316,7 +316,15 @@ PrefabInstance: objectReference: {fileID: 447660839} - target: {fileID: 2396754106601062846, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} propertyPath: hatSpawnPositions.Array.size - value: 6 + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 2396754106601062846, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + propertyPath: obstacleCourseSpawnPosition.x + value: 12.57 + objectReference: {fileID: 0} + - target: {fileID: 2396754106601062846, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + propertyPath: obstacleCourseSpawnPosition.y + value: -2.91 objectReference: {fileID: 0} - target: {fileID: 2396754106601062846, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} propertyPath: hatSpawnPositions.Array.data[0].x @@ -366,6 +374,14 @@ PrefabInstance: propertyPath: hatSpawnPositions.Array.data[5].y value: 11.5 objectReference: {fileID: 0} + - target: {fileID: 2396754106601062846, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + propertyPath: hatSpawnPositions.Array.data[6].x + value: 11.01 + objectReference: {fileID: 0} + - target: {fileID: 2396754106601062846, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} + propertyPath: hatSpawnPositions.Array.data[6].y + value: 11.49 + objectReference: {fileID: 0} - target: {fileID: 2931591312562416945, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2809,26 +2825,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 18, y: 2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 19, y: 2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: 14, y: 3, z: 0} second: serializedVersion: 2 @@ -2869,16 +2865,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 18, y: 3, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: -30, y: 4, z: 0} second: serializedVersion: 2 @@ -2949,16 +2935,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 18, y: 4, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: -31, y: 5, z: 0} second: serializedVersion: 2 @@ -3743,15 +3719,15 @@ Tilemap: m_TileAssetArray: - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 267 + - m_RefCount: 263 m_Data: {fileID: 11400000, guid: eba517dbe553d4e9eb4a38e332a4cfd9, type: 2} m_TileSpriteArray: - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 267 + - m_RefCount: 263 m_Data: {fileID: 7482667652216324306, guid: 586cb85cfa61a4214a970f850bffc743, type: 3} m_TileMatrixArray: - - m_RefCount: 267 + - m_RefCount: 263 m_Data: e00: 1 e01: 0 @@ -3770,7 +3746,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 267 + - m_RefCount: 263 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 @@ -3916,30 +3892,6 @@ CompositeCollider2D: Y: 70000000 - X: 140000000 Y: 70000000 - - - X: -260000000 - Y: 50000000 - - X: -270000000 - Y: 50000000 - - X: -270000000 - Y: 60000000 - - X: -290000000 - Y: 60000000 - - X: -290000000 - Y: 70000000 - - X: -300000000 - Y: 70000000 - - X: -300000000 - Y: 80000000 - - X: -310000000 - Y: 80000000 - - X: -310000000 - Y: 50000000 - - X: -300000000 - Y: 50000000 - - X: -300000000 - Y: 40000000 - - X: -260000000 - Y: 40000000 - - X: -160000000 Y: 60000000 - X: -170000000 @@ -3964,18 +3916,34 @@ CompositeCollider2D: Y: 50000000 - X: -160000000 Y: 50000000 + - - X: -260000000 + Y: 50000000 + - X: -270000000 + Y: 50000000 + - X: -270000000 + Y: 60000000 + - X: -290000000 + Y: 60000000 + - X: -290000000 + Y: 70000000 + - X: -300000000 + Y: 70000000 + - X: -300000000 + Y: 80000000 + - X: -310000000 + Y: 80000000 + - X: -310000000 + Y: 50000000 + - X: -300000000 + Y: 50000000 + - X: -300000000 + Y: 40000000 + - X: -260000000 + Y: 40000000 - - X: 210000000 Y: 20000000 - - X: 200000000 - Y: 20000000 - - X: 200000000 - Y: 30000000 - - X: 190000000 - Y: 30000000 - - X: 190000000 - Y: 50000000 - X: 180000000 - Y: 50000000 + Y: 20000000 - X: 180000000 Y: 70000000 - X: 170000000 @@ -4192,18 +4160,6 @@ CompositeCollider2D: - {x: 9.99997, y: 9} - {x: 9, y: 8.99997} - {x: 9.00003, y: 7} - - - {x: -26.000029, y: 4} - - {x: -26.000029, y: 5} - - {x: -27, y: 5.0000296} - - {x: -27.000029, y: 6} - - {x: -29, y: 6.0000296} - - {x: -29.000029, y: 7} - - {x: -30, y: 7.0000296} - - {x: -30.000029, y: 8} - - {x: -31, y: 7.9999704} - - {x: -30.999971, y: 5} - - {x: -30, y: 4.9999704} - - {x: -29.999971, y: 4} - - {x: -16.000029, y: 5} - {x: -16.000029, y: 6} - {x: -17, y: 6.0000296} @@ -4216,13 +4172,21 @@ CompositeCollider2D: - {x: -20.000029, y: 6} - {x: -21, y: 5.999971} - {x: -20.999971, y: 5} + - - {x: -26.000029, y: 4} + - {x: -26.000029, y: 5} + - {x: -27, y: 5.0000296} + - {x: -27.000029, y: 6} + - {x: -29, y: 6.0000296} + - {x: -29.000029, y: 7} + - {x: -30, y: 7.0000296} + - {x: -30.000029, y: 8} + - {x: -31, y: 7.9999704} + - {x: -30.999971, y: 5} + - {x: -30, y: 4.9999704} + - {x: -29.999971, y: 4} - - {x: 20.999971, y: -1} - {x: 20.999971, y: 2} - - {x: 20, y: 2.0000293} - - {x: 19.999971, y: 3} - - {x: 19, y: 3.0000293} - - {x: 18.999971, y: 5} - - {x: 18, y: 5.0000296} + - {x: 18, y: 2.0000293} - {x: 17.999971, y: 7} - {x: 17, y: 6.9999704} - {x: 16.999971, y: 6} @@ -4556,7 +4520,7 @@ Transform: m_GameObject: {fileID: 1430238912} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 11.01, y: 11.49, z: 0} + m_LocalPosition: {x: 12.57, y: -2.93, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Scenes/Title Screen.unity b/Assets/Scenes/Title Screen.unity index 2b510fc..c29d583 100644 --- a/Assets/Scenes/Title Screen.unity +++ b/Assets/Scenes/Title Screen.unity @@ -1707,18 +1707,16 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 'Put the hat on the winner + m_text: 'User guide in game - Sound effects - - User guide - - Comments - on the code? + More comments on the code Art - Playtest' + Playtest + + Reset + confirmation' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} diff --git a/Assets/Scripts/Game/GameManager.cs b/Assets/Scripts/Game/GameManager.cs index cad3c96..411679f 100644 --- a/Assets/Scripts/Game/GameManager.cs +++ b/Assets/Scripts/Game/GameManager.cs @@ -21,6 +21,7 @@ public class GameManager : MonoBehaviour public static GameMode gameMode = GameMode.freeForAll; // loads a default gamemode as a safety net public static string map = "Platformer With Headroom"; // loads a default map as a safety net public Vector2 spawnPosition; + public Vector2 obstacleCourseSpawnPosition; public List hatSpawnPositions = new List(); public Canvas LeaderboardCanvas; public Canvas TimerCanvas; diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 88ab5d4..298737a 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -21,7 +21,7 @@ EditorBuildSettings: path: Assets/Scenes/Other/Keep_Away.unity guid: e9fc24bb9df988b4196fa7d9969a7515 - enabled: 1 - path: Assets/Scenes/Other/(CITY) Keep_Away2.unity + path: Assets/Scenes/(CITY) Keep_Away2.unity guid: 5b70a9ceb8960e04584c7d2e13993639 - enabled: 1 path: Assets/Scenes/Other/FerrisWheel.unity