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
2024-04-25 15:16:46 +02:00
parent 6d4ee04d60 3f8f7e0a37
commit 1aa075773f
40 changed files with 3908 additions and 1110 deletions
--- a/Assets/Prefabs/Cars/Cars
+++ b/Assets/Prefabs/Cars/Cars
@@ -1,6 +1,11 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Prefabs/Cars/Cars LLLLL.prefab.meta
 guid: bf357d804290737469459ec8ffeb6c7d
 PrefabImporter:
+========
+guid: f7320b9acc0c07041a21a406416a5928
+DefaultImporter:
+>>>>>>>> 3f8f7e0a3765a7af3156232c0fa677c9758ce5d8:Assets/Scenes/WinScreen.unity.meta
  externalObjects: {}
  userData: 
  assetBundleName: 
--- a/Assets/Prefabs/Cars/RaceCar.prefab
+++ b/Assets/Prefabs/Cars/RaceCar.prefab
@@ -400,7 +400,7 @@ GameObject:
  - component: {fileID: 1459545008135898659}
  - component: {fileID: 4029776548783016511}
  m_Layer: 0
-  m_Name: RaceCar
+  m_Name: Racecar
  m_TagString: Player
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
--- a/Assets/Prefabs/Tracks/Racetrack3.prefab
+++ b/Assets/Prefabs/Tracks/Racetrack3.prefab
@@ -478,6 +478,52 @@ Transform:
  - {fileID: 7281725579112279301}
  m_Father: {fileID: 8440853621307243318}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &7688166367366294230
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3222507829086583714}
+  - component: {fileID: 7106641318900524479}
+  m_Layer: 0
+  m_Name: SkyboxLoader
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3222507829086583714
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7688166367366294230}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8440853621307243318}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &7106641318900524479
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7688166367366294230}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 56ccdf5df0a83eb4091e7eeb634e5d5a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  skyboxDay: {fileID: 2100000, guid: 86301280b87f5bb4bbf7633b535e2fc0, type: 2}
+  skyboxNight: {fileID: 2100000, guid: 1c8ac9deb3459a4448cc882add76b675, type: 2}
 --- !u!1 &7708173528503215869
 GameObject:
  m_ObjectHideFlags: 0
@@ -597,6 +643,7 @@ Transform:
  - {fileID: 2572699368672332911}
  - {fileID: 9053630949307204883}
  - {fileID: 1302603537520559881}
+  - {fileID: 3222507829086583714}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &13224934022731104
--- a/Assets/Prefabs/Tracks/racetrack1.prefab
+++ b/Assets/Prefabs/Tracks/racetrack1.prefab
@@ -35,6 +35,52 @@ Transform:
  - {fileID: 8987086998349677766}
  m_Father: {fileID: 253009768242110962}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &3735274376836254210
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2208510029805912171}
+  - component: {fileID: 4669520680851688400}
+  m_Layer: 0
+  m_Name: SkyboxLoader
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2208510029805912171
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3735274376836254210}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 253009768242110962}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4669520680851688400
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3735274376836254210}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 56ccdf5df0a83eb4091e7eeb634e5d5a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  skyboxDay: {fileID: 2100000, guid: 86301280b87f5bb4bbf7633b535e2fc0, type: 2}
+  skyboxNight: {fileID: 2100000, guid: 1c8ac9deb3459a4448cc882add76b675, type: 2}
 --- !u!1 &4620690873510956438
 GameObject:
  m_ObjectHideFlags: 0
@@ -107,6 +153,7 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
+  - {fileID: 2208510029805912171}
  - {fileID: 2444740508382612148}
  - {fileID: 1522313409382438026}
  m_Father: {fileID: 0}
--- a/Assets/Prefabs/Tracks/racetrack2.prefab
+++ b/Assets/Prefabs/Tracks/racetrack2.prefab
@@ -259,6 +259,52 @@ Transform:
  - {fileID: 4032044262844639312}
  m_Father: {fileID: 2931873659120596923}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &4430388929851039885
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 641138911149416759}
+  - component: {fileID: 4043771586756452115}
+  m_Layer: 0
+  m_Name: SkyboxLoader
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &641138911149416759
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4430388929851039885}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 4, y: 4, z: 4}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1828470746108631247}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4043771586756452115
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4430388929851039885}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 56ccdf5df0a83eb4091e7eeb634e5d5a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  skyboxDay: {fileID: 2100000, guid: 86301280b87f5bb4bbf7633b535e2fc0, type: 2}
+  skyboxNight: {fileID: 2100000, guid: 1c8ac9deb3459a4448cc882add76b675, type: 2}
 --- !u!1 &6222662985324615828
 GameObject:
  m_ObjectHideFlags: 0
@@ -550,6 +596,7 @@ Transform:
  m_LocalScale: {x: 0.25, y: 0.25, z: 0.25}
  m_ConstrainProportionsScale: 0
  m_Children:
+  - {fileID: 641138911149416759}
  - {fileID: 7081213788216054539}
  - {fileID: 5608896868433561930}
  - {fileID: 2931873659120596923}