h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-13 15:27:30 +08:00
Code Issues Releases Wiki Activity

Merge pull request #28468 from bdach/daily-challenge/event-feed

Browse Source 
Implement event feed view for daily challenge screen
This commit is contained in:
Dean Herbert 2024-06-17 20:16:48 +09:00 committed by GitHub
commit a6f09bc626
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 207 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
osu.Game.Tests/Visual/DailyChallenge/TestSceneDailyChallengeEventFeed.cs Normal file
View File

@ -0,0 +1,76 @@
// 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.
using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Framework.Extensions.ObjectExtensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Utils;
using osu.Game.Overlays;
using osu.Game.Screens.OnlinePlay.DailyChallenge;
using osu.Game.Tests.Resources;
namespace osu.Game.Tests.Visual.DailyChallenge
{
public partial class TestSceneDailyChallengeEventFeed : OsuTestScene
{
[Cached]
private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Plum);
[Test]
public void TestBasicAppearance()
{
DailyChallengeEventFeed feed = null!;
AddStep("create content", () => Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = colourProvider.Background4,
},
feed = new DailyChallengeEventFeed
{
RelativeSizeAxes = Axes.Both,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
}
});
AddSliderStep("adjust width", 0.1f, 1, 1, width =>
{
if (feed.IsNotNull())
feed.Width = width;
});
AddSliderStep("adjust height", 0.1f, 1, 1, height =>
{
if (feed.IsNotNull())
feed.Height = height;
});
AddStep("add normal score", () =>
{
var testScore = TestResources.CreateTestScoreInfo();
testScore.TotalScore = RNG.Next(1_000_000);
feed.AddNewScore(new DailyChallengeEventFeed.NewScoreEvent(testScore, null));
});
AddStep("add new user best", () =>
{
var testScore = TestResources.CreateTestScoreInfo();
testScore.TotalScore = RNG.Next(1_000_000);
feed.AddNewScore(new DailyChallengeEventFeed.NewScoreEvent(testScore, RNG.Next(1, 1000)));
});
AddStep("add top 10 score", () =>
{
var testScore = TestResources.CreateTestScoreInfo();
testScore.TotalScore = RNG.Next(1_000_000);
feed.AddNewScore(new DailyChallengeEventFeed.NewScoreEvent(testScore, RNG.Next(1, 10)));
});
}
}
}

131
osu.Game/Screens/OnlinePlay/DailyChallenge/DailyChallengeEventFeed.cs Normal file
View File

@ -0,0 +1,131 @@
// 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.
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Scoring;
using osu.Game.Users.Drawables;
using osuTK;
namespace osu.Game.Screens.OnlinePlay.DailyChallenge
{
public partial class DailyChallengeEventFeed : CompositeDrawable
{
private DailyChallengeEventFeedFlow flow = null!;
[BackgroundDependencyLoader]
private void load()
{
InternalChildren = new Drawable[]
{
new SectionHeader("Events"),
new Container
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Top = 35 },
Child = flow = new DailyChallengeEventFeedFlow
{
RelativeSizeAxes = Axes.Both,
Direction = FillDirection.Vertical,
Origin = Anchor.BottomCentre,
Anchor = Anchor.BottomCentre,
Spacing = new Vector2(5),
Masking = true,
}
}
};
}
public void AddNewScore(NewScoreEvent newScoreEvent)
{
var row = new NewScoreEventRow(newScoreEvent)
{
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
};
flow.Add(row);
row.Delay(15000).Then().FadeOut(300, Easing.OutQuint).Expire();
}
protected override void Update()
{
base.Update();
for (int i = 0; i < flow.Count; ++i)
{
var row = flow[i];
if (row.Y < -flow.DrawHeight)
{
row.RemoveAndDisposeImmediately();
i -= 1;
}
}
}
public record NewScoreEvent(IScoreInfo Score, int? NewRank);
private partial class DailyChallengeEventFeedFlow : FillFlowContainer
{
public override IEnumerable<Drawable> FlowingChildren => base.FlowingChildren.Reverse();
}
private partial class NewScoreEventRow : CompositeDrawable
{
private readonly NewScoreEvent newScore;
public NewScoreEventRow(NewScoreEvent newScore)
{
this.newScore = newScore;
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
LinkFlowContainer text;
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;
AutoSizeDuration = 300;
AutoSizeEasing = Easing.OutQuint;
InternalChildren = new Drawable[]
{
// TODO: cast is temporary, will be removed later
new ClickableAvatar((APIUser)newScore.Score.User)
{
Size = new Vector2(16),
Masking = true,
CornerRadius = 8,
},
text = new LinkFlowContainer(t =>
{
t.Font = OsuFont.Default.With(weight: newScore.NewRank == null ? FontWeight.Medium : FontWeight.Bold);
t.Colour = newScore.NewRank < 10 ? colours.Orange1 : Colour4.White;
})
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Padding = new MarginPadding { Left = 21 },
}
};
text.AddUserLink(newScore.Score.User);
text.AddText(" got ");
text.AddLink($"{newScore.Score.TotalScore:N0} points", () => { }); // TODO: present the score here
if (newScore.NewRank != null)
text.AddText($" and achieved rank #{newScore.NewRank.Value:N0}");
text.AddText("!");
}
}
}
}