sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-29 09:27:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

apply suggestions

Browse Source
This commit is contained in:
Nathan Alo 2021-08-14 22:39:12 +08:00
parent a553942a7f
commit 4ed06a1021
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Rulesets/Ruleset.cs
View File

@ -226,7 +226,7 @@ namespace osu.Game.Rulesets
/// <summary> /// <summary>
/// The playing verb to be shown in the <see cref="UserActivity.SoloGame.Status"/>. /// The playing verb to be shown in the <see cref="UserActivity.SoloGame.Status"/>.
/// </summary> /// </summary>
public virtual string PlayingVerb => "Playing solo"; public virtual string PlayingVerb => "Playing";
/// <summary> /// <summary>
/// A list of available variant ids. /// A list of available variant ids.

8
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
View File

@ -11,22 +11,16 @@ using osu.Game.Online.Rooms;
using osu.Game.Rulesets; using osu.Game.Rulesets;
using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Mods;
using osu.Game.Screens.Select; using osu.Game.Screens.Select;
using osu.Game.Users;
namespace osu.Game.Screens.OnlinePlay.Multiplayer namespace osu.Game.Screens.OnlinePlay.Multiplayer
{ {
public class MultiplayerMatchSongSelect : OnlinePlaySongSelect public class MultiplayerMatchSongSelect : OnlinePlaySongSelect
{ {
[Resolved] [Resolved]
private MultiplayerClient client { get; set; } private MultiplayerClient client { get; set; }
[Resolved]
private Room room { get; set; }
private LoadingLayer loadingLayer; private LoadingLayer loadingLayer;
protected override UserActivity InitialActivity => new UserActivity.InLobby(room);
/// <summary> /// <summary>
/// Construct a new instance of multiplayer song select. /// Construct a new instance of multiplayer song select.
/// </summary> /// </summary>

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

@ -17,7 +17,6 @@ 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
@ -26,8 +25,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
{ {
protected override bool PauseOnFocusLost => false; protected override bool PauseOnFocusLost => false;
protected override UserActivity InitialActivity => new UserActivity.MultiplayerGame(Beatmap.Value.BeatmapInfo, Ruleset.Value);
// Disallow fails in multiplayer for now. // Disallow fails in multiplayer for now.
protected override bool CheckModsAllowFailure() => false; protected override bool CheckModsAllowFailure() => false;

6
osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
View File

@ -17,6 +17,7 @@ using osu.Game.Overlays.Mods;
using osu.Game.Rulesets; using osu.Game.Rulesets;
using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Mods;
using osu.Game.Screens.Select; using osu.Game.Screens.Select;
using osu.Game.Users;
using osu.Game.Utils; using osu.Game.Utils;
namespace osu.Game.Screens.OnlinePlay namespace osu.Game.Screens.OnlinePlay
@ -32,6 +33,11 @@ namespace osu.Game.Screens.OnlinePlay
[Resolved(typeof(Room), nameof(Room.Playlist))] [Resolved(typeof(Room), nameof(Room.Playlist))]
protected BindableList<PlaylistItem> Playlist { get; private set; } protected BindableList<PlaylistItem> Playlist { get; private set; }
[Resolved]
private Room room { get; set; }
protected override UserActivity InitialActivity => new UserActivity.InLobby(room);
protected readonly Bindable<IReadOnlyList<Mod>> FreeMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>()); protected readonly Bindable<IReadOnlyList<Mod>> FreeMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
[CanBeNull] [CanBeNull]

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

@ -6,6 +6,7 @@ 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
{ {
@ -19,6 +20,8 @@ namespace osu.Game.Screens.Play
protected readonly PlaylistItem PlaylistItem; protected readonly PlaylistItem PlaylistItem;
protected override UserActivity InitialActivity => new UserActivity.MultiplayerGame(Beatmap.Value.BeatmapInfo, Ruleset.Value);
protected RoomSubmittingPlayer(PlaylistItem playlistItem, PlayerConfiguration configuration = null) protected RoomSubmittingPlayer(PlaylistItem playlistItem, PlayerConfiguration configuration = null)
: base(configuration) : base(configuration)
{ {

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

@ -74,7 +74,7 @@ namespace osu.Game.Users
public class InLobby : UserActivity public class InLobby : UserActivity
{ {
public override string Status => @"In a multiplayer lobby"; public override string Status => @"In a lobby";
public readonly Room Room; public readonly Room Room;