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

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