sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-29 17:37:23 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into non-null-beatmap

Browse Source
This commit is contained in:
Dean Herbert 2017-07-19 18:32:42 +09:00 committed by GitHub
commit da92fccdb0
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Beatmaps/IO/OszArchiveReader.cs
View File

@ -15,7 +15,7 @@ namespace osu.Game.Beatmaps.IO
AddReader<OszArchiveReader>((storage, path) => AddReader<OszArchiveReader>((storage, path) =>
{ {
using (var stream = storage.GetStream(path)) using (var stream = storage.GetStream(path))
return ZipFile.IsZipFile(stream, false); return stream != null && ZipFile.IsZipFile(stream, false);
}); });
OsuLegacyDecoder.Register(); OsuLegacyDecoder.Register();
} }

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

@ -149,7 +149,11 @@ namespace osu.Game.Database
public void Import(params string[] paths) public void Import(params string[] paths)
{ {
foreach (string p in paths) foreach (string p in paths)
Import(p); {
//In case the file was imported twice and deleted after the first time
if (File.Exists(p))
Import(p);
}
} }
/// <summary> /// <summary>
@ -183,6 +187,8 @@ namespace osu.Game.Database
if (existing != null) if (existing != null)
{ {
GetChildren(existing);
if (existing.DeletePending) if (existing.DeletePending)
{ {
existing.DeletePending = false; existing.DeletePending = false;

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

@ -28,6 +28,8 @@ namespace osu.Game.Screens.Menu
private readonly BackgroundScreenDefault background; private readonly BackgroundScreenDefault background;
private Screen songSelect; private Screen songSelect;
private readonly MenuSideFlashes sideFlashes;
protected override BackgroundScreen CreateBackground() => background; protected override BackgroundScreen CreateBackground() => background;
public MainMenu() public MainMenu()
@ -49,10 +51,10 @@ namespace osu.Game.Screens.Menu
OnSolo = delegate { Push(consumeSongSelect()); }, OnSolo = delegate { Push(consumeSongSelect()); },
OnMulti = delegate { Push(new Lobby()); }, OnMulti = delegate { Push(new Lobby()); },
OnExit = delegate { Exit(); }, OnExit = delegate { Exit(); },
}, }
new MenuSideFlashes(),
} }
} },
sideFlashes = new MenuSideFlashes(),
}; };
} }
@ -120,6 +122,8 @@ namespace osu.Game.Screens.Menu
Content.FadeOut(length, EasingTypes.InSine); Content.FadeOut(length, EasingTypes.InSine);
Content.MoveTo(new Vector2(-800, 0), length, EasingTypes.InSine); Content.MoveTo(new Vector2(-800, 0), length, EasingTypes.InSine);
sideFlashes.FadeOut(length / 4, EasingTypes.OutQuint);
} }
protected override void OnResuming(Screen last) protected override void OnResuming(Screen last)
@ -137,6 +141,8 @@ namespace osu.Game.Screens.Menu
Content.FadeIn(length, EasingTypes.OutQuint); Content.FadeIn(length, EasingTypes.OutQuint);
Content.MoveTo(new Vector2(0, 0), length, EasingTypes.OutQuint); Content.MoveTo(new Vector2(0, 0), length, EasingTypes.OutQuint);
sideFlashes.FadeIn(length / 4, EasingTypes.InQuint);
} }
protected override bool OnExiting(Screen next) protected override bool OnExiting(Screen next)