Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts: # Assets/Scenes/Racetrack.unity
This commit is contained in:
PokingPines
@@ -38,7 +38,7 @@ RenderSettings:
|
||||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1}
|
||||
m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
@@ -123,6 +123,63 @@ NavMeshSettings:
|
||||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!1001 &98617657
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4258781391370674817, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Car
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5049018613629602103, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 3.5477915
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5049018613629602103, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.54985416
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5049018613629602103, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -4.119685
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5049018613629602103, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5049018613629602103, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5049018613629602103, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5049018613629602103, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5049018613629602103, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5049018613629602103, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5049018613629602103, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
|
||||
--- !u!1001 &194664592
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -966,7 +1023,12 @@ PrefabInstance:
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 8e14ccd68551a1a4e93b83808515b996, 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
|
||||
@@ -1208,6 +1270,7 @@ PrefabInstance:
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
|
||||
--- !u!1001 &1493608039
|
||||
--- !u!1001 &1574695326
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
@@ -1215,120 +1278,95 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1622683419232670430, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
propertyPath: m_Mesh
|
||||
value:
|
||||
objectReference: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
|
||||
- target: {fileID: 5367141817907778726, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 210
|
||||
value: 6.063599
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5367141817907778726, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
value: 1.029345
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5367141817907778726, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 30
|
||||
value: -2.1784945
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5367141817907778726, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
- 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
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 1.9205093
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -6.9411907
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5367141817907778726, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5367141817907778726, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5367141817907778726, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5367141817907778726, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5367141817907778726, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5367141817907778726, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7180102031080833685, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
propertyPath: m_Materials.Array.data[0]
|
||||
- target: {fileID: 8858152487650577344, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_Follow
|
||||
value:
|
||||
objectReference: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
|
||||
- target: {fileID: 8114775389002431459, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: turned_track (8)
|
||||
objectReference: {fileID: 1293318021}
|
||||
- target: {fileID: 8858152487650577344, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LookAt
|
||||
value:
|
||||
objectReference: {fileID: 1293318021}
|
||||
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 6.063599
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 1.029345
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -2.1784945
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.97507
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.22189745
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
--- !u!1001 &1495764401
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 5367141817907778726, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5367141817907778726, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5367141817907778726, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 60
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5367141817907778726, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5367141817907778726, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5367141817907778726, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5367141817907778726, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5367141817907778726, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5367141817907778726, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 180
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5367141817907778726, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8114775389002431459, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: turned_track (7)
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: d0e27a4db754196488288aa844929395, type: 3}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
--- !u!1001 &1651506146
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1994,6 +2032,7 @@ SceneRoots:
|
||||
m_ObjectHideFlags: 0
|
||||
m_Roots:
|
||||
- {fileID: 1051678512}
|
||||
- {fileID: 1574695326}
|
||||
- {fileID: 1651506146}
|
||||
- {fileID: 7517042300667838150}
|
||||
- {fileID: 1298794172}
|
||||
@@ -2024,3 +2063,4 @@ SceneRoots:
|
||||
- {fileID: 1236122104}
|
||||
- {fileID: 1493608039}
|
||||
- {fileID: 1495764401}
|
||||
- {fileID: 98617657}
|
||||
|
||||
Reference in New Issue
Block a user