Commit af9433bc authored by radow's avatar radow
Browse files

modified Settings menu behaviour re:tabs

parent e886935e
......@@ -6339,8 +6339,8 @@ RectTransform:
m_Father: {fileID: 1561758490}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMin: {x: 0.491, y: 0}
m_AnchorMax: {x: 0.491, y: 1}
m_AnchoredPosition: {x: 3.4999847, y: 0.33479977}
m_SizeDelta: {x: 13.6058, y: -5.3825}
m_Pivot: {x: 0.5, y: 0.5}
......@@ -7272,7 +7272,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 0.491, y: 1}
m_AnchoredPosition: {x: -2.5, y: 0}
m_SizeDelta: {x: 5, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
......@@ -7733,6 +7733,81 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &753102435
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 753102436}
- component: {fileID: 753102438}
- component: {fileID: 753102437}
m_Layer: 5
m_Name: helper
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &753102436
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 753102435}
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: 849351432}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -220.11179, y: 194.9}
m_SizeDelta: {x: 471.2515, y: 3.5692}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &753102438
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 753102435}
m_CullTransparentMesh: 1
--- !u!114 &753102437
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 753102435}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &756596107
GameObject:
m_ObjectHideFlags: 0
......@@ -9269,7 +9344,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &849351432
RectTransform:
m_ObjectHideFlags: 0
......@@ -9283,6 +9358,9 @@ RectTransform:
m_Children:
- {fileID: 2728043712313227119}
- {fileID: 6514345107698612541}
- {fileID: 1883222030}
- {fileID: 753102436}
- {fileID: 2024863155}
m_Father: {fileID: 941060178898086515}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -10240,7 +10318,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -523, y: 233.00002}
m_AnchoredPosition: {x: -523, y: 235.40004}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &944459099
......@@ -10334,7 +10412,7 @@ MonoBehaviour:
m_VertexBufferAutoSizeReduction: 1
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: -191.10815, w: 0}
m_margin: {x: 0.000038161932, y: 0, z: -191.10815, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
......@@ -13893,7 +13971,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -140, y: 233.00002}
m_AnchoredPosition: {x: -113.3, y: 235.40004}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1315592065
......@@ -18433,7 +18511,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -100.8, y: 218}
m_AnchoredPosition: {x: -100.8, y: 223.80003}
m_SizeDelta: {x: 220, y: 41.1759}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1761282742
......@@ -18542,18 +18620,6 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
- m_Target: {fileID: 0}
m_TargetAssemblyTypeName: UnityEngine.EventSystems.EventSystem, UnityEngine.UI
m_MethodName: SetSelectedGameObject
m_Mode: 2
m_Arguments:
m_ObjectArgument: {fileID: 997092920049124938}
m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
--- !u!1 &1766255426
GameObject:
m_ObjectHideFlags: 0
......@@ -19175,6 +19241,81 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1883222029
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1883222030}
- component: {fileID: 1883222032}
- component: {fileID: 1883222031}
m_Layer: 5
m_Name: seperator
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1883222030
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1883222029}
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: 849351432}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -221.3, y: 223.76004}
m_SizeDelta: {x: 3.0733, y: 41.259}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1883222032
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1883222029}
m_CullTransparentMesh: 1
--- !u!114 &1883222031
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1883222029}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &1887019325
GameObject:
m_ObjectHideFlags: 0
......@@ -20218,6 +20359,81 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &2024863154
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2024863155}
- component: {fileID: 2024863157}
- component: {fileID: 2024863156}
m_Layer: 5
m_Name: helper (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &2024863155
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2024863154}
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: 849351432}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -220.11179, y: 239.77}
m_SizeDelta: {x: 471.2515, y: 3.5692}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2024863157
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2024863154}
m_CullTransparentMesh: 1
--- !u!114 &2024863156
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2024863154}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &2043379150
GameObject:
m_ObjectHideFlags: 0
......@@ -21712,8 +21928,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -375.1, y: 221.4}
m_SizeDelta: {x: 220, y: 34.7664}
m_AnchoredPosition: {x: -343.3, y: 223.8}
m_SizeDelta: {x: 220, y: 41.1663}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &313007692191508353
CanvasRenderer:
......@@ -21821,18 +22037,6 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 0}
m_TargetAssemblyTypeName: UnityEngine.EventSystems.EventSystem, UnityEngine.UI
m_MethodName: SetSelectedGameObject
m_Mode: 2
m_Arguments:
m_ObjectArgument: {fileID: 1761282738}
m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &1211585600427283004
GameObject:
m_ObjectHideFlags: 0
......@@ -23012,7 +23216,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: -5.2141, y: 0.3348}
m_SizeDelta: {x: 13.6058, y: -5.3825}
m_Pivot: {x: 0.5, y: 0.5}
......@@ -23680,7 +23884,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
......@@ -27056,7 +27260,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 0.799, y: 1}
m_AnchoredPosition: {x: -2.5, y: 0}
m_SizeDelta: {x: 5, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
......@@ -29507,8 +29711,8 @@ RectTransform:
m_Father: {fileID: 7500375087260342221}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMin: {x: 0.799, y: 0}
m_AnchorMax: {x: 0.799, y: 1}
m_AnchoredPosition: {x: 3.4999847, y: 0.33479977}
m_SizeDelta: {x: 13.6058, y: -5.3825}
m_Pivot: {x: 0.5, y: 0.5}
......@@ -30188,7 +30392,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: -5.2141, y: 0.3348}
m_SizeDelta: {x: 13.6058, y: -5.3825}
m_Pivot: {x: 0.5, y: 0.5}
......@@ -30338,7 +30542,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
......
......@@ -2622,6 +2622,9 @@ MonoBehaviour:
Neighbours:
- {fileID: 1118444026}
- {fileID: 626769357}
released: 1
markedForDespawn: 0
roomsToKeepNext:
--- !u!1 &1413515338 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -2711416216445777953, guid: 0cde28da2243712499e1e28c06439c67, type: 3}
......@@ -4701,18 +4704,6 @@ PrefabInstance:
propertyPath: _3DMenu
value:
objectReference: {fileID: 1569869156}
- target: {fileID: 616954611, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: m_AnchorMax.x
value: 0.491
objectReference: {fileID: 0}
- target: {fileID: 616954611, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 616954611, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: m_AnchorMin.x
value: 0.491
objectReference: {fileID: 0}
- target: {fileID: 617419863, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: letters
value:
......@@ -4753,22 +4744,6 @@ PrefabInstance:
propertyPath: menuitems.Array.data[3]
value:
objectReference: {fileID: 38301401}
- target: {fileID: 621499250, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 682338309, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: m_AnchorMax.x
value: 0.491
objectReference: {fileID: 0}
- target: {fileID: 682338309, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 849351431, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1095296509, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: _3DMenu
value:
......@@ -4777,10 +4752,6 @@ PrefabInstance:
propertyPath: _3DMenu
value:
objectReference: {fileID: 1569869156}
- target: {fileID: 1761282740, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target
value:
objectReference: {fileID: 2025518326}
- target: {fileID: 1804597932, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: _3DMenu
value:
......@@ -4805,34 +4776,6 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target
value:
objectReference: {fileID: 1569869155}
- target: {fileID: 228738658282218190, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: m_AnchorMax.x
value: 0.799
objectReference: {fileID: 0}
- target: {fileID: 228738658282218190, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 228738658282218190, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: m_AnchorMin.x
value: 0.799
objectReference: {fileID: 0}
- target: {fileID: 1832543016138998625, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3011595471431748279, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target
value:
objectReference: {fileID: 2025518326}
- target: {fileID: 4887868733151005771, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: m_AnchorMax.x
value: 0.799
objectReference: {fileID: 0}
- target: {fileID: 4887868733151005771, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7936654465066761587, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: m_Pivot.x
value: 0
......@@ -4921,10 +4864,6 @@ PrefabInstance:
propertyPath: m_Name
value: UI
objectReference: {fileID: 0}
- target: {fileID: 7936654465066761599, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
--- !u!1001 &8583126168578633395
......
......@@ -122,7 +122,7 @@ public class Menu : MonoBehaviour
{
//settings.TOB();
settingsUI.SetActive(true);
EventSystem.current.SetSelectedGameObject(null);
}
if (newState == MenuState.CREDITS) {
credits.gameObject.SetActive(true);
......
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