merge fix

2024-04-04 14:41:21 +02:00
parent 1158472ee7 4f1315abec
commit 0b0779be7e
8 changed files with 329 additions and 82 deletions
--- a/Assets/Scenes/Racetrack.unity
+++ b/Assets/Scenes/Racetrack.unity
@@ -1642,11 +1642,6 @@ PrefabInstance:
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 3b4743a43e04ed145b531ab0f1ae828b, type: 3}
--- !u!4 &1293318021 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 5049018613629602103, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
-  m_PrefabInstance: {fileID: 98617657}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1298794172
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -1875,6 +1870,11 @@ PrefabInstance:
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
+--- !u!4 &1403837502 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5049018613629602103, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
+  m_PrefabInstance: {fileID: 98617657}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1443287320
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -2123,10 +2123,38 @@ PrefabInstance:
      propertyPath: m_LocalPosition.z
      value: -2.1784945
      objectReference: {fileID: 0}
+    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      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_LocalEulerAnglesHint.x
+      value: 25.641
+      objectReference: {fileID: 0}
+    - target: {fileID: 679652745285801860, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+      propertyPath: far clip plane
+      value: 500
+      objectReference: {fileID: 0}
+    - target: {fileID: 679652745285801860, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+      propertyPath: near clip plane
+      value: 0.3
+      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: CameraSide
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2100622393876020061, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+      propertyPath: ShoulderOffset.y
+      value: 2
+      objectReference: {fileID: 0}
    - target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalPosition.x
      value: -2.5158076
@@ -2170,11 +2198,11 @@ PrefabInstance:
    - target: {fileID: 8858152487650577344, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_Follow
      value: 
-      objectReference: {fileID: 1293318021}
+      objectReference: {fileID: 1403837502}
    - target: {fileID: 8858152487650577344, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LookAt
      value: 
-      objectReference: {fileID: 1293318021}
+      objectReference: {fileID: 1403837502}
    - target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalPosition.x
      value: 8.515808
@@ -2189,13 +2217,18 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.97507
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalRotation.x
-      value: 0.22189745
+      value: -0
      objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    - target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 10.641
+      objectReference: {fileID: 0}
+    m_RemovedComponents:
+    - {fileID: 7119497487385811357, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
    m_AddedComponents: []
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
@@ -38,7 +38,7 @@ RenderSettings:
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 705507994}
-  m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -123,11 +123,6 @@ NavMeshSettings:
    debug:
      m_Flags: 0
  m_NavMeshData: {fileID: 0}
--- !u!4 &614480971 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 5049018613629602103, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
-  m_PrefabInstance: {fileID: 4305065282094742130}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &705507993
 GameObject:
  m_ObjectHideFlags: 0
@@ -222,6 +217,38 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1 &1897464303 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4840733166066636179, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+  m_PrefabInstance: {fileID: 4212961364147142189}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1897464305
+MonoBehaviour:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1897464303}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_TrackedObjectOffset: {x: 0, y: 0, z: 0}
+  m_LookaheadTime: 0
+  m_LookaheadSmoothing: 0
+  m_LookaheadIgnoreY: 1
+  m_HorizontalDamping: 0.5
+  m_VerticalDamping: 0.5
+  m_ScreenX: 0.5
+  m_ScreenY: 0.5
+  m_DeadZoneWidth: 0
+  m_DeadZoneHeight: 0
+  m_SoftZoneWidth: 0.8
+  m_SoftZoneHeight: 0.8
+  m_BiasX: 0
+  m_BiasY: 0
+  m_CenterOnActivate: 1
 --- !u!1 &1915174277
 GameObject:
  m_ObjectHideFlags: 0
@@ -323,7 +350,7 @@ Transform:
  serializedVersion: 2
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 10, y: 1, z: 10}
+  m_LocalScale: {x: 100, y: 1, z: 100}
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
@@ -336,10 +363,50 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 0}
    m_Modifications:
+    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 2.5158076
+      objectReference: {fileID: 0}
+    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.22949076
+      objectReference: {fileID: 0}
+    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -3.0588093
+      objectReference: {fileID: 0}
+    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.99439913
+      objectReference: {fileID: 0}
+    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.10569032
+      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: 679652745285801860, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+      propertyPath: field of view
+      value: 60
+      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: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 2100622393876020061, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+      propertyPath: ShoulderOffset.z
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalPosition.x
      value: -2.5158076
@@ -383,17 +450,53 @@ PrefabInstance:
    - target: {fileID: 8858152487650577344, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_Follow
      value: 
-      objectReference: {fileID: 614480971}
+      objectReference: {fileID: 9056490074252112709}
    - target: {fileID: 8858152487650577344, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LookAt
      value: 
-      objectReference: {fileID: 614480971}
-    m_RemovedComponents: []
+      objectReference: {fileID: 9056490074252112709}
+    - target: {fileID: 8858152487650577344, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+      propertyPath: m_Lens.FieldOfView
+      value: 60
+      objectReference: {fileID: 0}
+    - target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 2.5158076
+      objectReference: {fileID: 0}
+    - target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.22949076
+      objectReference: {fileID: 0}
+    - target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -3.0588093
+      objectReference: {fileID: 0}
+    - target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.99439913
+      objectReference: {fileID: 0}
+    - target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.10569032
+      objectReference: {fileID: 0}
+    - target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    m_RemovedComponents:
+    - {fileID: 7119497487385811357, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 4840733166066636179, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1897464305}
  m_SourcePrefab: {fileID: 100100000, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
--- !u!1001 &4305065282094742130
+--- !u!1001 &5532270393676571022
 PrefabInstance:
  m_ObjectHideFlags: 0
  serializedVersion: 2
@@ -401,92 +504,65 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 0}
    m_Modifications:
-    - target: {fileID: 1959449010828185711, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -2.4905412
-      objectReference: {fileID: 0}
-    - target: {fileID: 1959449010828185711, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 3.9198024
-      objectReference: {fileID: 0}
-    - target: {fileID: 1959449010828185711, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -13.815386
-      objectReference: {fileID: 0}
-    - target: {fileID: 1959449010828185711, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: -0.9852688
-      objectReference: {fileID: 0}
-    - target: {fileID: 1959449010828185711, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0.17096418
-      objectReference: {fileID: 0}
-    - target: {fileID: 1959449010828185711, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0.004030049
-      objectReference: {fileID: 0}
-    - target: {fileID: 1959449010828185711, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.0006944585
-      objectReference: {fileID: 0}
-    - target: {fileID: 4258781391370674817, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
-      propertyPath: m_Name
-      value: Car
-      objectReference: {fileID: 0}
-    - target: {fileID: 5049018613629602103, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
+    - target: {fileID: 1898089692201353361, guid: e3976318bf4730e4583a4e03a5b2ce04, type: 3}
      propertyPath: m_LocalPosition.x
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 5049018613629602103, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
+    - target: {fileID: 1898089692201353361, guid: e3976318bf4730e4583a4e03a5b2ce04, type: 3}
      propertyPath: m_LocalPosition.y
-      value: 0.55
+      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 5049018613629602103, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
+    - target: {fileID: 1898089692201353361, guid: e3976318bf4730e4583a4e03a5b2ce04, type: 3}
      propertyPath: m_LocalPosition.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 5049018613629602103, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
+    - target: {fileID: 1898089692201353361, guid: e3976318bf4730e4583a4e03a5b2ce04, type: 3}
      propertyPath: m_LocalRotation.w
      value: 1
      objectReference: {fileID: 0}
-    - target: {fileID: 5049018613629602103, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
+    - target: {fileID: 1898089692201353361, guid: e3976318bf4730e4583a4e03a5b2ce04, type: 3}
      propertyPath: m_LocalRotation.x
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 5049018613629602103, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
+    - target: {fileID: 1898089692201353361, guid: e3976318bf4730e4583a4e03a5b2ce04, type: 3}
      propertyPath: m_LocalRotation.y
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 5049018613629602103, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
+    - target: {fileID: 1898089692201353361, guid: e3976318bf4730e4583a4e03a5b2ce04, type: 3}
      propertyPath: m_LocalRotation.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 5049018613629602103, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
+    - target: {fileID: 1898089692201353361, guid: e3976318bf4730e4583a4e03a5b2ce04, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 5049018613629602103, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
+    - target: {fileID: 1898089692201353361, guid: e3976318bf4730e4583a4e03a5b2ce04, type: 3}
      propertyPath: m_LocalEulerAnglesHint.y
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 5049018613629602103, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
+    - target: {fileID: 1898089692201353361, guid: e3976318bf4730e4583a4e03a5b2ce04, type: 3}
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6277473666848002999, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
-      propertyPath: field of view
-      value: 60.000004
+    - target: {fileID: 4811018499574817333, guid: e3976318bf4730e4583a4e03a5b2ce04, type: 3}
+      propertyPath: m_Name
+      value: Car
      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
+  m_SourcePrefab: {fileID: 100100000, guid: e3976318bf4730e4583a4e03a5b2ce04, type: 3}
+--- !u!4 &9056490074252112709 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 1898089692201353361, guid: e3976318bf4730e4583a4e03a5b2ce04, type: 3}
+  m_PrefabInstance: {fileID: 5532270393676571022}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
  m_ObjectHideFlags: 0
  m_Roots:
  - {fileID: 705507995}
  - {fileID: 1915174281}
-  - {fileID: 4305065282094742130}
+  - {fileID: 5532270393676571022}
  - {fileID: 4212961364147142189}