Merge pull request #34389 from nekodex/ssv2-more-sfx

Add more SFX to SSv2 components

Author: peppy

osu.Game/Screens/SelectV2/BeatmapLeaderboardWedge.cs

@@ -7,6 +7,8 @@
 using System.Linq;
 using System.Threading;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Extensions.PolygonExtensions;
@@ -16,6 +18,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Framework.Threading;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -90,8 +93,12 @@ public partial class BeatmapLeaderboardWedge : VisibilityContainer
 
         protected override bool OnMouseDown(MouseDownEvent e) => true;
 
+        private Sample? swishSample;
+
+        private readonly List<ScheduledDelegate> scoreSfxDelegates = new List<ScheduledDelegate>();
+
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(AudioManager audio)
         {
             RelativeSizeAxes = Axes.Both;
 
@@ -172,6 +179,8 @@ private void load()
                     loading = new LoadingLayer(),
                 }
             };
+
+            swishSample = audio.Samples.Get(@"SongSelect/leaderboard-score");
         }
 
         protected override void LoadComplete()
@@ -258,6 +267,9 @@ protected void SetScores(IEnumerable<ScoreInfo> scores, ScoreInfo? userScore = n
             cancellationTokenSource?.Cancel();
             cancellationTokenSource = new CancellationTokenSource();
 
+            scoreSfxDelegates.ForEach(d => d.Cancel());
+            scoreSfxDelegates.Clear();
+
             clearScores();
             SetState(LeaderboardState.Success);
 
@@ -304,6 +316,23 @@ protected void SetScores(IEnumerable<ScoreInfo> scores, ScoreInfo? userScore = n
                      .FadeIn(300, Easing.OutQuint)
                      .MoveToX(0f, 300, Easing.OutQuint);
 
+                    bool visible = d.ScreenSpaceDrawQuad.TopLeft.Y < d.Parent!.ChildMaskingBounds.BottomLeft.Y;
+
+                    if (visible)
+                    {
+                        var del = Scheduler.AddDelayed(() =>
+                        {
+                            var chan = swishSample?.GetChannel();
+                            if (chan == null) return;
+
+                            chan.Balance.Value = -OsuGameBase.SFX_STEREO_STRENGTH;
+                            chan.Frequency.Value = 0.98f + RNG.NextDouble(0.04f);
+                            chan.Play();
+                        }, delay);
+
+                        scoreSfxDelegates.Add(del);
+                    }
+
                     delay += 30;
                     i++;
                 }

osu.Game/Screens/SelectV2/BeatmapMetadataWedge.cs

@@ -6,11 +6,14 @@
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Logging;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Graphics.Containers;
@@ -68,8 +71,11 @@ public partial class BeatmapMetadataWedge : VisibilityContainer
         [Resolved]
         private ISongSelect? songSelect { get; set; }
 
+        private Sample? wedgeAppearSample;
+        private Sample? wedgeHideSample;
+
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(AudioManager audio)
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -239,6 +245,9 @@ private void load()
                     }),
                 }
             };
+
+            wedgeAppearSample = audio.Samples.Get(@"SongSelect/metadata-wedge-pop-in");
+            wedgeHideSample = audio.Samples.Get(@"SongSelect/metadata-wedge-pop-out");
         }
 
         protected override void LoadComplete()
@@ -278,6 +287,10 @@ private void updateSubWedgeVisibility()
 
             if (State.Value == Visibility.Visible && currentOnlineBeatmap != null)
             {
+                // play show sounds only if the wedges were previously hidden
+                if (ratingsWedge.Alpha < 1)
+                    playWedgeAppearSound();
+
                 ratingsWedge.FadeIn(transition_duration, Easing.OutQuint)
                             .MoveToX(0, transition_duration, Easing.OutQuint);
 
@@ -287,6 +300,10 @@ private void updateSubWedgeVisibility()
             }
             else
             {
+                // play hide sounds only if the wedges were previously visible
+                if (ratingsWedge.Alpha > 0)
+                    playWedgeHideSound();
+
                 failRetryWedge.FadeOut(transition_duration, Easing.OutQuint)
                               .MoveToX(-50, transition_duration, Easing.OutQuint);
 
@@ -296,6 +313,38 @@ private void updateSubWedgeVisibility()
             }
         }
 
+        private void playWedgeAppearSound()
+        {
+            var wedgeAppearChannel1 = wedgeAppearSample?.GetChannel();
+            if (wedgeAppearChannel1 == null)
+                return;
+
+            wedgeAppearChannel1.Balance.Value = -OsuGameBase.SFX_STEREO_STRENGTH;
+            wedgeAppearChannel1.Frequency.Value = 0.98f + RNG.NextDouble(0.04f);
+            wedgeAppearChannel1.Play();
+
+            Scheduler.AddDelayed(() =>
+            {
+                var wedgeAppearChannel2 = wedgeAppearSample?.GetChannel();
+                if (wedgeAppearChannel2 == null)
+                    return;
+
+                wedgeAppearChannel2.Balance.Value = -OsuGameBase.SFX_STEREO_STRENGTH;
+                wedgeAppearChannel2.Frequency.Value = 0.90f + RNG.NextDouble(0.05f);
+                wedgeAppearChannel2.Play();
+            }, 100);
+        }
+
+        private void playWedgeHideSound()
+        {
+            var wedgeHideChannel = wedgeHideSample?.GetChannel();
+            if (wedgeHideChannel == null)
+                return;
+
+            wedgeHideChannel.Balance.Value = -OsuGameBase.SFX_STEREO_STRENGTH;
+            wedgeHideChannel.Play();
+        }
+
         private void updateDisplay()
         {
             var metadata = beatmap.Value.Metadata;

osu.Game/osu.Game.csproj

@@ -36,7 +36,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="20.1.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2025.715.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2025.708.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2025.726.0" />
     <PackageReference Include="Sentry" Version="5.1.1" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
     <PackageReference Include="SharpCompress" Version="0.39.0" />