Commit 0aa6a1bd authored by Simon Hetzer's avatar Simon Hetzer
Browse files

Preparing for merge to master

parent 298f8b53
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8552731182464753327
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8552731182464753326}
- component: {fileID: 8552731182464753324}
m_Layer: 9
m_Name: Ground
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8552731182464753326
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8552731182464753327}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -1.78, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &8552731182464753324
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8552731182464753327}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 6.922245, y: 0.69124794, z: 6.0839972}
m_Center: {x: 0.24519205, y: 0, z: -0.19529128}
fileFormatVersion: 2
guid: 539e6bd2530e17b46b20b27b9b55005d
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -341,6 +341,80 @@ Transform:
m_Father: {fileID: 1941459057602179300}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 260.486, y: -270, z: 90}
--- !u!1 &446759354
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 446759357}
- component: {fileID: 446759356}
- component: {fileID: 446759355}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &446759355
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 446759354}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3}
m_Name:
m_EditorClassIdentifier:
m_MoveRepeatDelay: 0.5
m_MoveRepeatRate: 0.1
m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
m_PointAction: {fileID: 1054132383583890850, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
m_MoveAction: {fileID: 3710738434707379630, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
m_SubmitAction: {fileID: 2064916234097673511, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
m_CancelAction: {fileID: -1967631576421560919, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
m_LeftClickAction: {fileID: 8056856818456041789, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
m_MiddleClickAction: {fileID: 3279352641294131588, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
m_RightClickAction: {fileID: 3837173908680883260, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
m_ScrollWheelAction: {fileID: 4502412055082496612, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
m_TrackedDevicePositionAction: {fileID: 4754684134866288074, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
m_TrackedDeviceOrientationAction: {fileID: 1025543830046995696, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
m_DeselectOnBackgroundClick: 1
m_PointerBehavior: 0
--- !u!114 &446759356
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 446759354}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0}
m_sendNavigationEvents: 1
m_DragThreshold: 10
--- !u!4 &446759357
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 446759354}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &512332119
GameObject:
m_ObjectHideFlags: 0
......@@ -371,6 +445,17 @@ Transform:
m_Father: {fileID: 6494428056972789103}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 100.423004, y: -270, z: 90}
--- !u!114 &642571133 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2070223918, guid: a9e2f722488f51b4aae0e8e422d7adc1, type: 3}
m_PrefabInstance: {fileID: 1233927201685512767}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 02667e3531b6afc4b9109bd92a0d4874, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &705507993
GameObject:
m_ObjectHideFlags: 0
......@@ -654,6 +739,14 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 5977026080901137237, guid: 7c264a38cef3cde4d9bf6164a6816c2b, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 642571133}
- target: {fileID: 5977026081934284532, guid: 7c264a38cef3cde4d9bf6164a6816c2b, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 642571133}
- target: {fileID: 5977026081978507347, guid: 7c264a38cef3cde4d9bf6164a6816c2b, type: 3}
propertyPath: m_Name
value: UI
......@@ -688,7 +781,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5977026081978509231, guid: 7c264a38cef3cde4d9bf6164a6816c2b, type: 3}
propertyPath: m_RootOrder
value: 6
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5977026081978509231, guid: 7c264a38cef3cde4d9bf6164a6816c2b, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
......@@ -809,71 +902,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1198122482
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 9127828313192769202, guid: caf4620acc56bba4c8e3bfa73e5b81d2, type: 3}
propertyPath: m_LocalPosition.x
value: -1.34
objectReference: {fileID: 0}
- target: {fileID: 9127828313192769202, guid: caf4620acc56bba4c8e3bfa73e5b81d2, type: 3}
propertyPath: m_LocalPosition.y
value: 0.84
objectReference: {fileID: 0}
- target: {fileID: 9127828313192769202, guid: caf4620acc56bba4c8e3bfa73e5b81d2, type: 3}
propertyPath: m_LocalPosition.z
value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 9127828313192769202, guid: caf4620acc56bba4c8e3bfa73e5b81d2, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9127828313192769202, guid: caf4620acc56bba4c8e3bfa73e5b81d2, type: 3}
propertyPath: m_LocalRotation.y
value: -0.36591658
objectReference: {fileID: 0}
- target: {fileID: 9127828313192769202, guid: caf4620acc56bba4c8e3bfa73e5b81d2, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9127828313192769202, guid: caf4620acc56bba4c8e3bfa73e5b81d2, type: 3}
propertyPath: m_LocalRotation.w
value: 0.93064773
objectReference: {fileID: 0}
- target: {fileID: 9127828313192769202, guid: caf4620acc56bba4c8e3bfa73e5b81d2, type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 9127828313192769202, guid: caf4620acc56bba4c8e3bfa73e5b81d2, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9127828313192769202, guid: caf4620acc56bba4c8e3bfa73e5b81d2, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -42.928
objectReference: {fileID: 0}
- target: {fileID: 9127828313192769202, guid: caf4620acc56bba4c8e3bfa73e5b81d2, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9127828313192769204, guid: caf4620acc56bba4c8e3bfa73e5b81d2, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 1e651d67da6a03642a64234317034bab, type: 2}
- target: {fileID: 9127828313192769206, guid: caf4620acc56bba4c8e3bfa73e5b81d2, type: 3}
propertyPath: m_Name
value: Exhibit
objectReference: {fileID: 0}
- target: {fileID: 9127828313192769206, guid: caf4620acc56bba4c8e3bfa73e5b81d2, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: caf4620acc56bba4c8e3bfa73e5b81d2, type: 3}
--- !u!1 &1261087092
GameObject:
m_ObjectHideFlags: 0
......@@ -1054,6 +1082,68 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2121618799
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 543450651840130069}
m_Modifications:
- target: {fileID: 8552731182464753326, guid: 539e6bd2530e17b46b20b27b9b55005d, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8552731182464753326, guid: 539e6bd2530e17b46b20b27b9b55005d, type: 3}
propertyPath: m_LocalPosition.y
value: -1.78
objectReference: {fileID: 0}
- target: {fileID: 8552731182464753326, guid: 539e6bd2530e17b46b20b27b9b55005d, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8552731182464753326, guid: 539e6bd2530e17b46b20b27b9b55005d, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8552731182464753326, guid: 539e6bd2530e17b46b20b27b9b55005d, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8552731182464753326, guid: 539e6bd2530e17b46b20b27b9b55005d, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8552731182464753326, guid: 539e6bd2530e17b46b20b27b9b55005d, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8552731182464753326, guid: 539e6bd2530e17b46b20b27b9b55005d, type: 3}
propertyPath: m_RootOrder
value: 7
objectReference: {fileID: 0}
- target: {fileID: 8552731182464753326, guid: 539e6bd2530e17b46b20b27b9b55005d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8552731182464753326, guid: 539e6bd2530e17b46b20b27b9b55005d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8552731182464753326, guid: 539e6bd2530e17b46b20b27b9b55005d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8552731182464753327, guid: 539e6bd2530e17b46b20b27b9b55005d, type: 3}
propertyPath: m_Name
value: Ground
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 539e6bd2530e17b46b20b27b9b55005d, type: 3}
--- !u!4 &2121618800 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8552731182464753326, guid: 539e6bd2530e17b46b20b27b9b55005d, type: 3}
m_PrefabInstance: {fileID: 2121618799}
m_PrefabAsset: {fileID: 0}
--- !u!4 &543450651840130069
Transform:
m_ObjectHideFlags: 0
......@@ -1072,6 +1162,7 @@ Transform:
- {fileID: 1941459057602179300}
- {fileID: 3552052555738444863}
- {fileID: 6494428056972789103}
- {fileID: 2121618800}
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -1093,7 +1184,7 @@ GameObject:
m_Component:
- component: {fileID: 543450651840130069}
m_Layer: 0
m_Name: Raum
m_Name: Room
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......@@ -1146,25 +1237,9 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1233927202073022284, guid: a9e2f722488f51b4aae0e8e422d7adc1, type: 3}
propertyPath: field of view
value: 65
objectReference: {fileID: 0}
- target: {fileID: 1233927202938622209, guid: a9e2f722488f51b4aae0e8e422d7adc1, type: 3}
propertyPath: mouseSensitivity
value: 70
objectReference: {fileID: 0}
- target: {fileID: 1233927202938622209, guid: a9e2f722488f51b4aae0e8e422d7adc1, type: 3}
propertyPath: setDragAfterFrames
value: 10
objectReference: {fileID: 0}
- target: {fileID: 1233927202938622210, guid: a9e2f722488f51b4aae0e8e422d7adc1, type: 3}
propertyPath: moveSpeed
value: 3
objectReference: {fileID: 0}
- target: {fileID: 1233927202938622211, guid: a9e2f722488f51b4aae0e8e422d7adc1, type: 3}
propertyPath: m_LocalPosition.x
value: 4.21
value: 2.872
objectReference: {fileID: 0}
- target: {fileID: 1233927202938622211, guid: a9e2f722488f51b4aae0e8e422d7adc1, type: 3}
propertyPath: m_LocalPosition.y
......@@ -1172,7 +1247,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1233927202938622211, guid: a9e2f722488f51b4aae0e8e422d7adc1, type: 3}
propertyPath: m_LocalPosition.z
value: 2.59
value: 2.243
objectReference: {fileID: 0}
- target: {fileID: 1233927202938622211, guid: a9e2f722488f51b4aae0e8e422d7adc1, type: 3}
propertyPath: m_LocalRotation.x
......
Supports Markdown
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