do not play scene change animation sound in some cases

UltraStar-Deluxe · Aug 20, 2022 · 97d6d34 · 97d6d34
1 parent 56861f8
commit 97d6d34
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/UltraStar Play/Assets/Common/Scene/ESceneUtils.cs b/UltraStar Play/Assets/Common/Scene/ESceneUtils.cs
@@ -1,7 +1,13 @@
 using System.Linq;
+using UnityEngine.SceneManagement;
 
 public static class ESceneUtils
 {
+    public static EScene GetCurrentScene()
+    {
+        return GetSceneByBuildIndex(SceneManager.GetActiveScene().buildIndex);
+    }
+
     public static EScene GetSceneByBuildIndex(int buildIndex)
     {
         return EnumUtils.GetValuesAsList<EScene>()

diff --git a/UltraStar Play/Assets/Common/Scene/SceneNavigator.cs b/UltraStar Play/Assets/Common/Scene/SceneNavigator.cs
@@ -46,15 +46,19 @@ public void LoadScene(SceneEnumHolder holder)
 
     public void LoadScene(EScene scene)
     {
+        EScene currentScene = ESceneUtils.GetCurrentScene();
+
         beforeSceneChangeEventStream.OnNext(new BeforeSceneChangeEvent(scene));
 
         Action doChangeScene = () => SceneManager.LoadScene((int)scene);
-
         if (settings.GraphicSettings.AnimateSceneChange)
         {
             sceneChangeAnimationControl.AnimateChangeToScene(
                 doChangeScene,
-                sceneChangeAnimationControl.StartSceneChangeAnimation);
+                (visualElement) => sceneChangeAnimationControl.StartSceneChangeAnimation(
+                    visualElement,
+                    currentScene,
+                    scene));
         }
         else
         {

diff --git a/UltraStar Play/Assets/Common/Scene/UltraStarPlaySceneChangeAnimationControl.cs b/UltraStar Play/Assets/Common/Scene/UltraStarPlaySceneChangeAnimationControl.cs
@@ -48,8 +48,15 @@ public override void Start()
         }
     }
 
-    public void StartSceneChangeAnimation(VisualElement visualElement)
+    public void StartSceneChangeAnimation(VisualElement visualElement, EScene currentScene, EScene nextScene)
     {
+        bool skipSceneChangeAnimationSound = nextScene == EScene.SingScene
+                                             || currentScene == EScene.SingingResultsScene;
+        if (!skipSceneChangeAnimationSound)
+        {
+            PlaySceneChangeAnimationSound();
+        }
+
         LeanTween.value(gameObject, 0, 1, 0.3f)
             .setOnUpdate((float animTimePercent) =>
             {
@@ -60,8 +67,11 @@ public void StartSceneChangeAnimation(VisualElement visualElement)
             })
             .setOnComplete(() => visualElement.RemoveFromHierarchy())
             .setEaseInSine();
+    }
 
-        audioSource.volume = settings.AudioSettings.SceneChangeSoundVolumePercent;
+    private void PlaySceneChangeAnimationSound()
+    {
+        audioSource.volume = settings.AudioSettings.SceneChangeSoundVolumePercent / 100f;
         audioSource.Play();
     }