Merge branch 'master' of ooftooft.net:Racesm

# Conflicts:
#	Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta
#	Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_URP_v1.24.unitypackage.meta
#	Assets/ML-Agents/Timers/Car Customization_timers.json
#	Assets/ML-Agents/Timers/City racesm_timers.json.meta
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json
#	Assets/ML-Agents/Timers/WinScreen_timers.json.meta
#	Assets/Prefabs/Cars/Cars LLLLL.prefab.meta
#	Assets/Scenes/WinScreen.unity.meta
This commit is contained in:
2024-04-25 15:16:46 +02:00
40 changed files with 3908 additions and 1110 deletions

View File

@@ -1 +1,5 @@
{"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"}}
<<<<<<< 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

View File

@@ -1,5 +1,9 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/ML-Agents/Timers/City racesm_timers.json.meta
guid: ca66b14272dc63548acbee53df329532
========
guid: b02eb4a9869b93e4d9092991c9f89a8f
>>>>>>>> 3f8f7e0a3765a7af3156232c0fa677c9758ce5d8:Assets/ML-Agents/Timers/WinScreen_timers.json.meta
TextScriptImporter:
externalObjects: {}
userData:

View File

@@ -1 +1 @@
{"count":1,"self":368.38138879999997,"total":369.3048028,"children":{"InitializeActuators":{"count":2,"self":0.0010008,"total":0.0010008,"children":null},"InitializeSensors":{"count":2,"self":0.0026865,"total":0.0026865,"children":null},"AgentSendState":{"count":2034,"self":0.1027444,"total":0.14509229999999998,"children":{"CollectObservations":{"count":814,"self":0.0157754,"total":0.0157754,"children":null},"WriteActionMask":{"count":814,"self":0.0030396,"total":0.0030396,"children":null},"RequestDecision":{"count":814,"self":0.020547,"total":0.0235329,"children":{"RayPerceptionSensor.Perceive":{"count":814,"self":0.0029858999999999997,"total":0.0029858999999999997,"children":null}}}}},"DecideAction":{"count":2034,"self":0.6702108,"total":0.68242649999999994,"children":{"RayPerceptionSensor.Perceive":{"count":1628,"self":0.0122157,"total":0.0122157,"children":null}}},"AgentAct":{"count":2034,"self":0.0922156,"total":0.0922156,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713972613","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 68a8aa29-874c-491d-8190-81b339430499 -accessToken aIldjTK1Ru8qZVQIJYeN601l-WMihZl-qvWd4h4pikU005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Map selector","end_time_seconds":"1713972982"}}
{"count":1,"self":50.872592,"total":50.954067699999996,"children":{"InitializeActuators":{"count":1,"self":0.0010263,"total":0.0010263,"children":null},"InitializeSensors":{"count":1,"self":0.0015439,"total":0.0015439,"children":null},"AgentSendState":{"count":2204,"self":0.0344133,"total":0.038423599999999995,"children":{"CollectObservations":{"count":86,"self":0.0009994,"total":0.0009994,"children":null},"WriteActionMask":{"count":86,"self":0.0010086,"total":0.0010086,"children":null},"RequestDecision":{"count":86,"self":0.0010004,"total":0.0020023,"children":{"RayPerceptionSensor.Perceive":{"count":172,"self":0.0010019,"total":0.0010019,"children":null}}}}},"DecideAction":{"count":2204,"self":0.035701699999999996,"total":0.035701699999999996,"children":null},"AgentAct":{"count":2204,"self":0.0047789,"total":0.0047789,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714050106","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":"Map selector","end_time_seconds":"1714050157"}}

View File

@@ -1 +1,5 @@
{"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"}}
<<<<<<< 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

View File

@@ -0,0 +1 @@
{"count":1,"self":54.9860992,"total":55.0441065,"children":{"InitializeActuators":{"count":1,"self":0.0015849999999999998,"total":0.0015849999999999998,"children":null},"InitializeSensors":{"count":1,"self":0.0025266,"total":0.0025266,"children":null},"AgentSendState":{"count":783,"self":0.0224385,"total":0.033880799999999996,"children":{"CollectObservations":{"count":189,"self":7.53E-05,"total":7.53E-05,"children":null},"WriteActionMask":{"count":189,"self":0.0016967999999999998,"total":0.0016967999999999998,"children":null},"RequestDecision":{"count":189,"self":0.0066726,"total":0.0096702,"children":{"RayPerceptionSensor.Perceive":{"count":378,"self":0.0029976,"total":0.0029976,"children":null}}}}},"DecideAction":{"count":783,"self":0.0156998,"total":0.0156998,"children":null},"AgentAct":{"count":783,"self":0.004313,"total":0.004313,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714047932","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":"WinScreen","end_time_seconds":"1714047987"}}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/ML-Agents/Timers/City racesm_timers.json.meta
guid: ca66b14272dc63548acbee53df329532
========
guid: b02eb4a9869b93e4d9092991c9f89a8f
>>>>>>>> 3f8f7e0a3765a7af3156232c0fa677c9758ce5d8:Assets/ML-Agents/Timers/WinScreen_timers.json.meta
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1 +1 @@
{"count":1,"self":57.9887808,"total":58.107647899999996,"children":{"InitializeActuators":{"count":2,"self":0.0010314,"total":0.0010314,"children":null},"InitializeSensors":{"count":2,"self":0.0023714,"total":0.0023714,"children":null},"AgentSendState":{"count":212,"self":0.0090765,"total":0.0228877,"children":{"CollectObservations":{"count":86,"self":0.0015991999999999998,"total":0.0015991999999999998,"children":null},"WriteActionMask":{"count":86,"self":0,"total":0,"children":null},"RequestDecision":{"count":86,"self":0.012211999999999999,"total":0.012211999999999999,"children":{"RayPerceptionSensor.Perceive":{"count":86,"self":0,"total":0,"children":null}}}}},"DecideAction":{"count":212,"self":0.0874686,"total":0.0884751,"children":{"RayPerceptionSensor.Perceive":{"count":172,"self":0.0010065,"total":0.0010065,"children":null}}},"AgentAct":{"count":212,"self":0.0040986,"total":0.0040986,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713950271","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\\UnityStuf\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Magnus -hubSessionId 8870a2b5-eb85-482c-9f97-a69682ef9b2b -accessToken bzgvRbOYucyzh7SN49GEtq72W2SGxkT2it-FtzLbNHM005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"mini_racetrack3","end_time_seconds":"1713950329"}}
{"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"}}