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

Improve loading animation

Browse Source
This commit is contained in:
Andrei Zavatski 2019-11-13 17:18:58 +03:00
parent 4e90daf212
commit 3f6140db6d
2 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game/Overlays/BeatmapSet/Scores/NoScoresPlaceholder.cs
View File

@ -4,7 +4,6 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics;
using osu.Framework.Bindables;
using osu.Game.Screens.Select.Leaderboards;
using osu.Framework.Graphics.Sprites;
@ -12,8 +11,6 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
{
public class NoScoresPlaceholder : Container
{
public readonly Bindable<BeatmapLeaderboardScope> Scope = new Bindable<BeatmapLeaderboardScope>();
private readonly SpriteText text;
public NoScoresPlaceholder()
@ -25,25 +22,22 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
};
}
protected override void LoadComplete()
{
base.LoadComplete();
Scope.BindValueChanged(scope => text.Text = getText(scope.NewValue), true);
}
private string getText(BeatmapLeaderboardScope scope)
public void UpdateText(BeatmapLeaderboardScope scope)
{
switch (scope)
{
default:
case BeatmapLeaderboardScope.Global:
return @"No scores yet. Maybe should try setting some?";
text.Text = @"No scores yet. Maybe should try setting some?";
return;
case BeatmapLeaderboardScope.Friend:
return @"None of your friends has set a score on this map yet!";
text.Text = @"None of your friends has set a score on this map yet!";
return;
case BeatmapLeaderboardScope.Country:
return @"No one from your country has set a score on this map yet!";
text.Text = @"No one from your country has set a score on this map yet!";
return;
}
}
}

50
osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
View File

@ -23,6 +23,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
public class ScoresContainer : CompositeDrawable
{
private const int spacing = 15;
private const int duration = 200;
public readonly Bindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
@ -32,7 +33,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
private readonly Box background;
private readonly ScoreTable scoreTable;
private readonly FillFlowContainer topScoresContainer;
private readonly LoadingAnimation loadingAnimation;
private readonly DimmedLoadingLayer loading;
private readonly FillFlowContainer modFilter;
private readonly LeaderboardModSelector modSelector;
private readonly NoScoresPlaceholder noScoresPlaceholder;
@ -89,7 +90,6 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
AutoSizeAxes = Axes.Y,
Width = 0.95f,
Direction = FillDirection.Vertical,
Spacing = new Vector2(0, spacing),
Margin = new MarginPadding { Vertical = spacing },
Children = new Drawable[]
{
@ -116,8 +116,17 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
{
AutoSizeAxes = Axes.Y,
RelativeSizeAxes = Axes.X,
Margin = new MarginPadding { Vertical = spacing },
Children = new Drawable[]
{
noScoresPlaceholder = new NoScoresPlaceholder
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Alpha = 0,
AlwaysPresent = true,
Margin = new MarginPadding { Vertical = 10 }
},
new FillFlowContainer
{
RelativeSizeAxes = Axes.X,
@ -126,13 +135,6 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
Spacing = new Vector2(0, spacing),
Children = new Drawable[]
{
noScoresPlaceholder = new NoScoresPlaceholder
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Alpha = 0,
Scope = { BindTarget = scope }
},
topScoresContainer = new FillFlowContainer
{
RelativeSizeAxes = Axes.X,
@ -147,12 +149,16 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
}
}
},
loadingAnimation = new LoadingAnimation
new Container
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Alpha = 0,
},
RelativeSizeAxes = Axes.Both,
Masking = true,
CornerRadius = 10,
Child = loading = new DimmedLoadingLayer(iconScale: 0.8f)
{
Alpha = 0,
},
}
}
}
}
@ -210,24 +216,28 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
getScoresRequest?.Cancel();
getScoresRequest = null;
Scores = null;
noScoresPlaceholder.Hide();
noScoresPlaceholder.FadeOut(duration, Easing.OutQuint);
updateModFilterVisibility();
if (hasNoLeaderboard)
{
Scores = null;
return;
}
loadingAnimation.Show();
loading.Show();
getScoresRequest = new GetScoresRequest(Beatmap.Value, Beatmap.Value.Ruleset, scope.Value, modSelector.SelectedMods);
getScoresRequest.Success += scores =>
{
loadingAnimation.Hide();
loading.Hide();
Scores = scores;
if (!scores.Scores.Any())
noScoresPlaceholder.Show();
{
noScoresPlaceholder.UpdateText(scope.Value);
noScoresPlaceholder.FadeIn(duration, Easing.OutQuint);
}
};
api.Queue(getScoresRequest);
}