diff --git a/Assets/Prefabs/Gamestate/StaticInfo.prefab b/Assets/Prefabs/Gamestate/StaticInfo.prefab
index 8b8bf27af..e00ef274a 100644
--- a/Assets/Prefabs/Gamestate/StaticInfo.prefab
+++ b/Assets/Prefabs/Gamestate/StaticInfo.prefab
@@ -15,7 +15,7 @@ GameObject:
- component: {fileID: 6426285471098592642}
- component: {fileID: 5022952277509122877}
- component: {fileID: 6572921195520930000}
- - component: {fileID: 1094824400466468296}
+ - component: {fileID: 3780314087357157891}
m_Layer: 0
m_Name: StaticInfo
m_TagString: Untagged
@@ -218,7 +218,7 @@ MonoBehaviour:
- {fileID: 11400000, guid: b3561cb4178fb97b49ad139a8802559f, type: 2}
- {fileID: 11400000, guid: ce090b8391704374cb30f8ae3b85ae72, type: 2}
customRulesTemplate: {fileID: 11400000, guid: 78d6c599f9b46f347a2164c209c4afd4, type: 2}
---- !u!114 &1094824400466468296
+--- !u!114 &3780314087357157891
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -231,9 +231,9 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mainAudioMixer: {fileID: 24100000, guid: 92cf7610df7967a41806df0e74d33c49, type: 2}
- lowerSensLimit: 0.1
- upperSensLimit: 3
- lowerFOVLimit: 60
- upperFOVLimit: 130
- lowerZoomFOVLimit: 20
- upperZoomFOVLimit: 50
+ LowerSensLimit: 0.1
+ UpperSensLimit: 3
+ LowerFOVLimit: 60
+ UpperFOVLimit: 120
+ LowerZoomFOVLimit: 20
+ UpperZoomFOVLimit: 50
diff --git a/Assets/Prefabs/UI/Elements/Dropdown.prefab b/Assets/Prefabs/UI/Elements/Dropdown.prefab
index ded6e58c2..e9d3a7859 100644
--- a/Assets/Prefabs/UI/Elements/Dropdown.prefab
+++ b/Assets/Prefabs/UI/Elements/Dropdown.prefab
@@ -1399,7 +1399,7 @@ GameObject:
- component: {fileID: 1988978234052568614}
- component: {fileID: 7786018998957624118}
- component: {fileID: 8296568250077800006}
- - component: {fileID: 8930153315073570134}
+ - component: {fileID: 7182465716744361408}
m_Layer: 5
m_Name: Dropdown
m_TagString: Untagged
@@ -1592,7 +1592,7 @@ MonoBehaviour:
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
---- !u!114 &8930153315073570134
+--- !u!114 &7182465716744361408
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -1601,15 +1601,6 @@ MonoBehaviour:
m_GameObject: {fileID: 8483670200265780626}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
+ m_Script: {fileID: 11500000, guid: 13f5cdbcb24caa747b6dc3f8259a6829, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Delegates:
- - eventID: 0
- callback:
- m_PersistentCalls:
- m_Calls: []
- - eventID: 1
- callback:
- m_PersistentCalls:
- m_Calls: []
diff --git a/Assets/Prefabs/UI/Elements/Slider.prefab b/Assets/Prefabs/UI/Elements/Slider.prefab
index 8ad8ea025..134b15501 100644
--- a/Assets/Prefabs/UI/Elements/Slider.prefab
+++ b/Assets/Prefabs/UI/Elements/Slider.prefab
@@ -556,6 +556,7 @@ GameObject:
- component: {fileID: 2261462308808573997}
- component: {fileID: 5152159382224659745}
- component: {fileID: 628177840045729091}
+ - component: {fileID: 6380889236745050598}
m_Layer: 5
m_Name: Slider
m_TagString: Untagged
@@ -693,3 +694,15 @@ MonoBehaviour:
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
+--- !u!114 &6380889236745050598
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8411587129487110349}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 13f5cdbcb24caa747b6dc3f8259a6829, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
diff --git a/Assets/Prefabs/UI/Menus/MenuCanvas.prefab b/Assets/Prefabs/UI/Menus/MenuCanvas.prefab
index c9d907795..1dfc20828 100644
--- a/Assets/Prefabs/UI/Menus/MenuCanvas.prefab
+++ b/Assets/Prefabs/UI/Menus/MenuCanvas.prefab
@@ -101,7 +101,7 @@ GameObject:
- component: {fileID: 59388356648534408}
- component: {fileID: 6927816616533030158}
- component: {fileID: 2541788151808520362}
- - component: {fileID: 5975390560533702530}
+ - component: {fileID: 1745081869733007592}
m_Layer: 5
m_Name: Slider
m_TagString: Untagged
@@ -147,7 +147,7 @@ MonoBehaviour:
m_Navigation:
m_Mode: 4
m_WrapAround: 1
- m_SelectOnUp: {fileID: 88877825589591098}
+ m_SelectOnUp: {fileID: 4479662479665033656}
m_SelectOnDown: {fileID: 4783037583379668445}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
@@ -227,7 +227,7 @@ MonoBehaviour:
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
---- !u!114 &5975390560533702530
+--- !u!114 &1745081869733007592
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -236,26 +236,9 @@ MonoBehaviour:
m_GameObject: {fileID: 66940620124215963}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
+ m_Script: {fileID: 11500000, guid: 13f5cdbcb24caa747b6dc3f8259a6829, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Delegates:
- - eventID: 0
- callback:
- m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 1098348358083011975}
- m_TargetAssemblyTypeName: MainMenuController, Assembly-CSharp
- m_MethodName: SelectControl
- m_Mode: 2
- m_Arguments:
- m_ObjectArgument: {fileID: 59388356648534408}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.UI.Selectable, UnityEngine.UI
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
--- !u!1 &110615194986557832
GameObject:
m_ObjectHideFlags: 0
@@ -806,10 +789,10 @@ RectTransform:
m_Father: {fileID: 4960671082220497470}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 1276.3931, y: 0}
- m_SizeDelta: {x: 87.21387, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 0, y: -49}
+ m_SizeDelta: {x: 0, y: 98}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3141151884795190096
CanvasRenderer:
@@ -1177,7 +1160,7 @@ GameObject:
- component: {fileID: 8608919704597989997}
- component: {fileID: 3859410024920040085}
- component: {fileID: 5826717732542312857}
- - component: {fileID: 7504167303843632084}
+ - component: {fileID: 2382409880526667576}
m_Layer: 5
m_Name: InputField (TMP)
m_TagString: Untagged
@@ -1259,10 +1242,10 @@ MonoBehaviour:
m_Navigation:
m_Mode: 4
m_WrapAround: 0
- m_SelectOnUp: {fileID: 88877825589591098}
- m_SelectOnDown: {fileID: 4783037583379668445}
+ m_SelectOnUp: {fileID: 3425308789493345845}
+ m_SelectOnDown: {fileID: 59388356648534408}
m_SelectOnLeft: {fileID: 0}
- m_SelectOnRight: {fileID: 0}
+ m_SelectOnRight: {fileID: 4479662479665033656}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 0.9294118, g: 0.909804, b: 0.854902, a: 1}
@@ -1410,7 +1393,7 @@ MonoBehaviour:
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
---- !u!114 &7504167303843632084
+--- !u!114 &2382409880526667576
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -1419,26 +1402,9 @@ MonoBehaviour:
m_GameObject: {fileID: 1264343544702406411}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
+ m_Script: {fileID: 11500000, guid: 13f5cdbcb24caa747b6dc3f8259a6829, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Delegates:
- - eventID: 0
- callback:
- m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 1098348358083011975}
- m_TargetAssemblyTypeName: MainMenuController, Assembly-CSharp
- m_MethodName: SelectControl
- m_Mode: 2
- m_Arguments:
- m_ObjectArgument: {fileID: 3859410024920040085}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.UI.Selectable, UnityEngine.UI
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
--- !u!1 &1652947252453242366
GameObject:
m_ObjectHideFlags: 0
@@ -2022,10 +1988,10 @@ RectTransform:
m_Father: {fileID: 4960671082220497470}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 43.606934, y: 0}
- m_SizeDelta: {x: 87.21387, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 0, y: -49}
+ m_SizeDelta: {x: 0, y: 98}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4729982755591244063
CanvasRenderer:
@@ -2632,10 +2598,10 @@ RectTransform:
m_Father: {fileID: 8135159386306205615}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 960, y: 0}
- m_SizeDelta: {x: 1320, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 0, y: -100}
+ m_SizeDelta: {x: 0, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5295701275927280984
CanvasRenderer:
@@ -2756,11 +2722,11 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 1098348358083011975}
m_TargetAssemblyTypeName: MainMenuController, Assembly-CSharp
- m_MethodName: DeselectControl
- m_Mode: 1
+ m_MethodName: SelectControl
+ m_Mode: 2
m_Arguments:
m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.UI.Selectable, UnityEngine.UI
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
@@ -2879,10 +2845,10 @@ RectTransform:
m_Father: {fileID: 4960671082220497470}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 660, y: 0}
- m_SizeDelta: {x: 379.19073, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 0, y: -49}
+ m_SizeDelta: {x: 0, y: 98}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &547494529736131921
CanvasRenderer:
@@ -3056,10 +3022,10 @@ RectTransform:
m_Father: {fileID: 8135159386306205615}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 960, y: 0}
- m_SizeDelta: {x: 1320, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 0, y: -590}
+ m_SizeDelta: {x: 0, y: 880}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8196030944864643667
CanvasRenderer:
@@ -3911,7 +3877,7 @@ GameObject:
- component: {fileID: 4479662479665033656}
- component: {fileID: 8073456483928774916}
- component: {fileID: 4604894776828813905}
- - component: {fileID: 9010194691634654016}
+ - component: {fileID: 1576075599796405934}
m_Layer: 5
m_Name: Slider
m_TagString: Untagged
@@ -3957,8 +3923,8 @@ MonoBehaviour:
m_Navigation:
m_Mode: 4
m_WrapAround: 1
- m_SelectOnUp: {fileID: 88877825589591098}
- m_SelectOnDown: {fileID: 4783037583379668445}
+ m_SelectOnUp: {fileID: 4479662479665033656}
+ m_SelectOnDown: {fileID: 59388356648534408}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
@@ -4037,7 +4003,7 @@ MonoBehaviour:
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
---- !u!114 &9010194691634654016
+--- !u!114 &1576075599796405934
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -4046,26 +4012,9 @@ MonoBehaviour:
m_GameObject: {fileID: 3922331325814160527}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
+ m_Script: {fileID: 11500000, guid: 13f5cdbcb24caa747b6dc3f8259a6829, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Delegates:
- - eventID: 0
- callback:
- m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 1098348358083011975}
- m_TargetAssemblyTypeName: MainMenuController, Assembly-CSharp
- m_MethodName: SelectControl
- m_Mode: 2
- m_Arguments:
- m_ObjectArgument: {fileID: 4479662479665033656}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.UI.Selectable, UnityEngine.UI
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
--- !u!1 &4026824962317560842
GameObject:
m_ObjectHideFlags: 0
@@ -4605,10 +4554,10 @@ RectTransform:
m_Father: {fileID: 4960671082220497470}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 1041.1907, y: 0}
- m_SizeDelta: {x: 379.19073, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 0, y: -49}
+ m_SizeDelta: {x: 0, y: 98}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8682021935811751294
CanvasRenderer:
@@ -5439,7 +5388,7 @@ GameObject:
- component: {fileID: 2879107271091884797}
- component: {fileID: 546089446897616885}
- component: {fileID: 8926067372053732462}
- - component: {fileID: 2560118197782764605}
+ - component: {fileID: 8655630321418820654}
m_Layer: 5
m_Name: InputField (TMP)
m_TagString: Untagged
@@ -5521,10 +5470,10 @@ MonoBehaviour:
m_Navigation:
m_Mode: 4
m_WrapAround: 0
- m_SelectOnUp: {fileID: 88877825589591098}
- m_SelectOnDown: {fileID: 4783037583379668445}
+ m_SelectOnUp: {fileID: 4479662479665033656}
+ m_SelectOnDown: {fileID: 6885232896790258425}
m_SelectOnLeft: {fileID: 0}
- m_SelectOnRight: {fileID: 0}
+ m_SelectOnRight: {fileID: 59388356648534408}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 0.9294118, g: 0.909804, b: 0.854902, a: 1}
@@ -5672,7 +5621,7 @@ MonoBehaviour:
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
---- !u!114 &2560118197782764605
+--- !u!114 &8655630321418820654
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -5681,26 +5630,9 @@ MonoBehaviour:
m_GameObject: {fileID: 6105263772077305812}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
+ m_Script: {fileID: 11500000, guid: 13f5cdbcb24caa747b6dc3f8259a6829, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Delegates:
- - eventID: 0
- callback:
- m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 1098348358083011975}
- m_TargetAssemblyTypeName: MainMenuController, Assembly-CSharp
- m_MethodName: SelectControl
- m_Mode: 2
- m_Arguments:
- m_ObjectArgument: {fileID: 546089446897616885}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.UI.Selectable, UnityEngine.UI
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
--- !u!1 &6237245385919691695
GameObject:
m_ObjectHideFlags: 0
@@ -6249,10 +6181,10 @@ RectTransform:
m_Father: {fileID: 4960671082220497470}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 278.80923, y: -49}
- m_SizeDelta: {x: 379.19073, y: 98}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8906595679900524286
CanvasRenderer:
@@ -6558,7 +6490,7 @@ GameObject:
- component: {fileID: 3017298932097113614}
- component: {fileID: 850675689967797050}
- component: {fileID: 4369061943361284931}
- - component: {fileID: 2966083810336199200}
+ - component: {fileID: 8806637367361499330}
m_Layer: 5
m_Name: InputField (TMP)
m_TagString: Untagged
@@ -6640,10 +6572,10 @@ MonoBehaviour:
m_Navigation:
m_Mode: 4
m_WrapAround: 0
- m_SelectOnUp: {fileID: 88877825589591098}
- m_SelectOnDown: {fileID: 4783037583379668445}
+ m_SelectOnUp: {fileID: 59388356648534408}
+ m_SelectOnDown: {fileID: 3425308789493345845}
m_SelectOnLeft: {fileID: 0}
- m_SelectOnRight: {fileID: 0}
+ m_SelectOnRight: {fileID: 6885232896790258425}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 0.9294118, g: 0.909804, b: 0.854902, a: 1}
@@ -6791,7 +6723,7 @@ MonoBehaviour:
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
---- !u!114 &2966083810336199200
+--- !u!114 &8806637367361499330
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -6800,26 +6732,9 @@ MonoBehaviour:
m_GameObject: {fileID: 7040960722816719568}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
+ m_Script: {fileID: 11500000, guid: 13f5cdbcb24caa747b6dc3f8259a6829, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Delegates:
- - eventID: 0
- callback:
- m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 1098348358083011975}
- m_TargetAssemblyTypeName: MainMenuController, Assembly-CSharp
- m_MethodName: SelectControl
- m_Mode: 2
- m_Arguments:
- m_ObjectArgument: {fileID: 850675689967797050}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.UI.Selectable, UnityEngine.UI
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
--- !u!1 &7193756028609406332
GameObject:
m_ObjectHideFlags: 0
@@ -7901,7 +7816,6 @@ MonoBehaviour:
ZoomFOVInputField: {fileID: 850675689967797050}
FOVSlider: {fileID: 59388356648534408}
ZoomFOVSlider: {fileID: 6885232896790258425}
- settingsInfo: {fileID: 0}
--- !u!114 &663754273832830575
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -8423,7 +8337,6 @@ MonoBehaviour:
versionText: {fileID: 6033132097125083771}
mainMenuCamera: {fileID: 0}
videoPlayerCamera: {fileID: 0}
- settingsInfo: {fileID: 0}
--- !u!82 &5626306360106808345
AudioSource:
m_ObjectHideFlags: 0
@@ -8532,7 +8445,7 @@ GameObject:
- component: {fileID: 6885232896790258425}
- component: {fileID: 5226770260665708551}
- component: {fileID: 4725718180385276882}
- - component: {fileID: 3775309144718065018}
+ - component: {fileID: 965759792867229310}
m_Layer: 5
m_Name: Slider
m_TagString: Untagged
@@ -8578,8 +8491,8 @@ MonoBehaviour:
m_Navigation:
m_Mode: 4
m_WrapAround: 1
- m_SelectOnUp: {fileID: 88877825589591098}
- m_SelectOnDown: {fileID: 4783037583379668445}
+ m_SelectOnUp: {fileID: 59388356648534408}
+ m_SelectOnDown: {fileID: 3425308789493345845}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
@@ -8658,7 +8571,7 @@ MonoBehaviour:
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
---- !u!114 &3775309144718065018
+--- !u!114 &965759792867229310
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -8667,26 +8580,9 @@ MonoBehaviour:
m_GameObject: {fileID: 8230465072192356540}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
+ m_Script: {fileID: 11500000, guid: 13f5cdbcb24caa747b6dc3f8259a6829, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Delegates:
- - eventID: 0
- callback:
- m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 1098348358083011975}
- m_TargetAssemblyTypeName: MainMenuController, Assembly-CSharp
- m_MethodName: SelectControl
- m_Mode: 2
- m_Arguments:
- m_ObjectArgument: {fileID: 6885232896790258425}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.UI.Selectable, UnityEngine.UI
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
--- !u!1 &8255412031830499850
GameObject:
m_ObjectHideFlags: 0
@@ -9654,7 +9550,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2732659713138082864, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMax.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 2732659713138082864, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMin.x
@@ -9662,11 +9558,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2732659713138082864, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMin.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 2732659713138082864, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.x
- value: 1220
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 2732659713138082864, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.y
@@ -9702,11 +9598,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2732659713138082864, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 660
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 2732659713138082864, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 0
+ value: -210
objectReference: {fileID: 0}
- target: {fileID: 2732659713138082864, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -9722,51 +9618,51 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3464628727579885202, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3464628727579885202, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3464628727579885202, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.x
- value: 85.65254
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3464628727579885202, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.y
- value: 90
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3464628727579885202, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 567.17377
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3464628727579885202, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -45
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3821726327718836887, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3821726327718836887, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3821726327718836887, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.x
- value: 610
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3821726327718836887, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.y
- value: 90
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3821726327718836887, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 915
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3821726327718836887, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -45
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 4361713132085702506, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_Name
@@ -9778,27 +9674,27 @@ PrefabInstance:
objectReference: {fileID: 1098348358083011975}
- target: {fileID: 5708197506384322637, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMax.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 5708197506384322637, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMin.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 5708197506384322637, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.x
- value: 499.34747
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 5708197506384322637, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.y
- value: 0
+ value: 90
objectReference: {fileID: 0}
- target: {fileID: 5708197506384322637, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 274.67374
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 5708197506384322637, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 0
+ value: -45
objectReference: {fileID: 0}
- target: {fileID: 7295068642545403421, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_Navigation.m_Mode
@@ -9942,27 +9838,27 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8941782068485230557, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8941782068485230557, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8941782068485230557, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.x
- value: 610
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8941782068485230557, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.y
- value: 90
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8941782068485230557, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 305
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8941782068485230557, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -45
+ value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
@@ -10015,7 +9911,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2732659713138082864, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMax.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 2732659713138082864, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMin.x
@@ -10023,11 +9919,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2732659713138082864, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMin.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 2732659713138082864, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.x
- value: 1220
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 2732659713138082864, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.y
@@ -10063,11 +9959,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2732659713138082864, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 660
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 2732659713138082864, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 0
+ value: -95
objectReference: {fileID: 0}
- target: {fileID: 2732659713138082864, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -10083,51 +9979,51 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3464628727579885202, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3464628727579885202, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3464628727579885202, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.x
- value: 85.65254
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3464628727579885202, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.y
- value: 90
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3464628727579885202, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 567.17377
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3464628727579885202, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -45
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3821726327718836887, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3821726327718836887, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3821726327718836887, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.x
- value: 610
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3821726327718836887, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.y
- value: 90
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3821726327718836887, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 915
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3821726327718836887, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -45
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 4361713132085702506, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_Name
@@ -10139,27 +10035,27 @@ PrefabInstance:
objectReference: {fileID: 1098348358083011975}
- target: {fileID: 5708197506384322637, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMax.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 5708197506384322637, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMin.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 5708197506384322637, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.x
- value: 499.34747
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 5708197506384322637, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.y
- value: 0
+ value: 90
objectReference: {fileID: 0}
- target: {fileID: 5708197506384322637, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 274.67374
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 5708197506384322637, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 0
+ value: -45
objectReference: {fileID: 0}
- target: {fileID: 7295068642545403421, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_Navigation.m_Mode
@@ -10255,27 +10151,27 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8941782068485230557, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8941782068485230557, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8941782068485230557, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.x
- value: 610
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8941782068485230557, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.y
- value: 90
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8941782068485230557, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 305
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8941782068485230557, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -45
+ value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
@@ -13794,7 +13690,7 @@ PrefabInstance:
- target: {fileID: 5910931854525475931, guid: 58e54f7d80aca2645ab598618dffc039, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target
value:
- objectReference: {fileID: 0}
+ objectReference: {fileID: 1098348358083011975}
- target: {fileID: 5910931854525475931, guid: 58e54f7d80aca2645ab598618dffc039, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Target
value:
@@ -18390,7 +18286,7 @@ PrefabInstance:
- target: {fileID: 1543121137935169886, guid: e472bbf090cca566cae93eec176f8dff, type: 3}
propertyPath: m_Navigation.m_SelectOnUp
value:
- objectReference: {fileID: 6097246139495308676}
+ objectReference: {fileID: 6885232896790258425}
- target: {fileID: 1543121137935169886, guid: e472bbf090cca566cae93eec176f8dff, type: 3}
propertyPath: m_Navigation.m_WrapAround
value: 1
@@ -18398,7 +18294,7 @@ PrefabInstance:
- target: {fileID: 1543121137935169886, guid: e472bbf090cca566cae93eec176f8dff, type: 3}
propertyPath: m_Navigation.m_SelectOnDown
value:
- objectReference: {fileID: 4564214452312528895}
+ objectReference: {fileID: 4479662479665033656}
- target: {fileID: 1543121137935169886, guid: e472bbf090cca566cae93eec176f8dff, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 4
@@ -20044,7 +19940,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5877506774103653876, guid: e472bbf090cca566cae93eec176f8dff, type: 3}
propertyPath: m_AnchorMax.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 5877506774103653876, guid: e472bbf090cca566cae93eec176f8dff, type: 3}
propertyPath: m_AnchorMin.x
@@ -20052,15 +19948,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5877506774103653876, guid: e472bbf090cca566cae93eec176f8dff, type: 3}
propertyPath: m_AnchorMin.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 5877506774103653876, guid: e472bbf090cca566cae93eec176f8dff, type: 3}
propertyPath: m_SizeDelta.x
- value: 620
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 5877506774103653876, guid: e472bbf090cca566cae93eec176f8dff, type: 3}
propertyPath: m_SizeDelta.y
- value: 100
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 5877506774103653876, guid: e472bbf090cca566cae93eec176f8dff, type: 3}
propertyPath: m_LocalPosition.x
@@ -20092,11 +19988,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5877506774103653876, guid: e472bbf090cca566cae93eec176f8dff, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 660
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 5877506774103653876, guid: e472bbf090cca566cae93eec176f8dff, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -50
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 5877506774103653876, guid: e472bbf090cca566cae93eec176f8dff, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -20884,7 +20780,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2732659713138082864, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMax.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 2732659713138082864, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMin.x
@@ -20892,11 +20788,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2732659713138082864, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMin.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 2732659713138082864, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.x
- value: 1220
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 2732659713138082864, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.y
@@ -20932,11 +20828,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2732659713138082864, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 660
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 2732659713138082864, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 0
+ value: -325
objectReference: {fileID: 0}
- target: {fileID: 2732659713138082864, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -20952,51 +20848,51 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3464628727579885202, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMax.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 3464628727579885202, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMin.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 3464628727579885202, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.x
- value: 85.65254
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3464628727579885202, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.y
- value: 0
+ value: 90
objectReference: {fileID: 0}
- target: {fileID: 3464628727579885202, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 567.17377
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3464628727579885202, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 0
+ value: -45
objectReference: {fileID: 0}
- target: {fileID: 3821726327718836887, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMax.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 3821726327718836887, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMin.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 3821726327718836887, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.x
- value: 610
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3821726327718836887, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.y
- value: 0
+ value: 90
objectReference: {fileID: 0}
- target: {fileID: 3821726327718836887, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 915
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3821726327718836887, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 0
+ value: -45
objectReference: {fileID: 0}
- target: {fileID: 3919089750255283690, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_Size
@@ -21012,27 +20908,27 @@ PrefabInstance:
objectReference: {fileID: 1098348358083011975}
- target: {fileID: 5708197506384322637, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 5708197506384322637, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 5708197506384322637, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.x
- value: 499.34747
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 5708197506384322637, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.y
- value: 90
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 5708197506384322637, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 274.67374
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 5708197506384322637, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -45
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 5737856650197358937, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMax.x
@@ -21054,6 +20950,10 @@ PrefabInstance:
propertyPath: m_Navigation.m_WrapAround
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 7295068642545403421, guid: f5384028af52031318b1e7207eae294c, type: 3}
+ propertyPath: m_Navigation.m_SelectOnDown
+ value:
+ objectReference: {fileID: 4783037583379668445}
- target: {fileID: 7295068642545403421, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
@@ -21136,27 +21036,27 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8941782068485230557, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMax.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 8941782068485230557, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMin.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 8941782068485230557, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.x
- value: 610
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8941782068485230557, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_SizeDelta.y
- value: 0
+ value: 90
objectReference: {fileID: 0}
- target: {fileID: 8941782068485230557, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 305
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8941782068485230557, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 0
+ value: -45
objectReference: {fileID: 0}
- target: {fileID: 9002934651440049553, guid: f5384028af52031318b1e7207eae294c, type: 3}
propertyPath: m_AnchorMax.x
diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity
index 8bdf80014..12f6fea6c 100644
--- a/Assets/Scenes/Menu.unity
+++ b/Assets/Scenes/Menu.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 785370674}
- m_IndirectSpecularColor: {r: 0.062483214, g: 0.21941298, b: 0.49511638, a: 1}
+ m_IndirectSpecularColor: {r: 0.06252091, g: 0.21943001, b: 0.49507943, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -360,22 +360,12 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- m_RemovedComponents: []
+ m_RemovedComponents:
+ - {fileID: 1094824400466468296, guid: 0e2ad36662a02c3488301a5286b27635, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0e2ad36662a02c3488301a5286b27635, type: 3}
---- !u!114 &204859168 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 1094824400466468296, guid: 0e2ad36662a02c3488301a5286b27635, type: 3}
- m_PrefabInstance: {fileID: 204859167}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 3a21a5d09b8415b46910fd7e3d444796, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!4 &282782751 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e82874ba34dffc64f840e8d7656aac9b, type: 3}
@@ -862,73 +852,105 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
+ - target: {fileID: 311264985586020460, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
+ propertyPath: m_Layer
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 782351408867208552, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
+ propertyPath: m_Layer
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 782351408867208552, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2102403552624161613, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
+ propertyPath: m_Layer
+ value: 2
+ objectReference: {fileID: 0}
- target: {fileID: 2128763140442446709, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_Name
value: EventLog
objectReference: {fileID: 0}
+ - target: {fileID: 2128763140442446709, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
+ propertyPath: m_Layer
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 2128763140442446709, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2821346034402975772, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
+ propertyPath: m_Layer
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 3249794960374761983, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
+ propertyPath: m_Layer
+ value: 2
+ objectReference: {fileID: 0}
- target: {fileID: 4141395643410867512, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchorMax.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 4141395643410867512, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchorMin.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 4141395643410867512, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_SizeDelta.x
- value: 0
+ value: 1046.6667
objectReference: {fileID: 0}
- target: {fileID: 4141395643410867512, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 0
+ value: 533.3334
objectReference: {fileID: 0}
- target: {fileID: 4141395643410867512, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 0
+ value: -55
objectReference: {fileID: 0}
- target: {fileID: 4578728439339042837, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchorMax.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 4578728439339042837, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchorMin.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 4578728439339042837, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_SizeDelta.x
- value: 0
+ value: 1046.6667
objectReference: {fileID: 0}
- target: {fileID: 4578728439339042837, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 0
+ value: 533.3334
objectReference: {fileID: 0}
- target: {fileID: 4578728439339042837, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 0
+ value: -85
objectReference: {fileID: 0}
- target: {fileID: 5146230216362970951, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchorMax.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 5146230216362970951, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchorMin.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 5146230216362970951, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_SizeDelta.x
- value: 0
+ value: 1046.6667
objectReference: {fileID: 0}
- target: {fileID: 5146230216362970951, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 0
+ value: 533.3334
objectReference: {fileID: 0}
- target: {fileID: 5146230216362970951, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 0
+ value: -175
objectReference: {fileID: 0}
- target: {fileID: 5247273415676455409, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_RootOrder
- value: 11
+ value: 10
objectReference: {fileID: 0}
- target: {fileID: 5247273415676455409, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_LocalPosition.x
@@ -970,85 +992,101 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 5387138280754350798, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
+ propertyPath: m_Layer
+ value: 2
+ objectReference: {fileID: 0}
- target: {fileID: 5443924671391283675, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchorMax.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 5443924671391283675, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchorMin.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 5443924671391283675, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_SizeDelta.x
- value: 0
+ value: 1046.6667
objectReference: {fileID: 0}
- target: {fileID: 5443924671391283675, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 0
+ value: 533.3334
objectReference: {fileID: 0}
- target: {fileID: 5443924671391283675, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 0
+ value: -145
+ objectReference: {fileID: 0}
+ - target: {fileID: 5573831978175956736, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
+ propertyPath: m_Layer
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 5666427671796790388, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
+ propertyPath: m_Layer
+ value: 2
objectReference: {fileID: 0}
- target: {fileID: 6931718346765377975, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchorMax.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 6931718346765377975, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchorMin.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 6931718346765377975, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_SizeDelta.x
- value: 0
+ value: 1046.6667
objectReference: {fileID: 0}
- target: {fileID: 6931718346765377975, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 0
+ value: 533.3334
objectReference: {fileID: 0}
- target: {fileID: 6931718346765377975, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 0
+ value: -115
objectReference: {fileID: 0}
- target: {fileID: 7688717083063581215, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchorMax.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 7688717083063581215, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchorMin.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 7688717083063581215, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_SizeDelta.x
- value: 0
+ value: 1046.6667
objectReference: {fileID: 0}
- target: {fileID: 7688717083063581215, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 0
+ value: 533.3334
objectReference: {fileID: 0}
- target: {fileID: 7688717083063581215, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 0
+ value: -205
+ objectReference: {fileID: 0}
+ - target: {fileID: 7770369318922873262, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
+ propertyPath: m_Layer
+ value: 2
objectReference: {fileID: 0}
- target: {fileID: 8803564469037421523, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchorMax.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 8803564469037421523, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchorMin.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 8803564469037421523, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_SizeDelta.x
- value: 0
+ value: 1046.6667
objectReference: {fileID: 0}
- target: {fileID: 8803564469037421523, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 0
+ value: 533.3334
objectReference: {fileID: 0}
- target: {fileID: 8803564469037421523, guid: a1a56a7ccbd053e5a8d1b0f7ce6ac38a, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 0
+ value: -25
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
@@ -1711,7 +1749,7 @@ Transform:
m_Children:
- {fileID: 954105976}
m_Father: {fileID: 0}
- m_RootOrder: 10
+ m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1372750352 stripped
MonoBehaviour:
@@ -2859,10 +2897,6 @@ PrefabInstance:
propertyPath: sun
value:
objectReference: {fileID: 785370678}
- - target: {fileID: 1098348358083011975, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3}
- propertyPath: settingsInfo
- value:
- objectReference: {fileID: 204859168}
- target: {fileID: 1098348358083011975, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3}
propertyPath: mainMenuCamera
value:
@@ -2971,10 +3005,6 @@ PrefabInstance:
propertyPath: m_Camera
value:
objectReference: {fileID: 378774845}
- - target: {fileID: 2476189418835285165, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3}
- propertyPath: settingsInfo
- value:
- objectReference: {fileID: 204859168}
- target: {fileID: 2878829664369250595, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target
value:
@@ -3003,10 +3033,6 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target
value:
objectReference: {fileID: 378774849}
- - target: {fileID: 3425308789493345845, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3}
- propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target
- value:
- objectReference: {fileID: 204859168}
- target: {fileID: 4018858951849858731, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3}
propertyPath: m_TargetCamera
value:
@@ -3035,30 +3061,14 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target
value:
objectReference: {fileID: 378774849}
- - target: {fileID: 4772157052296254996, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3}
- propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target
- value:
- objectReference: {fileID: 8419046673555529007}
- - target: {fileID: 4772157052296254996, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3}
- propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName
- value: HostLocalLobby
- objectReference: {fileID: 0}
- target: {fileID: 4783037583379668445, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target
value:
objectReference: {fileID: 378774849}
- - target: {fileID: 4783037583379668445, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3}
- propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target
- value:
- objectReference: {fileID: 204859168}
- target: {fileID: 4833381458767646314, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target
value:
objectReference: {fileID: 378774849}
- - target: {fileID: 4833381458767646314, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3}
- propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target
- value:
- objectReference: {fileID: 204859168}
- target: {fileID: 5921977457797426374, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target
value:
diff --git a/Assets/Scripts/Control&Input/PlayerInputManagerController.cs b/Assets/Scripts/Control&Input/PlayerInputManagerController.cs
index 2bff31c7c..50994be7c 100644
--- a/Assets/Scripts/Control&Input/PlayerInputManagerController.cs
+++ b/Assets/Scripts/Control&Input/PlayerInputManagerController.cs
@@ -1,6 +1,7 @@
using Mirror;
using System.Collections.Generic;
using System.Diagnostics.Tracing;
+using System.Linq;
using UnityEngine;
using UnityEngine.InputSystem;
@@ -107,10 +108,12 @@ public void JoinAllInputs()
/// Name of the inputMap you want to change to
public void ChangeInputMaps(string mapNameOrId)
{
+ Cursor.visible = LocalPlayerInputs.Any(i => i.IsMouseAndKeyboard) && mapNameOrId.Equals("Menu");
+ Cursor.lockState = Cursor.visible ? CursorLockMode.None : CursorLockMode.Locked;
+
LocalPlayerInputs.ForEach(playerInput =>
{
ChangeInputMapForPlayer(mapNameOrId, playerInput);
- Cursor.visible = playerInput.IsMouseAndKeyboard && mapNameOrId.Equals("Menu");
// Free the playerInputs from their mortail coils (Player prefab or similar assets)
var previousParent = playerInput.transform.parent;
diff --git a/Assets/Scripts/Control&Input/PlayerMovement.cs b/Assets/Scripts/Control&Input/PlayerMovement.cs
index e9de0bbf5..3bb8c9ace 100644
--- a/Assets/Scripts/Control&Input/PlayerMovement.cs
+++ b/Assets/Scripts/Control&Input/PlayerMovement.cs
@@ -180,7 +180,7 @@ public void SetPlayerInput(InputManager player)
localGunHolderHeight = gunHolder.transform.localPosition.y;
playerCamera = inputManager.PlayerCamera;
SetFOVFromSettings();
- sensScale = SettingsInfo.Singleton.settings.sensScale;
+ sensScale = SettingsDataManager.Singleton.SettingsDataInstance.SensitivityScale;
if (MatchController.Singleton)
MatchController.Singleton.onRoundEnd += ResetZoom;
@@ -200,9 +200,9 @@ public void SetFOVFromSettings()
{
if (playerCamera != null)
{
- startingFov = SettingsInfo.Singleton.settings.playerFOV;
- playerCamera.fieldOfView = SettingsInfo.Singleton.settings.playerFOV;
- ZoomFov = SettingsInfo.Singleton.settings.zoomFOV;
+ startingFov = SettingsDataManager.Singleton.SettingsDataInstance.PlayerFOV;
+ playerCamera.fieldOfView = startingFov;
+ ZoomFov = SettingsDataManager.Singleton.SettingsDataInstance.ZoomFOV;
}
}
diff --git a/Assets/Scripts/SettingsDataManager.cs b/Assets/Scripts/SettingsDataManager.cs
new file mode 100644
index 000000000..fbae2bc56
--- /dev/null
+++ b/Assets/Scripts/SettingsDataManager.cs
@@ -0,0 +1,268 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using UnityEditor.Search;
+using UnityEngine;
+using UnityEngine.Audio;
+using UnityEngine.Rendering;
+
+public class SettingsData
+{
+ public float SensitivityScale { get; internal set; }
+ public float PlayerFOV { get; internal set; }
+ public float ZoomFOV { get; internal set; }
+ public float MasterVolume { get; internal set; }
+ public float MusicVolume { get; internal set; }
+ public float SfxVolume { get; internal set; }
+ public int QualityPresetIndex { get; internal set; }
+ public int ResolutionPresetIndex { get; internal set; }
+ public int DisplayModeIndex { get; internal set; }
+
+ ///
+ /// Constructor initialized with given parameter values.
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public SettingsData(
+ float sensitivityScaleVal, float playerFOV, float zoomFOV,
+ float masterVolumeVal, float musicVolumeVal, float sfxVolumeVal,
+ int qualityPresetIndexVal, int resolutionPresetIndexVal, int displayModeIndexVal)
+ {
+ SensitivityScale = sensitivityScaleVal;
+ PlayerFOV = playerFOV;
+ ZoomFOV = zoomFOV;
+ MasterVolume = masterVolumeVal;
+ MusicVolume = musicVolumeVal;
+ SfxVolume = sfxVolumeVal;
+ QualityPresetIndex = qualityPresetIndexVal;
+ ResolutionPresetIndex = resolutionPresetIndexVal;
+ DisplayModeIndex = displayModeIndexVal;
+ }
+
+ ///
+ /// Default constructor for SettingsData. Set with default values.
+ ///
+ public SettingsData()
+ {
+ SensitivityScale = 1.0f;
+ PlayerFOV = 60f;
+ ZoomFOV = 30f;
+ MasterVolume = 1.0f;
+ MusicVolume = 1.0f;
+ SfxVolume = 1.0f;
+ QualityPresetIndex = 0;
+ ResolutionPresetIndex = 0;
+ DisplayModeIndex = 0;
+ }
+
+ public string FormatDataToJSON()
+ {
+ return $"{{\"SensitivityScale\":{SensitivityScale},\"PlayerFOV\":{PlayerFOV},\"ZoomFOV\":{ZoomFOV}," +
+ $"\"MasterVolume\":{MasterVolume},\"MusicVolume\":{MusicVolume},\"SfxVolume\":{SfxVolume}," +
+ $"\"QualityPresetIndex\":{QualityPresetIndex},\"ResolutionPresetIndex\":{ResolutionPresetIndex},\"DisplayModeIndex\":{DisplayModeIndex}}}";
+ }
+}
+
+public class SettingsDataManager : MonoBehaviour
+{
+ public static SettingsDataManager Singleton { get; private set; }
+
+ private const string FileName = "/Settings.json";
+
+ private static string FilePath;
+ #region Graphic variables
+ public Resolution[] Resolutions { get; private set; }
+ public string[] QualityNames { get; private set; }
+ #endregion
+ #region Audio variables
+ private const string audioGroupMaster = "masterVolume";
+ private const string audioGroupMusic = "musicVolume";
+ private const string audioGroupSFX = "sfxVolume";
+
+ private float maxVolumeMusic;
+ private float maxVolumeSFX;
+
+ [SerializeField]
+ private AudioMixer mainAudioMixer;
+ #endregion
+ #region Gameplay variables
+
+ [Header("Sensitivity Limits")]
+ public float LowerSensLimit = 0.1f;
+ public float UpperSensLimit = 3f;
+
+ [Header("FOV Limits")]
+ public float LowerFOVLimit = 60f;
+ public float UpperFOVLimit = 120f;
+
+ [Header("Zoom FOV Limits")]
+ public float LowerZoomFOVLimit = 20f;
+ public float UpperZoomFOVLimit = 50f;
+
+ #endregion
+
+ public SettingsData SettingsDataInstance;
+
+ private void Awake()
+ {
+ Resolutions = Screen.resolutions.Reverse().ToArray();
+ QualityNames = QualitySettings.names;
+
+ SettingsDataInstance = new();
+
+ mainAudioMixer.GetFloat(audioGroupMusic, out float musicVolume);
+ maxVolumeMusic = musicVolume;
+ mainAudioMixer.GetFloat(audioGroupSFX, out float sfxVolume);
+ maxVolumeSFX = sfxVolume;
+ }
+
+ void Start()
+ {
+ #region Singleton boilerplate
+
+ if (Singleton != null)
+ {
+ if (Singleton != this)
+ {
+ Debug.LogWarning($"There's more than one {Singleton.GetType()} in the scene!");
+ Destroy(gameObject);
+ }
+
+ return;
+ }
+
+ Singleton = this;
+
+ #endregion Singleton boilerplate
+
+ FilePath = Application.persistentDataPath + FileName;
+
+ if (!File.Exists(FilePath))
+ {
+ CreateDefaultFile();
+ }
+ LoadSettingsFile();
+ ApplyAllSettings();
+
+ DontDestroyOnLoad(gameObject);
+ }
+ #region Save methods
+ private void LoadSettingsFile()
+ {
+ try
+ {
+ string jsonData = File.ReadAllText(FilePath);
+ SettingsDataInstance = JsonUtility.FromJson(jsonData);
+ Debug.Log("Settings data loaded");
+ }
+ catch
+ {
+ Debug.Log("Settings file corrupted or missing");
+ CreateDefaultFile();
+ }
+ }
+
+ private void CreateDefaultFile()
+ {
+ string jsonData = JsonUtility.ToJson(SettingsDataInstance);
+ File.WriteAllText(FilePath, jsonData);
+ }
+
+ public void SaveSettingsData()
+ {
+ CreateDefaultFile();
+ }
+
+ public void ApplyAllSettings()
+ {
+ SetResolutionLevel(SettingsDataInstance.ResolutionPresetIndex);
+ SetDisplayMode(SettingsDataInstance.DisplayModeIndex);
+ SetQualityLevel(SettingsDataInstance.QualityPresetIndex);
+ SetMasterVolume(SettingsDataInstance.MasterVolume);
+ SetMusicVolume(SettingsDataInstance.MusicVolume);
+ SetSFXVolume(SettingsDataInstance.SfxVolume);
+ }
+ #endregion
+ #region Audio methods
+ private float LinearToLogarithmicVolume(float volume)
+ {
+ return 20 * (Mathf.Log10(10 * Mathf.Max(volume, .0001f)) - 1);
+ }
+
+ public void SetMasterVolume(float volume)
+ {
+ SettingsDataInstance.MasterVolume = Mathf.Clamp(volume, 0f, 1f);
+ mainAudioMixer.SetFloat(audioGroupMaster, LinearToLogarithmicVolume(SettingsDataInstance.MasterVolume));
+ }
+
+ public void SetMusicVolume(float volume)
+ {
+ SettingsDataInstance.MusicVolume = Mathf.Clamp(volume, 0f, 1f);
+ mainAudioMixer.SetFloat(audioGroupMusic, LinearToLogarithmicVolume(SettingsDataInstance.MusicVolume) + maxVolumeMusic);
+ }
+
+ public void SetSFXVolume(float volume)
+ {
+ SettingsDataInstance.SfxVolume = Mathf.Clamp(volume, 0f, 1f);
+ mainAudioMixer.SetFloat(audioGroupSFX, LinearToLogarithmicVolume(SettingsDataInstance.SfxVolume) + maxVolumeSFX);
+ }
+ #endregion
+ #region Graphic methods
+ public void SetQualityLevel(int index)
+ {
+ SettingsDataInstance.QualityPresetIndex = Math.Clamp(index, 0, QualityNames.Length - 1);
+ QualitySettings.SetQualityLevel(QualityNames.Length - index - 1);
+ }
+
+ public void SetResolutionLevel(int index)
+ {
+ SettingsDataInstance.ResolutionPresetIndex = Math.Clamp(index, 0, Resolutions.Length - 1);
+ var resolution = Resolutions[index];
+ Screen.SetResolution(resolution.width, resolution.height, true);
+ }
+
+ public void SetDisplayMode(int index)
+ {
+ // Constant value 3, because of dropdowns children in the editor.
+ SettingsDataInstance.DisplayModeIndex = Math.Clamp(index, 0, 3);
+ Screen.fullScreenMode = (FullScreenMode)index;
+ }
+ #endregion
+ #region Gameplay methods
+ public float ClampSensValue(float value)
+ {
+ return Mathf.Clamp(value, LowerSensLimit, UpperSensLimit);
+ }
+ public void SetSensMultiplier(float scale)
+ {
+ SettingsDataInstance.SensitivityScale = Mathf.Max(scale, 0.1f);
+ }
+
+ public float ClampFOVValue(float value)
+ {
+ return Mathf.Clamp(value, LowerFOVLimit, UpperFOVLimit);
+ }
+
+ public float ClampZoomFOVValue(float value)
+ {
+ return Mathf.Clamp(value, LowerSensLimit, UpperSensLimit);
+ }
+
+ public void SetFOV(float fov)
+ {
+ SettingsDataInstance.PlayerFOV = Mathf.Clamp(fov, 1f, 179f);
+ }
+
+ public void SetZoomFOV(float zoomFOV)
+ {
+ SettingsDataInstance.ZoomFOV = Mathf.Clamp(zoomFOV, 1f, 179f);
+ }
+ #endregion
+}
diff --git a/Assets/Scripts/SettingsInfo.cs.meta b/Assets/Scripts/SettingsDataManager.cs.meta
similarity index 100%
rename from Assets/Scripts/SettingsInfo.cs.meta
rename to Assets/Scripts/SettingsDataManager.cs.meta
diff --git a/Assets/Scripts/SettingsInfo.cs b/Assets/Scripts/SettingsInfo.cs
deleted file mode 100644
index 5e403c46b..000000000
--- a/Assets/Scripts/SettingsInfo.cs
+++ /dev/null
@@ -1,253 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using UnityEditor.Search;
-using UnityEngine;
-using UnityEngine.Audio;
-using UnityEngine.Rendering;
-
-public struct Settings
-{
- // Audio
- public float masterVolume;
- public float musicVolume;
- public float sfxVolume;
-
- // Graphics
- public int qualityPresetIndex;
- public int resolutionPresetIndex;
- public int displayMode;
-
- // Gameplay
- public float sensScale;
- public float playerFOV;
- public float zoomFOV;
-}
-
-public class SettingsInfo : MonoBehaviour
-{
- public static SettingsInfo Singleton { get; private set; }
-
- private const string FileName = "/Settings.json";
-
- private static string FilePath;
- #region Graphics variables
- public Resolution[] resolutions { get; private set; }
-
- public string[] qualityNames { get; private set; }
- #endregion
- #region Audio variables
- private const string audioGroupMaster = "masterVolume";
- private const string audioGroupMusic = "musicVolume";
- private const string audioGroupSFX = "sfxVolume";
-
- private float maxVolumeMusic;
- private float maxVolumeSFX;
-
- [SerializeField]
- private AudioMixer mainAudioMixer;
- #endregion
- #region Gameplay variables
-
- [Header("Sensitivity Limits")]
- public float lowerSensLimit = 0.1f;
- public float upperSensLimit = 3f;
-
- [Header("FOV Limits")]
- public float lowerFOVLimit = 60f;
- public float upperFOVLimit = 120f;
-
- [Header("Zoom FOV Limits")]
- public float lowerZoomFOVLimit = 20f;
- public float upperZoomFOVLimit = 50f;
-
- #endregion
- public Settings settings = new()
- {
- sensScale = 1.0f,
- masterVolume = 1.0f,
- musicVolume = 1.0f,
- sfxVolume = 1.0f,
- qualityPresetIndex = 0,
- resolutionPresetIndex = 0,
- displayMode = 0,
- };
-
- private void Awake()
- {
- resolutions = Screen.resolutions.Reverse().ToArray();
- qualityNames = QualitySettings.names;
-
- mainAudioMixer.GetFloat(audioGroupMusic, out float musicVolume);
- maxVolumeMusic = musicVolume;
- mainAudioMixer.GetFloat(audioGroupSFX, out float sfxVolume);
- maxVolumeSFX = sfxVolume;
- }
-
- void Start()
- {
- #region Singleton boilerplate
-
- if (Singleton != null)
- {
- if (Singleton != this)
- {
- Debug.LogWarning($"There's more than one {Singleton.GetType()} in the scene!");
- Destroy(gameObject);
- }
-
- return;
- }
-
- Singleton = this;
-
- #endregion Singleton boilerplate
-
- FilePath = Application.persistentDataPath + FileName;
-
- if (!File.Exists(FilePath))
- {
- CreateDefaultFile();
- }
- LoadSettingsFile();
- ApplyAllSettings();
-
- DontDestroyOnLoad(gameObject);
- }
- #region Save methods
- private void LoadSettingsFile()
- {
- try
- {
- string jsonData = File.ReadAllText(FilePath);
- settings = JsonUtility.FromJson(jsonData);
- Debug.Log("Settings data loaded");
- ValidateSettings();
- }
- catch
- {
- Debug.Log("Settings file corrupted or missing");
- CreateDefaultFile();
- }
- }
-
- private void ValidateSettings()
- {
- // Check limits for Audio
- Mathf.Clamp(settings.masterVolume, 0f, 1f);
- Mathf.Clamp(settings.musicVolume, 0f, 1f);
- Mathf.Clamp(settings.sfxVolume, 0f, 1f);
-
- // Check limits for Graphics
- Math.Clamp(settings.resolutionPresetIndex, 0, resolutions.Length - 1);
- Math.Clamp(settings.qualityPresetIndex, 0, qualityNames.Length - 1);
- Math.Clamp(settings.displayMode, 0, 3);
-
- // Check lower limits for Gameplay
- if (settings.sensScale <= 0f)
- settings.sensScale = 0.01f;
-
- if (settings.playerFOV < 20f)
- settings.playerFOV = 20f;
-
- if (settings.zoomFOV < 5f)
- settings.zoomFOV = 5f;
- }
-
- private void CreateDefaultFile()
- {
- string jsonData = JsonUtility.ToJson(settings);
- File.WriteAllText(FilePath, jsonData);
- }
-
- public void SaveSettingsData()
- {
- CreateDefaultFile();
- }
-
- public void ApplyAllSettings()
- {
- SetResolutionLevel(settings.resolutionPresetIndex);
- SetDisplayMode(settings.resolutionPresetIndex);
- SetQualityLevel(settings.qualityPresetIndex);
- SetMasterVolume(settings.masterVolume);
- SetMusicVolume(settings.musicVolume);
- }
- #endregion
- #region Audio methods
- private float LinearToLogarithmicVolume(float volume)
- {
- return 20 * (Mathf.Log10(10 * Mathf.Max(volume, .0001f)) - 1);
- }
-
- public void SetMasterVolume(float volume)
- {
- settings.masterVolume = volume;
- mainAudioMixer.SetFloat(audioGroupMaster, LinearToLogarithmicVolume(settings.masterVolume));
- }
-
- public void SetMusicVolume(float volume)
- {
- settings.musicVolume = volume;
- mainAudioMixer.SetFloat(audioGroupMusic, LinearToLogarithmicVolume(settings.musicVolume) + maxVolumeMusic);
- }
-
- public void SetSFXVolume(float volume)
- {
- settings.sfxVolume = volume;
- mainAudioMixer.SetFloat(audioGroupSFX, LinearToLogarithmicVolume(settings.sfxVolume) + maxVolumeSFX);
- }
- #endregion
- #region Graphic methods
- public void SetQualityLevel(int index)
- {
- settings.qualityPresetIndex = index;
- QualitySettings.SetQualityLevel(qualityNames.Length - index - 1);
- }
-
- public void SetResolutionLevel(int index)
- {
- settings.resolutionPresetIndex = index;
- var resolution = resolutions[index];
- Screen.SetResolution(resolution.width, resolution.height, true);
- }
-
- public void SetDisplayMode(int index)
- {
- settings.displayMode = index;
- Screen.fullScreenMode = (FullScreenMode)index;
- }
- #endregion
- #region Gameplay methods
- public float ClampSensValue(float value)
- {
- return Mathf.Clamp(value, lowerSensLimit, upperSensLimit);
- }
- public void SetSensMultiplier(float scale)
- {
- settings.sensScale = scale;
- }
-
- public float ClampFOVValue(float value)
- {
- return Mathf.Clamp(value, lowerFOVLimit, upperFOVLimit);
- }
-
- public float ClampZoomFOVValue(float value)
- {
- return Mathf.Clamp(value, lowerZoomFOVLimit, upperZoomFOVLimit);
- }
-
- public void SetFOV(float fov)
- {
- settings.playerFOV = fov;
- }
-
- public void SetZoomFOV(float zoomFOV)
- {
- settings.zoomFOV = zoomFOV;
- }
- #endregion
-}
diff --git a/Assets/Scripts/UI/MainMenu/MainMenuController.cs b/Assets/Scripts/UI/MainMenu/MainMenuController.cs
index 630953a82..b4873b125 100644
--- a/Assets/Scripts/UI/MainMenu/MainMenuController.cs
+++ b/Assets/Scripts/UI/MainMenu/MainMenuController.cs
@@ -81,9 +81,6 @@ public class MainMenuController : MonoBehaviour
private LobbyType lobbyType;
- [SerializeField]
- private SettingsInfo settingsInfo;
-
private InputManager firstInputJoined;
private void Awake()
@@ -95,6 +92,9 @@ private void Awake()
private void Start()
{
+ // Set inactive since it blocks the ui elements for tabs.
+ EventLog.Singleton.transform.GetChild(0).gameObject.SetActive(false);
+
aiButtonOriginalPosition = aIButton.transform.localPosition;
PlayerInputManagerController.Singleton.MatchHasAI = false;
audioSource = GetComponent();
@@ -391,6 +391,7 @@ public void HostFriendsOnlyLobby()
public void StartTrainingMode()
{
+ EventLog.Singleton.transform.GetChild(0).gameObject.SetActive(false);
PlayerInputManagerController.Singleton.RemoveJoinListener();
Peer2PeerTransport.StartTrainingMode();
playerSelectManager.UpdateLobby();
@@ -418,6 +419,8 @@ public void SetGamemode(Ruleset gamemode)
public void StartLobby()
{
+ EventLog.Singleton.transform.GetChild(0).gameObject.SetActive(true);
+
if (!SteamManager.IsSteamActive)
{
NetworkManager.singleton.StartHost();
diff --git a/Assets/Scripts/UI/MainMenu/OptionsMenu.cs b/Assets/Scripts/UI/MainMenu/OptionsMenu.cs
index 1aacbc036..c73ef0dbf 100644
--- a/Assets/Scripts/UI/MainMenu/OptionsMenu.cs
+++ b/Assets/Scripts/UI/MainMenu/OptionsMenu.cs
@@ -54,51 +54,51 @@ public class OptionsMenu : MonoBehaviour
#endregion
- [SerializeField]
- private SettingsInfo settingsInfo;
+ private SettingsDataManager settingsDataManager;
private void Start()
{
+ settingsDataManager = SettingsDataManager.Singleton;
+
CheckResolutions();
CheckQuality();
- settingsInfo = SettingsInfo.Singleton;
- sensitivitySlider.minValue = settingsInfo.lowerSensLimit;
- sensitivitySlider.maxValue = settingsInfo.upperSensLimit;
+ sensitivitySlider.minValue = settingsDataManager.LowerSensLimit;
+ sensitivitySlider.maxValue = settingsDataManager.UpperSensLimit;
- FOVSlider.minValue = settingsInfo.lowerFOVLimit;
- FOVSlider.maxValue = settingsInfo.upperFOVLimit;
+ FOVSlider.minValue = settingsDataManager.LowerFOVLimit;
+ FOVSlider.maxValue = settingsDataManager.UpperFOVLimit;
- ZoomFOVSlider.minValue = settingsInfo.lowerZoomFOVLimit;
- ZoomFOVSlider.maxValue = settingsInfo.upperZoomFOVLimit;
+ ZoomFOVSlider.minValue = settingsDataManager.LowerZoomFOVLimit;
+ ZoomFOVSlider.maxValue = settingsDataManager.UpperZoomFOVLimit;
SetOptionItems();
}
private void SetOptionItems()
{
- resolutionDropdown.value = settingsInfo.settings.resolutionPresetIndex;
+ resolutionDropdown.value = settingsDataManager.SettingsDataInstance.ResolutionPresetIndex;
- fullscreenTypeDropdown.value = settingsInfo.settings.resolutionPresetIndex;
+ fullscreenTypeDropdown.value = settingsDataManager.SettingsDataInstance.DisplayModeIndex;
- qualityDropdown.value = settingsInfo.settings.qualityPresetIndex;
+ qualityDropdown.value = settingsDataManager.SettingsDataInstance.QualityPresetIndex;
- masterVolumeSlider.value = settingsInfo.settings.masterVolume;
+ masterVolumeSlider.value = settingsDataManager.SettingsDataInstance.MasterVolume;
- musicVolumeSlider.value = settingsInfo.settings.musicVolume;
+ musicVolumeSlider.value = settingsDataManager.SettingsDataInstance.MusicVolume;
- sfxVolumeSlider.value = settingsInfo.settings.sfxVolume;
+ sfxVolumeSlider.value = settingsDataManager.SettingsDataInstance.SfxVolume;
- sensitivitySlider.value = settingsInfo.settings.sensScale;
- sensitivityInputField.text = settingsInfo.settings.sensScale.ToString("0.00");
+ sensitivitySlider.value = settingsDataManager.SettingsDataInstance.SensitivityScale;
+ sensitivityInputField.text = settingsDataManager.SettingsDataInstance.SensitivityScale.ToString("0.00");
- FOVSlider.value = settingsInfo.settings.playerFOV;
- FOVInputField.text = settingsInfo.settings.playerFOV.ToString("0.00");
+ FOVSlider.value = settingsDataManager.SettingsDataInstance.PlayerFOV;
+ FOVInputField.text = settingsDataManager.SettingsDataInstance.PlayerFOV.ToString("0.00");
- ZoomFOVSlider.value = settingsInfo.settings.zoomFOV;
- ZoomFOVInputField.text = settingsInfo.settings.zoomFOV.ToString("0.00");
+ ZoomFOVSlider.value = settingsDataManager.SettingsDataInstance.ZoomFOV;
+ ZoomFOVInputField.text = settingsDataManager.SettingsDataInstance.ZoomFOV.ToString("0.00");
- settingsInfo.ApplyAllSettings();
+ settingsDataManager.ApplyAllSettings();
}
///
@@ -106,7 +106,7 @@ private void SetOptionItems()
///
private void CheckResolutions()
{
- Resolution[] resolutions = settingsInfo.resolutions;
+ Resolution[] resolutions = settingsDataManager.Resolutions;
resolutionDropdown.AddOptions(resolutions.Select(r => $"{r.width} x {r.height}").ToList());
resolutionDropdown.value = System.Array.FindIndex(resolutions, r => r.width == Screen.currentResolution.width && r.height == Screen.currentResolution.height);
resolutionDropdown.RefreshShownValue();
@@ -115,7 +115,7 @@ private void CheckResolutions()
private void CheckQuality()
{
// We invert this list so the dropdown goes from high to low quality.
- string[] qualityNames = settingsInfo.qualityNames;
+ string[] qualityNames = settingsDataManager.QualityNames;
qualityDropdown.AddOptions(qualityNames.Reverse().ToList());
qualityDropdown.value = QualitySettings.GetQualityLevel() - qualityNames.Length - 1;
qualityDropdown.RefreshShownValue();
@@ -123,86 +123,86 @@ private void CheckQuality()
public void SetMasterVolume(float volume)
{
- settingsInfo.SetMasterVolume(volume);
+ settingsDataManager.SetMasterVolume(volume);
}
public void SetMusicVolume(float volume)
{
- settingsInfo.SetMusicVolume(volume);
+ settingsDataManager.SetMusicVolume(volume);
}
public void SetSFXVolume(float volume)
{
- settingsInfo.SetSFXVolume(volume);
+ settingsDataManager.SetSFXVolume(volume);
}
public void SetQualityLevel(int qualityPresetIndex)
{
- settingsInfo.SetQualityLevel(qualityPresetIndex);
+ settingsDataManager.SetQualityLevel(qualityPresetIndex);
}
public void SetResolution(int dropdownIndex)
{
- settingsInfo.SetResolutionLevel(dropdownIndex);
+ settingsDataManager.SetResolutionLevel(dropdownIndex);
}
public void SetDisplayMode(int displayMode)
{
- settingsInfo.SetDisplayMode(displayMode);
+ settingsDataManager.SetDisplayMode(displayMode);
}
public void CheckSensInputValue(string inputValue)
{
- sensitivityInputField.text = settingsInfo.ClampSensValue(float.Parse(inputValue)).ToString("0.00");
+ sensitivityInputField.text = settingsDataManager.ClampSensValue(float.Parse(inputValue)).ToString("0.00");
}
public void ChangeSensInputField(float value)
{
sensitivityInputField.text = value.ToString("0.00");
- settingsInfo.SetSensMultiplier(value);
+ settingsDataManager.SetSensMultiplier(value);
}
public void ChangeSensSliderValue(string inputValue)
{
- float value = settingsInfo.ClampSensValue(float.Parse(inputValue));
+ float value = settingsDataManager.ClampSensValue(float.Parse(inputValue));
sensitivitySlider.value = value;
- settingsInfo.SetSensMultiplier(value);
+ settingsDataManager.SetSensMultiplier(value);
}
public void CheckFOVInputValue(string inputValue)
{
- FOVInputField.text = settingsInfo.ClampFOVValue(float.Parse(inputValue)).ToString("0.00");
+ FOVInputField.text = settingsDataManager.ClampFOVValue(float.Parse(inputValue)).ToString("0.00");
}
public void CheckZoomFOVInputValue(string inputValue)
{
- ZoomFOVInputField.text = settingsInfo.ClampZoomFOVValue(float.Parse(inputValue)).ToString("0.00");
+ ZoomFOVInputField.text = settingsDataManager.ClampZoomFOVValue(float.Parse(inputValue)).ToString("0.00");
}
public void ChangeFOVInputField(float value)
{
FOVInputField.text = value.ToString("0.00");
- settingsInfo.SetFOV(value);
+ settingsDataManager.SetFOV(value);
}
public void ChangeZoomFOVInputField(float value)
{
ZoomFOVInputField.text = value.ToString("0.00");
- settingsInfo.SetZoomFOV(value);
+ settingsDataManager.SetZoomFOV(value);
}
public void ChangeFOVSliderValue(string inputValue)
{
- float value = settingsInfo.ClampFOVValue(float.Parse(inputValue));
+ float value = settingsDataManager.ClampFOVValue(float.Parse(inputValue));
FOVSlider.value = value;
- settingsInfo.SetFOV(value);
+ settingsDataManager.SetFOV(value);
}
public void ChangeZoomFOVSliderValue(string inputValue)
{
- float value = settingsInfo.ClampZoomFOVValue(float.Parse(inputValue));
+ float value = settingsDataManager.ClampZoomFOVValue(float.Parse(inputValue));
ZoomFOVSlider.value = value;
- settingsInfo.SetZoomFOV(value);
+ settingsDataManager.SetZoomFOV(value);
}
}
diff --git a/Assets/Scripts/UI/PauseMenu.cs b/Assets/Scripts/UI/PauseMenu.cs
index 1b9e0efe9..f7c261eda 100644
--- a/Assets/Scripts/UI/PauseMenu.cs
+++ b/Assets/Scripts/UI/PauseMenu.cs
@@ -1,5 +1,6 @@
using System.Collections;
using System.Collections.Generic;
+using System.Linq;
using Mirror;
using UnityEngine;
using UnityEngine.EventSystems;
@@ -38,6 +39,9 @@ private void Open(InputAction.CallbackContext ctx)
panel.gameObject.SetActive(true);
EventSystem.current.SetSelectedGameObject(buttonToFocus.gameObject);
+ //Cursor.visible = PlayerInputManagerController.Singleton.LocalPlayerInputs.Any(i => i.IsMouseAndKeyboard);
+ //Cursor.lockState = Cursor.visible ? CursorLockMode.None : CursorLockMode.Locked;
+
foreach (var player in Peer2PeerTransport.LocalPlayerInstances)
{
PlayerInputManagerController.Singleton.ChangeInputMapForPlayer("Menu", player.inputManager);
@@ -56,6 +60,11 @@ private void Continue(InputAction.CallbackContext ctx) =>
public void Continue()
{
+ // Todo: Make mouse visible and interact with buttons.
+ // To achieve this the globalHUD needs to assign it's canvas to the player's camera.
+ //Cursor.visible = false;
+ //Cursor.lockState = CursorLockMode.Locked;
+
panel.gameObject.SetActive(false);
var inputMap = SceneManager.GetActiveScene().name == Scenes.Bidding ? "Bidding" : "FPS";
diff --git a/Assets/Scripts/UI/SelectButtonHover.cs b/Assets/Scripts/UI/SelectUIElementHover.cs
similarity index 59%
rename from Assets/Scripts/UI/SelectButtonHover.cs
rename to Assets/Scripts/UI/SelectUIElementHover.cs
index 1ad1375a8..0695ce630 100644
--- a/Assets/Scripts/UI/SelectButtonHover.cs
+++ b/Assets/Scripts/UI/SelectUIElementHover.cs
@@ -4,10 +4,16 @@
using UnityEngine.EventSystems;
using UnityEngine.UI;
-public class SelectButtonHover : MonoBehaviour, IPointerEnterHandler
+public class SelectUIElementHover : MonoBehaviour, IPointerEnterHandler
{
public void OnPointerEnter(PointerEventData eventData)
{
+ StartCoroutine(WaitSelect());
+ }
+
+ private IEnumerator WaitSelect()
+ {
+ yield return null;
EventSystem.current.SetSelectedGameObject(gameObject);
}
}
diff --git a/Assets/Scripts/UI/SelectButtonHover.cs.meta b/Assets/Scripts/UI/SelectUIElementHover.cs.meta
similarity index 100%
rename from Assets/Scripts/UI/SelectButtonHover.cs.meta
rename to Assets/Scripts/UI/SelectUIElementHover.cs.meta