Commit 72c506e2 authored by radow's avatar radow
Browse files

added dummzbutton to settings menu for controlersupport

parent af9433bc
......@@ -6627,6 +6627,7 @@ MonoBehaviour:
resumeButton: {fileID: 2095767541}
fadeScreen: {fileID: 8199650163827836641}
furtherReading: {fileID: 2304914984157466196}
dummyButton: {fileID: 5210522106035646566}
volumeMusicSlider: {fileID: 884254605}
volumeNarrationSlider: {fileID: 5378019738200771616}
muteToggle: {fileID: 532893483}
......@@ -7763,7 +7764,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 849351432}
m_RootOrder: 3
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}
......@@ -9356,6 +9357,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3669510910326592063}
- {fileID: 2728043712313227119}
- {fileID: 6514345107698612541}
- {fileID: 1883222030}
......@@ -18620,6 +18622,18 @@ 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: 5210522106035646566}
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
......@@ -19271,7 +19285,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 849351432}
m_RootOrder: 2
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}
......@@ -20389,7 +20403,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 849351432}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
......@@ -22037,6 +22051,18 @@ 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: 5210522106035646566}
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
......@@ -22677,7 +22703,7 @@ RectTransform:
- {fileID: 972874159}
- {fileID: 375836076}
m_Father: {fileID: 849351432}
m_RootOrder: 1
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}
......@@ -22870,7 +22896,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
img: {fileID: 5053653522316910576}
basic: {r: 1, g: 1, b: 1, a: 1}
light: {r: 0.04705882, g: 1, b: 0, a: 1}
light: {r: 0, g: 1, b: 0.9023998, a: 1}
--- !u!1 &2018313248601101893
GameObject:
m_ObjectHideFlags: 0
......@@ -23216,7 +23242,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, y: 1}
m_AnchoredPosition: {x: -5.2141, y: 0.3348}
m_SizeDelta: {x: 13.6058, y: -5.3825}
m_Pivot: {x: 0.5, y: 0.5}
......@@ -23258,6 +23284,85 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &2249720265272828309
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 804266928771032768}
- component: {fileID: 7673000727436358737}
- component: {fileID: 7017938159286716568}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &804266928771032768
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2249720265272828309}
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: 3669510910326592063}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7673000727436358737
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2249720265272828309}
m_CullTransparentMesh: 1
--- !u!114 &7017938159286716568
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2249720265272828309}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
--- !u!1 &2304914984157466196
GameObject:
m_ObjectHideFlags: 0
......@@ -23884,7 +23989,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, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
......@@ -25554,6 +25659,127 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &5210522106035646566
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3669510910326592063}
- component: {fileID: 1613113488078793857}
- component: {fileID: 6930392973234961312}
- component: {fileID: 4186880132151319914}
m_Layer: 5
m_Name: Dummybutton
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3669510910326592063
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5210522106035646566}
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:
- {fileID: 804266928771032768}
m_Father: {fileID: 849351432}
m_RootOrder: 0
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: -216.2, y: 223.1}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1613113488078793857
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5210522106035646566}
m_CullTransparentMesh: 1
--- !u!114 &6930392973234961312
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5210522106035646566}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, 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: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
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!114 &4186880132151319914
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5210522106035646566}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 6930392973234961312}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &5282313295563491100
GameObject:
m_ObjectHideFlags: 0
......@@ -27547,7 +27773,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 13.916, y: -13.9155}
m_AnchoredPosition: {x: 9.8, y: -13.9155}
m_SizeDelta: {x: 27.831, y: 27.8311}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7496861829253312664
......@@ -27948,7 +28174,7 @@ RectTransform:
- {fileID: 348448438}
- {fileID: 1761282739}
m_Father: {fileID: 849351432}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
......@@ -28163,7 +28389,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
img: {fileID: 8326031694603239298}
basic: {r: 1, g: 1, b: 1, a: 1}
light: {r: 0.04705882, g: 1, b: 0, a: 1}
light: {r: 0, g: 1, b: 0.9023998, a: 1}
--- !u!1 &7716939016417730683
GameObject:
m_ObjectHideFlags: 0
......@@ -30237,7 +30463,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
img: {fileID: 1158977244173066167}
basic: {r: 1, g: 1, b: 1, a: 1}
light: {r: 0.04705882, g: 1, b: 0, a: 1}
light: {r: 0, g: 1, b: 0.9023998, a: 1}
--- !u!1 &8860471102008170436
GameObject:
m_ObjectHideFlags: 0
......@@ -30392,7 +30618,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, y: 1}
m_AnchoredPosition: {x: -5.2141, y: 0.3348}
m_SizeDelta: {x: 13.6058, y: -5.3825}
m_Pivot: {x: 0.5, y: 0.5}
......@@ -30542,7 +30768,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, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
......
......@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
......@@ -5715,6 +5715,9 @@ MonoBehaviour:
Neighbours:
- {fileID: 1118444026}
- {fileID: 626769357}
released: 1
markedForDespawn: 0
roomsToKeepNext:
--- !u!1 &1409514067
GameObject:
m_ObjectHideFlags: 0
......@@ -9357,6 +9360,10 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 971851233, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 1095296509, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: _3DMenu
value:
......@@ -9451,6 +9458,10 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target
value:
objectReference: {fileID: 2025518326}
- target: {fileID: 1761282740, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName
value: SetSelectedGameObject
objectReference: {fileID: 0}
- target: {fileID: 1804597932, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: _3DMenu
value:
......@@ -9519,6 +9530,10 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target
value:
objectReference: {fileID: 2025518326}
- target: {fileID: 3011595471431748279, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName
value: SetSelectedGameObject
objectReference: {fileID: 0}
- target: {fileID: 3857489942085725749, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: m_AnchoredPosition.x
value: 192.9
......
......@@ -4752,6 +4752,10 @@ 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:
......@@ -4776,6 +4780,10 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target
value:
objectReference: {fileID: 1569869155}
- 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: 7936654465066761587, guid: a1333b91b1c4ce74abcd499d87207b8d, type: 3}
propertyPath: m_Pivot.x
value: 0
......
......@@ -89,6 +89,7 @@ public class Menu : MonoBehaviour
public GameObject resumeButton;
public GameObject fadeScreen;
public GameObject furtherReading;
public GameObject dummyButton;
public void TransitionTo(MenuSubType newState)
{
......@@ -122,7 +123,7 @@ public class Menu : MonoBehaviour
{
//settings.TOB();
settingsUI.SetActive(true);
EventSystem.current.SetSelectedGameObject(null);
EventSystem.current.SetSelectedGameObject(dummyButton);
}
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