RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix line endings and derp that was causing request failures.

This commit is contained in:
Unknown 2017-11-28 11:35:39 +05:30
parent ae201f0ef5
commit ac1fb5118c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@
using System.Net; using System.Net;
using osu.Game.Rulesets; using osu.Game.Rulesets;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Game.Beatmaps.ControlPoints; using osu.Game.Beatmaps.ControlPoints;
using osu.Framework.Audio.Track; using osu.Framework.Audio.Track;
namespace osu.Game.Screens.Select.Leaderboards namespace osu.Game.Screens.Select.Leaderboards
@ -51,7 +51,6 @@ public IEnumerable<Score> Scores
set set
{ {
scores = value; scores = value;
getScoresRequest?.Cancel();
getScoresRequest = null; getScoresRequest = null;
placeholderContainer.FadeOut(fade_duration); placeholderContainer.FadeOut(fade_duration);
@ -202,6 +201,8 @@ private void updateScores()
{ {
if (!IsLoaded) return; if (!IsLoaded) return;
getScoresRequest?.Cancel();
Scores = null; Scores = null;
if (api == null || Beatmap?.OnlineBeatmapID == null) return; if (api == null || Beatmap?.OnlineBeatmapID == null) return;
@ -318,7 +319,7 @@ protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint,
icon.RotateTo(rightWard ? 3 : -3, duration * 2, Easing.OutCubic); icon.RotateTo(rightWard ? 3 : -3, duration * 2, Easing.OutCubic);
icon.Animate( icon.Animate(
i => i.MoveToY(-3, duration, Easing.Out), i => i.MoveToY(-3, duration, Easing.Out),
i => i.ScaleTo(IsHovered ? 1.3f : 1.1f, duration, Easing.Out) i => i.ScaleTo(IsHovered ? 1.3f : 1.1f, duration, Easing.Out)
).Then( ).Then(
i => i.MoveToY(0, duration, Easing.In), i => i.MoveToY(0, duration, Easing.In),
i => i.ScaleTo(IsHovered ? 1.4f : 1f, duration, Easing.In) i => i.ScaleTo(IsHovered ? 1.4f : 1f, duration, Easing.In)
@ -350,7 +351,7 @@ protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
protected override bool OnMouseUp(InputState state, MouseUpEventArgs args) protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
{ {
icon.ScaleTo(1.2f, 400, Easing.OutElastic).Then().ScaleTo(1f, 400, Easing.OutElastic); icon.ScaleTo(1.2f, 400, Easing.OutElastic);
return base.OnMouseUp(state, args); return base.OnMouseUp(state, args);
} }
} }