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

Make external changes into history.

Browse Source
This commit is contained in:
Huo Yaoyuan
2016-11-07 21:30:25 +08:00
parent ad1dccf6ce
commit d1f64cfbfc
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,7 +213,8 @@ namespace osu.Game.Overlays
{ {
if (beatmapSource.Value == current) return; if (beatmapSource.Value == current) return;
current = beatmapSource.Value; current = beatmapSource.Value;
updateCurrent(current, null); updateCurrent(current, true);
appendToHistory(current.BeatmapInfo);
} }
private void appendToHistory(BeatmapInfo beatmap) private void appendToHistory(BeatmapInfo beatmap)
@ -248,7 +249,7 @@ namespace osu.Game.Overlays
} }
} }
private void play(BeatmapInfo info, bool? isNext) private void play(BeatmapInfo info, bool isNext)
{ {
current = database.GetWorkingBeatmap(info, current); current = database.GetWorkingBeatmap(info, current);
Task.Run(() => Task.Run(() =>
@ -260,7 +261,7 @@ namespace osu.Game.Overlays
updateCurrent(current, isNext); updateCurrent(current, isNext);
} }
private void updateCurrent(WorkingBeatmap beatmap, bool? isNext) private void updateCurrent(WorkingBeatmap beatmap, bool isNext)
{ {
BeatmapMetadata metadata = beatmap.Beatmap.Metadata; BeatmapMetadata metadata = beatmap.Beatmap.Metadata;
title.Text = metadata.TitleUnicode ?? metadata.Title; title.Text = metadata.TitleUnicode ?? metadata.Title;
@ -270,13 +271,13 @@ namespace osu.Game.Overlays
Add(newBackground); Add(newBackground);
if (isNext == true) if (isNext)
{ {
newBackground.Position = new Vector2(400, 0); newBackground.Position = new Vector2(400, 0);
newBackground.MoveToX(0, 500, EasingTypes.OutCubic); newBackground.MoveToX(0, 500, EasingTypes.OutCubic);
backgroundSprite.MoveToX(-400, 500, EasingTypes.OutCubic); backgroundSprite.MoveToX(-400, 500, EasingTypes.OutCubic);
} }
else if (isNext == false) else
{ {
newBackground.Position = new Vector2(-400, 0); newBackground.Position = new Vector2(-400, 0);
newBackground.MoveToX(0, 500, EasingTypes.OutCubic); newBackground.MoveToX(0, 500, EasingTypes.OutCubic);