diff --git a/Assets/ML-Agents/Timers/Car Customization_timers.json b/Assets/ML-Agents/Timers/Car Customization_timers.json index cd23d9a..8055199 100644 --- a/Assets/ML-Agents/Timers/Car Customization_timers.json +++ b/Assets/ML-Agents/Timers/Car Customization_timers.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"count":1,"self":72.428767999999991,"total":72.4318012,"children":{"InitializeActuators":{"count":1,"self":0.0010000999999999999,"total":0.0010000999999999999,"children":null},"InitializeSensors":{"count":1,"self":0.0020328,"total":0.0020328,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714050721","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 b034e26d-02c7-41ad-9a20-c198a628a35a -accessToken Dt6gMuGhvx1BDLlNSM4Gg2t5w5_py5VVtuHcl5oYJQk005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Car Customization","end_time_seconds":"1714050793"}} -======= -{"count":1,"self":5.0768423999999994,"total":5.0899353,"children":{"InitializeActuators":{"count":1,"self":0.0010459,"total":0.0010459,"children":null},"InitializeSensors":{"count":1,"self":0.0025578999999999997,"total":0.0025578999999999997,"children":null},"AgentSendState":{"count":2,"self":0.0020004,"total":0.0055566,"children":{"CollectObservations":{"count":2,"self":0.0015198,"total":0.0015198,"children":null},"WriteActionMask":{"count":2,"self":0,"total":0,"children":null},"RequestDecision":{"count":2,"self":0.0020364,"total":0.0020364,"children":{"RayPerceptionSensor.Perceive":{"count":4,"self":0,"total":0,"children":null}}}}},"DecideAction":{"count":2,"self":0.0010008999999999999,"total":0.0010008999999999999,"children":null},"AgentAct":{"count":2,"self":0.0023487,"total":0.0023487,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714049648","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 9c1f01bb-11a4-4f0f-a783-b9132e478973 -accessToken 4E81NOgN5ztdhX4t4u3WEoX4xouq9HnIn-2L54HpD0Y005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Car Customization","end_time_seconds":"1714049653"}} ->>>>>>> 3f8f7e0a3765a7af3156232c0fa677c9758ce5d8 +{"count":1,"self":53.3242304,"total":53.3307461,"children":{"InitializeActuators":{"count":1,"self":0,"total":0,"children":null},"InitializeSensors":{"count":1,"self":0.0020066999999999997,"total":0.0020066999999999997,"children":null},"AgentSendState":{"count":1,"self":0.0035031,"total":0.0045081,"children":{"CollectObservations":{"count":1,"self":0.001005,"total":0.001005,"children":null}}}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714051487","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 b034e26d-02c7-41ad-9a20-c198a628a35a -accessToken Dt6gMuGhvx1BDLlNSM4Gg2t5w5_py5VVtuHcl5oYJQk005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Car Customization","end_time_seconds":"1714051541"}} \ No newline at end of file diff --git a/Assets/ML-Agents/Timers/Racetrack mini_timers.json b/Assets/ML-Agents/Timers/Racetrack mini_timers.json index 5cdd889..37e78cd 100644 --- a/Assets/ML-Agents/Timers/Racetrack mini_timers.json +++ b/Assets/ML-Agents/Timers/Racetrack mini_timers.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"count":1,"self":6.0079864,"total":6.0129949,"children":{"InitializeActuators":{"count":3,"self":0.0010026,"total":0.0010026,"children":null},"InitializeSensors":{"count":3,"self":0.0030045,"total":0.0030045,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714050947","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 b034e26d-02c7-41ad-9a20-c198a628a35a -accessToken Dt6gMuGhvx1BDLlNSM4Gg2t5w5_py5VVtuHcl5oYJQk005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Racetrack mini","end_time_seconds":"1714050953"}} -======= -{"count":1,"self":195.828608,"total":207.79549129999998,"children":{"InitializeActuators":{"count":8,"self":0.0019947,"total":0.0019947,"children":null},"InitializeSensors":{"count":8,"self":0.0019868999999999998,"total":0.0019868999999999998,"children":null},"AgentSendState":{"count":10074,"self":2.374,"total":2.9844268,"children":{"CollectObservations":{"count":16120,"self":0.41922739999999997,"total":0.41922739999999997,"children":null},"WriteActionMask":{"count":16120,"self":0.0603338,"total":0.0603338,"children":null},"RequestDecision":{"count":16120,"self":0.1308656,"total":0.1308656,"children":null}}},"DecideAction":{"count":10074,"self":6.6263347999999995,"total":6.9084939,"children":{"RayPerceptionSensor.Perceive":{"count":32240,"self":0.2821592,"total":0.2821592,"children":null}}},"AgentAct":{"count":10074,"self":2.0609492,"total":2.0609490999999998,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":65,"max":25.59291,"min":-3.30474,"runningAverage":6.794643,"value":1.62280738,"weightedAverage":6.22606945}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714050278","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 FV38BX0LdlmK-m4amNy3jH1hDBMyOs3Ki2__yJqeaFY005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Racetrack mini","end_time_seconds":"1714050486"}} ->>>>>>> 3f8f7e0a3765a7af3156232c0fa677c9758ce5d8 +{"count":1,"self":138.9299456,"total":140.8284301,"children":{"InitializeActuators":{"count":8,"self":0.0010004999999999999,"total":0.0010004999999999999,"children":null},"InitializeSensors":{"count":8,"self":0.0025084,"total":0.0025084,"children":null},"AgentSendState":{"count":6805,"self":0.39578209999999997,"total":0.50476579999999993,"children":{"CollectObservations":{"count":10888,"self":0.062793,"total":0.062793,"children":null},"WriteActionMask":{"count":10888,"self":0.014744499999999999,"total":0.014744499999999999,"children":null},"RequestDecision":{"count":10888,"self":0.0314462,"total":0.0314462,"children":null}}},"DecideAction":{"count":6805,"self":0.94154549999999992,"total":0.97379739999999992,"children":{"RayPerceptionSensor.Perceive":{"count":21776,"self":0.0322519,"total":0.0322519,"children":null}}},"AgentAct":{"count":6805,"self":0.4153926,"total":0.4153926,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":37,"max":25.5315037,"min":-1.48766124,"runningAverage":6.426719,"value":4.999134,"weightedAverage":8.814682}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714051562","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 b034e26d-02c7-41ad-9a20-c198a628a35a -accessToken Dt6gMuGhvx1BDLlNSM4Gg2t5w5_py5VVtuHcl5oYJQk005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Racetrack mini","end_time_seconds":"1714051702"}} \ No newline at end of file diff --git a/Assets/ML-Agents/Timers/WinScreen_timers.json.meta b/Assets/ML-Agents/Timers/WinScreen_timers.json.meta index 000cd54..7a18f6c 100644 --- a/Assets/ML-Agents/Timers/WinScreen_timers.json.meta +++ b/Assets/ML-Agents/Timers/WinScreen_timers.json.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<<< HEAD:Assets/ML-Agents/Timers/City racesm_timers.json.meta -guid: ca66b14272dc63548acbee53df329532 +guid: f597e65b9d937b24b9b2cf599a194f37 ======== guid: b02eb4a9869b93e4d9092991c9f89a8f >>>>>>>> 3f8f7e0a3765a7af3156232c0fa677c9758ce5d8:Assets/ML-Agents/Timers/WinScreen_timers.json.meta diff --git a/Assets/ML-Agents/Timers/mini_racetrack3_timers.json b/Assets/ML-Agents/Timers/mini_racetrack3_timers.json index 365cb3d..9d42131 100644 --- a/Assets/ML-Agents/Timers/mini_racetrack3_timers.json +++ b/Assets/ML-Agents/Timers/mini_racetrack3_timers.json @@ -1 +1 @@ -{"count":1,"self":10.688885599999999,"total":10.7634405,"children":{"InitializeActuators":{"count":1,"self":0.0032123,"total":0.0032123,"children":null},"InitializeSensors":{"count":1,"self":0.0030196,"total":0.0030196,"children":null},"AgentSendState":{"count":261,"self":0.038522,"total":0.0672791,"children":{"CollectObservations":{"count":261,"self":0.028757099999999997,"total":0.028757099999999997,"children":null}}}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714043053","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 45b5d559-24dc-4b99-a8b6-a125447684df -accessToken bXHJaHm6Ggta2huR1hMWbJtprK9AdD_DuLyfh8whvdM005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"mini_racetrack3","end_time_seconds":"1714043064"}} \ No newline at end of file +{"count":1,"self":45.2942848,"total":45.3013117,"children":{"InitializeActuators":{"count":1,"self":0,"total":0,"children":null},"InitializeSensors":{"count":1,"self":0.0020066999999999997,"total":0.0020066999999999997,"children":null},"AgentSendState":{"count":1,"self":0.0035031,"total":0.0045081,"children":{"CollectObservations":{"count":1,"self":0.001005,"total":0.001005,"children":null}}}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714051487","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 b034e26d-02c7-41ad-9a20-c198a628a35a -accessToken Dt6gMuGhvx1BDLlNSM4Gg2t5w5_py5VVtuHcl5oYJQk005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"mini_racetrack3","end_time_seconds":"1714051533"}} \ No newline at end of file diff --git a/Assets/Scenes/Car Customization.unity b/Assets/Scenes/Car Customization.unity index ca6164c..778b480 100644 --- a/Assets/Scenes/Car Customization.unity +++ b/Assets/Scenes/Car Customization.unity @@ -1680,7 +1680,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 820120218557562435, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3730747174356696648, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} propertyPath: m_Name diff --git a/Assets/Scenes/WinScreen.unity.meta b/Assets/Scenes/WinScreen.unity.meta index 2e03d66..f537bd0 100644 --- a/Assets/Scenes/WinScreen.unity.meta +++ b/Assets/Scenes/WinScreen.unity.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<<< HEAD:Assets/Prefabs/Cars/Cars LLLLL.prefab.meta -guid: bf357d804290737469459ec8ffeb6c7d +guid: 59a7f2226d0a85440a54a775942ec0d6 PrefabImporter: ======== guid: f7320b9acc0c07041a21a406416a5928 diff --git a/Assets/Scripts/Car Customization/Car Loader.cs b/Assets/Scripts/Car Customization/Car Loader.cs index e2c19ad..7bf76be 100644 --- a/Assets/Scripts/Car Customization/Car Loader.cs +++ b/Assets/Scripts/Car Customization/Car Loader.cs @@ -15,17 +15,8 @@ public class CarLoader : MonoBehaviour public GameObject targetcar; void Start() { - try - { - carType = GameObject.Find("Car Data").GetComponent().carType; - carColor = GameObject.Find("Car Data").GetComponent().carColor; - } - catch (System.Exception) - { - carType = "Racecar"; - carColor = "Default"; - print("no loading"); - } + carType = GameObject.Find("Car Data").GetComponent().carType; + carColor = GameObject.Find("Car Data").GetComponent().carColor; foreach (GameObject car in Cars) {