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

Merge branch 'master' into sliderbar-tooltip-precision

Browse Source
This commit is contained in:
Dean Herbert 2018-01-08 22:51:16 +09:00 committed by GitHub
commit 9eb4eb4b36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Mania/Tests/TestCaseManiaHitObjects.cs
View File

@ -78,7 +78,7 @@ namespace osu.Game.Rulesets.Mania.Tests
RelativeChildSize = new Vector2(1, 10000), RelativeChildSize = new Vector2(1, 10000),
Children = new[] Children = new[]
{ {
new DrawableHoldNote(new HoldNote(), ManiaAction.Key1) new DrawableHoldNote(new HoldNote { Duration = 1 }, ManiaAction.Key1)
{ {
Y = 5000, Y = 5000,
Height = 1000, Height = 1000,

23
osu.Game.Rulesets.Osu/Mods/OsuMod.cs
View File

@ -70,14 +70,7 @@ namespace osu.Game.Rulesets.Osu.Mods
break; break;
case DrawableSlider slider: case DrawableSlider slider:
using (slider.BeginAbsoluteSequence(fadeOutStartTime, true)) using (slider.BeginAbsoluteSequence(fadeOutStartTime, true))
{
slider.Body.FadeOut(longFadeDuration, Easing.Out); slider.Body.FadeOut(longFadeDuration, Easing.Out);
// delay a bit less to let the sliderball fade out peacefully instead of having a hard cut
using (slider.BeginDelayedSequence(longFadeDuration - fadeOutDuration, true))
slider.Ball.FadeOut(fadeOutDuration);
}
break; break;
case DrawableSpinner spinner: case DrawableSpinner spinner:
// hide elements we don't care about. // hide elements we don't care about.
@ -86,23 +79,7 @@ namespace osu.Game.Rulesets.Osu.Mods
spinner.Background.Hide(); spinner.Background.Hide();
using (spinner.BeginAbsoluteSequence(fadeOutStartTime + longFadeDuration, true)) using (spinner.BeginAbsoluteSequence(fadeOutStartTime + longFadeDuration, true))
{
spinner.FadeOut(fadeOutDuration); spinner.FadeOut(fadeOutDuration);
// speed up the end sequence accordingly
switch (state)
{
case ArmedState.Hit:
spinner.ScaleTo(spinner.Scale * 1.2f, fadeOutDuration * 2, Easing.Out);
break;
case ArmedState.Miss:
spinner.ScaleTo(spinner.Scale * 0.8f, fadeOutDuration * 2, Easing.In);
break;
}
spinner.Expire();
}
break; break;
} }
} }

17
osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
View File

@ -93,7 +93,8 @@ namespace osu.Game.Screens.Select.Leaderboards
get { return scope; } get { return scope; }
set set
{ {
if (value == scope) return; if (value == scope)
return;
scope = value; scope = value;
updateScores(); updateScores();
@ -107,8 +108,6 @@ namespace osu.Game.Screens.Select.Leaderboards
get { return placeholderState; } get { return placeholderState; }
set set
{ {
if (value == placeholderState) return;
if (value != PlaceholderState.Successful) if (value != PlaceholderState.Successful)
{ {
getScoresRequest?.Cancel(); getScoresRequest?.Cancel();
@ -116,6 +115,9 @@ namespace osu.Game.Screens.Select.Leaderboards
Scores = null; Scores = null;
} }
if (value == placeholderState)
return;
switch (placeholderState = value) switch (placeholderState = value)
{ {
case PlaceholderState.NetworkFailure: case PlaceholderState.NetworkFailure:
@ -171,7 +173,8 @@ namespace osu.Game.Screens.Select.Leaderboards
get { return beatmap; } get { return beatmap; }
set set
{ {
if (beatmap == value) return; if (beatmap == value)
return;
beatmap = value; beatmap = value;
Scores = null; Scores = null;
@ -259,7 +262,8 @@ namespace osu.Game.Screens.Select.Leaderboards
private void onUpdateFailed(Exception e) private void onUpdateFailed(Exception e)
{ {
if (e is OperationCanceledException) return; if (e is OperationCanceledException)
return;
PlaceholderState = PlaceholderState.NetworkFailure; PlaceholderState = PlaceholderState.NetworkFailure;
Logger.Error(e, @"Couldn't fetch beatmap scores!"); Logger.Error(e, @"Couldn't fetch beatmap scores!");
@ -294,7 +298,8 @@ namespace osu.Game.Screens.Select.Leaderboards
if (!scrollContainer.IsScrolledToEnd()) if (!scrollContainer.IsScrolledToEnd())
fadeStart -= LeaderboardScore.HEIGHT; fadeStart -= LeaderboardScore.HEIGHT;
if (scrollFlow == null) return; if (scrollFlow == null)
return;
foreach (var c in scrollFlow.Children) foreach (var c in scrollFlow.Children)
{ {