Ciakon/racesm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge fix

Browse Source
This commit is contained in:
PokingPines
2024-04-04 14:41:21 +02:00
parent 1158472ee7 4f1315abec
commit 0b0779be7e
8 changed files with 329 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
Assets/Scenes/Racetrack.unity
View File

@@ -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: []