Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts: # Assets/Scenes/Racetrack mini.unity
This commit is contained in:
@@ -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:
|
||||
@@ -2123,7 +2123,7 @@ PrefabInstance:
|
||||
m_Modifications:
|
||||
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 37.1
|
||||
value: 61.00025
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
@@ -2439,7 +2439,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: 0.15, y: 0.25, z: 0.25}
|
||||
m_LocalScale: {x: 0.25, y: 0.25, z: 0.25}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 257768024}
|
||||
@@ -2523,7 +2523,7 @@ PrefabInstance:
|
||||
m_Modifications:
|
||||
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 39.51581
|
||||
value: 63.51606
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
@@ -2639,7 +2639,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 453987798}
|
||||
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 39.51581
|
||||
value: 63.51606
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
@@ -3056,7 +3056,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: 0.15, y: 0.25, z: 0.25}
|
||||
m_LocalScale: {x: 0.25, y: 0.25, z: 0.25}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 19977953}
|
||||
|
||||
Reference in New Issue
Block a user