Commit 5a63a353 authored by Simon Hetzer's avatar Simon Hetzer
Browse files

Merge conflicts resolved and restored

parent 16a7a17f
......@@ -93,6 +93,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c1351c763083a4d44850e704219718a6, type: 3}
m_Name:
m_EditorClassIdentifier:
cmanager: {fileID: 0}
header: {fileID: 2102479644}
subtitle: {fileID: 363535071}
linksRight2Left:
......
......@@ -123,6 +123,63 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1001 &78555184
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 317693961400993026, guid: 2cd450cfc74482f489684dbfbd5eb89d, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 317693961400993026, guid: 2cd450cfc74482f489684dbfbd5eb89d, type: 3}
propertyPath: m_LocalPosition.y
value: 0.066
objectReference: {fileID: 0}
- target: {fileID: 317693961400993026, guid: 2cd450cfc74482f489684dbfbd5eb89d, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 317693961400993026, guid: 2cd450cfc74482f489684dbfbd5eb89d, type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 317693961400993026, guid: 2cd450cfc74482f489684dbfbd5eb89d, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 317693961400993026, guid: 2cd450cfc74482f489684dbfbd5eb89d, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 317693961400993026, guid: 2cd450cfc74482f489684dbfbd5eb89d, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 317693961400993026, guid: 2cd450cfc74482f489684dbfbd5eb89d, type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 317693961400993026, guid: 2cd450cfc74482f489684dbfbd5eb89d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: 317693961400993026, guid: 2cd450cfc74482f489684dbfbd5eb89d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 317693961400993026, guid: 2cd450cfc74482f489684dbfbd5eb89d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 317693961400993031, guid: 2cd450cfc74482f489684dbfbd5eb89d, type: 3}
propertyPath: m_Name
value: MoveToPointer
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2cd450cfc74482f489684dbfbd5eb89d, type: 3}
--- !u!1 &185556684
GameObject:
m_ObjectHideFlags: 0
......@@ -311,6 +368,143 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &351293763
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 841970794910107740, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 642571133}
- target: {fileID: 1102182145493554537, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1340398893867869600, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2237673197667527522, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2804698390380959455, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2921287457663061220, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2921287457663061220, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2921287457663061220, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2921287457663061220, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2921287457663061220, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2921287457663061220, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2921287457663061220, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2921287457663061220, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_RootOrder
value: 7
objectReference: {fileID: 0}
- target: {fileID: 2921287457663061220, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2921287457663061220, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2921287457663061220, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2921287457663061220, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2921287457663061220, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2921287457663061220, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2921287457663061220, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2921287457663061220, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2921287457663061220, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2921287457663061220, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2921287457663061220, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2921287457663061220, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2921287457663061220, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2921287457663061224, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_Name
value: Menu
objectReference: {fileID: 0}
- target: {fileID: 2921287458059113554, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1995329558}
- target: {fileID: 2921287458928906835, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2921287459393748190, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6915753414165497222, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: ingameUI
value:
objectReference: {fileID: 1032788353}
- target: {fileID: 8542788850021212359, guid: bedcef096787708409305c8d764377d9, type: 3}
propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1995329559}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bedcef096787708409305c8d764377d9, type: 3}
--- !u!1 &379440995
GameObject:
m_ObjectHideFlags: 0
......@@ -413,7 +607,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &512332119
GameObject:
......@@ -548,6 +742,94 @@ Transform:
m_Father: {fileID: 1178751566}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 46.443, y: 21.305, z: 40.351}
--- !u!1 &751004736
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 751004737}
- component: {fileID: 751004738}
m_Layer: 2
m_Name: Barrier
m_TagString: Barrier
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &751004737
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 751004736}
m_LocalRotation: {x: 0.00000005960465, y: -0.00000008940698, z: -0.6997006, w: 0.7144362}
m_LocalPosition: {x: -0.0257, y: 0.2732, z: 0.0952}
m_LocalScale: {x: -0.0408385, y: -0.040838502, z: -0.040838506}
m_Children: []
m_Father: {fileID: 3552052555738444863}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -88.806}
--- !u!65 &751004738
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 751004736}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1.3476604, y: 1, z: 1}
m_Center: {x: -0.17383026, y: 0, z: 0}
--- !u!1 &806661664
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 806661665}
- component: {fileID: 806661666}
m_Layer: 2
m_Name: Barrier
m_TagString: Barrier
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &806661665
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 806661664}
m_LocalRotation: {x: 0.00000005960465, y: 0.0000001192093, z: 0.80944365, w: 0.58719766}
m_LocalPosition: {x: 0.0641, y: 0.262, z: 0.0986}
m_LocalScale: {x: -0.0408385, y: -0.040838502, z: -0.040838506}
m_Children: []
m_Father: {fileID: 4349561922064262014}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 108.083}
--- !u!65 &806661666
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 806661664}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1.3476604, y: 1, z: 1}
m_Center: {x: -0.17383026, y: 0, z: 0}
--- !u!1 &850824543
GameObject:
m_ObjectHideFlags: 0
......@@ -739,10 +1021,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 49909464, guid: 7c264a38cef3cde4d9bf6164a6816c2b, type: 3}
propertyPath: m_Color.a
value: 0.56078434
objectReference: {fileID: 0}
- target: {fileID: 49909466, guid: 7c264a38cef3cde4d9bf6164a6816c2b, type: 3}
propertyPath: cmanager
value:
......@@ -789,7 +1067,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5977026081978509231, guid: 7c264a38cef3cde4d9bf6164a6816c2b, type: 3}
propertyPath: m_RootOrder
value: 5
value: 6
objectReference: {fileID: 0}
- target: {fileID: 5977026081978509231, guid: 7c264a38cef3cde4d9bf6164a6816c2b, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
......@@ -845,6 +1123,11 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7c264a38cef3cde4d9bf6164a6816c2b, type: 3}
--- !u!1 &1032788353 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5977026081978507347, guid: 7c264a38cef3cde4d9bf6164a6816c2b, type: 3}
m_PrefabInstance: {fileID: 1032788352}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1176432458
GameObject:
m_ObjectHideFlags: 0
......@@ -903,7 +1186,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 7
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1178751565
GameObject:
......@@ -1162,6 +1445,116 @@ MonoBehaviour:
mail: kaufmanna@hochschule-trier.de
socialMedia: www.instagram.com
semester: 7
--- !u!1 &1673596051
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1673596052}
- component: {fileID: 1673596053}
m_Layer: 2
m_Name: Barrier
m_TagString: Barrier
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1673596052
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1673596051}
m_LocalRotation: {x: 0.000000009313226, y: 0.00000008940697, z: 0.99983394, w: 0.01822649}
m_LocalPosition: {x: 0.0108, y: 0.3022, z: 0.0989}
m_LocalScale: {x: -0.0408385, y: -0.040838502, z: -0.040838506}
m_Children: []
m_Father: {fileID: 1941459057602179300}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 177.911}
--- !u!65 &1673596053
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1673596051}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1.7038614, y: 1, z: 1}
m_Center: {x: 0.0042707627, y: -4.091901e-12, z: -7.286634e-12}
--- !u!1 &1831609713
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1831609714}
- component: {fileID: 1831609715}
m_Layer: 2
m_Name: Barrier
m_TagString: Barrier
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1831609714
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1831609713}
m_LocalRotation: {x: -0, y: 0.0000000074505815, z: -0.11402197, w: 0.99347824}
m_LocalPosition: {x: -0.0065, y: 0.2277, z: 0.0997}
m_LocalScale: {x: -0.0408385, y: -0.0408385, z: -0.0408385}
m_Children: []
m_Father: {fileID: 6494428056972789103}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -13.094}
--- !u!65 &1831609715
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1831609713}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1.3476604, y: 1, z: 1}
m_Center: {x: -0.17383026, y: 0, z: 0}
--- !u!114 &1995329558 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1233927202938622210, 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: 21a8743f7f6e2df4381f242ebb7ccd49, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1995329559 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1233927202938622209, 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: c3f46cd3e40e2694ba992a25974957fc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &2121618799
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -1199,7 +1592,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8552731182464753326, guid: 539e6bd2530e17b46b20b27b9b55005d, type: 3}
propertyPath: m_RootOrder
value: 7
value: 8
objectReference: {fileID: 0}
- target: {fileID: 8552731182464753326, guid: 539e6bd2530e17b46b20b27b9b55005d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
......@@ -1347,7 +1740,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1233927202938622211, guid: a9e2f722488f51b4aae0e8e422d7adc1, type: 3}
propertyPath: m_RootOrder
value: 4
value: 5
objectReference: {fileID: 0}
- target: {fileID: 1233927202938622211, guid: a9e2f722488f51b4aae0e8e422d7adc1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
......@@ -1430,7 +1823,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2b772632f54e1d540b86aaee5f2c0cba, type: 3}
m_Name:
m_EditorClassIdentifier:
scrollSpeed: 2.3
--- !u!114 &1847168065817881701
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -1456,6 +1848,7 @@ Transform:
m_LocalScale: {x: 100, y: 100, z: 100}
m_Children:
- {fileID: 379440996}
- {fileID: 1673596052}
m_Father: {fileID: 543450651840130069}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -1471,6 +1864,7 @@ Transform:
m_LocalScale: {x: 100, y: 100, z: 100}
m_Children:
- {fileID: 1176432459}
- {fileID: 751004737}
m_Father: {fileID: 543450651840130069}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -1521,7 +1915,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2b772632f54e1d540b86aaee5f2c0cba, type: 3}
m_Name:
m_EditorClassIdentifier:
scrollSpeed: 2.3
--- !u!114 &3781595554152024328
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -1596,6 +1989,7 @@ Transform:
m_LocalScale: {x: 100, y: 100, z: 100}
m_Children:
- {fileID: 1405337879}
- {fileID: 806661665}
m_Father: {fileID: 543450651840130069}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -1701,6 +2095,7 @@ Transform:
m_LocalScale: {x: 100, y: 100, z: 100}
m_Children:
- {fileID: 512332120}
- {fileID: 1831609714}
m_Father: {fileID: 543450651840130069}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -1751,7 +2146,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2b772632f54e1d540b86aaee5f2c0cba, type: 3}
m_Name:
m_EditorClassIdentifier:
scrollSpeed: 2.3
--- !u!114 &7063749615022454867
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -1826,7 +2220,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2b772632f54e1d540b86aaee5f2c0cba, type: 3}
m_Name:
m_EditorClassIdentifier:
scrollSpeed: 2.3
--- !u!114 &7341012975892538347
MonoBehaviour:
m_ObjectHideFlags: 0
......
......@@ -6,6 +6,7 @@ TagManager:
tags:
- SpectatePosition
- Content
- Barrier
layers:
- Default
- TransparentFX
......@@ -17,7 +18,7 @@ TagManager:
-
- Exhibit Focus
- Walkable Ground
-
- Barrier
-
-
-
......
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