diff --git a/Assets/ML-Agents/Timers/ForestRacetrack_timers.json b/Assets/ML-Agents/Timers/ForestRacetrack_timers.json index 1577054..48f4d80 100644 --- a/Assets/ML-Agents/Timers/ForestRacetrack_timers.json +++ b/Assets/ML-Agents/Timers/ForestRacetrack_timers.json @@ -1 +1,5 @@ -{"count":1,"self":10.4157048,"total":11.1841809,"children":{"InitializeActuators":{"count":8,"self":0.0019944999999999997,"total":0.0019944999999999997,"children":null},"InitializeSensors":{"count":8,"self":0.0019947,"total":0.0019947,"children":null},"AgentSendState":{"count":314,"self":0.0484605,"total":0.0744336,"children":{"CollectObservations":{"count":504,"self":0.00801,"total":0.00801,"children":null},"WriteActionMask":{"count":504,"self":0.00099549999999999986,"total":0.00099549999999999986,"children":null},"RequestDecision":{"count":504,"self":0.0169676,"total":0.0169676,"children":null}}},"DecideAction":{"count":314,"self":0.63277189999999994,"total":0.6397572,"children":{"RayPerceptionSensor.Perceive":{"count":1008,"self":0.0069853,"total":0.0069853,"children":null}}},"AgentAct":{"count":314,"self":0.0472652,"total":0.0472652,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714121178","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":"1714121189"}} \ No newline at end of file +<<<<<<< HEAD +{"count":1,"self":10.4157048,"total":11.1841809,"children":{"InitializeActuators":{"count":8,"self":0.0019944999999999997,"total":0.0019944999999999997,"children":null},"InitializeSensors":{"count":8,"self":0.0019947,"total":0.0019947,"children":null},"AgentSendState":{"count":314,"self":0.0484605,"total":0.0744336,"children":{"CollectObservations":{"count":504,"self":0.00801,"total":0.00801,"children":null},"WriteActionMask":{"count":504,"self":0.00099549999999999986,"total":0.00099549999999999986,"children":null},"RequestDecision":{"count":504,"self":0.0169676,"total":0.0169676,"children":null}}},"DecideAction":{"count":314,"self":0.63277189999999994,"total":0.6397572,"children":{"RayPerceptionSensor.Perceive":{"count":1008,"self":0.0069853,"total":0.0069853,"children":null}}},"AgentAct":{"count":314,"self":0.0472652,"total":0.0472652,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714121178","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":"1714121189"}} +======= +{"count":1,"self":10.229835999999999,"total":10.539707,"children":{"InitializeActuators":{"count":8,"self":0.0015033,"total":0.0015033,"children":null},"InitializeSensors":{"count":8,"self":0.0015321,"total":0.0015321,"children":null},"AgentSendState":{"count":302,"self":0.025935299999999998,"total":0.0560955,"children":{"CollectObservations":{"count":488,"self":0.0060285,"total":0.0060285,"children":null},"WriteActionMask":{"count":488,"self":0,"total":0,"children":null},"RequestDecision":{"count":488,"self":0.0241317,"total":0.0241317,"children":null}}},"DecideAction":{"count":302,"self":0.22161319999999998,"total":0.2252556,"children":{"RayPerceptionSensor.Perceive":{"count":976,"self":0.0036423999999999996,"total":0.0036423999999999996,"children":null}}},"AgentAct":{"count":302,"self":0.0239814,"total":0.0239814,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714119859","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":"1714119870"}} +>>>>>>> 2296b85dc53301fe32c92b3c43dbf49679df7e9b diff --git a/Assets/ML-Agents/Timers/ForestRacetrack_timers.json.meta b/Assets/ML-Agents/Timers/ForestRacetrack_timers.json.meta index fa1abe8..033eb26 100644 --- a/Assets/ML-Agents/Timers/ForestRacetrack_timers.json.meta +++ b/Assets/ML-Agents/Timers/ForestRacetrack_timers.json.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD +guid: d8bb5515cee0b6a4eb5b45eb46ece700 +======= guid: 6988adb36b3693a46b16dc30340e98ca +>>>>>>> f4d4e76f8b5ccb20237103e437b5acd47d7b3c40 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/ML-Agents/Timers/WinScreen_timers.json b/Assets/ML-Agents/Timers/WinScreen_timers.json index 21d7cd7..bd2c5c9 100644 --- a/Assets/ML-Agents/Timers/WinScreen_timers.json +++ b/Assets/ML-Agents/Timers/WinScreen_timers.json @@ -1 +1,9 @@ -{"count":1,"self":86.943936,"total":96.840498599999989,"children":{"InitializeActuators":{"count":8,"self":0.0029922,"total":0.0029922,"children":null},"InitializeSensors":{"count":8,"self":0.0029917,"total":0.0029917,"children":null},"AgentSendState":{"count":4582,"self":0.78503249999999991,"total":0.9650871,"children":{"CollectObservations":{"count":6288,"self":0.10648149999999999,"total":0.10648149999999999,"children":null},"WriteActionMask":{"count":6288,"self":0.02222,"total":0.02222,"children":null},"RequestDecision":{"count":6288,"self":0.0513531,"total":0.0513531,"children":null}}},"DecideAction":{"count":4582,"self":8.3173576,"total":8.4548896,"children":{"RayPerceptionSensor.Perceive":{"count":12576,"self":0.1375323,"total":0.1375323,"children":null}}},"AgentAct":{"count":4582,"self":0.46860939999999995,"total":0.46860939999999995,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":7,"max":24.91114,"min":19.7783585,"runningAverage":21.9734344,"value":21.0881538,"weightedAverage":21.94166}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714121754","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":"1714121851"}} \ No newline at end of file +<<<<<<< HEAD +{"count":1,"self":86.943936,"total":96.840498599999989,"children":{"InitializeActuators":{"count":8,"self":0.0029922,"total":0.0029922,"children":null},"InitializeSensors":{"count":8,"self":0.0029917,"total":0.0029917,"children":null},"AgentSendState":{"count":4582,"self":0.78503249999999991,"total":0.9650871,"children":{"CollectObservations":{"count":6288,"self":0.10648149999999999,"total":0.10648149999999999,"children":null},"WriteActionMask":{"count":6288,"self":0.02222,"total":0.02222,"children":null},"RequestDecision":{"count":6288,"self":0.0513531,"total":0.0513531,"children":null}}},"DecideAction":{"count":4582,"self":8.3173576,"total":8.4548896,"children":{"RayPerceptionSensor.Perceive":{"count":12576,"self":0.1375323,"total":0.1375323,"children":null}}},"AgentAct":{"count":4582,"self":0.46860939999999995,"total":0.46860939999999995,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":7,"max":24.91114,"min":19.7783585,"runningAverage":21.9734344,"value":21.0881538,"weightedAverage":21.94166}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714121754","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":"1714121851"}} +======= +<<<<<<< HEAD +{"count":1,"self":495.4255872,"total":498.2974708,"children":{"InitializeActuators":{"count":8,"self":0,"total":0,"children":null},"InitializeSensors":{"count":8,"self":0.0020004,"total":0.0020004,"children":null},"AgentSendState":{"count":4757,"self":0.289884,"total":0.3578125,"children":{"CollectObservations":{"count":7616,"self":0.035282299999999996,"total":0.035282299999999996,"children":null},"WriteActionMask":{"count":7616,"self":0.0061163,"total":0.0061163,"children":null},"RequestDecision":{"count":7616,"self":0.0265299,"total":0.0265299,"children":null}}},"DecideAction":{"count":4757,"self":2.1771583999999997,"total":2.227519,"children":{"RayPerceptionSensor.Perceive":{"count":15232,"self":0.050360699999999994,"total":0.050360699999999994,"children":null}}},"AgentAct":{"count":4757,"self":0.28455169999999996,"total":0.28455169999999996,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":7,"max":25.4703846,"min":20.7829914,"runningAverage":23.9274235,"value":21.1050835,"weightedAverage":23.3504276}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714118972","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":"1714119471"}} +======= +{"count":1,"self":309.1399424,"total":332.36884549999996,"children":{"InitializeActuators":{"count":8,"self":0.0025664999999999998,"total":0.0025664999999999998,"children":null},"InitializeSensors":{"count":8,"self":0.0032746,"total":0.0032746,"children":null},"AgentSendState":{"count":16365,"self":2.330854,"total":2.7563383,"children":{"CollectObservations":{"count":21936,"self":0.2326556,"total":0.2326556,"children":null},"WriteActionMask":{"count":21936,"self":0.0537007,"total":0.0537007,"children":null},"RequestDecision":{"count":21936,"self":0.1391281,"total":0.1391281,"children":null}}},"DecideAction":{"count":16365,"self":18.895307199999998,"total":19.2007151,"children":{"RayPerceptionSensor.Perceive":{"count":43872,"self":0.30540819999999996,"total":0.30540819999999996,"children":null}}},"AgentAct":{"count":16365,"self":1.2650044,"total":1.2650044,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":7,"max":24.6894,"min":10.6325016,"runningAverage":18.0623131,"value":14.3437386,"weightedAverage":17.18949}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714118988","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\hassa\\OneDrive\\Skrivebord\\alt pro\\Unity stuff\\Unity ting\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-hassa -hubSessionId f8278c6f-053c-492d-a479-00a9dbf73437 -accessToken 1rPuSgTkgUUOXMaGthhixd2ZEngLQ-H31CETUrEqtzM005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"WinScreen","end_time_seconds":"1714119320"}} +>>>>>>> f4d4e76f8b5ccb20237103e437b5acd47d7b3c40 +>>>>>>> 2296b85dc53301fe32c92b3c43dbf49679df7e9b diff --git a/Assets/Scenes/Car Customization.unity b/Assets/Scenes/Car Customization.unity index 778b480..d4b0b43 100644 --- a/Assets/Scenes/Car Customization.unity +++ b/Assets/Scenes/Car Customization.unity @@ -1250,7 +1250,6 @@ GameObject: m_Component: - component: {fileID: 481224846} - component: {fileID: 481224847} - - component: {fileID: 481224849} - component: {fileID: 481224848} m_Layer: 0 m_Name: Main garage @@ -1358,102 +1357,6 @@ AudioListener: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 481224845} m_Enabled: 1 ---- !u!82 &481224849 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 481224845} - 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!1 &535753315 GameObject: m_ObjectHideFlags: 0 @@ -1748,6 +1651,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 820120218557562435, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} insertIndex: -1 addedObject: {fileID: 1607325866} + - targetCorrespondingSourceObject: {fileID: 820120218557562435, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + insertIndex: -1 + addedObject: {fileID: 1607325868} m_SourcePrefab: {fileID: 100100000, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} --- !u!1001 &727592024 PrefabInstance: @@ -4694,6 +4600,102 @@ MonoBehaviour: m_EditorClassIdentifier: 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: 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!1 &1671445827 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Map selector.unity b/Assets/Scenes/Map selector.unity index db60485..75c77ce 100644 --- a/Assets/Scenes/Map selector.unity +++ b/Assets/Scenes/Map selector.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.4482451, g: 0.49827182, b: 0.57558125, a: 1} + m_IndirectSpecularColor: {r: 0.4482453, g: 0.49827206, b: 0.5755818, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1604,6 +1604,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 841402787} + - component: {fileID: 841402788} m_Layer: 0 m_Name: CameraRotator m_TagString: Untagged @@ -1627,6 +1628,14 @@ Transform: - {fileID: 333991148} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!81 &841402788 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 841402786} + m_Enabled: 1 --- !u!4 &845470139 stripped Transform: m_CorrespondingSourceObject: {fileID: 1828470746108631247, guid: bb42b7aaa687b2f4d811c8cc5d2d259f, type: 3} diff --git a/Assets/Scripts/map selector script/Map Selector Script.cs b/Assets/Scripts/map selector script/Map Selector Script.cs index a1bcb83..7ea12e7 100644 --- a/Assets/Scripts/map selector script/Map Selector Script.cs +++ b/Assets/Scripts/map selector script/Map Selector Script.cs @@ -53,6 +53,8 @@ public class MapSelectorScript : MonoBehaviour public void SelectMapAndLoadScene() { + AudioSource backgroundMusic = GameObject.Find("Car Data").GetComponent(); + backgroundMusic.Stop(); SceneManager.LoadScene(scene); } }