From c016d5120238fba2faf99d5116e49f804291e69b Mon Sep 17 00:00:00 2001
From: maikeljh <mjh191003@gmail.com>
Date: Sat, 11 May 2024 10:52:54 +0700
Subject: [PATCH] [Fix] Volume
---
Assets/Resources/MasterMixer.mixer | 2 +-
Assets/Scenes/MainMenu.unity | 4 ++--
Assets/Scripts/Global/Settings.cs | 11 +++++++----
Assets/Scripts/Managers/LevelManager.cs | 4 +++-
4 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/Assets/Resources/MasterMixer.mixer b/Assets/Resources/MasterMixer.mixer
index a84efb5..f1d4256 100644
--- a/Assets/Resources/MasterMixer.mixer
+++ b/Assets/Resources/MasterMixer.mixer
@@ -131,7 +131,7 @@ AudioMixerSnapshotController:
e9b9a6501310a426b9d138b9f0f95c00: -34.7
64090e3683acf4e56a6c6c075c3f71d9: -37.3
14483c187061e4b0bb3412b5a62fc9e8: -10.34521
- 4aa8bd7817000453e95180932afbdae1: 20
+ 4aa8bd7817000453e95180932afbdae1: 0
9be56f5a02475794888adbc56b9ae69e: 20
19e18afc1a8214404a92b5e588209e3d: 22000
bc71986e499b946c0848dfbb1273975c: 7.85
diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity
index f07fc59..d53918e 100644
--- a/Assets/Scenes/MainMenu.unity
+++ b/Assets/Scenes/MainMenu.unity
@@ -4684,8 +4684,8 @@ MonoBehaviour:
m_FillRect: {fileID: 677464596}
m_HandleRect: {fileID: 1984857994}
m_Direction: 0
- m_MinValue: -60
- m_MaxValue: 0
+ m_MinValue: 0
+ m_MaxValue: 100
m_WholeNumbers: 0
m_Value: 0
m_OnValueChanged:
diff --git a/Assets/Scripts/Global/Settings.cs b/Assets/Scripts/Global/Settings.cs
index 541c527..11639b6 100644
--- a/Assets/Scripts/Global/Settings.cs
+++ b/Assets/Scripts/Global/Settings.cs
@@ -21,13 +21,16 @@ public class Settings : MonoBehaviour
// Start is called before the first frame update
void Start()
{
+ // Setup audio mixer
+ audioMixer = Resources.Load<AudioMixer>("MasterMixer");
+
// Get preferences
playerName = PlayerPrefs.GetString(PLAYER_NAME_KEY, "");
difficulty = PlayerPrefs.GetInt(DIFFICULTY_KEY, 0);
- volume = PlayerPrefs.GetFloat(VOLUME_KEY, 20);
+ volume = PlayerPrefs.GetFloat(VOLUME_KEY, 100);
// Setup preferences
- audioMixer.SetFloat("volume", volume);
+ AudioListener.volume = volume / 100;
playerNameInput.text = playerName;
difficultyDropdown.value = difficulty;
volumeInput.value = volume;
@@ -35,7 +38,7 @@ public class Settings : MonoBehaviour
public void SetVolume(float volume)
{
- audioMixer.SetFloat("volume", volume);
+ AudioListener.volume = volume / 100;
this.volume = volume;
}
@@ -66,7 +69,7 @@ public class Settings : MonoBehaviour
difficulty = PlayerPrefs.GetInt(DIFFICULTY_KEY, 0);
volume = PlayerPrefs.GetFloat(VOLUME_KEY, 20);
- audioMixer.SetFloat("volume", volume);
+ AudioListener.volume = volume / 100;
playerNameInput.text = playerName;
difficultyDropdown.value = difficulty;
volumeInput.value = volume;
diff --git a/Assets/Scripts/Managers/LevelManager.cs b/Assets/Scripts/Managers/LevelManager.cs
index d778205..dc8761f 100644
--- a/Assets/Scripts/Managers/LevelManager.cs
+++ b/Assets/Scripts/Managers/LevelManager.cs
@@ -494,7 +494,9 @@ namespace Nightmare
source.mute = true;
}
}
- break;
+ } else if (SceneManager.sceneCount > 1)
+ {
+ SceneManager.UnloadSceneAsync(scene);
}
}
--
GitLab