sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 08:49:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add button to open results

Browse Source
This commit is contained in:
smoogipoo
2020-05-28 22:25:00 +09:00
parent 0f373acacb
commit a606f41297
3 changed files with 44 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
View File

@ -19,9 +19,19 @@ namespace osu.Game.Tests.Visual.Multiplayer
public class TestSceneTimeshiftResultsScreen : ScreenTestScene public class TestSceneTimeshiftResultsScreen : ScreenTestScene
{ {
[Test] [Test]
public void TestShowResults() public void TestShowResultsWithScore()
{
createResults(new TestScoreInfo(new OsuRuleset().RulesetInfo));
}
[Test]
public void TestShowResultsNullScore()
{
createResults(null);
}
private void createResults(ScoreInfo score)
{ {
var score = new TestScoreInfo(new OsuRuleset().RulesetInfo);
var roomScores = new List<RoomScore>(); var roomScores = new List<RoomScore>();
for (int i = 0; i < 10; i++) for (int i = 0; i < 10; i++)

33
osu.Game/Screens/Multi/Match/MatchSubScreen.cs
View File

@ -2,6 +2,7 @@
// 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 System;
using System.Diagnostics;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
@ -10,6 +11,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Screens; using osu.Framework.Screens;
using osu.Game.Audio; using osu.Game.Audio;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Game.Online.API.Requests; using osu.Game.Online.API.Requests;
using osu.Game.Online.Multiplayer; using osu.Game.Online.Multiplayer;
@ -18,6 +20,7 @@ using osu.Game.Rulesets.Mods;
using osu.Game.Screens.Multi.Components; using osu.Game.Screens.Multi.Components;
using osu.Game.Screens.Multi.Match.Components; using osu.Game.Screens.Multi.Match.Components;
using osu.Game.Screens.Multi.Play; using osu.Game.Screens.Multi.Play;
using osu.Game.Screens.Multi.Ranking;
using osu.Game.Screens.Select; using osu.Game.Screens.Select;
using Footer = osu.Game.Screens.Multi.Match.Components.Footer; using Footer = osu.Game.Screens.Multi.Match.Components.Footer;
@ -114,10 +117,29 @@ namespace osu.Game.Screens.Multi.Match
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Horizontal = 5 }, Padding = new MarginPadding { Horizontal = 5 },
Child = new OverlinedPlaylist(true) // Temporarily always allow selection Child = new GridContainer
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
SelectedItem = { BindTarget = SelectedItem } Content = new[]
{
new Drawable[]
{
new OverlinedPlaylist(true) // Temporarily always allow selection
{
RelativeSizeAxes = Axes.Both,
SelectedItem = { BindTarget = SelectedItem }
}
},
new Drawable[]
{
new TriangleButton
{
RelativeSizeAxes = Axes.X,
Text = "Show beatmap results",
Action = showBeatmapResults
}
}
}
} }
}, },
new Container new Container
@ -257,5 +279,12 @@ namespace osu.Game.Screens.Multi.Match
break; break;
} }
} }
private void showBeatmapResults()
{
Debug.Assert(roomId.Value != null);
this.Push(new TimeshiftResultsScreen(null, roomId.Value.Value, SelectedItem.Value, false));
}
} }
} }

2
osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Screens.Multi.Ranking
protected override APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback) protected override APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback)
{ {
var req = new GetRoomPlaylistScoresRequest(roomId, playlistItem.ID); var req = new GetRoomPlaylistScoresRequest(roomId, playlistItem.ID);
req.Success += r => scoresCallback?.Invoke(r.Select(s => s.CreateScoreInfo(playlistItem))); req.Success += r => scoresCallback?.Invoke(r.Where(s => s.ID != Score?.OnlineScoreID).Select(s => s.CreateScoreInfo(playlistItem)));
return req; return req;
} }
} }