h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 00:27:25 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into oauth-fixes

Browse Source
This commit is contained in:
Dan Balasescu 2017-05-11 21:07:13 +09:00 committed by GitHub
commit 08f5cbca51
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
View File

@ -142,7 +142,7 @@ namespace osu.Game.Tests.Beatmaps.IO
Assert.IsTrue(waitAction.BeginInvoke(null, null).AsyncWaitHandle.WaitOne(timeout), Assert.IsTrue(waitAction.BeginInvoke(null, null).AsyncWaitHandle.WaitOne(timeout),
@"Beatmaps did not import to the database in allocated time"); @"Beatmaps did not import to the database in allocated time");
var set = host.Dependencies.Get<BeatmapDatabase>().GetChildren(resultSets.First(), true); var set = host.Dependencies.Get<BeatmapDatabase>().GetChildren(resultSets.First());
Assert.IsTrue(set.Beatmaps.Count == resultBeatmaps.Count(), Assert.IsTrue(set.Beatmaps.Count == resultBeatmaps.Count(),
$@"Incorrect database beatmap count post-import ({resultBeatmaps.Count()} but should be {set.Beatmaps.Count})."); $@"Incorrect database beatmap count post-import ({resultBeatmaps.Count()} but should be {set.Beatmaps.Count}).");

3
osu.Game/Database/BeatmapDatabase.cs
View File

@ -267,6 +267,9 @@ namespace osu.Game.Database
public WorkingBeatmap GetWorkingBeatmap(BeatmapInfo beatmapInfo, WorkingBeatmap previous = null, bool withStoryboard = false) public WorkingBeatmap GetWorkingBeatmap(BeatmapInfo beatmapInfo, WorkingBeatmap previous = null, bool withStoryboard = false)
{ {
if (beatmapInfo.BeatmapSet == null)
beatmapInfo = GetChildren(beatmapInfo, true);
if (beatmapInfo.BeatmapSet == null) if (beatmapInfo.BeatmapSet == null)
throw new InvalidOperationException($@"Beatmap set {beatmapInfo.BeatmapSetInfoID} is not in the local database."); throw new InvalidOperationException($@"Beatmap set {beatmapInfo.BeatmapSetInfoID} is not in the local database.");

8
osu.Game/Database/Database.cs
View File

@ -48,11 +48,9 @@ namespace osu.Game.Database
return Connection.Table<T>(); return Connection.Table<T>();
} }
public T GetWithChildren<T>(object id, bool recursive = false) where T : class /// <summary>
{ /// This is expensive. Use with caution.
return Connection.GetWithChildren<T>(id, recursive); /// </summary>
}
public List<T> GetAllWithChildren<T>(Expression<Func<T, bool>> filter = null, bool recursive = true) public List<T> GetAllWithChildren<T>(Expression<Func<T, bool>> filter = null, bool recursive = true)
where T : class where T : class
{ {

6
osu.Game/Overlays/ChatOverlay.cs
View File

@ -110,12 +110,18 @@ namespace osu.Game.Overlays
{ {
MoveToY(0, transition_length, EasingTypes.OutQuint); MoveToY(0, transition_length, EasingTypes.OutQuint);
FadeIn(transition_length, EasingTypes.OutQuint); FadeIn(transition_length, EasingTypes.OutQuint);
inputTextBox.HoldFocus = true;
base.PopIn();
} }
protected override void PopOut() protected override void PopOut()
{ {
MoveToY(DrawSize.Y, transition_length, EasingTypes.InSine); MoveToY(DrawSize.Y, transition_length, EasingTypes.InSine);
FadeOut(transition_length, EasingTypes.InSine); FadeOut(transition_length, EasingTypes.InSine);
inputTextBox.HoldFocus = false;
base.PopOut();
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]

2
osu.Game/Screens/Menu/MainMenu.cs
View File

@ -79,7 +79,7 @@ namespace osu.Game.Screens.Menu
if (count > 0) if (count > 0)
{ {
var beatmap = query.ElementAt(RNG.Next(0, count - 1)); var beatmap = query.ElementAt(RNG.Next(0, count - 1));
beatmaps.GetChildren(beatmap, true); beatmaps.GetChildren(beatmap);
Beatmap = beatmaps.GetWorkingBeatmap(beatmap.Beatmaps[0]); Beatmap = beatmaps.GetWorkingBeatmap(beatmap.Beatmaps[0]);
} }
} }