diff --git a/Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_URP_v1.24.unitypackage.meta b/Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_URP_v1.24.unitypackage.meta deleted file mode 100644 index 73c9a86..0000000 --- a/Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_URP_v1.24.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f58d25b9e504a4f41ab4a71cf87c1845 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ML-Agents/Timers/Car Customization_timers.json b/Assets/ML-Agents/Timers/Car Customization_timers.json index 26f6c25..96c3c36 100644 --- a/Assets/ML-Agents/Timers/Car Customization_timers.json +++ b/Assets/ML-Agents/Timers/Car Customization_timers.json @@ -1 +1 @@ -{"count":1,"self":237.5488256,"total":238.8033793,"children":{"InitializeActuators":{"count":8,"self":0.0010234999999999999,"total":0.0010234999999999999,"children":null},"InitializeSensors":{"count":8,"self":0.0020252,"total":0.0020252,"children":null},"AgentSendState":{"count":3500,"self":0.1812675,"total":0.2385947,"children":{"CollectObservations":{"count":5600,"self":0.035244,"total":0.035244,"children":null},"WriteActionMask":{"count":5600,"self":0.0030093999999999997,"total":0.0030093999999999997,"children":null},"RequestDecision":{"count":5600,"self":0.0190738,"total":0.0190738,"children":null}}},"DecideAction":{"count":3500,"self":0.76805329999999994,"total":0.78443109999999994,"children":{"RayPerceptionSensor.Perceive":{"count":11200,"self":0.016377799999999998,"total":0.016377799999999998,"children":null}}},"AgentAct":{"count":3500,"self":0.2284724,"total":0.2284724,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714126738","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\noahk\\Documents\\Unity projects\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-noahk -hubSessionId a6f45e0e-41b6-4c96-a70e-ec8e10ca5aa9 -accessToken LhF-MiZYoHmiI2p1_6JvQZvJ6QUPd4VyLbrTbhNHTT8005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Car Customization","end_time_seconds":"1714126977"}} \ No newline at end of file +{"count":1,"self":10.6869432,"total":10.777194099999999,"children":{"InitializeActuators":{"count":8,"self":0.0035095,"total":0.0035095,"children":null},"InitializeSensors":{"count":8,"self":0.0035093999999999998,"total":0.0035093999999999998,"children":null},"AgentSendState":{"count":1,"self":0.0090396,"total":0.0199904,"children":{"CollectObservations":{"count":8,"self":0,"total":0,"children":null},"WriteActionMask":{"count":8,"self":0,"total":0,"children":null},"RequestDecision":{"count":8,"self":0.0109508,"total":0.0109508,"children":null}}},"DecideAction":{"count":1,"self":0.0632417,"total":0.0632417,"children":{"RayPerceptionSensor.Perceive":{"count":16,"self":0,"total":0,"children":null}}},"AgentAct":{"count":1,"self":0,"total":0,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714132819","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\noahk\\Documents\\Unity projects\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-noahk -hubSessionId a6f45e0e-41b6-4c96-a70e-ec8e10ca5aa9 -accessToken LhF-MiZYoHmiI2p1_6JvQZvJ6QUPd4VyLbrTbhNHTT8005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Car Customization","end_time_seconds":"1714132830"}} \ No newline at end of file diff --git a/Assets/ML-Agents/Timers/ForestRacetrack_timers.json b/Assets/ML-Agents/Timers/ForestRacetrack_timers.json index bdae286..899f85f 100644 --- a/Assets/ML-Agents/Timers/ForestRacetrack_timers.json +++ b/Assets/ML-Agents/Timers/ForestRacetrack_timers.json @@ -1,9 +1 @@ -<<<<<<< HEAD -{"count":1,"self":54.697376,"total":56.2490324,"children":{"InitializeActuators":{"count":8,"self":0.0015032,"total":0.0015032,"children":null},"InitializeSensors":{"count":8,"self":0.0028936,"total":0.0028936,"children":null},"AgentSendState":{"count":2580,"self":0.1613813,"total":0.21219159999999998,"children":{"CollectObservations":{"count":4128,"self":0.029130899999999998,"total":0.029130899999999998,"children":null},"WriteActionMask":{"count":4128,"self":0.0045593,"total":0.0045593,"children":null},"RequestDecision":{"count":4128,"self":0.0171201,"total":0.0171201,"children":null}}},"DecideAction":{"count":2580,"self":1.1775138,"total":1.1990912,"children":{"RayPerceptionSensor.Perceive":{"count":8256,"self":0.0215774,"total":0.0215774,"children":null}}},"AgentAct":{"count":2580,"self":0.1349573,"total":0.1349573,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":5,"max":25.06042,"min":23.94484,"runningAverage":24.5239849,"value":24.1170235,"weightedAverage":24.5986176}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714131023","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\noahk\\Documents\\Unity projects\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-noahk -hubSessionId a6f45e0e-41b6-4c96-a70e-ec8e10ca5aa9 -accessToken LhF-MiZYoHmiI2p1_6JvQZvJ6QUPd4VyLbrTbhNHTT8005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"ForestRacetrack","end_time_seconds":"1714131080"}} -======= -<<<<<<< HEAD -{"count":1,"self":32.8065536,"total":36.7679407,"children":{"InitializeActuators":{"count":8,"self":0.0040387999999999995,"total":0.0040387999999999995,"children":null},"InitializeSensors":{"count":8,"self":0.0029939999999999997,"total":0.0029939999999999997,"children":null},"AgentSendState":{"count":1587,"self":0.3011096,"total":0.3888908,"children":{"CollectObservations":{"count":2544,"self":0.044843,"total":0.044843,"children":null},"WriteActionMask":{"count":2544,"self":0.0105366,"total":0.0105366,"children":null},"RequestDecision":{"count":2544,"self":0.032401599999999996,"total":0.032401599999999996,"children":null}}},"DecideAction":{"count":1587,"self":3.2400292,"total":3.2936266,"children":{"RayPerceptionSensor.Perceive":{"count":5088,"self":0.053597399999999996,"total":0.053597399999999996,"children":null}}},"AgentAct":{"count":1587,"self":0.2688357,"total":0.2688357,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714130182","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\Magnus\\Desktop\\Ny unityting\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Magnus -hubSessionId 8c17471b-7795-4082-905c-75744d6a077b -accessToken hv3zp4IA8nxcowfZc35r5tDHrlmzUZoExTBgESksngo005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"ForestRacetrack","end_time_seconds":"1714130219"}} -======= -{"count":1,"self":8.7055952,"total":8.8210854,"children":{"InitializeActuators":{"count":8,"self":0.0010003,"total":0.0010003,"children":null},"InitializeSensors":{"count":8,"self":0.0035110999999999996,"total":0.0035110999999999996,"children":null},"AgentSendState":{"count":44,"self":0.0055582,"total":0.018727499999999998,"children":{"CollectObservations":{"count":72,"self":0.0019789,"total":0.0019789,"children":null},"WriteActionMask":{"count":72,"self":0,"total":0,"children":null},"RequestDecision":{"count":72,"self":0.0111904,"total":0.0111904,"children":null}}},"DecideAction":{"count":44,"self":0.0842009,"total":0.0842009,"children":{"RayPerceptionSensor.Perceive":{"count":144,"self":0,"total":0,"children":null}}},"AgentAct":{"count":44,"self":0.0080505,"total":0.0080505,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714129909","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\noahk\\Documents\\Unity projects\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-noahk -hubSessionId a6f45e0e-41b6-4c96-a70e-ec8e10ca5aa9 -accessToken LhF-MiZYoHmiI2p1_6JvQZvJ6QUPd4VyLbrTbhNHTT8005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"ForestRacetrack","end_time_seconds":"1714129918"}} ->>>>>>> 8744c617fc8715a42e6dd73e481f756db2205086 ->>>>>>> 2a3284ac7c7577c027d1ab933ed82def95da0f94 +{"count":1,"self":7.7646456,"total":7.8548963,"children":{"InitializeActuators":{"count":8,"self":0.0035095,"total":0.0035095,"children":null},"InitializeSensors":{"count":8,"self":0.0035093999999999998,"total":0.0035093999999999998,"children":null},"AgentSendState":{"count":1,"self":0.0090396,"total":0.0199904,"children":{"CollectObservations":{"count":8,"self":0,"total":0,"children":null},"WriteActionMask":{"count":8,"self":0,"total":0,"children":null},"RequestDecision":{"count":8,"self":0.0109508,"total":0.0109508,"children":null}}},"DecideAction":{"count":1,"self":0.0632417,"total":0.0632417,"children":{"RayPerceptionSensor.Perceive":{"count":16,"self":0,"total":0,"children":null}}},"AgentAct":{"count":1,"self":0,"total":0,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714132819","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\noahk\\Documents\\Unity projects\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-noahk -hubSessionId a6f45e0e-41b6-4c96-a70e-ec8e10ca5aa9 -accessToken LhF-MiZYoHmiI2p1_6JvQZvJ6QUPd4VyLbrTbhNHTT8005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"ForestRacetrack","end_time_seconds":"1714132827"}} \ No newline at end of file diff --git a/Assets/ML-Agents/Timers/WinScreen_timers.json b/Assets/ML-Agents/Timers/WinScreen_timers.json index ae3f6db..b1f6091 100644 --- a/Assets/ML-Agents/Timers/WinScreen_timers.json +++ b/Assets/ML-Agents/Timers/WinScreen_timers.json @@ -1 +1,5 @@ -{"count":1,"self":312.9512448,"total":322.0418405,"children":{"InitializeActuators":{"count":8,"self":0.0030266,"total":0.0030266,"children":null},"InitializeSensors":{"count":8,"self":0.0020425,"total":0.0020425,"children":null},"AgentSendState":{"count":15820,"self":0.73858099999999993,"total":0.9069683,"children":{"CollectObservations":{"count":5032,"self":0.1044208,"total":0.1044208,"children":null},"WriteActionMask":{"count":5032,"self":0.019871399999999997,"total":0.019871399999999997,"children":null},"RequestDecision":{"count":5032,"self":0.0440951,"total":0.0440951,"children":null}}},"DecideAction":{"count":15820,"self":7.5735176,"total":7.6746079,"children":{"RayPerceptionSensor.Perceive":{"count":10064,"self":0.1010901,"total":0.1010901,"children":null}}},"AgentAct":{"count":15820,"self":0.501961,"total":0.501961,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":7,"max":25.4915333,"min":23.8990974,"runningAverage":24.8208847,"value":25.12378,"weightedAverage":24.8215046}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714133660","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\Magnus\\Desktop\\Ny unityting\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Magnus -hubSessionId 8c17471b-7795-4082-905c-75744d6a077b -accessToken hv3zp4IA8nxcowfZc35r5tDHrlmzUZoExTBgESksngo005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"WinScreen","end_time_seconds":"1714133982"}} \ No newline at end of file +<<<<<<< HEAD +{"count":1,"self":312.9512448,"total":322.0418405,"children":{"InitializeActuators":{"count":8,"self":0.0030266,"total":0.0030266,"children":null},"InitializeSensors":{"count":8,"self":0.0020425,"total":0.0020425,"children":null},"AgentSendState":{"count":15820,"self":0.73858099999999993,"total":0.9069683,"children":{"CollectObservations":{"count":5032,"self":0.1044208,"total":0.1044208,"children":null},"WriteActionMask":{"count":5032,"self":0.019871399999999997,"total":0.019871399999999997,"children":null},"RequestDecision":{"count":5032,"self":0.0440951,"total":0.0440951,"children":null}}},"DecideAction":{"count":15820,"self":7.5735176,"total":7.6746079,"children":{"RayPerceptionSensor.Perceive":{"count":10064,"self":0.1010901,"total":0.1010901,"children":null}}},"AgentAct":{"count":15820,"self":0.501961,"total":0.501961,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":7,"max":25.4915333,"min":23.8990974,"runningAverage":24.8208847,"value":25.12378,"weightedAverage":24.8215046}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714133660","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\Magnus\\Desktop\\Ny unityting\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Magnus -hubSessionId 8c17471b-7795-4082-905c-75744d6a077b -accessToken hv3zp4IA8nxcowfZc35r5tDHrlmzUZoExTBgESksngo005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"WinScreen","end_time_seconds":"1714133982"}} +======= +{"count":1,"self":367.47586559999996,"total":374.68267299999997,"children":{"InitializeActuators":{"count":16,"self":0.0010002,"total":0.0010002,"children":null},"InitializeSensors":{"count":16,"self":0.0019317,"total":0.0019317,"children":null},"AgentSendState":{"count":18354,"self":0.9089815,"total":1.1072521,"children":{"CollectObservations":{"count":25480,"self":0.11964609999999999,"total":0.11964609999999999,"children":null},"WriteActionMask":{"count":25480,"self":0.024442199999999997,"total":0.024442199999999997,"children":null},"RequestDecision":{"count":25480,"self":0.054182299999999996,"total":0.054182299999999996,"children":null}}},"DecideAction":{"count":18354,"self":5.1585944,"total":5.2748705,"children":{"RayPerceptionSensor.Perceive":{"count":50960,"self":0.1162763,"total":0.1162763,"children":null}}},"AgentAct":{"count":18354,"self":0.82174949999999991,"total":0.82174949999999991,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":28,"max":27.5440578,"min":20.9639225,"runningAverage":24.66793,"value":24.2929268,"weightedAverage":24.8807487}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714132843","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\noahk\\Documents\\Unity projects\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-noahk -hubSessionId a6f45e0e-41b6-4c96-a70e-ec8e10ca5aa9 -accessToken LhF-MiZYoHmiI2p1_6JvQZvJ6QUPd4VyLbrTbhNHTT8005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"WinScreen","end_time_seconds":"1714133217"}} +>>>>>>> a17999b57fe65f9152a1692cd7b251383d8b28ec diff --git a/Assets/Prefabs/Driving UI.prefab b/Assets/Prefabs/Driving UI.prefab new file mode 100644 index 0000000..475f800 --- /dev/null +++ b/Assets/Prefabs/Driving UI.prefab @@ -0,0 +1,373 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2249422870405817347 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8518173326926186102} + - component: {fileID: 6179273434147949429} + - component: {fileID: 4583573475034773881} + m_Layer: 5 + m_Name: Lap counter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8518173326926186102 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2249422870405817347} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6591880210688179092} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -655.9142, y: 467.70325} + m_SizeDelta: {x: 508.1716, y: 44.5935} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6179273434147949429 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2249422870405817347} + m_CullTransparentMesh: 1 +--- !u!114 &4583573475034773881 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2249422870405817347} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Lap count: 1/1' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 45 + m_fontSizeBase: 45 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3550901392990883198 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4473337556744181764} + - component: {fileID: 1574617844504807406} + - component: {fileID: 2584150267315418173} + m_Layer: 5 + m_Name: Time + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4473337556744181764 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3550901392990883198} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6591880210688179092} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -655.91, y: 395.5386} + m_SizeDelta: {x: 508.17, y: 68.9229} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1574617844504807406 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3550901392990883198} + m_CullTransparentMesh: 1 +--- !u!114 &2584150267315418173 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3550901392990883198} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Time: 0' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 45 + m_fontSizeBase: 45 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4015923860507804037 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6591880210688179092} + - component: {fileID: 4306150116839875363} + - component: {fileID: 6685174614727123123} + - component: {fileID: 5984215937384903561} + m_Layer: 5 + m_Name: Driving UI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6591880210688179092 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4015923860507804037} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8518173326926186102} + - {fileID: 4473337556744181764} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!223 &4306150116839875363 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4015923860507804037} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &6685174614727123123 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4015923860507804037} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &5984215937384903561 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4015923860507804037} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 diff --git a/Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta b/Assets/Prefabs/Driving UI.prefab.meta similarity index 63% rename from Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta rename to Assets/Prefabs/Driving UI.prefab.meta index 2f7eb2e..f05cc21 100644 --- a/Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta +++ b/Assets/Prefabs/Driving UI.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 58f7e79a87c79824597746e8c1bfe400 -DefaultImporter: +guid: ad34455a014250446a5073260803b0a0 +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Scenes/Car Customization.unity b/Assets/Scenes/Car Customization.unity index 0d95c59..945e559 100644 --- a/Assets/Scenes/Car Customization.unity +++ b/Assets/Scenes/Car Customization.unity @@ -1654,6 +1654,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 820120218557562435, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} insertIndex: -1 addedObject: {fileID: 1607325868} + - targetCorrespondingSourceObject: {fileID: 820120218557562435, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + insertIndex: -1 + addedObject: {fileID: 1607325869} m_SourcePrefab: {fileID: 100100000, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} --- !u!1001 &727592024 PrefabInstance: @@ -4601,6 +4604,102 @@ MonoBehaviour: carType: carColor: --- !u!82 &1607325868 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1607325861} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 10cae2fd52e1c0f4eba2e2091d441cd1, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.7 + m_Pitch: 1 + Loop: 1 + 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!82 &1607325869 AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Assets/Scenes/CityRacetrack.unity b/Assets/Scenes/CityRacetrack.unity index bc74e7a..ff5bcbb 100644 --- a/Assets/Scenes/CityRacetrack.unity +++ b/Assets/Scenes/CityRacetrack.unity @@ -1880,6 +1880,125 @@ GameObject: m_CorrespondingSourceObject: {fileID: 6044828091041745544, guid: 7a3d78e18ac1cd7458d86f15c7aedc7a, type: 3} m_PrefabInstance: {fileID: 1965039481} m_PrefabAsset: {fileID: 0} +--- !u!1001 &787693911 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4015923860507804037, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_Name + value: Driving UI + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ad34455a014250446a5073260803b0a0, type: 3} +--- !u!114 &787693912 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2584150267315418173, guid: ad34455a014250446a5073260803b0a0, type: 3} + m_PrefabInstance: {fileID: 787693911} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &787693913 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4583573475034773881, guid: ad34455a014250446a5073260803b0a0, type: 3} + m_PrefabInstance: {fileID: 787693911} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &810828349 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6838100718802891394, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} @@ -18603,6 +18722,14 @@ PrefabInstance: propertyPath: lapAmount value: 1 objectReference: {fileID: 0} + - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: lapCounter + value: + objectReference: {fileID: 787693913} + - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: timeCounter + value: + objectReference: {fileID: 787693912} - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} propertyPath: players.Array.size value: 8 @@ -25970,3 +26097,4 @@ SceneRoots: - {fileID: 109285484} - {fileID: 1965039481} - {fileID: 1812019949} + - {fileID: 787693911} diff --git a/Assets/Scenes/ForestRacetrack.unity b/Assets/Scenes/ForestRacetrack.unity index f140bbb..b7f3083 100644 --- a/Assets/Scenes/ForestRacetrack.unity +++ b/Assets/Scenes/ForestRacetrack.unity @@ -740,109 +740,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5026680989480309367, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3} m_PrefabInstance: {fileID: 610534799} m_PrefabAsset: {fileID: 0} ---- !u!1 &391669961 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 391669966} - - component: {fileID: 391669965} - - component: {fileID: 391669964} - - component: {fileID: 391669963} - m_Layer: 5 - m_Name: Driving UI - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &391669963 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 391669961} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &391669964 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 391669961} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &391669965 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 391669961} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &391669966 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 391669961} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1885205885} - - {fileID: 1986611067} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} --- !u!4 &429798251 stripped Transform: m_CorrespondingSourceObject: {fileID: 5026680989480309367, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3} @@ -5198,140 +5095,17 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!1 &1885205884 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1885205885} - - component: {fileID: 1885205887} - - component: {fileID: 1885205886} - m_Layer: 5 - m_Name: Lap counter - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1885205885 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1885205884} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 391669966} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -655.9142, y: 467.70325} - m_SizeDelta: {x: 508.1716, y: 44.5935} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1885205886 +--- !u!114 &1885205886 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 4583573475034773881, guid: ad34455a014250446a5073260803b0a0, type: 3} + m_PrefabInstance: {fileID: 4459975215774235058} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1885205884} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: 'Lap count: 1' - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 45 - m_fontSizeBase: 45 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 1 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1885205887 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1885205884} - m_CullTransparentMesh: 1 --- !u!1001 &1888316364 PrefabInstance: m_ObjectHideFlags: 0 @@ -5545,140 +5319,17 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3} ---- !u!1 &1986611066 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1986611067} - - component: {fileID: 1986611069} - - component: {fileID: 1986611068} - m_Layer: 5 - m_Name: Time - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1986611067 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1986611066} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 391669966} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -655.91, y: 395.5386} - m_SizeDelta: {x: 508.17, y: 68.9229} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1986611068 +--- !u!114 &1986611068 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 2584150267315418173, guid: ad34455a014250446a5073260803b0a0, type: 3} + m_PrefabInstance: {fileID: 4459975215774235058} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1986611066} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: 'Time: 0' - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 45 - m_fontSizeBase: 45 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 1 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1986611069 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1986611066} - m_CullTransparentMesh: 1 --- !u!1001 &2015774333 PrefabInstance: m_ObjectHideFlags: 0 @@ -6073,6 +5724,107 @@ GameObject: m_CorrespondingSourceObject: {fileID: 4545264293194713344, guid: bb42b7aaa687b2f4d811c8cc5d2d259f, type: 3} m_PrefabInstance: {fileID: 802517270703114805} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4459975215774235058 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4015923860507804037, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_Name + value: Driving UI + objectReference: {fileID: 0} + - target: {fileID: 4583573475034773881, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_text + value: 'Lap count: 1/3' + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ad34455a014250446a5073260803b0a0, type: 3} --- !u!1001 &8684226825208193988 PrefabInstance: m_ObjectHideFlags: 0 @@ -6171,7 +5923,7 @@ PrefabInstance: objectReference: {fileID: 1373860105} - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} propertyPath: lapAmount - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} propertyPath: lapCounter @@ -6348,5 +6100,5 @@ SceneRoots: - {fileID: 8684226825208193988} - {fileID: 1513738220} - {fileID: 1373860104} - - {fileID: 391669966} + - {fileID: 4459975215774235058} - {fileID: 2105838994} diff --git a/Assets/Scenes/WinScreen.unity b/Assets/Scenes/WinScreen.unity index da335a5..80eccb8 100644 --- a/Assets/Scenes/WinScreen.unity +++ b/Assets/Scenes/WinScreen.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 1158590934} - m_IndirectSpecularColor: {r: 0.29684296, g: 0.6337676, b: 0.9937157, a: 1} + m_IndirectSpecularColor: {r: 0.29684302, g: 0.6337671, b: 0.9937157, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1086,6 +1086,7 @@ GameObject: - component: {fileID: 869443464} - component: {fileID: 869443463} - component: {fileID: 869443462} + - component: {fileID: 869443465} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -1167,6 +1168,102 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 6.866, y: 0, z: 0} +--- !u!82 &869443465 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 869443461} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 9dbf5fdfbadcb2844afbea5ae1833581, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.7 + m_Pitch: 1 + Loop: 1 + 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!1001 &874635445 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index ad1f405..56e02ef 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -18,6 +18,7 @@ public class GameManager : MonoBehaviour int[] playerLaps; public TextMeshProUGUI lapCounter; public TextMeshProUGUI timeCounter; + float DNFTimer = 0; void Start() { // reset laps @@ -82,8 +83,8 @@ public class GameManager : MonoBehaviour playerLaps[i] += 1; - if (playerLaps[i] < lapAmount) - lapCounter.text = "Lap count: " + playerLaps[i]; + if (playerLaps[i] <= lapAmount) + lapCounter.text = "Lap count: " + playerLaps[i] + "/" + lapAmount; } string strTimes =playerTimes[i].ToString(); @@ -115,9 +116,14 @@ public class GameManager : MonoBehaviour } } + //DNF + if (playersFinished.Count() > 0) + { + DNFTimer += Time.deltaTime; + } // race finished - if (playersFinished.Count() == players.Count()) + if (playersFinished.Count() == players.Count() || DNFTimer > 10) { // sort array float[] fTimes = new float[players.Count()]; @@ -145,5 +151,7 @@ public class GameManager : MonoBehaviour SceneManager.LoadScene("WinScreen"); } + + } } diff --git a/Assets/Scripts/LapTimer.cs b/Assets/Scripts/Unused/LapTimer.cs similarity index 100% rename from Assets/Scripts/LapTimer.cs rename to Assets/Scripts/Unused/LapTimer.cs diff --git a/Assets/Scripts/LapTimer.cs.meta b/Assets/Scripts/Unused/LapTimer.cs.meta similarity index 100% rename from Assets/Scripts/LapTimer.cs.meta rename to Assets/Scripts/Unused/LapTimer.cs.meta diff --git a/Assets/Sounds/Aurea Carmina.mp3 b/Assets/Sounds/Aurea Carmina.mp3 new file mode 100644 index 0000000..3a7a031 Binary files /dev/null and b/Assets/Sounds/Aurea Carmina.mp3 differ diff --git a/Assets/Sounds/Aurea Carmina.mp3.meta b/Assets/Sounds/Aurea Carmina.mp3.meta new file mode 100644 index 0000000..805a1a1 --- /dev/null +++ b/Assets/Sounds/Aurea Carmina.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 9dbf5fdfbadcb2844afbea5ae1833581 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: