h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 20:22:55 +08:00
Code Issues Releases Wiki Activity

Add tween when missing to avoid sudden volume difference

Browse Source
This commit is contained in:
Dean Herbert 2021-07-30 16:10:20 +09:00
parent b399ddaea0
commit 3cfd235b7f
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Rulesets/Mods/ModMuted.cs
View File

@ -6,6 +6,7 @@ using System.Linq;
using osu.Framework.Audio; using osu.Framework.Audio;
using osu.Framework.Audio.Track; using osu.Framework.Audio.Track;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Game.Configuration; using osu.Game.Configuration;
@ -43,7 +44,7 @@ namespace osu.Game.Rulesets.Mods
Value = true Value = true
}; };
[SettingSource("Muted at combo", "The combo count at which point the music is completely muted.")] [SettingSource("Final volume at combo", "The combo count at which point the music reaches its final volume.")]
public BindableInt MuteComboCount { get; } = new BindableInt public BindableInt MuteComboCount { get; } = new BindableInt
{ {
Default = 100, Default = 100,
@ -83,10 +84,19 @@ namespace osu.Game.Rulesets.Mods
{ {
double dimFactor = Math.Min(1, (double)combo.NewValue / MuteComboCount.Value); double dimFactor = Math.Min(1, (double)combo.NewValue / MuteComboCount.Value);
metronomeVolumeAdjust.Value = dimFactor;
trackVolumeAdjust.Value = 1 - dimFactor;
if (InverseMuting.Value) if (InverseMuting.Value)
dimFactor = 1 - dimFactor; dimFactor = 1 - dimFactor;
if (combo.NewValue < combo.OldValue)
{
scoreProcessor.TransformBindableTo(metronomeVolumeAdjust, dimFactor, 200, Easing.OutQuint);
scoreProcessor.TransformBindableTo(trackVolumeAdjust, 1 - dimFactor, 200, Easing.OutQuint);
}
else
{
metronomeVolumeAdjust.Value = dimFactor;
trackVolumeAdjust.Value = 1 - dimFactor;
}
}, true); }, true);
} }