Merge branch 'master' of git@ooftooft.net:Racesm.git

# Conflicts:
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json

Assets/ML-Agents/Timers/Car Customization_timers.json

@@ -1 +1 @@
-{"count":1,"self":44.298704,"total":44.491450799999996,"children":{"InitializeActuators":{"count":2,"self":0.0010002,"total":0.0010002,"children":null},"InitializeSensors":{"count":2,"self":0.0020448,"total":0.0020448,"children":null},"AgentSendState":{"count":1590,"self":0.1070018,"total":0.1571918,"children":{"CollectObservations":{"count":920,"self":0.035919599999999996,"total":0.035919599999999996,"children":null},"WriteActionMask":{"count":594,"self":0.0020415999999999998,"total":0.0020415999999999998,"children":null},"RequestDecision":{"count":594,"self":0.007285,"total":0.0122288,"children":{"RayPerceptionSensor.Perceive":{"count":1188,"self":0.0049438,"total":0.0049438,"children":null}}}}},"DecideAction":{"count":1264,"self":0.0220853,"total":0.0220853,"children":null},"AgentAct":{"count":1264,"self":0.0104246,"total":0.0104246,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714039554","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":"Car Customization","end_time_seconds":"1714039599"}}
+{"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"}}

Assets/ML-Agents/Timers/Map selector_timers.json

@@ -1 +1 @@
-{"count":1,"self":50.186048,"total":50.726340099999994,"children":{"InitializeActuators":{"count":1,"self":0.0015099,"total":0.0015099,"children":null},"InitializeSensors":{"count":1,"self":0.0035129999999999996,"total":0.0035129999999999996,"children":null},"AgentSendState":{"count":2236,"self":0.3053915,"total":0.5352697,"children":{"CollectObservations":{"count":2236,"self":0.22987819999999998,"total":0.22987819999999998,"children":null}}}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714038869","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":"Map selector","end_time_seconds":"1714038919"}}
+{"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"}}

Assets/ML-Agents/Timers/Racetrack mini_timers.json

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

Assets/ML-Agents/Timers/WinScreen_timers.json

@@ -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"}}

Assets/ML-Agents/Timers/WinScreen_timers.json.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: f58d25b9e504a4f41ab4a71cf87c1845
+guid: b02eb4a9869b93e4d9092991c9f89a8f
-DefaultImporter:
+TextScriptImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

Assets/Scenes/WinScreen.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 58f7e79a87c79824597746e8c1bfe400
+guid: f7320b9acc0c07041a21a406416a5928
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Scripts/BackToStart.cs

@@ -0,0 +1,17 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+public class BackToStart : MonoBehaviour
+{
+    public void returnToStart()
+    {
+        Destroy(GameObject.Find("Car Data"));
+        Destroy(GameObject.Find("SkyboxManager"));
+        Destroy(GameObject.Find("GameManager"));
+        SceneManager.LoadScene(0);
+        
+        
+    }
+}

Assets/Scripts/BackToStart.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3e3f507f50d340f468852b068fedb6fb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Car Customization/Garage.cs

@@ -71,7 +71,7 @@ public class Garage : MonoBehaviour
 
     void startGame()
     {
-        SceneManager.LoadScene("Map selector");
+        SceneManager.LoadScene(1);
         carData.GetComponent<CarData>().carType = CurrentCar.name;
         carData.GetComponent<CarData>().carColor = currentColor;
     }

Assets/Scripts/TestScripts.cs

@@ -0,0 +1,12 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+public class TestScripts : MonoBehaviour
+{
+    public void Start()
+    {
+        SceneManager.LoadScene(4);
+    }
+}

Assets/Scripts/TestScripts.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6353d73605631bb4ba84158bbcdec189
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/map selector script/Map Selector Script.cs

@@ -7,11 +7,11 @@ public class MapSelectorScript : MonoBehaviour
 {
     public int scene;
     public void change_to_track2(){
-        scene = 1;
+        scene = 2;
     }
 
     public void change_to_track3(){
-        scene = 2;
+        scene = 3;
     }
 
     public void selectMap(){

Assets/Scripts/map selector script/TimeOfDay.cs

@@ -6,7 +6,7 @@ using TMPro;
 
 public class TimeOfDay : MonoBehaviour
 {
-    public string skyboxMaterial;
+    public string skyboxMaterial = "not selected";
 
     public static TimeOfDay Instance;
     public TextMeshProUGUI MainText;

ProjectSettings/EditorBuildSettings.asset

@@ -5,16 +5,19 @@ EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
-  - enabled: 0
+  - enabled: 1
     path: Assets/Scenes/Car Customization.unity
     guid: 46fb4d69ffddef24abd332313bb5f4d8
-  - enabled: 0
+  - enabled: 1
     path: Assets/Scenes/Map selector.unity
     guid: 3bfd8ede691814e41941f96acfa07d03
-  - enabled: 0
+  - enabled: 1
     path: Assets/Scenes/Racetrack mini.unity
     guid: 9b5f77be9dfb7c14cba3af351597ec83
-  - enabled: 0
+  - enabled: 1
     path: Assets/Scenes/mini_racetrack3.unity
     guid: 2d4634271c08833499c8478f17c7a330
+  - enabled: 1
+    path: Assets/Scenes/WinScreen.unity
+    guid: f7320b9acc0c07041a21a406416a5928
   m_configObjects: {}