diff --git a/Assets/Scenes/Menu/Option.unity b/Assets/Scenes/Menu/Option.unity index 01c3a7f0279f942887a78c4f5c4c6b1987f5fe27..00f5e24dcfee4c712d69f25c22ea43fa8f7b56ae 100644 --- a/Assets/Scenes/Menu/Option.unity +++ b/Assets/Scenes/Menu/Option.unity @@ -837,6 +837,7 @@ GameObject: m_Component: - component: {fileID: 689385256} - component: {fileID: 689385257} + - component: {fileID: 689385258} m_Layer: 5 m_Name: Slider m_TagString: Untagged @@ -863,8 +864,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: -10, y: 75} - m_SizeDelta: {x: 1800, y: 150} + m_AnchoredPosition: {x: -460, y: 75} + m_SizeDelta: {x: 900, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &689385257 MonoBehaviour: @@ -916,7 +917,32 @@ MonoBehaviour: m_Value: 0 m_OnValueChanged: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 689385258} + m_TargetAssemblyTypeName: SoundMenu, Assembly-CSharp + m_MethodName: ChangeVolume + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &689385258 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 689385255} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5d9ce8d8795d1164295a0ea1e4e28f0e, type: 3} + m_Name: + m_EditorClassIdentifier: + volumeSlider: {fileID: 689385257} --- !u!1 &689851488 GameObject: m_ObjectHideFlags: 0 @@ -1042,8 +1068,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: 100, y: -325} - m_SizeDelta: {x: 400, y: 150} + m_AnchoredPosition: {x: 15, y: -325} + m_SizeDelta: {x: 200, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &730011228 MonoBehaviour: @@ -1163,8 +1189,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: -750, y: 240} - m_SizeDelta: {x: 320, y: 80} + m_AnchoredPosition: {x: -830, y: 240} + m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &774778107 MonoBehaviour: @@ -1484,7 +1510,7 @@ GameObject: - component: {fileID: 927890161} - component: {fileID: 927890160} m_Layer: 5 - m_Name: Button + m_Name: Hard m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1507,8 +1533,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: 1500, y: -325} - m_SizeDelta: {x: 400, y: 150} + m_AnchoredPosition: {x: 705, y: -325} + m_SizeDelta: {x: 200, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &927890160 MonoBehaviour: @@ -2126,8 +2152,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: 800, y: -325} - m_SizeDelta: {x: 400, y: 150} + m_AnchoredPosition: {x: 360, y: -325} + m_SizeDelta: {x: 200, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1439000953 MonoBehaviour: @@ -2667,7 +2693,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1905911407 RectTransform: m_ObjectHideFlags: 0 @@ -2842,8 +2868,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: -10, y: 350} - m_SizeDelta: {x: 1800, y: 100} + m_AnchoredPosition: {x: -460, y: 350} + m_SizeDelta: {x: 900, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1988686944 MonoBehaviour: @@ -3075,6 +3101,134 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &2071804561 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2071804563} + - component: {fileID: 2071804562} + m_Layer: 0 + m_Name: TesAudio + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!82 &2071804562 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2071804561} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: be0be5fcec329f64b893d951c2328fc8, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.2 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!4 &2071804563 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2071804561} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 443.82397, y: 277.70883, z: -135.08888} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2122017895 GameObject: m_ObjectHideFlags: 0 @@ -3152,3 +3306,4 @@ SceneRoots: - {fileID: 1937603309} - {fileID: 2122017898} - {fileID: 1292272647} + - {fileID: 2071804563} diff --git a/Assets/Scripts/Menu/SoundMenu.cs b/Assets/Scripts/Menu/SoundMenu.cs new file mode 100644 index 0000000000000000000000000000000000000000..aa1eab8e0cbbd45406c373e6467830017b38e9f7 --- /dev/null +++ b/Assets/Scripts/Menu/SoundMenu.cs @@ -0,0 +1,35 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class SoundMenu : MonoBehaviour +{ + [SerializeField] Slider volumeSlider; + + private void Start() + { + if(!PlayerPrefs.HasKey("musicVolume")) + { + PlayerPrefs.SetFloat("musicVolume", 1); + Load(); + } + Load(); + } + + public void ChangeVolume() + { + AudioListener.volume = volumeSlider.value; + save(); + } + + private void Load() + { + volumeSlider.value = PlayerPrefs.GetFloat("musicVolume"); + } + + private void save() + { + PlayerPrefs.SetFloat("musicVolume", volumeSlider.value); + } +} \ No newline at end of file diff --git a/Assets/Scripts/Menu/SoundMenu.cs.meta b/Assets/Scripts/Menu/SoundMenu.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..91b6e1799185d468782bf1cac4e332bc4a49a3de --- /dev/null +++ b/Assets/Scripts/Menu/SoundMenu.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5d9ce8d8795d1164295a0ea1e4e28f0e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: