diff --git a/Assets/Audio.meta b/Assets/Audio.meta new file mode 100644 index 0000000..097be16 --- /dev/null +++ b/Assets/Audio.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3a3c3bbeccca22c4cbba8469a77e70b6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Fail.wav b/Assets/Audio/Fail.wav new file mode 100644 index 0000000..b417d98 Binary files /dev/null and b/Assets/Audio/Fail.wav differ diff --git a/Assets/Audio/Fail.wav.meta b/Assets/Audio/Fail.wav.meta new file mode 100644 index 0000000..52d0154 --- /dev/null +++ b/Assets/Audio/Fail.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 0ce38813d9769af4f9f3d7d71605d4c2 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Pass.wav b/Assets/Audio/Pass.wav new file mode 100644 index 0000000..3d7f694 Binary files /dev/null and b/Assets/Audio/Pass.wav differ diff --git a/Assets/Audio/Pass.wav.meta b/Assets/Audio/Pass.wav.meta new file mode 100644 index 0000000..4558d7e --- /dev/null +++ b/Assets/Audio/Pass.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: e1dc5e68320d2254a9ae96dbe1da991c +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Blocker.prefab b/Assets/Prefabs/Blocker.prefab new file mode 100644 index 0000000..97ea2e7 --- /dev/null +++ b/Assets/Prefabs/Blocker.prefab @@ -0,0 +1,46 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7647008341406417233 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4144505436841889974} + - component: {fileID: 7757166141245819309} + m_Layer: 0 + m_Name: Blocker + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4144505436841889974 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7647008341406417233} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 105.8, y: 1.13, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &7757166141245819309 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7647008341406417233} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 2, z: 100} + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Blocker.prefab.meta b/Assets/Prefabs/Blocker.prefab.meta new file mode 100644 index 0000000..ac3242f --- /dev/null +++ b/Assets/Prefabs/Blocker.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 974b40f62aef1cd4385daf3ed2113a7b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/CarVehicle_v2.prefab b/Assets/Prefabs/CarVehicle_v2.prefab index b4d9b04..8e9b2f4 100644 --- a/Assets/Prefabs/CarVehicle_v2.prefab +++ b/Assets/Prefabs/CarVehicle_v2.prefab @@ -1,5 +1,132 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &211054968103069939 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 479884006711313012} + - component: {fileID: 5035570738665456215} + m_Layer: 0 + m_Name: Pass Audio Source + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &479884006711313012 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 211054968103069939} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.955, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4857148080672114697} + m_RootOrder: 19 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &5035570738665456215 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 211054968103069939} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: e1dc5e68320d2254a9ae96dbe1da991c, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &1971487791211410457 GameObject: m_ObjectHideFlags: 0 @@ -79,6 +206,133 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 0 km/h +--- !u!1 &4531964639432614087 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6767275639874713511} + - component: {fileID: 1959163050299246291} + m_Layer: 0 + m_Name: Fail Audio Source + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6767275639874713511 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4531964639432614087} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.955, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4857148080672114697} + m_RootOrder: 20 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &1959163050299246291 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4531964639432614087} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 0ce38813d9769af4f9f3d7d71605d4c2, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &4857148078764229070 GameObject: m_ObjectHideFlags: 0 @@ -1041,8 +1295,8 @@ BoxCollider: m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 0.09887203, y: 0.1, z: 0.18940048} - m_Center: {x: -0.025185578, y: 8.618052e-17, z: 0.0007266328} + m_Size: {x: 0.09887203, y: 0.060575765, z: 0.1481337} + m_Center: {x: -0.025185578, y: 0.03713026, z: -0.01990676} --- !u!1 &4857148079306184813 GameObject: m_ObjectHideFlags: 0 @@ -1602,8 +1856,8 @@ BoxCollider: m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 0.102222286, y: 0.1, z: 0.15971167} - m_Center: {x: 0.032645255, y: -1.9827877e-17, z: 0.0020746067} + m_Size: {x: 0.102222286, y: 0.06904394, z: 0.15245403} + m_Center: {x: 0.032645255, y: 0.04400776, z: -0.0015542135} --- !u!1 &4857148079593391499 GameObject: m_ObjectHideFlags: 0 @@ -3985,6 +4239,8 @@ Transform: - {fileID: 4821062175600546514} - {fileID: 5225542037434773117} - {fileID: 7939163952366164909} + - {fileID: 479884006711313012} + - {fileID: 6767275639874713511} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4043,6 +4299,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 890186e76f1674a43a43a3d97eeffec8, type: 3} m_Name: m_EditorClassIdentifier: + passSound: {fileID: 5035570738665456215} + failSound: {fileID: 1959163050299246291} --- !u!114 &927052440975831332 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Level 1.unity b/Assets/Scenes/Level 1.unity index 79a535f..103eb92 100644 --- a/Assets/Scenes/Level 1.unity +++ b/Assets/Scenes/Level 1.unity @@ -6616,6 +6616,17 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6327788405367704134, guid: acdc2db3a16083946b7cc264f1ed2b42, + type: 3} + propertyPath: m_Text + value: 'Objective: Perform a right hand turn on the 2nd turning lane at the + junction ahead. + + Ensure that you turn into the middle lane on the + next street. + + Info: 2nd turning lane is the 2nd lane from the right.' + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acdc2db3a16083946b7cc264f1ed2b42, type: 3} --- !u!1001 &375122499 @@ -7703,7 +7714,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 536 + m_RootOrder: 537 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &434482632 PrefabInstance: @@ -8178,7 +8189,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 532 + m_RootOrder: 533 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &453927521 PrefabInstance: @@ -11671,6 +11682,40 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4752f864e3118e64482c22f7a8d21b01, type: 3} +--- !u!1 &608048134 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 608048135} + m_Layer: 0 + m_Name: Blockers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &608048135 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 608048134} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 107.1, y: 1, z: -4.9325676} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4324405113852209598} + - {fileID: 1258993453} + - {fileID: 1059220984} + - {fileID: 724861425} + m_Father: {fileID: 0} + m_RootOrder: 523 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &612593063 PrefabInstance: m_ObjectHideFlags: 0 @@ -13169,7 +13214,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4407244999693362, guid: cf478f40302c0fc44adceaba491ac9b1, type: 3} propertyPath: m_RootOrder - value: 537 + value: 538 objectReference: {fileID: 0} - target: {fileID: 4407244999693362, guid: cf478f40302c0fc44adceaba491ac9b1, type: 3} propertyPath: m_LocalPosition.x @@ -13444,6 +13489,86 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 129 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1001 &724861424 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 608048135} + m_Modifications: + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalPosition.x + value: -110.9 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalPosition.z + value: -137.4 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7647008341406417233, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_Name + value: Blocker (3) + objectReference: {fileID: 0} + - target: {fileID: 7757166141245819309, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_Size.z + value: 100 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 974b40f62aef1cd4385daf3ed2113a7b, type: 3} +--- !u!4 &724861425 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + m_PrefabInstance: {fileID: 724861424} + m_PrefabAsset: {fileID: 0} --- !u!1001 &725969373 PrefabInstance: m_ObjectHideFlags: 0 @@ -17671,7 +17796,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 530 + m_RootOrder: 531 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!1001 &949475430 PrefabInstance: @@ -18095,7 +18220,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 529 + m_RootOrder: 530 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!1001 &967120858 PrefabInstance: @@ -18318,7 +18443,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 526 + m_RootOrder: 527 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &971590897 PrefabInstance: @@ -19492,7 +19617,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 525 + m_RootOrder: 526 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1036582836 PrefabInstance: @@ -19959,6 +20084,86 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 30916da9dd66da74d8e831f29c0b250f, type: 3} +--- !u!1001 &1059220983 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 608048135} + m_Modifications: + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalPosition.x + value: -110.9 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalPosition.z + value: 107.3 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7647008341406417233, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_Name + value: Blocker (2) + objectReference: {fileID: 0} + - target: {fileID: 7757166141245819309, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_Size.z + value: 100 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 974b40f62aef1cd4385daf3ed2113a7b, type: 3} +--- !u!4 &1059220984 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + m_PrefabInstance: {fileID: 1059220983} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1063069992 PrefabInstance: m_ObjectHideFlags: 0 @@ -20562,7 +20767,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 527 + m_RootOrder: 528 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!1001 &1116104529 PrefabInstance: @@ -21086,7 +21291,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 534 + m_RootOrder: 535 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!1001 &1141271807 PrefabInstance: @@ -23672,6 +23877,86 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bd74764b9e7e05b4fb02c2afbdf080af, type: 3} +--- !u!1001 &1258993452 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 608048135} + m_Modifications: + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalPosition.x + value: -214.2 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7647008341406417233, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_Name + value: Blocker (1) + objectReference: {fileID: 0} + - target: {fileID: 7757166141245819309, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_Size.z + value: 100 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 974b40f62aef1cd4385daf3ed2113a7b, type: 3} +--- !u!4 &1258993453 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + m_PrefabInstance: {fileID: 1258993452} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1272476399 PrefabInstance: m_ObjectHideFlags: 0 @@ -24141,7 +24426,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 538 + m_RootOrder: 539 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1287337187 PrefabInstance: @@ -31857,7 +32142,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 533 + m_RootOrder: 534 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1741918269 PrefabInstance: @@ -32446,7 +32731,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 528 + m_RootOrder: 529 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!1001 &1764001843 PrefabInstance: @@ -33608,7 +33893,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 524 + m_RootOrder: 525 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1821719729 PrefabInstance: @@ -35241,7 +35526,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 535 + m_RootOrder: 536 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1878556435 PrefabInstance: @@ -36542,7 +36827,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 523 + m_RootOrder: 524 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1936724945 PrefabInstance: @@ -37025,7 +37310,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 531 + m_RootOrder: 532 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!1001 &1963083737 PrefabInstance: @@ -37837,7 +38122,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 539 + m_RootOrder: 540 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2018932913 PrefabInstance: @@ -40556,6 +40841,81 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a499fb307c0195b49a8e02d122903acf, type: 3} +--- !u!1001 &4324405113852209597 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 608048135} + m_Modifications: + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7647008341406417233, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_Name + value: Blocker + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 974b40f62aef1cd4385daf3ed2113a7b, type: 3} +--- !u!4 &4324405113852209598 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + m_PrefabInstance: {fileID: 4324405113852209597} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4548264394720697803 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Level 2a.unity b/Assets/Scenes/Level 2a.unity index 9d31064..a72d2b3 100644 --- a/Assets/Scenes/Level 2a.unity +++ b/Assets/Scenes/Level 2a.unity @@ -727,6 +727,86 @@ Transform: type: 3} m_PrefabInstance: {fileID: 29609537} m_PrefabAsset: {fileID: 0} +--- !u!1001 &31310807 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1265299732} + m_Modifications: + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalPosition.x + value: -867.7 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalPosition.y + value: 304.63 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalPosition.z + value: -98.9 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7647008341406417233, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_Name + value: Blocker (3) + objectReference: {fileID: 0} + - target: {fileID: 7757166141245819309, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_Size.z + value: 300 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 974b40f62aef1cd4385daf3ed2113a7b, type: 3} +--- !u!4 &31310808 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + m_PrefabInstance: {fileID: 31310807} + m_PrefabAsset: {fileID: 0} --- !u!1001 &40538091 PrefabInstance: m_ObjectHideFlags: 0 @@ -7330,6 +7410,81 @@ Transform: type: 3} m_PrefabInstance: {fileID: 241210671} m_PrefabAsset: {fileID: 0} +--- !u!1001 &244150320 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1265299732} + m_Modifications: + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalPosition.x + value: -1010.67 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalPosition.y + value: 304.63 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalPosition.z + value: -124.05 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7647008341406417233, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_Name + value: Blocker (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 974b40f62aef1cd4385daf3ed2113a7b, type: 3} +--- !u!4 &244150321 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + m_PrefabInstance: {fileID: 244150320} + m_PrefabAsset: {fileID: 0} --- !u!1001 &245670609 PrefabInstance: m_ObjectHideFlags: 0 @@ -14170,6 +14325,17 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6327788405367704134, guid: acdc2db3a16083946b7cc264f1ed2b42, + type: 3} + propertyPath: m_Text + value: 'Objective: Avoid the bus lane as you enter the main street and + + return + to leftmost lane when it is okay to. + + Tip: Take note of the bus lane + markings.' + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acdc2db3a16083946b7cc264f1ed2b42, type: 3} --- !u!114 &517070480 stripped @@ -29541,6 +29707,81 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1088599646} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &1093657906 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1265299732} + m_Modifications: + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalPosition.x + value: -730.15 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalPosition.y + value: 304.63 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalPosition.z + value: -124.05 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7647008341406417233, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_Name + value: Blocker + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 974b40f62aef1cd4385daf3ed2113a7b, type: 3} +--- !u!4 &1093657907 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + m_PrefabInstance: {fileID: 1093657906} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1098059626 PrefabInstance: m_ObjectHideFlags: 0 @@ -33271,6 +33512,81 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1226053156} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1227320028 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1265299732} + m_Modifications: + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalPosition.x + value: -742.6 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalPosition.y + value: 304.63 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalPosition.z + value: -177.82 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7647008341406417233, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + propertyPath: m_Name + value: Blocker (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 974b40f62aef1cd4385daf3ed2113a7b, type: 3} +--- !u!4 &1227320029 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4144505436841889974, guid: 974b40f62aef1cd4385daf3ed2113a7b, + type: 3} + m_PrefabInstance: {fileID: 1227320028} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1228632720 PrefabInstance: m_ObjectHideFlags: 0 @@ -34185,6 +34501,40 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1258839575} m_PrefabAsset: {fileID: 0} +--- !u!1 &1265299731 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1265299732} + m_Layer: 0 + m_Name: Blockers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1265299732 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1265299731} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 813.7427, y: -303.7272, z: 127.42097} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1093657907} + - {fileID: 1227320029} + - {fileID: 244150321} + - {fileID: 31310808} + m_Father: {fileID: 0} + m_RootOrder: 23 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1268095914 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/CarCollide.cs b/Assets/Scripts/CarCollide.cs index 624c1fc..dffe84f 100644 --- a/Assets/Scripts/CarCollide.cs +++ b/Assets/Scripts/CarCollide.cs @@ -27,7 +27,8 @@ void Update() } void OnTriggerEnter(Collider other) { - if (other.gameObject.CompareTag("PlayerVehicle") && !other.gameObject.GetComponent().isLevelDone) { + if (other.gameObject.CompareTag("PlayerVehicle") && !other.gameObject.GetComponent().isLevelDone + && !other.gameObject.GetComponent().isLevelFail) { resultsText.enabled = true; resultsText.text = message; if (isWinCon) diff --git a/Assets/Scripts/InstructionManager.cs b/Assets/Scripts/InstructionManager.cs index 539ff17..2a795b1 100644 --- a/Assets/Scripts/InstructionManager.cs +++ b/Assets/Scripts/InstructionManager.cs @@ -17,10 +17,12 @@ void Start() switch (level) { case 1: - instructMessage = "Objective: Perform a right hand turn on the\n2nd turning lane at the junction ahead.\nEnsure that you turn into the correct lane - 2nd lane to 2nd lane."; + instructMessage = "Objective: Perform a right hand turn on the 2nd turning lane at the junction ahead.\n" + + "Ensure that you turn into the middle lane on the next street\nInfo: 2nd turning lane is the 2nd lane from the right."; break; case 2: - instructMessage = "Objective: Avoid the bus lane and keep to left-most lane after.\nLook out for the road markings."; + instructMessage = "Objective: Avoid the bus lane as you enter the main street and\n" + + "return to left-most lane when it is okay to.\nTip: Take note of the bus lane markings."; break; default: instructMessage = ""; diff --git a/Assets/Scripts/LevelManager.cs b/Assets/Scripts/LevelManager.cs index 219b75f..0b5470e 100644 --- a/Assets/Scripts/LevelManager.cs +++ b/Assets/Scripts/LevelManager.cs @@ -7,6 +7,10 @@ public class LevelManager : MonoBehaviour public bool isLevelDone { get; set; } public bool isLevelFail { get; set; } + public AudioSource passSound; + public AudioSource failSound; + private bool togglePlayed; + // Start is called before the first frame update void Start() { @@ -16,6 +20,17 @@ void Start() // Update is called once per frame void Update() { + if (isLevelDone && !togglePlayed) + { + passSound.Play(); + togglePlayed = true; + } + + if (isLevelFail && !togglePlayed) + { + failSound.Play(); + togglePlayed = true; + } } } diff --git a/Assets/Scripts/Steering.cs b/Assets/Scripts/Steering.cs index 2f27868..542ec75 100644 --- a/Assets/Scripts/Steering.cs +++ b/Assets/Scripts/Steering.cs @@ -49,6 +49,7 @@ void Update() { vehicleSpeed = GetComponentInParent().speed; + // When level is passed or failed, slow the vehicle down if (GetComponentInParent().isLevelDone || GetComponentInParent().isLevelFail) { wheelFL.brakeTorque = breakForce; @@ -62,6 +63,7 @@ void Update() decelerateSound.Stop(); } + // Calculates steering when hand touches the steering wheel to turn if (target) { offset.position = target.position; @@ -103,6 +105,7 @@ void Update() } } + // Braking if (leftController.activateAction.action.ReadValue() > 0.0f) { Debug.Log("Brake"); @@ -127,6 +130,7 @@ void Update() wheelBR.brakeTorque = 0; } + // Acceleration if (rightController.activateAction.action.ReadValue() > 0.0f && vehicleSpeed <= GetComponentInParent().speedLimit && !GetComponentInParent().isLevelDone && !GetComponentInParent().isLevelFail) { diff --git a/Assets/Scripts/UpdateSpeed.cs b/Assets/Scripts/UpdateSpeed.cs index d6c500f..c2ddbdb 100644 --- a/Assets/Scripts/UpdateSpeed.cs +++ b/Assets/Scripts/UpdateSpeed.cs @@ -19,6 +19,7 @@ void Start() // Update is called once per frame void FixedUpdate() { + // Converts speed unit to km/h speed = GetComponent().velocity.magnitude * 3.6f; speedometer.text = (int)speed + " km/h";