feat: add ambiance types (#42)

aarthificial-unity · Sep 24, 2023 · 6c7ce38 · 6c7ce38
1 parent 314ca47
commit 6c7ce38
Show file tree

Hide file tree

Showing 15 changed files with 233 additions and 122 deletions.
diff --git a/Assets/Audio/Ambiance.meta b/Assets/Audio/Ambiance.meta
diff --git a/Assets/Audio/Ambiance/AmbianceSetter.cs b/Assets/Audio/Ambiance/AmbianceSetter.cs
@@ -0,0 +1,12 @@
+using Framework;
+using UnityEngine;
+
+namespace Audio.Ambiance {
+  public class AmbianceSetter : MonoBehaviour {
+    [SerializeField] private AmbianceType _ambianceType;
+
+    private void Awake() {
+      App.Audio.SetAmbiance(_ambianceType);
+    }
+  }
+}
diff --git a/Assets/Audio/Ambiance/AmbianceSetter.cs.meta b/Assets/Audio/Ambiance/AmbianceSetter.cs.meta
diff --git a/Assets/Audio/Ambiance/AmbianceType.cs b/Assets/Audio/Ambiance/AmbianceType.cs
@@ -0,0 +1,7 @@
+using UnityEngine;
+
+namespace Audio.Ambiance {
+  public class AmbianceType : ScriptableObject {
+    public int Value;
+  }
+}
diff --git a/Assets/Audio/Ambiance/AmbianceType.cs.meta b/Assets/Audio/Ambiance/AmbianceType.cs.meta
diff --git a/Assets/Audio/Ambiance/LoadingDocsAmbiance.asset b/Assets/Audio/Ambiance/LoadingDocsAmbiance.asset
diff --git a/Assets/Audio/Ambiance/LoadingDocsAmbiance.asset.meta b/Assets/Audio/Ambiance/LoadingDocsAmbiance.asset.meta
diff --git a/Assets/Audio/Ambiance/MainMenuAmbiance.asset b/Assets/Audio/Ambiance/MainMenuAmbiance.asset
diff --git a/Assets/Audio/Ambiance/MainMenuAmbiance.asset.meta b/Assets/Audio/Ambiance/MainMenuAmbiance.asset.meta
diff --git a/Assets/Audio/AudioManager.cs b/Assets/Audio/AudioManager.cs
@@ -1,4 +1,5 @@
-using FMOD.Studio;
+using Audio.Ambiance;
+using FMOD.Studio;
 using FMODUnity;
 using Settings.Bundles;
 using UnityEngine;
@@ -37,10 +38,9 @@ private void OnDisable() {
       _bundle.MusicVolume.Changed -= HandleMusicVolumeChanged;
     }
 
-    public void PlayAmbience() {
+    public void SetAmbiance(AmbianceType ambianceType) {
       if (_ambienceAudio.IsInitialized) {
-        _ambienceSceneParam.CurrentValue =
-          SceneManager.GetActiveScene().buildIndex;
+        _ambienceSceneParam.CurrentValue = ambianceType.Value;
         _ambienceAudio.Instance.getPlaybackState(out var state);
         if (state == PLAYBACK_STATE.STOPPED) {
           _ambienceAudio.Play();

diff --git a/Assets/Framework/StoryBundle.prefab b/Assets/Framework/StoryBundle.prefab
diff --git a/Assets/Framework/StoryState.cs b/Assets/Framework/StoryState.cs
@@ -52,7 +52,6 @@ public void Pause() {
     public void Resume() {
       Assert.IsTrue(IsActive);
 
-      App.Audio.PlayAmbience();
       App.Input.SwitchToGameplay();
       IsPaused = false;
       Time.timeScale = 1;

diff --git a/Assets/Scenes/Intro/EntryGate.unity b/Assets/Scenes/Intro/EntryGate.unity