Merge branch 'master' of ooftooft.net:Racesm

2024-04-24 10:12:01 +02:00
parent 6db70114b0 f694fd6945
commit 6eb1fdb699
5 changed files with 3324 additions and 52 deletions
--- a/Assets/Prefabs/Tracks/Racetrack3.prefab
+++ b/Assets/Prefabs/Tracks/Racetrack3.prefab
--- a/Assets/Prefabs/Tracks/racetrack_4.prefab
+++ b/Assets/Prefabs/Tracks/racetrack_4.prefab
--- a/Assets/Prefabs/Tracks/racetrack_4.prefab.meta
+++ b/Assets/Prefabs/Tracks/racetrack_4.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8358fa575ee4f2e44946d6172e10c6d5
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/Racetrack.unity
+++ b/Assets/Scenes/Racetrack.unity
@@ -38,7 +38,7 @@ RenderSettings:
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1}
  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -284,31 +284,31 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 0}
    m_Modifications:
-    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
      propertyPath: m_LocalPosition.x
      value: -64.985565
      objectReference: {fileID: 0}
-    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
      propertyPath: m_LocalPosition.y
      value: -3.0205092
      objectReference: {fileID: 0}
-    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
      propertyPath: m_LocalPosition.z
      value: 7.5995665
      objectReference: {fileID: 0}
-    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
      propertyPath: m_LocalRotation.w
      value: 0.7900051
      objectReference: {fileID: 0}
-    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
      propertyPath: m_LocalRotation.x
      value: 0.1695625
      objectReference: {fileID: 0}
-    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
      propertyPath: m_LocalRotation.y
      value: 0.5760666
      objectReference: {fileID: 0}
-    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
      propertyPath: m_LocalRotation.z
      value: -0.12364388
      objectReference: {fileID: 0}
@@ -316,7 +316,7 @@ PrefabInstance:
      propertyPath: field of view
      value: 60.000004
      objectReference: {fileID: 0}
-    - target: {fileID: 1387890555408215438, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+    - target: {fileID: 5442577508303945574, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
      propertyPath: m_Name
      value: Camera
      objectReference: {fileID: 0}
@@ -400,7 +400,7 @@ PrefabInstance:
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+  m_SourcePrefab: {fileID: 100100000, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
 --- !u!1 &1032240013
 GameObject:
  m_ObjectHideFlags: 0
@@ -1023,6 +1023,63 @@ PrefabInstance:
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3}
+--- !u!1001 &4833200516469304011
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 473786254074528415, guid: 8358fa575ee4f2e44946d6172e10c6d5, type: 3}
+      propertyPath: m_Name
+      value: racetrack_4
+      objectReference: {fileID: 0}
+    - target: {fileID: 2992483127055826181, guid: 8358fa575ee4f2e44946d6172e10c6d5, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -120
+      objectReference: {fileID: 0}
+    - target: {fileID: 2992483127055826181, guid: 8358fa575ee4f2e44946d6172e10c6d5, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2992483127055826181, guid: 8358fa575ee4f2e44946d6172e10c6d5, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2992483127055826181, guid: 8358fa575ee4f2e44946d6172e10c6d5, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2992483127055826181, guid: 8358fa575ee4f2e44946d6172e10c6d5, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2992483127055826181, guid: 8358fa575ee4f2e44946d6172e10c6d5, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2992483127055826181, guid: 8358fa575ee4f2e44946d6172e10c6d5, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2992483127055826181, guid: 8358fa575ee4f2e44946d6172e10c6d5, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2992483127055826181, guid: 8358fa575ee4f2e44946d6172e10c6d5, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2992483127055826181, guid: 8358fa575ee4f2e44946d6172e10c6d5, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8358fa575ee4f2e44946d6172e10c6d5, type: 3}
 --- !u!1001 &7921848799276681536
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -1175,3 +1232,4 @@ SceneRoots:
  - {fileID: 437868554}
  - {fileID: 467812079}
  - {fileID: 1239887511}
+  - {fileID: 4833200516469304011}
--- a/Assets/Scenes/mini_racetrack3.unity
+++ b/Assets/Scenes/mini_racetrack3.unity
@@ -38,7 +38,7 @@ RenderSettings:
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.29684302, g: 0.6337671, b: 0.9937157, a: 1}
+  m_IndirectSpecularColor: {r: 0.29684305, g: 0.63376737, b: 0.9937157, a: 1}
  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -375,46 +375,6 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 0}
    m_Modifications:
-    - target: {fileID: 1742803291406415280, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
-      propertyPath: Loader
-      value: 
-      objectReference: {fileID: 776505354}
-    - target: {fileID: 1742803291406415280, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
-      propertyPath: TargetCar
-      value: 
-      objectReference: {fileID: 1852564513}
-    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0.8158076
-      objectReference: {fileID: 0}
-    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -1.1205094
-      objectReference: {fileID: 0}
-    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 63.561188
-      objectReference: {fileID: 0}
-    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.97014254
-      objectReference: {fileID: 0}
-    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0.24253564
-      objectReference: {fileID: 0}
-    - target: {fileID: 5442577508303945574, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
-      propertyPath: m_Name
-      value: Camera
-      objectReference: {fileID: 0}
    - target: {fileID: 679652745285801860, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: field of view
      value: 60.000004
@@ -495,6 +455,46 @@ PrefabInstance:
      propertyPath: m_LocalRotation.z
      value: -0.24253564
      objectReference: {fileID: 0}
+    - target: {fileID: 1742803291406415280, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
+      propertyPath: Loader
+      value: 
+      objectReference: {fileID: 776505354}
+    - target: {fileID: 1742803291406415280, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
+      propertyPath: TargetCar
+      value: 
+      objectReference: {fileID: 1852564513}
+    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.8158076
+      objectReference: {fileID: 0}
+    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1.1205094
+      objectReference: {fileID: 0}
+    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 63.561188
+      objectReference: {fileID: 0}
+    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.97014254
+      objectReference: {fileID: 0}
+    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.24253564
+      objectReference: {fileID: 0}
+    - target: {fileID: 5442577508303945574, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
+      propertyPath: m_Name
+      value: Camera
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@@ -15974,7 +15974,7 @@ Transform:
  m_GameObject: {fileID: 1852564513}
  serializedVersion: 2
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0.561, y: 0, z: 1.304}
+  m_LocalPosition: {x: 0.561, y: 0.1, z: 1.304}
  m_LocalScale: {x: 0.25, y: 0.25, z: 0.25}
  m_ConstrainProportionsScale: 0
  m_Children: