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

Temporarily disable WorkingBeatmapCache and fix multiple invalid data flows

Browse Source
This commit is contained in:
Dean Herbert
2021-12-22 17:05:00 +09:00
parent 0793b0f0ab
commit 33060990b7
5 changed files with 57 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
osu.Game/Screens/Menu/IntroScreen.cs
View File

@ -81,8 +81,11 @@ namespace osu.Game.Screens.Menu
this.createNextScreen = createNextScreen;
}
[Resolved]
private BeatmapManager beatmaps { get; set; }
[BackgroundDependencyLoader]
private void load(OsuConfigManager config, SkinManager skinManager, BeatmapManager beatmaps, Framework.Game game, RealmContextFactory realmContextFactory)
private void load(OsuConfigManager config, SkinManager skinManager, Framework.Game game, RealmContextFactory realmContextFactory)
{
// prevent user from changing beatmap while the intro is still running.
beatmap = Beatmap.BeginLease(false);
@ -101,7 +104,13 @@ namespace osu.Game.Screens.Menu
if (sets.Count > 0)
{
setInfo = beatmaps.QueryBeatmapSet(s => s.ID == sets[RNG.Next(0, sets.Count - 1)].ID);
initialBeatmap = beatmaps.GetWorkingBeatmap(setInfo?.PerformRead(s => s.Beatmaps[0].ToLive(realmContextFactory)));
setInfo?.PerformRead(s =>
{
if (s.Beatmaps.Count == 0)
return;
initialBeatmap = beatmaps.GetWorkingBeatmap(s.Beatmaps[0].ToLive(realmContextFactory));
});
}
}
@ -131,12 +140,29 @@ namespace osu.Game.Screens.Menu
if (setInfo == null)
return false;
initialBeatmap = beatmaps.GetWorkingBeatmap(setInfo.PerformRead(s => s.Beatmaps[0].ToLive(realmContextFactory)));
setInfo.PerformRead(s =>
{
if (s.Beatmaps.Count == 0)
return;
initialBeatmap = beatmaps.GetWorkingBeatmap(s.Beatmaps[0].ToLive(realmContextFactory));
});
return UsingThemedIntro = initialBeatmap != null;
}
}
protected override void LoadComplete()
{
base.LoadComplete();
// TODO: This is temporary to get the setInfo on the update thread, to make things work "better" without using ILive everywhere.
var setInfo = beatmaps.QueryBeatmapSets(b => b.Hash == BeatmapHash).FirstOrDefault();
if (setInfo?.Value.Beatmaps.Count > 0)
initialBeatmap = beatmaps.GetWorkingBeatmap(setInfo.Value.Beatmaps.First());
}
public override void OnResuming(IScreen last)
{
this.FadeIn(300);