diff --git a/Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta b/Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta new file mode 100644 index 0000000..2f7eb2e --- /dev/null +++ b/Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 58f7e79a87c79824597746e8c1bfe400 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: 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 new file mode 100644 index 0000000..73c9a86 --- /dev/null +++ b/Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_URP_v1.24.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f58d25b9e504a4f41ab4a71cf87c1845 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ML-Agents/Timers/ForestRacetrack_timers.json b/Assets/ML-Agents/Timers/ForestRacetrack_timers.json index b5834da..f001e0c 100644 --- a/Assets/ML-Agents/Timers/ForestRacetrack_timers.json +++ b/Assets/ML-Agents/Timers/ForestRacetrack_timers.json @@ -1 +1,5 @@ -{"count":1,"self":16.4673248,"total":16.889606399999998,"children":{"InitializeActuators":{"count":8,"self":0.0030069999999999997,"total":0.0030069999999999997,"children":null},"InitializeSensors":{"count":8,"self":0.0010002,"total":0.0010002,"children":null},"AgentSendState":{"count":617,"self":0.038239999999999996,"total":0.056531899999999996,"children":{"CollectObservations":{"count":992,"self":0.0066193,"total":0.0066193,"children":null},"WriteActionMask":{"count":992,"self":0,"total":0,"children":null},"RequestDecision":{"count":992,"self":0.0116726,"total":0.0116726,"children":null}}},"DecideAction":{"count":617,"self":0.31339469999999997,"total":0.3166316,"children":{"RayPerceptionSensor.Perceive":{"count":1984,"self":0.0032369,"total":0.0032369,"children":null}}},"AgentAct":{"count":617,"self":0.044110199999999995,"total":0.044110199999999995,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714124585","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":"1714124602"}} \ No newline at end of file +<<<<<<< HEAD +{"count":1,"self":121.0610688,"total":138.0208419,"children":{"InitializeActuators":{"count":8,"self":0.0019971,"total":0.0019971,"children":null},"InitializeSensors":{"count":8,"self":0.0040322,"total":0.0040322,"children":null},"AgentSendState":{"count":6652,"self":1.3374462999999999,"total":1.5864675,"children":{"CollectObservations":{"count":10648,"self":0.13765929999999998,"total":0.13765929999999998,"children":null},"WriteActionMask":{"count":10648,"self":0.0276351,"total":0.0276351,"children":null},"RequestDecision":{"count":10648,"self":0.08372679999999999,"total":0.08372679999999999,"children":null}}},"DecideAction":{"count":6652,"self":14.4748288,"total":14.7074404,"children":{"RayPerceptionSensor.Perceive":{"count":21296,"self":0.2326122,"total":0.2326122,"children":null}}},"AgentAct":{"count":6652,"self":0.65683969999999992,"total":0.65683969999999992,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":7,"max":24.5822716,"min":17.1586933,"runningAverage":21.37373,"value":17.1586933,"weightedAverage":21.06385}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714127057","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":"1714127195"}} +======= +{"count":1,"self":16.4673248,"total":16.889606399999998,"children":{"InitializeActuators":{"count":8,"self":0.0030069999999999997,"total":0.0030069999999999997,"children":null},"InitializeSensors":{"count":8,"self":0.0010002,"total":0.0010002,"children":null},"AgentSendState":{"count":617,"self":0.038239999999999996,"total":0.056531899999999996,"children":{"CollectObservations":{"count":992,"self":0.0066193,"total":0.0066193,"children":null},"WriteActionMask":{"count":992,"self":0,"total":0,"children":null},"RequestDecision":{"count":992,"self":0.0116726,"total":0.0116726,"children":null}}},"DecideAction":{"count":617,"self":0.31339469999999997,"total":0.3166316,"children":{"RayPerceptionSensor.Perceive":{"count":1984,"self":0.0032369,"total":0.0032369,"children":null}}},"AgentAct":{"count":617,"self":0.044110199999999995,"total":0.044110199999999995,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714124585","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":"1714124602"}} +>>>>>>> 49b4414155257b40f20687a86068adc472c780dd diff --git a/Assets/ML-Agents/Timers/WinScreen_timers.json b/Assets/ML-Agents/Timers/WinScreen_timers.json index e653663..fc0a649 100644 --- a/Assets/ML-Agents/Timers/WinScreen_timers.json +++ b/Assets/ML-Agents/Timers/WinScreen_timers.json @@ -1 +1 @@ -{"count":1,"self":299.9013632,"total":307.61609189999996,"children":{"InitializeActuators":{"count":8,"self":0.0010006,"total":0.0010006,"children":null},"InitializeSensors":{"count":8,"self":0.0015026,"total":0.0015026,"children":null},"AgentSendState":{"count":15142,"self":0.7721819,"total":0.9181054,"children":{"CollectObservations":{"count":21584,"self":0.0768378,"total":0.0768378,"children":null},"WriteActionMask":{"count":21584,"self":0.026219799999999998,"total":0.026219799999999998,"children":null},"RequestDecision":{"count":21584,"self":0.0428659,"total":0.0428659,"children":null}}},"DecideAction":{"count":15142,"self":6.0027792,"total":6.0986367999999995,"children":{"RayPerceptionSensor.Perceive":{"count":43168,"self":0.0958574,"total":0.0958574,"children":null}}},"AgentAct":{"count":15142,"self":0.6944775,"total":0.6944775,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":21,"max":25.388195,"min":17.5381966,"runningAverage":23.97337,"value":24.9569759,"weightedAverage":24.8837566}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714125978","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":"1714126286"}} \ No newline at end of file +{"count":1,"self":199.1533184,"total":218.8379795,"children":{"InitializeActuators":{"count":8,"self":0.0019921,"total":0.0019921,"children":null},"InitializeSensors":{"count":8,"self":0.0030242999999999997,"total":0.0030242999999999997,"children":null},"AgentSendState":{"count":10664,"self":1.5327274,"total":1.9015727,"children":{"CollectObservations":{"count":12680,"self":0.2323625,"total":0.2323625,"children":null},"WriteActionMask":{"count":12680,"self":0.046358899999999995,"total":0.046358899999999995,"children":null},"RequestDecision":{"count":12680,"self":0.090123899999999993,"total":0.090123899999999993,"children":null}}},"DecideAction":{"count":10664,"self":16.3909248,"total":16.650102999999998,"children":{"RayPerceptionSensor.Perceive":{"count":25360,"self":0.2591788,"total":0.2591788,"children":null}}},"AgentAct":{"count":10664,"self":1.1259698,"total":1.1259698,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":21,"max":25.5732841,"min":19.9673977,"runningAverage":24.3276081,"value":25.3809662,"weightedAverage":25.0823269}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714127324","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":"1714127543"}} \ No newline at end of file diff --git a/Assets/Scenes/WinScreen.unity b/Assets/Scenes/WinScreen.unity index b86fd2f..3c51041 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: 0} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -226,6 +226,16 @@ MonoBehaviour: - {fileID: 127894455} defaultColors: - {fileID: 2100000, guid: 09dbb87d6674be741b80fa8cefe11b0e, type: 2} +--- !u!1 &163619876 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5471432146962600635, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} + m_PrefabInstance: {fileID: 1496457013} + m_PrefabAsset: {fileID: 0} +--- !u!1 &182581428 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5471432146962600635, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} + m_PrefabInstance: {fileID: 1873035929} + m_PrefabAsset: {fileID: 0} --- !u!1001 &204152976 PrefabInstance: m_ObjectHideFlags: 0 @@ -427,6 +437,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} m_PrefabInstance: {fileID: 363122539} m_PrefabAsset: {fileID: 0} +--- !u!1 &446304807 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5471432146962600635, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} + m_PrefabInstance: {fileID: 363122539} + m_PrefabAsset: {fileID: 0} --- !u!1001 &484370173 PrefabInstance: m_ObjectHideFlags: 0 @@ -631,6 +646,127 @@ RectTransform: m_AnchoredPosition: {x: 928, y: 230} m_SizeDelta: {x: 1000, y: 400} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &783549761 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 783549765} + - component: {fileID: 783549764} + - component: {fileID: 783549763} + - component: {fileID: 783549762} + m_Layer: 5 + m_Name: Play + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &783549762 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 783549761} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 783549763} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &783549763 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 783549761} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.23031552, g: 0.8490566, b: 0, 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_Sprite: {fileID: 21300000, guid: 61583fba956632548911dbe60ba47876, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &783549764 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 783549761} + m_CullTransparentMesh: 1 +--- !u!224 &783549765 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 783549761} + 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: + - {fileID: 476199421} + m_Father: {fileID: 0} + 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: 960, y: 148} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &784053825 PrefabInstance: m_ObjectHideFlags: 0 @@ -835,7 +971,24 @@ MonoBehaviour: - 2442 - DNF - DNF - winner: {fileID: 0} + Garages: + - {fileID: 1759731988} + - {fileID: 163619876} + - {fileID: 182581428} + - {fileID: 1548256152} + - {fileID: 446304807} + - {fileID: 1977529810} + - {fileID: 1257793076} + - {fileID: 1433079962} + Cars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} --- !u!1001 &850453472 PrefabInstance: m_ObjectHideFlags: 0 @@ -950,7 +1103,6 @@ GameObject: - component: {fileID: 869443464} - component: {fileID: 869443463} - component: {fileID: 869443462} - - component: {fileID: 869443465} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -1032,102 +1184,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, 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: 10cae2fd52e1c0f4eba2e2091d441cd1, type: 3} - m_PlayOnAwake: 1 - m_Volume: 1 - 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 @@ -1557,6 +1613,16 @@ MonoBehaviour: - {fileID: 1204717678} defaultColors: - {fileID: 2100000, guid: 290dcb9964b00e94bb0debc820182e71, type: 2} +--- !u!1 &1257793076 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5471432146962600635, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} + m_PrefabInstance: {fileID: 874635445} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1433079962 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5471432146962600635, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} + m_PrefabInstance: {fileID: 1050167112} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1496457013 PrefabInstance: m_ObjectHideFlags: 0 @@ -1627,6 +1693,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} m_PrefabInstance: {fileID: 1496457013} m_PrefabAsset: {fileID: 0} +--- !u!1 &1548256152 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5471432146962600635, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} + m_PrefabInstance: {fileID: 484370173} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1556617105 PrefabInstance: m_ObjectHideFlags: 0 @@ -1784,7 +1855,7 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 1, g: 0, b: 0, a: 1} + m_HighlightedColor: {r: 0.03198047, g: 0.7264151, b: 0.17153284, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} @@ -1856,6 +1927,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1688019504} m_CullTransparentMesh: 1 +--- !u!1 &1759731988 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5471432146962600635, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} + m_PrefabInstance: {fileID: 2144194469} + m_PrefabAsset: {fileID: 0} --- !u!1 &1828984436 GameObject: m_ObjectHideFlags: 0 @@ -2332,6 +2408,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1879694846} m_CullTransparentMesh: 1 +--- !u!1 &1977529810 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5471432146962600635, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} + m_PrefabInstance: {fileID: 2076255753} + m_PrefabAsset: {fileID: 0} --- !u!1 &2002437005 GameObject: m_ObjectHideFlags: 0 @@ -2585,7 +2666,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5471432146962600635, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6033441500748191172, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} propertyPath: car @@ -2626,3 +2707,4 @@ SceneRoots: - {fileID: 2076255753} - {fileID: 874635445} - {fileID: 1050167112} + - {fileID: 783549765} diff --git a/Assets/Scripts/WinScript.cs b/Assets/Scripts/WinScript.cs index 58cabad..f7d9c75 100644 --- a/Assets/Scripts/WinScript.cs +++ b/Assets/Scripts/WinScript.cs @@ -2,19 +2,67 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using TMPro; +using Unity.VisualScripting; public class WinScript : MonoBehaviour { public TextMeshProUGUI MainText; public TextMeshProUGUI MainText2; public List leaderboard; public List time; - public GameObject winner; + public GameObject[] Garages; + + private GameObject currentGarage; void Start() { + foreach (GameObject carGarage in Garages) + { + carGarage.SetActive(false); + } leaderboard = GameObject.Find("GameManager").GetComponent().playersFinished; time = GameObject.Find("GameManager").GetComponent().playerTimes; + if (leaderboard[0] == "Racecar") + { + currentGarage = Garages[6]; + Garages[6].SetActive(true); + } + else if (leaderboard[0] == "Hotrod") + { + currentGarage = Garages[2]; + Garages[2].SetActive(true); + } + else if (leaderboard[0] == "Icecream") + { + currentGarage = Garages[5]; + Garages[5].SetActive(true); + } + else if (leaderboard[0] == "MuscleCar") + { + currentGarage = Garages[1]; + Garages[1].SetActive(true); + } + else if (leaderboard[0] == "Pickup") + { + currentGarage = Garages[3]; + Garages[3].SetActive(true); + } + else if (leaderboard[0] == "SchoolBus") + { + currentGarage = Garages[7]; + Garages[7].SetActive(true); + } + else if (leaderboard[0] == "Sportscar") + { + currentGarage = Garages[4]; + Garages[4].SetActive(true); + } + else if (leaderboard[0] == "StreetRacist") + { + currentGarage = Garages[0]; + Garages[0].SetActive(true); + } + } @@ -23,13 +71,18 @@ public class WinScript : MonoBehaviour private void Update() { MainText.text = "Leaderboard: "; - MainText2.text = "\n"; + MainText2.text = "Time: "; for (var i = 0; i < leaderboard.Count; i++){ MainText.text += "\n" + (i+1) + "." + leaderboard[i]; MainText2.text += "\n(" + time[i] + ")"; } } + + private void FixedUpdate() { + currentGarage.transform.eulerAngles += Vector3.up * 0.7f; + //currentRotation = CurrentCar.transform.rotation; + }