mirror of
https://github.com/ppy/osu.git
synced 2025-03-01 15:42:54 +08:00
Add completion marker to daily challenge profile counter
This commit is contained in:
parent
a8456ce9ac
commit
b215073957
@ -38,6 +38,10 @@ namespace osu.Game.Tests.Visual.Online
|
|||||||
AddSliderStep("top 10%", 0, 999, 0, v => update(s => s.Top10PercentPlacements = v));
|
AddSliderStep("top 10%", 0, 999, 0, v => update(s => s.Top10PercentPlacements = v));
|
||||||
AddSliderStep("top 50%", 0, 999, 0, v => update(s => s.Top50PercentPlacements = v));
|
AddSliderStep("top 50%", 0, 999, 0, v => update(s => s.Top50PercentPlacements = v));
|
||||||
AddSliderStep("playcount", 0, 1500, 1, v => update(s => s.PlayCount = v));
|
AddSliderStep("playcount", 0, 1500, 1, v => update(s => s.PlayCount = v));
|
||||||
|
AddStep("user played today", () => update(s => s.LastUpdate = DateTimeOffset.UtcNow.Date));
|
||||||
|
AddStep("user played yesterday", () => update(s => s.LastUpdate = DateTimeOffset.UtcNow.Date.AddDays(-1)));
|
||||||
|
AddStep("user is local user", () => update(s => s.UserID = API.LocalUser.Value.Id));
|
||||||
|
AddStep("user is not local user", () => update(s => s.UserID = API.LocalUser.Value.Id + 1000));
|
||||||
AddStep("create", () =>
|
AddStep("create", () =>
|
||||||
{
|
{
|
||||||
Clear();
|
Clear();
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
||||||
// See the LICENCE file in the repository root for full licence text.
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
|
using System;
|
||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
using osu.Framework.Bindables;
|
using osu.Framework.Bindables;
|
||||||
using osu.Framework.Extensions.LocalisationExtensions;
|
using osu.Framework.Extensions.LocalisationExtensions;
|
||||||
@ -8,11 +9,14 @@ using osu.Framework.Graphics;
|
|||||||
using osu.Framework.Graphics.Containers;
|
using osu.Framework.Graphics.Containers;
|
||||||
using osu.Framework.Graphics.Cursor;
|
using osu.Framework.Graphics.Cursor;
|
||||||
using osu.Framework.Graphics.Shapes;
|
using osu.Framework.Graphics.Shapes;
|
||||||
|
using osu.Framework.Graphics.Sprites;
|
||||||
using osu.Game.Graphics;
|
using osu.Game.Graphics;
|
||||||
using osu.Game.Graphics.Containers;
|
using osu.Game.Graphics.Containers;
|
||||||
using osu.Game.Graphics.Sprites;
|
using osu.Game.Graphics.Sprites;
|
||||||
using osu.Game.Localisation;
|
using osu.Game.Localisation;
|
||||||
|
using osu.Game.Online.API;
|
||||||
using osu.Game.Online.API.Requests.Responses;
|
using osu.Game.Online.API.Requests.Responses;
|
||||||
|
using osuTK;
|
||||||
|
|
||||||
namespace osu.Game.Overlays.Profile.Header.Components
|
namespace osu.Game.Overlays.Profile.Header.Components
|
||||||
{
|
{
|
||||||
@ -23,6 +27,11 @@ namespace osu.Game.Overlays.Profile.Header.Components
|
|||||||
public DailyChallengeTooltipData? TooltipContent { get; private set; }
|
public DailyChallengeTooltipData? TooltipContent { get; private set; }
|
||||||
|
|
||||||
private OsuSpriteText dailyPlayCount = null!;
|
private OsuSpriteText dailyPlayCount = null!;
|
||||||
|
private Container content = null!;
|
||||||
|
private CircularContainer completionMark = null!;
|
||||||
|
|
||||||
|
[Resolved]
|
||||||
|
private IAPIProvider api { get; set; }
|
||||||
|
|
||||||
[Resolved]
|
[Resolved]
|
||||||
private OsuColour colours { get; set; } = null!;
|
private OsuColour colours { get; set; } = null!;
|
||||||
@ -34,10 +43,17 @@ namespace osu.Game.Overlays.Profile.Header.Components
|
|||||||
private void load()
|
private void load()
|
||||||
{
|
{
|
||||||
AutoSizeAxes = Axes.Both;
|
AutoSizeAxes = Axes.Both;
|
||||||
CornerRadius = 5;
|
|
||||||
Masking = true;
|
|
||||||
|
|
||||||
InternalChildren = new Drawable[]
|
InternalChildren = new Drawable[]
|
||||||
|
{
|
||||||
|
content = new Container
|
||||||
|
{
|
||||||
|
AutoSizeAxes = Axes.Both,
|
||||||
|
CornerRadius = 6,
|
||||||
|
BorderThickness = 2,
|
||||||
|
BorderColour = colourProvider.Background4,
|
||||||
|
Masking = true,
|
||||||
|
Children = new Drawable[]
|
||||||
{
|
{
|
||||||
new Box
|
new Box
|
||||||
{
|
{
|
||||||
@ -48,7 +64,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
|
|||||||
{
|
{
|
||||||
Anchor = Anchor.Centre,
|
Anchor = Anchor.Centre,
|
||||||
Origin = Anchor.Centre,
|
Origin = Anchor.Centre,
|
||||||
Padding = new MarginPadding(5f),
|
Padding = new MarginPadding(3f),
|
||||||
AutoSizeAxes = Axes.Both,
|
AutoSizeAxes = Axes.Both,
|
||||||
Direction = FillDirection.Horizontal,
|
Direction = FillDirection.Horizontal,
|
||||||
Children = new Drawable[]
|
Children = new Drawable[]
|
||||||
@ -65,7 +81,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
|
|||||||
{
|
{
|
||||||
AutoSizeAxes = Axes.X,
|
AutoSizeAxes = Axes.X,
|
||||||
RelativeSizeAxes = Axes.Y,
|
RelativeSizeAxes = Axes.Y,
|
||||||
CornerRadius = 5f,
|
CornerRadius = 3,
|
||||||
Masking = true,
|
Masking = true,
|
||||||
Children = new Drawable[]
|
Children = new Drawable[]
|
||||||
{
|
{
|
||||||
@ -86,6 +102,32 @@ namespace osu.Game.Overlays.Profile.Header.Components
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
}
|
||||||
|
},
|
||||||
|
completionMark = new CircularContainer
|
||||||
|
{
|
||||||
|
Alpha = 0,
|
||||||
|
Size = new Vector2(16),
|
||||||
|
Anchor = Anchor.TopRight,
|
||||||
|
Origin = Anchor.Centre,
|
||||||
|
Masking = true,
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
new Box
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Colour = colours.Lime1,
|
||||||
|
},
|
||||||
|
new SpriteIcon
|
||||||
|
{
|
||||||
|
Size = new Vector2(8),
|
||||||
|
Colour = colourProvider.Background6,
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.Centre,
|
||||||
|
Icon = FontAwesome.Solid.Check,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -114,6 +156,20 @@ namespace osu.Game.Overlays.Profile.Header.Components
|
|||||||
dailyPlayCount.Text = DailyChallengeStatsDisplayStrings.UnitDay(stats.PlayCount.ToLocalisableString("N0"));
|
dailyPlayCount.Text = DailyChallengeStatsDisplayStrings.UnitDay(stats.PlayCount.ToLocalisableString("N0"));
|
||||||
dailyPlayCount.Colour = colours.ForRankingTier(DailyChallengeStatsTooltip.TierForPlayCount(stats.PlayCount));
|
dailyPlayCount.Colour = colours.ForRankingTier(DailyChallengeStatsTooltip.TierForPlayCount(stats.PlayCount));
|
||||||
|
|
||||||
|
bool playedToday = stats.LastUpdate?.Date == DateTimeOffset.UtcNow.Date;
|
||||||
|
bool userIsOnOwnProfile = stats.UserID == api.LocalUser.Value.Id;
|
||||||
|
|
||||||
|
if (playedToday && userIsOnOwnProfile)
|
||||||
|
{
|
||||||
|
completionMark.Alpha = 1;
|
||||||
|
content.BorderColour = colours.Lime1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
completionMark.Alpha = 0;
|
||||||
|
content.BorderColour = colourProvider.Background4;
|
||||||
|
}
|
||||||
|
|
||||||
TooltipContent = new DailyChallengeTooltipData(colourProvider, stats);
|
TooltipContent = new DailyChallengeTooltipData(colourProvider, stats);
|
||||||
|
|
||||||
Show();
|
Show();
|
||||||
|
Loading…
Reference in New Issue
Block a user