yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

設定にSE音量を追加

This commit is contained in:
kimura 2021-12-06 15:12:21 +09:00
parent e33effdb85
commit d22c2d63e1
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
popcorn/Assets/MyGame/Scenes/Settings/Scripts/SettingDialog.cs
View File

@ -12,9 +12,11 @@ namespace MyGame.Scenes.Settings.Scripts
[SerializeField] private Animator backgroundAnimator; [SerializeField] private Animator backgroundAnimator;
[SerializeField] private Button closeButton; [SerializeField] private Button closeButton;
[SerializeField] private Slider volumeSlider; [SerializeField] private Slider bgmVolumeSlider;
[SerializeField] private Slider seVolumeSlider;
[SerializeField] private Toggle vibrationalToggle; [SerializeField] private Toggle vibrationalToggle;
[SerializeField] private GameObject soundOnIcon; [SerializeField] private GameObject bgmSoundOnIcon;
[SerializeField] private GameObject seSoundOnIcon;
[SerializeField] private GameObject vibeOnIcon; [SerializeField] private GameObject vibeOnIcon;
private void Start() private void Start()
@ -32,18 +34,29 @@ namespace MyGame.Scenes.Settings.Scripts
}); });
}).AddTo(this); }).AddTo(this);
volumeSlider.value = SoundManager.Instance.GetVolume(SoundType.BGM); bgmVolumeSlider.value = SoundManager.Instance.GetVolume(SoundType.BGM);
volumeSlider.OnValueChangedAsObservable().Subscribe(volume => bgmVolumeSlider.OnValueChangedAsObservable().Subscribe(volume =>
{ {
var currentEnabled = SoundManager.Instance.IsEnabled(SoundType.BGM); var currentEnabled = SoundManager.Instance.IsEnabled(SoundType.BGM);
var newEnabled = !Mathf.Approximately(volume, 0f); var newEnabled = !Mathf.Approximately(volume, 0f);
if (currentEnabled != newEnabled) if (currentEnabled != newEnabled)
{ {
SoundManager.Instance.EnabledSound(SoundType.BGM, newEnabled); SoundManager.Instance.EnabledSound(SoundType.BGM, newEnabled);
SoundManager.Instance.EnabledSound(SoundType.SE, newEnabled); bgmSoundOnIcon.SetActive(newEnabled);
soundOnIcon.SetActive(newEnabled);
} }
SoundManager.Instance.ChangeVolume(SoundType.BGM, volume); 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); SoundManager.Instance.ChangeVolume(SoundType.SE, volume);
}).AddTo(this); }).AddTo(this);

6
popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity
View File

@ -1571,9 +1571,11 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
backgroundAnimator: {fileID: 1292446174} backgroundAnimator: {fileID: 1292446174}
closeButton: {fileID: 1680775602} closeButton: {fileID: 1680775602}
volumeSlider: {fileID: 1036737259} bgmVolumeSlider: {fileID: 1036737259}
seVolumeSlider: {fileID: 1664661688}
vibrationalToggle: {fileID: 1491113402} vibrationalToggle: {fileID: 1491113402}
soundOnIcon: {fileID: 872879782} bgmSoundOnIcon: {fileID: 872879782}
seSoundOnIcon: {fileID: 158592185}
vibeOnIcon: {fileID: 1814839065} vibeOnIcon: {fileID: 1814839065}
--- !u!1 &1173859415 --- !u!1 &1173859415
GameObject: GameObject: