sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert async changes

Browse Source
This commit is contained in:
Dean Herbert
2018-08-31 07:04:40 +09:00
parent 247e1ee714
commit 03084aa04b
46 changed files with 120 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
@ -46,7 +45,7 @@ namespace osu.Game.Screens.Select.Carousel
private SampleChannel sampleHover;
[BackgroundDependencyLoader]
private async Task load(AudioManager audio, OsuColour colours)
private void load(AudioManager audio, OsuColour colours)
{
InternalChild = borderContainer = new Container
{
@ -69,7 +68,7 @@ namespace osu.Game.Screens.Select.Carousel
}
};
sampleHover = await audio.Sample.GetAsync($@"SongSelect/song-ping-variation-{RNG.Next(1, 5)}");
sampleHover = audio.Sample.Get($@"SongSelect/song-ping-variation-{RNG.Next(1, 5)}");
hoverLayer.Colour = colours.Blue.Opacity(0.1f);
}