From d22c2d63e1a3c4cb2014fa998e30a497a70fc7fc Mon Sep 17 00:00:00 2001 From: kimura Date: Mon, 6 Dec 2021 15:12:21 +0900 Subject: [PATCH] =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=81=ABSE=E9=9F=B3=E9=87=8F?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/Settings/Scripts/SettingDialog.cs | 25 ++++++++++++++----- .../Scenes/Settings/SettingsDialog.unity | 6 +++-- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Settings/Scripts/SettingDialog.cs b/popcorn/Assets/MyGame/Scenes/Settings/Scripts/SettingDialog.cs index ee0b9afe..cd1d23cc 100644 --- a/popcorn/Assets/MyGame/Scenes/Settings/Scripts/SettingDialog.cs +++ b/popcorn/Assets/MyGame/Scenes/Settings/Scripts/SettingDialog.cs @@ -12,9 +12,11 @@ namespace MyGame.Scenes.Settings.Scripts [SerializeField] private Animator backgroundAnimator; [SerializeField] private Button closeButton; - [SerializeField] private Slider volumeSlider; + [SerializeField] private Slider bgmVolumeSlider; + [SerializeField] private Slider seVolumeSlider; [SerializeField] private Toggle vibrationalToggle; - [SerializeField] private GameObject soundOnIcon; + [SerializeField] private GameObject bgmSoundOnIcon; + [SerializeField] private GameObject seSoundOnIcon; [SerializeField] private GameObject vibeOnIcon; private void Start() @@ -32,18 +34,29 @@ namespace MyGame.Scenes.Settings.Scripts }); }).AddTo(this); - volumeSlider.value = SoundManager.Instance.GetVolume(SoundType.BGM); - volumeSlider.OnValueChangedAsObservable().Subscribe(volume => + bgmVolumeSlider.value = SoundManager.Instance.GetVolume(SoundType.BGM); + bgmVolumeSlider.OnValueChangedAsObservable().Subscribe(volume => { var currentEnabled = SoundManager.Instance.IsEnabled(SoundType.BGM); var newEnabled = !Mathf.Approximately(volume, 0f); if (currentEnabled != newEnabled) { SoundManager.Instance.EnabledSound(SoundType.BGM, newEnabled); - SoundManager.Instance.EnabledSound(SoundType.SE, newEnabled); - soundOnIcon.SetActive(newEnabled); + bgmSoundOnIcon.SetActive(newEnabled); } SoundManager.Instance.ChangeVolume(SoundType.BGM, volume); + }).AddTo(this); + + seVolumeSlider.value = SoundManager.Instance.GetVolume(SoundType.SE); + seVolumeSlider.OnValueChangedAsObservable().Subscribe(volume => + { + var currentEnabled = SoundManager.Instance.IsEnabled(SoundType.SE); + var newEnabled = !Mathf.Approximately(volume, 0f); + if (currentEnabled != newEnabled) + { + SoundManager.Instance.EnabledSound(SoundType.SE, newEnabled); + seSoundOnIcon.SetActive(newEnabled); + } SoundManager.Instance.ChangeVolume(SoundType.SE, volume); }).AddTo(this); diff --git a/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity b/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity index bb46d457..0df749e7 100644 --- a/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity +++ b/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity @@ -1571,9 +1571,11 @@ MonoBehaviour: m_EditorClassIdentifier: backgroundAnimator: {fileID: 1292446174} closeButton: {fileID: 1680775602} - volumeSlider: {fileID: 1036737259} + bgmVolumeSlider: {fileID: 1036737259} + seVolumeSlider: {fileID: 1664661688} vibrationalToggle: {fileID: 1491113402} - soundOnIcon: {fileID: 872879782} + bgmSoundOnIcon: {fileID: 872879782} + seSoundOnIcon: {fileID: 158592185} vibeOnIcon: {fileID: 1814839065} --- !u!1 &1173859415 GameObject: