h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-24 09:37:19 +08:00
Code Issues Releases Wiki Activity

Update remaining Player components to use WorkingBeatmap again

Browse Source
This commit is contained in:
Dean Herbert 2020-08-21 15:25:57 +09:00
parent d2c2e8bbe8
commit f7e4feee34
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Screens/Play/FailAnimation.cs
View File

@ -6,12 +6,12 @@ using osu.Framework.Bindables;
using osu.Game.Rulesets.UI;
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using osu.Framework.Allocation;
using osu.Framework.Audio.Sample;
using osu.Framework.Audio.Track;
using osu.Framework.Graphics;
using osu.Framework.Utils;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Objects.Drawables;
using osuTK;
using osuTK.Graphics;
@ -28,24 +28,23 @@ namespace osu.Game.Screens.Play
private readonly DrawableRuleset drawableRuleset;
[NotNull]
private readonly ITrack track;
private readonly BindableDouble trackFreq = new BindableDouble(1);
private Track track;
private const float duration = 2500;
private SampleChannel failSample;
public FailAnimation(DrawableRuleset drawableRuleset, [NotNull] ITrack track)
public FailAnimation(DrawableRuleset drawableRuleset)
{
this.drawableRuleset = drawableRuleset;
this.track = track;
}
[BackgroundDependencyLoader]
private void load(AudioManager audio)
private void load(AudioManager audio, IBindable<WorkingBeatmap> beatmap)
{
track = beatmap.Value.Track;
failSample = audio.Samples.Get(@"Gameplay/failsound");
}

8
osu.Game/Screens/Play/Player.cs
View File

@ -151,7 +151,7 @@ namespace osu.Game.Screens.Play
}
[BackgroundDependencyLoader]
private void load(AudioManager audio, OsuConfigManager config, MusicController musicController)
private void load(AudioManager audio, OsuConfigManager config)
{
Mods.Value = base.Mods.Value.Select(m => m.CreateCopy()).ToArray();
@ -188,7 +188,7 @@ namespace osu.Game.Screens.Play
addUnderlayComponents(GameplayClockContainer);
addGameplayComponents(GameplayClockContainer, Beatmap.Value, playableBeatmap);
addOverlayComponents(GameplayClockContainer, Beatmap.Value, musicController.CurrentTrack);
addOverlayComponents(GameplayClockContainer, Beatmap.Value);
if (!DrawableRuleset.AllowGameplayOverlays)
{
@ -265,7 +265,7 @@ namespace osu.Game.Screens.Play
});
}
private void addOverlayComponents(Container target, WorkingBeatmap working, ITrack track)
private void addOverlayComponents(Container target, WorkingBeatmap working)
{
target.AddRange(new[]
{
@ -332,7 +332,7 @@ namespace osu.Game.Screens.Play
performImmediateExit();
},
},
failAnimation = new FailAnimation(DrawableRuleset, track) { OnComplete = onFailComplete, },
failAnimation = new FailAnimation(DrawableRuleset) { OnComplete = onFailComplete, },
});
}