Merge branch 'master' of ooftooft.net:Racesm

# Conflicts: # Assets/Prefabs/City Pieces/circular_tall_building.prefab.meta # Assets/Prefabs/City Pieces/circular_tall_building_2.prefab.meta
2024-04-24 07:13:29 +02:00
parent 65c678e706 e7ae74b9c4
commit f18bad9413
33 changed files with 24423 additions and 2549 deletions
--- a/Assets/Scenes/City
+++ b/Assets/Scenes/City
@@ -131,38 +131,6 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 0}
    m_Modifications:
-    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -0.73695564
-      objectReference: {fileID: 0}
-    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -5.1185045
-      objectReference: {fileID: 0}
-    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -20.950691
-      objectReference: {fileID: 0}
-    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.973249
-      objectReference: {fileID: 0}
-    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0.22975294
-      objectReference: {fileID: 0}
-    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
    - target: {fileID: 679652745285801860, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_Enabled
      value: 1
@@ -171,10 +139,6 @@ PrefabInstance:
      propertyPath: field of view
      value: 60.000004
      objectReference: {fileID: 0}
-    - target: {fileID: 1387890555408215438, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
-      propertyPath: m_Name
-      value: Camera
-      objectReference: {fileID: 0}
    - target: {fileID: 2100622393876020061, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: CameraDistance
      value: 6
@@ -259,11 +223,47 @@ PrefabInstance:
      propertyPath: m_LocalRotation.z
      value: -0
      objectReference: {fileID: 0}
+    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.73695564
+      objectReference: {fileID: 0}
+    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -5.1185045
+      objectReference: {fileID: 0}
+    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -20.950691
+      objectReference: {fileID: 0}
+    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.973249
+      objectReference: {fileID: 0}
+    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.22975294
+      objectReference: {fileID: 0}
+    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5442577508303945574, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
+      propertyPath: m_Name
+      value: Camera
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+  m_SourcePrefab: {fileID: 100100000, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
 --- !u!1001 &5271093100053076446
 PrefabInstance:
  m_ObjectHideFlags: 0
--- 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.29684296, g: 0.6337676, 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:
@@ -225,42 +225,10 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 0}
    m_Modifications:
-    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0.8158076
-      objectReference: {fileID: 0}
-    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -1.1205094
-      objectReference: {fileID: 0}
-    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 63.561188
-      objectReference: {fileID: 0}
-    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.97014254
-      objectReference: {fileID: 0}
-    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0.24253564
-      objectReference: {fileID: 0}
    - target: {fileID: 679652745285801860, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: field of view
      value: 60.000004
      objectReference: {fileID: 0}
-    - target: {fileID: 1387890555408215438, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
-      propertyPath: m_Name
-      value: Camera
-      objectReference: {fileID: 0}
    - target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalPosition.x
      value: -2.5158076
@@ -337,11 +305,51 @@ 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: 776505354}
+    - 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: []
    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+  m_SourcePrefab: {fileID: 100100000, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
 --- !u!1001 &530169025
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -416,6 +424,11 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 479420, guid: 8e6be04d8370d1c4fa754d22592984f1, type: 3}
  m_PrefabInstance: {fileID: 530169025}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &776505354 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5711380006811689493, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+  m_PrefabInstance: {fileID: 923696410}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &868865095
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -718,7 +731,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 2161611741186629825, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
      propertyPath: m_LocalPosition.z
-      value: 0
+      value: 97
      objectReference: {fileID: 0}
    - target: {fileID: 2161611741186629825, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
      propertyPath: m_LocalRotation.w