RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move audio adjustment inside OnResuming

This commit is contained in:
iiSaLMaN 2019-07-04 05:18:29 +03:00
parent 99603ca0b6
commit b53aeec90d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Screens/Menu/Intro.cs
View File

@ -35,13 +35,16 @@ public class Intro : StartupScreen
private readonly BindableDouble exitingVolumeFade = new BindableDouble(1);
[Resolved]
private AudioManager audio { get; set; }
private Bindable<bool> menuVoice;
private Bindable<bool> menuMusic;
private Track track;
private WorkingBeatmap introBeatmap;
[BackgroundDependencyLoader]
private void load(AudioManager audio, OsuConfigManager config, BeatmapManager beatmaps, Framework.Game game)
private void load(OsuConfigManager config, BeatmapManager beatmaps, Framework.Game game)
{
menuVoice = config.GetBindable<bool>(OsuSetting.MenuVoice);
menuMusic = config.GetBindable<bool>(OsuSetting.MenuMusic);
@ -74,8 +77,6 @@ private void load(AudioManager audio, OsuConfigManager config, BeatmapManager be
welcome = audio.Samples.Get(@"welcome");
seeya = audio.Samples.Get(@"seeya");
audio.AddAdjustment(AdjustableProperty.Volume, exitingVolumeFade);
}
private const double delay_step_one = 2300;
@ -165,6 +166,7 @@ public override void OnResuming(IScreen last)
else
fadeOutTime = 500;
audio.AddAdjustment(AdjustableProperty.Volume, exitingVolumeFade);
this.TransformBindableTo(exitingVolumeFade, 0, fadeOutTime).OnComplete(_ => this.Exit());
//don't want to fade out completely else we will stop running updates.