Commit c6ff4415 authored by Markus Schlösser's avatar Markus Schlösser

Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GDW-SS-18/unity/to-the-surface

parents 4d8ae750 692d3796
......@@ -178,7 +178,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 4383029025640084, guid: 643858c7b38da3e42aec11e5bd268411, type: 2}
propertyPath: m_RootOrder
value: 7
value: 6
objectReference: {fileID: 0}
- target: {fileID: 114953758882948998, guid: 643858c7b38da3e42aec11e5bd268411,
type: 2}
......@@ -322,11 +322,67 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 4738578539073676, guid: 5049e6f02b2ad03449fa1f069764a1ab, type: 2}
propertyPath: m_RootOrder
value: 3
value: 2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5049e6f02b2ad03449fa1f069764a1ab, type: 2}
m_IsPrefabAsset: 0
--- !u!1001 &344446350
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4985997612340110, guid: 9c07364efcb415146945e77d21a3d85e, type: 2}
propertyPath: m_LocalPosition.x
value: -19
objectReference: {fileID: 0}
- target: {fileID: 4985997612340110, guid: 9c07364efcb415146945e77d21a3d85e, type: 2}
propertyPath: m_LocalPosition.y
value: -4
objectReference: {fileID: 0}
- target: {fileID: 4985997612340110, guid: 9c07364efcb415146945e77d21a3d85e, type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4985997612340110, guid: 9c07364efcb415146945e77d21a3d85e, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4985997612340110, guid: 9c07364efcb415146945e77d21a3d85e, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4985997612340110, guid: 9c07364efcb415146945e77d21a3d85e, type: 2}
propertyPath: m_LocalRotation.z
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 4985997612340110, guid: 9c07364efcb415146945e77d21a3d85e, type: 2}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 4985997612340110, guid: 9c07364efcb415146945e77d21a3d85e, type: 2}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4985997612340110, guid: 9c07364efcb415146945e77d21a3d85e, type: 2}
propertyPath: m_LocalEulerAnglesHint.z
value: 90
objectReference: {fileID: 0}
- target: {fileID: 114448520176699186, guid: 9c07364efcb415146945e77d21a3d85e,
type: 2}
propertyPath: onDuration
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114448520176699186, guid: 9c07364efcb415146945e77d21a3d85e,
type: 2}
propertyPath: offDuration
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9c07364efcb415146945e77d21a3d85e, type: 2}
m_IsPrefabAsset: 0
--- !u!1001 &433565243
Prefab:
m_ObjectHideFlags: 0
......@@ -384,7 +440,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 4903554568936386, guid: 175e157ee0d02404c8605c8ae4f8a2d0, type: 2}
propertyPath: m_RootOrder
value: 6
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8195094282778294420, guid: 175e157ee0d02404c8605c8ae4f8a2d0,
type: 2}
......@@ -7799,7 +7855,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 4720128643836508, guid: c8cf1c8d84ea8e34f97fdccc7a610e08, type: 2}
propertyPath: m_RootOrder
value: 5
value: 4
objectReference: {fileID: 0}
- target: {fileID: 1234457352278208, guid: c8cf1c8d84ea8e34f97fdccc7a610e08, type: 2}
propertyPath: m_Name
......@@ -19959,52 +20015,6 @@ Prefab:
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c8cf1c8d84ea8e34f97fdccc7a610e08, type: 2}
m_IsPrefabAsset: 0
--- !u!1001 &1059264578
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4145981147311642, guid: 46cd98e9487c65a4eb58290806b0e696, type: 2}
propertyPath: m_LocalPosition.x
value: -19
objectReference: {fileID: 0}
- target: {fileID: 4145981147311642, guid: 46cd98e9487c65a4eb58290806b0e696, type: 2}
propertyPath: m_LocalPosition.y
value: -4
objectReference: {fileID: 0}
- target: {fileID: 4145981147311642, guid: 46cd98e9487c65a4eb58290806b0e696, type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4145981147311642, guid: 46cd98e9487c65a4eb58290806b0e696, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4145981147311642, guid: 46cd98e9487c65a4eb58290806b0e696, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4145981147311642, guid: 46cd98e9487c65a4eb58290806b0e696, type: 2}
propertyPath: m_LocalRotation.z
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 4145981147311642, guid: 46cd98e9487c65a4eb58290806b0e696, type: 2}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 4145981147311642, guid: 46cd98e9487c65a4eb58290806b0e696, type: 2}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4145981147311642, guid: 46cd98e9487c65a4eb58290806b0e696, type: 2}
propertyPath: m_LocalEulerAnglesHint.z
value: 90
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 46cd98e9487c65a4eb58290806b0e696, type: 2}
m_IsPrefabAsset: 0
--- !u!1001 &1111482158
Prefab:
m_ObjectHideFlags: 0
......@@ -20181,7 +20191,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 4913280303060386, guid: ded4b6169e62c9a44beabdd4c7447262, type: 2}
propertyPath: m_RootOrder
value: 8
value: 7
objectReference: {fileID: 0}
- target: {fileID: 1665917632395270, guid: ded4b6169e62c9a44beabdd4c7447262, type: 2}
propertyPath: m_Name
......@@ -20232,7 +20242,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 4913280303060386, guid: ded4b6169e62c9a44beabdd4c7447262, type: 2}
propertyPath: m_RootOrder
value: 11
value: 10
objectReference: {fileID: 0}
- target: {fileID: 1665917632395270, guid: ded4b6169e62c9a44beabdd4c7447262, type: 2}
propertyPath: m_Name
......@@ -20352,7 +20362,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 4913280303060386, guid: ded4b6169e62c9a44beabdd4c7447262, type: 2}
propertyPath: m_RootOrder
value: 13
value: 12
objectReference: {fileID: 0}
- target: {fileID: 1665917632395270, guid: ded4b6169e62c9a44beabdd4c7447262, type: 2}
propertyPath: m_Name
......@@ -20476,7 +20486,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 4979966340574982, guid: 8423f8de9823deb4b8e438ad4f85f721, type: 2}
propertyPath: m_RootOrder
value: 4
value: 3
objectReference: {fileID: 0}
- target: {fileID: 114577748845638106, guid: 8423f8de9823deb4b8e438ad4f85f721,
type: 2}
......@@ -20533,7 +20543,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 4398632234699092, guid: 2900943b51305b14f9775fce7e170064, type: 2}
propertyPath: m_RootOrder
value: 2
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2900943b51305b14f9775fce7e170064, type: 2}
......
......@@ -7856,7 +7856,7 @@ Prefab:
- target: {fileID: 114364974979223006, guid: ac8335930a4ce4f42bdd925048408184,
type: 2}
propertyPath: fireDelay
value: 2
value: 3.5
objectReference: {fileID: 0}
- target: {fileID: 114364974979223006, guid: ac8335930a4ce4f42bdd925048408184,
type: 2}
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment