h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-21 23:23:52 +08:00
Code Issues Releases Wiki Activity

Use metadata field of WorkingBeatmap.

Browse Source
This commit is contained in:
Huo Yaoyuan 2017-05-06 14:03:08 +08:00
parent 4f49151984
commit 146d57953d
6 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
View File

@ -51,14 +51,12 @@ namespace osu.Game.Beatmaps.Drawables
title = new OsuSpriteText title = new OsuSpriteText
{ {
Font = @"Exo2.0-BoldItalic", Font = @"Exo2.0-BoldItalic",
Text = beatmap.BeatmapSetInfo.Metadata.Title,
TextSize = 22, TextSize = 22,
Shadow = true, Shadow = true,
}, },
artist = new OsuSpriteText artist = new OsuSpriteText
{ {
Font = @"Exo2.0-SemiBoldItalic", Font = @"Exo2.0-SemiBoldItalic",
Text = beatmap.BeatmapSetInfo.Metadata.Artist,
TextSize = 17, TextSize = 17,
Shadow = true, Shadow = true,
}, },
@ -81,8 +79,8 @@ namespace osu.Game.Beatmaps.Drawables
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(LocalisationEngine localisation) private void load(LocalisationEngine localisation)
{ {
title.Current = localisation.GetUnicodePreference(beatmap.BeatmapSetInfo.Metadata.TitleUnicode, beatmap.BeatmapSetInfo.Metadata.Title); title.Current = localisation.GetUnicodePreference(beatmap.Metadata.TitleUnicode, beatmap.Metadata.Title);
artist.Current = localisation.GetUnicodePreference(beatmap.BeatmapSetInfo.Metadata.ArtistUnicode, beatmap.BeatmapSetInfo.Metadata.Artist); artist.Current = localisation.GetUnicodePreference(beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist);
} }
private class PanelBackground : BufferedContainer private class PanelBackground : BufferedContainer

6
osu.Game/Database/DatabaseWorkingBeatmap.cs
View File

@ -51,13 +51,13 @@ namespace osu.Game.Database
protected override Texture GetBackground() protected override Texture GetBackground()
{ {
if (BeatmapInfo?.Metadata?.BackgroundFile == null) if (Metadata?.BackgroundFile == null)
return null; return null;
try try
{ {
using (var reader = getReader()) using (var reader = getReader())
return new TextureStore(new RawTextureLoaderStore(reader), false).Get(BeatmapInfo.Metadata.BackgroundFile); return new TextureStore(new RawTextureLoaderStore(reader), false).Get(Metadata.BackgroundFile);
} }
catch { return null; } catch { return null; }
} }
@ -66,7 +66,7 @@ namespace osu.Game.Database
{ {
try try
{ {
var trackData = getReader()?.GetStream(BeatmapInfo.Metadata.AudioFile); var trackData = getReader()?.GetStream(Metadata.AudioFile);
return trackData == null ? null : new TrackBass(trackData); return trackData == null ? null : new TrackBass(trackData);
} }
catch { return null; } catch { return null; }

2
osu.Game/Overlays/MusicController.cs
View File

@ -315,7 +315,7 @@ namespace osu.Game.Overlays
} }
else else
{ {
BeatmapMetadata metadata = beatmap.Beatmap.BeatmapInfo.Metadata; BeatmapMetadata metadata = beatmap.Metadata;
title.Current = localisation.GetUnicodePreference(metadata.TitleUnicode, metadata.Title); title.Current = localisation.GetUnicodePreference(metadata.TitleUnicode, metadata.Title);
artist.Current = localisation.GetUnicodePreference(metadata.ArtistUnicode, metadata.Artist); artist.Current = localisation.GetUnicodePreference(metadata.ArtistUnicode, metadata.Artist);
} }

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

@ -65,7 +65,6 @@ namespace osu.Game.Screens.Menu
private Bindable<bool> menuMusic; private Bindable<bool> menuMusic;
private TrackManager trackManager; private TrackManager trackManager;
private WorkingBeatmap song;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuGame game, OsuConfigManager config, BeatmapDatabase beatmaps) private void load(OsuGame game, OsuConfigManager config, BeatmapDatabase beatmaps)
@ -79,8 +78,7 @@ namespace osu.Game.Screens.Menu
List<BeatmapSetInfo> choosableBeatmapSets = beatmaps.Query<BeatmapSetInfo>().ToList(); List<BeatmapSetInfo> choosableBeatmapSets = beatmaps.Query<BeatmapSetInfo>().ToList();
if (choosableBeatmapSets.Count > 0) if (choosableBeatmapSets.Count > 0)
{ {
song = beatmaps.GetWorkingBeatmap(beatmaps.GetWithChildren<BeatmapSetInfo>(choosableBeatmapSets[RNG.Next(0, choosableBeatmapSets.Count - 1)].ID).Beatmaps[0]); Beatmap = beatmaps.GetWorkingBeatmap(beatmaps.GetWithChildren<BeatmapSetInfo>(choosableBeatmapSets[RNG.Next(0, choosableBeatmapSets.Count - 1)].ID).Beatmaps[0]);
Beatmap = song;
} }
} }
@ -106,15 +104,15 @@ namespace osu.Game.Screens.Menu
{ {
base.OnEntering(last); base.OnEntering(last);
buttons.FadeInFromZero(500); buttons.FadeInFromZero(500);
if (last is Intro && song != null) if (last is Intro && Beatmap != null)
{ {
Task.Run(() => Task.Run(() =>
{ {
trackManager.SetExclusive(song.Track); trackManager.SetExclusive(Beatmap.Track);
song.Track.Seek(song.Beatmap.Metadata.PreviewTime); Beatmap.Track.Seek(Beatmap.Metadata.PreviewTime);
if (song.Beatmap.Metadata.PreviewTime == -1) if (Beatmap.Metadata.PreviewTime == -1)
song.Track.Seek(song.Track.Length * 0.4f); Beatmap.Track.Seek(Beatmap.Track.Length * 0.4f);
song.Track.Start(); Beatmap.Track.Start();
}); });
} }
} }

2
osu.Game/Screens/Select/BeatmapDeleteDialog.cs
View File

@ -26,7 +26,7 @@ namespace osu.Game.Screens.Select
Icon = FontAwesome.fa_trash_o; Icon = FontAwesome.fa_trash_o;
HeaderText = @"Confirm deletion of"; HeaderText = @"Confirm deletion of";
BodyText = $@"{beatmap.Beatmap?.Metadata?.Artist} - {beatmap.Beatmap?.Metadata?.Title}"; BodyText = $@"{beatmap?.Metadata?.Artist} - {beatmap?.Metadata?.Title}";
Buttons = new PopupDialogButton[] Buttons = new PopupDialogButton[]
{ {
new PopupDialogOkButton new PopupDialogOkButton

2
osu.Game/Screens/Select/SongSelect.cs
View File

@ -343,7 +343,7 @@ namespace osu.Game.Screens.Select
{ {
trackManager.SetExclusive(track); trackManager.SetExclusive(track);
if (preview) if (preview)
track.Seek(Beatmap.Beatmap.Metadata.PreviewTime); track.Seek(Beatmap.Metadata.PreviewTime);
track.Start(); track.Start();
} }
} }