h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 09:23:06 +08:00
Code Issues Releases Wiki Activity

split multiplayer and playlist activity

Browse Source
This commit is contained in:
Nathan Alo 2021-08-22 09:54:07 +08:00
parent eaca331170
commit 2877b43824
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
View File

@ -17,6 +17,7 @@ using osu.Game.Scoring;
using osu.Game.Screens.Play; using osu.Game.Screens.Play;
using osu.Game.Screens.Play.HUD; using osu.Game.Screens.Play.HUD;
using osu.Game.Screens.Ranking; using osu.Game.Screens.Ranking;
using osu.Game.Users;
using osuTK; using osuTK;
namespace osu.Game.Screens.OnlinePlay.Multiplayer namespace osu.Game.Screens.OnlinePlay.Multiplayer
@ -28,6 +29,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
// Disallow fails in multiplayer for now. // Disallow fails in multiplayer for now.
protected override bool CheckModsAllowFailure() => false; protected override bool CheckModsAllowFailure() => false;
protected override UserActivity InitialActivity => new UserActivity.InMultiplayerGame(Beatmap.Value.BeatmapInfo, Ruleset.Value);
[Resolved] [Resolved]
private MultiplayerClient client { get; set; } private MultiplayerClient client { get; set; }

3
osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
View File

@ -13,6 +13,7 @@ using osu.Game.Rulesets;
using osu.Game.Scoring; using osu.Game.Scoring;
using osu.Game.Screens.Play; using osu.Game.Screens.Play;
using osu.Game.Screens.Ranking; using osu.Game.Screens.Ranking;
using osu.Game.Users;
namespace osu.Game.Screens.OnlinePlay.Playlists namespace osu.Game.Screens.OnlinePlay.Playlists
{ {
@ -20,6 +21,8 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
{ {
public Action Exited; public Action Exited;
protected override UserActivity InitialActivity => new UserActivity.InPlaylistGame(Beatmap.Value.BeatmapInfo, Ruleset.Value);
public PlaylistsPlayer(PlaylistItem playlistItem, PlayerConfiguration configuration = null) public PlaylistsPlayer(PlaylistItem playlistItem, PlayerConfiguration configuration = null)
: base(playlistItem, configuration) : base(playlistItem, configuration)
{ {

3
osu.Game/Screens/Play/RoomSubmittingPlayer.cs
View File

@ -6,7 +6,6 @@ using osu.Framework.Bindables;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Game.Online.Rooms; using osu.Game.Online.Rooms;
using osu.Game.Scoring; using osu.Game.Scoring;
using osu.Game.Users;
namespace osu.Game.Screens.Play namespace osu.Game.Screens.Play
{ {
@ -20,8 +19,6 @@ namespace osu.Game.Screens.Play
protected readonly PlaylistItem PlaylistItem; protected readonly PlaylistItem PlaylistItem;
protected override UserActivity InitialActivity => new UserActivity.InMultiplayerGame(Beatmap.Value.BeatmapInfo, Ruleset.Value);
protected RoomSubmittingPlayer(PlaylistItem playlistItem, PlayerConfiguration configuration = null) protected RoomSubmittingPlayer(PlaylistItem playlistItem, PlayerConfiguration configuration = null)
: base(configuration) : base(configuration)
{ {

8
osu.Game/Users/UserActivity.cs
View File

@ -50,6 +50,14 @@ namespace osu.Game.Users
public override string Status => $@"{base.Status} with others"; public override string Status => $@"{base.Status} with others";
} }
public class InPlaylistGame : InGame
{
public InPlaylistGame(BeatmapInfo beatmap, RulesetInfo ruleset)
: base(beatmap, ruleset)
{
}
}
public class InSoloGame : InGame public class InSoloGame : InGame
{ {
public InSoloGame(BeatmapInfo info, RulesetInfo ruleset) public InSoloGame(BeatmapInfo info, RulesetInfo ruleset)