From 8f3ecfdab4fc740bf06b9dec8bfab0b890d1fa36 Mon Sep 17 00:00:00 2001 From: Lncvrt Date: Sat, 7 Jun 2025 14:25:46 -0700 Subject: [PATCH] Add a setting to hide socials from main menu --- Assets/Scenes/MainMenu.unity | 15 + Assets/Scenes/SettingsMenu.unity | 411 +++++++++++++++++++++- Assets/Scripts/GamePlayer.cs | 4 +- Assets/Scripts/HideIfSettingFalse.cs | 12 + Assets/Scripts/HideIfSettingFalse.cs.meta | 2 + Assets/Scripts/LoadingMenu.cs | 4 +- Assets/Scripts/SettingsMenu.cs | 7 + 7 files changed, 434 insertions(+), 21 deletions(-) create mode 100644 Assets/Scripts/HideIfSettingFalse.cs create mode 100644 Assets/Scripts/HideIfSettingFalse.cs.meta diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index f51c1a0..63afd3f 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -1716,6 +1716,7 @@ GameObject: m_Component: - component: {fileID: 989689724} - component: {fileID: 989689725} + - component: {fileID: 989689726} m_Layer: 5 m_Name: Socials m_TagString: Untagged @@ -1770,6 +1771,20 @@ MonoBehaviour: m_Spacing: {x: 5, y: 0} m_Constraint: 0 m_ConstraintCount: 2 +--- !u!114 &989689726 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 989689723} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 510ceabd73a028caaacaff223c041fc8, type: 3} + m_Name: + m_EditorClassIdentifier: + setting: Setting4 + reverse: 1 --- !u!1 &1083924172 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/SettingsMenu.unity b/Assets/Scenes/SettingsMenu.unity index fba70d3..ce9a387 100644 --- a/Assets/Scenes/SettingsMenu.unity +++ b/Assets/Scenes/SettingsMenu.unity @@ -194,6 +194,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 19891387} m_CullTransparentMesh: 1 +--- !u!1 &24449670 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 24449671} + - component: {fileID: 24449673} + - component: {fileID: 24449672} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &24449671 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 24449670} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1981913292} + m_Father: {fileID: 1304594479} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 10, y: -10} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &24449672 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 24449670} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 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!222 &24449673 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 24449670} + m_CullTransparentMesh: 1 --- !u!1 &38087965 GameObject: m_ObjectHideFlags: 0 @@ -269,6 +345,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 38087965} m_CullTransparentMesh: 1 +--- !u!1 &55903556 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 55903557} + - component: {fileID: 55903559} + - component: {fileID: 55903558} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &55903557 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 55903556} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1304594479} + 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: 110, y: 40} + m_SizeDelta: {x: 250, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &55903558 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 55903556} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Hide socials from main menu + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 4fd546dd0900395408d2de20f5025882, type: 2} + m_sharedMaterial: {fileID: -1476194838487357290, guid: 4fd546dd0900395408d2de20f5025882, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 17.7 + m_fontSizeBase: 28 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 1 + m_fontSizeMax: 24 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &55903559 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 55903556} + m_CullTransparentMesh: 1 --- !u!1 &99615552 GameObject: m_ObjectHideFlags: 0 @@ -781,6 +993,7 @@ MonoBehaviour: setting1toggle: {fileID: 520069224} setting2toggle: {fileID: 169747951} setting3toggle: {fileID: 1174440250} + setting4toggle: {fileID: 1304594480} musicSlider: {fileID: 382287572} sfxSlider: {fileID: 964986325} --- !u!1 &382287570 @@ -1180,8 +1393,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 145, y: 40} - m_SizeDelta: {x: 321.1625, y: 50} + m_AnchoredPosition: {x: 110, y: 40} + m_SizeDelta: {x: 250, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &606672994 MonoBehaviour: @@ -1230,12 +1443,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28 + m_fontSize: 24 m_fontSizeBase: 28 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 + m_enableAutoSizing: 1 + m_fontSizeMin: 1 + m_fontSizeMax: 24 m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 @@ -1316,8 +1529,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 145, y: 40} - m_SizeDelta: {x: 321.1625, y: 50} + m_AnchoredPosition: {x: 110, y: 40} + m_SizeDelta: {x: 250, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &713450370 MonoBehaviour: @@ -1366,12 +1579,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28 + m_fontSize: 24 m_fontSizeBase: 28 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 + m_enableAutoSizing: 1 + m_fontSizeMin: 1 + m_fontSizeMax: 24 m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 @@ -2070,8 +2283,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 145, y: 40} - m_SizeDelta: {x: 321.1625, y: 50} + m_AnchoredPosition: {x: 110, y: 40} + m_SizeDelta: {x: 250, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1245917766 MonoBehaviour: @@ -2120,12 +2333,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28 + m_fontSize: 24 m_fontSizeBase: 28 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 + m_enableAutoSizing: 1 + m_fontSizeMin: 1 + m_fontSizeMax: 24 m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 @@ -2409,6 +2622,92 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: sceneName: MainMenu +--- !u!1 &1304594478 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1304594479} + - component: {fileID: 1304594480} + m_Layer: 5 + m_Name: Toggle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1304594479 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1304594478} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 24449671} + - {fileID: 55903557} + m_Father: {fileID: 1308455152} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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!114 &1304594480 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1304594478} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, 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: 24449672} + toggleTransition: 1 + graphic: {fileID: 1981913293} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_IsOn: 1 --- !u!1 &1308455151 GameObject: m_ObjectHideFlags: 0 @@ -2441,6 +2740,7 @@ RectTransform: - {fileID: 520069223} - {fileID: 169747950} - {fileID: 1174440249} + - {fileID: 1304594479} m_Father: {fileID: 876482804} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -2834,6 +3134,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1934826636} m_CullTransparentMesh: 1 +--- !u!1 &1981913291 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1981913292} + - component: {fileID: 1981913294} + - component: {fileID: 1981913293} + m_Layer: 5 + m_Name: Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1981913292 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1981913291} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 24449671} + 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: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1981913293 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1981913291} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 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: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1981913294 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1981913291} + m_CullTransparentMesh: 1 --- !u!1 &2028499540 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GamePlayer.cs b/Assets/Scripts/GamePlayer.cs index 845b252..c0b7463 100644 --- a/Assets/Scripts/GamePlayer.cs +++ b/Assets/Scripts/GamePlayer.cs @@ -572,7 +572,7 @@ public class GamePlayer : MonoBehaviour Cursor.visible = true; Cursor.lockState = CursorLockMode.None; backgroundMusic.Pause(); - pausePanel.SetActive(value: true); + pausePanel.SetActive(true); } public void DisablePause() @@ -580,7 +580,7 @@ public class GamePlayer : MonoBehaviour Cursor.visible = false; Cursor.lockState = CursorLockMode.Locked; backgroundMusic.Play(); - pausePanel.SetActive(value: false); + pausePanel.SetActive(false); } void OnApplicationPause(bool pause) diff --git a/Assets/Scripts/HideIfSettingFalse.cs b/Assets/Scripts/HideIfSettingFalse.cs new file mode 100644 index 0000000..71cafd7 --- /dev/null +++ b/Assets/Scripts/HideIfSettingFalse.cs @@ -0,0 +1,12 @@ +using UnityEngine; + +public class HideIfSettingFalse : MonoBehaviour +{ + public string setting; + public bool reverse; + + void Awake() + { + gameObject.SetActive(PlayerPrefs.GetInt(setting, 0) == (reverse ? 0 : 1)); + } +} \ No newline at end of file diff --git a/Assets/Scripts/HideIfSettingFalse.cs.meta b/Assets/Scripts/HideIfSettingFalse.cs.meta new file mode 100644 index 0000000..9d980cb --- /dev/null +++ b/Assets/Scripts/HideIfSettingFalse.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 510ceabd73a028caaacaff223c041fc8 \ No newline at end of file diff --git a/Assets/Scripts/LoadingMenu.cs b/Assets/Scripts/LoadingMenu.cs index 789f184..b361705 100644 --- a/Assets/Scripts/LoadingMenu.cs +++ b/Assets/Scripts/LoadingMenu.cs @@ -32,13 +32,15 @@ public class LoadingMenu : MonoBehaviour SetIfNone("Setting1", 1); SetIfNone("Setting2", 0); SetIfNone("Setting3", 1); + SetIfNone("Setting4", 0); Screen.fullScreen = PlayerPrefs.GetInt("Setting1", 1) == 1; } else { SetIfNone("Setting1", 1, true); - SetIfNone("Setting2", 0, true); + SetIfNone("Setting2", 0); SetIfNone("Setting3", 1, true); + SetIfNone("Setting4", 0, true); Application.targetFrameRate = 360; QualitySettings.vSyncCount = 0; if (Application.platform == RuntimePlatform.WebGLPlayer) { diff --git a/Assets/Scripts/SettingsMenu.cs b/Assets/Scripts/SettingsMenu.cs index aab27be..315bff0 100644 --- a/Assets/Scripts/SettingsMenu.cs +++ b/Assets/Scripts/SettingsMenu.cs @@ -6,6 +6,7 @@ public class SettingsMenu : MonoBehaviour public Toggle setting1toggle; public Toggle setting2toggle; public Toggle setting3toggle; + public Toggle setting4toggle; public Slider musicSlider; public Slider sfxSlider; @@ -18,12 +19,14 @@ public class SettingsMenu : MonoBehaviour setting1toggle.isOn = PlayerPrefs.GetInt("Setting1", 1) == 1; setting2toggle.isOn = PlayerPrefs.GetInt("Setting2", 0) == 1; setting3toggle.isOn = PlayerPrefs.GetInt("Setting3", 1) == 1; + setting4toggle.isOn = PlayerPrefs.GetInt("Setting4", 0) == 1; } else { setting1toggle.interactable = false; setting2toggle.isOn = PlayerPrefs.GetInt("Setting2", 0) == 1; setting3toggle.interactable = false; + setting4toggle.isOn = PlayerPrefs.GetInt("Setting4", 0) == 1; if (Application.platform == RuntimePlatform.WebGLPlayer) { setting1toggle.isOn = false; @@ -43,6 +46,10 @@ public class SettingsMenu : MonoBehaviour PlayerPrefs.SetInt("Setting3", value ? 1 : 0); QualitySettings.vSyncCount = value ? 1 : -1; }); + setting4toggle.onValueChanged.AddListener(value => + { + PlayerPrefs.SetInt("Setting4", value ? 1 : 0); + }); musicSlider.onValueChanged.AddListener(value => { PlayerPrefs.SetFloat("musicVolume", value);