diff --git a/Assets/Scripts/Settings.cs b/Assets/Scripts/Settings.cs index e769237d..bf7e655e 100644 --- a/Assets/Scripts/Settings.cs +++ b/Assets/Scripts/Settings.cs @@ -10,7 +10,7 @@ namespace SHADE_Scripting { static public float cameraSensitivity = 100.0f; - static public float cameraFOV = 90.0f; + static public float cameraFOV = 45.0f; static public float masterVolume = 100.0f; static public float sfxVolume = 100.0f; diff --git a/Assets/Scripts/UI/SC_Options.cs b/Assets/Scripts/UI/SC_Options.cs index bc2fa69c..992e0605 100644 --- a/Assets/Scripts/UI/SC_Options.cs +++ b/Assets/Scripts/UI/SC_Options.cs @@ -7,89 +7,94 @@ using System.Threading.Tasks; namespace SHADE_Scripting.UI { - public class Options:Script + public class Options : Script + { + public GameObject masterVolSlider; + public GameObject sfxVolSlider; + public GameObject bgmVolSlider; + public GameObject fovSlider; + public GameObject sensitivitySlider; + + + + + protected override void awake() { - public GameObject masterVolSlider; - public GameObject sfxVolSlider; - public GameObject bgmVolSlider; - public GameObject fovSlider; - public GameObject sensitivitySlider; + Slider mv = masterVolSlider.GetComponent(); + Slider sfx = sfxVolSlider.GetComponent(); + Slider bgm = bgmVolSlider.GetComponent(); + Slider fov = fovSlider.GetComponent(); + Slider sens = sensitivitySlider.GetComponent(); + if (mv != null) + { + mv.ScaledValue = Settings.masterVolume; - protected override void awake() - { - Slider mv = masterVolSlider.GetComponent(); - Slider sfx = sfxVolSlider.GetComponent(); - Slider bgm = bgmVolSlider.GetComponent(); - Slider fov = fovSlider.GetComponent(); - Slider sens = sensitivitySlider.GetComponent(); + } + if (sfx != null) + { + sfx.ScaledValue = Settings.sfxVolume; - + } + if (bgm != null) + { + bgm.ScaledValue = Settings.bgmVolume; - if (mv != null) - { - mv.ScaledValue = Settings.masterVolume; - - } - if (sfx != null) - { - sfx.ScaledValue = Settings.sfxVolume; - - } - if (bgm != null) - { - bgm.ScaledValue = Settings.bgmVolume; - - } - if (fov != null) - { - fov.ScaledValue = Settings.cameraFOV; - - } - if (sens != null) - { - sens.ScaledValue = Settings.cameraSensitivity; - - } + } + if (fov != null) + { + fov.ScaledValue = Settings.cameraFOV; + } + if (sens != null) + { + sens.ScaledValue = Settings.cameraSensitivity; - } - - - protected override void update() - { - Slider mv = masterVolSlider.GetComponent(); - Slider sfx = sfxVolSlider.GetComponent(); - Slider bgm = bgmVolSlider.GetComponent(); - Slider fov = fovSlider.GetComponent(); - Slider sens = sensitivitySlider.GetComponent(); - - if(mv != null) - { - Settings.masterVolume = mv.ScaledValue; - } - if (sfx != null) - { - Settings.sfxVolume = sfx.ScaledValue; - } - if (bgm != null) - { - Settings.bgmVolume = bgm.ScaledValue; - } - if (fov != null) - { - Settings.cameraFOV = fov.ScaledValue; - } - if (sens != null) - { - Settings.cameraSensitivity = sens.ScaledValue; - } - - - } + } } + + + protected override void update() + { + Slider mv = masterVolSlider.GetComponent(); + Slider sfx = sfxVolSlider.GetComponent(); + Slider bgm = bgmVolSlider.GetComponent(); + Slider fov = fovSlider.GetComponent(); + Slider sens = sensitivitySlider.GetComponent(); + + if (mv != null) + { + Settings.masterVolume = mv.ScaledValue * 0.01f; + SHADE.Audio.SetVCAVolume("vca:/MASTER", Settings.masterVolume); + //Debug.Log($"MASTERee:{SHADE.Audio.GetVCAVolume("vca:/MASTER")} value of master: {mv.ScaledValue * 0.001f}"); + } + if (sfx != null) + { + Settings.sfxVolume = sfx.ScaledValue; + SHADE.Audio.SetVCAVolume("vca:/SFX", Settings.sfxVolume); + SHADE.Audio.SetVCAVolume("vca:/UI", Settings.sfxVolume); + } + if (bgm != null) + { + Settings.bgmVolume = bgm.ScaledValue; + SHADE.Audio.SetVCAVolume("vca:/MUSIC", Settings.bgmVolume); + } + if (fov != null) + { + Settings.cameraFOV = fov.ScaledValue; + } + if (sens != null) + { + Settings.cameraSensitivity = sens.ScaledValue; + } + + + } + + + } }