h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-06-03 02:31:25 +08:00
Code Issues Releases Wiki Activity

Remove V2 suffix from migrated classes

Browse Source
This commit is contained in:
Dean Herbert
2026-02-20 16:58:16 +09:00
Unverified
parent cb12d35d8f
commit fabce18552
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+4 -4
View File
@@ -1153,7 +1153,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
});
AddStep("open user style selection", () => this.ChildrenOfType<MultiplayerMatchSubScreen>().Single().ShowUserStyleSelect());
AddUntilStep("style selection screen opened", () => this.ChildrenOfType<MultiplayerMatchFreestyleSelectV2>().SingleOrDefault()?.IsCurrentScreen() == true);
AddUntilStep("style selection screen opened", () => this.ChildrenOfType<MultiplayerMatchFreestyleSelect>().SingleOrDefault()?.IsCurrentScreen() == true);
AddStep("change beatmap", () =>
{
@@ -1166,7 +1166,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
});
AddWaitStep("wait for potential beatmap change", 2);
AddAssert("style selection screen still open", () => this.ChildrenOfType<MultiplayerMatchFreestyleSelectV2>().SingleOrDefault()?.IsCurrentScreen() == true);
AddAssert("style selection screen still open", () => this.ChildrenOfType<MultiplayerMatchFreestyleSelect>().SingleOrDefault()?.IsCurrentScreen() == true);
}
/// <summary>
@@ -1190,7 +1190,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
});
AddStep("open user style selection", () => this.ChildrenOfType<MultiplayerMatchSubScreen>().Single().ShowUserStyleSelect());
AddUntilStep("style selection screen opened", () => this.ChildrenOfType<MultiplayerMatchFreestyleSelectV2>().SingleOrDefault()?.IsCurrentScreen() == true);
AddUntilStep("style selection screen opened", () => this.ChildrenOfType<MultiplayerMatchFreestyleSelect>().SingleOrDefault()?.IsCurrentScreen() == true);
AddStep("change beatmap set", () =>
{
@@ -1203,7 +1203,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
});
AddUntilStep("selected beatmap changed", () => Beatmap.Value.BeatmapInfo.Equals(importedSet2.Beatmaps.First()));
AddUntilStep("style selection screen closed", () => this.ChildrenOfType<MultiplayerMatchFreestyleSelectV2>().SingleOrDefault()?.IsCurrentScreen() != true);
AddUntilStep("style selection screen closed", () => this.ChildrenOfType<MultiplayerMatchFreestyleSelect>().SingleOrDefault()?.IsCurrentScreen() != true);
}
private void enterGameplay()
osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
+2 -2
View File
@@ -248,7 +248,7 @@ namespace osu.Game.Tests.Visual.Playlists
AddUntilStep("original beatmap", () => Beatmap.Value.BeatmapInfo.Equals(importedSet.Beatmaps[0]));
AddStep("enter freestyle select", () => playlistsScreen.Stack.ChildrenOfType<DrawableRoomPlaylistItem.PlaylistEditButton>().Single(b => b.IsPresent).TriggerClick());
AddUntilStep("wait for select screen", () => playlistsScreen.Stack.CurrentScreen is PlaylistsRoomFreestyleSelectV2 selectScreen && selectScreen.CarouselItemsPresented);
AddUntilStep("wait for select screen", () => playlistsScreen.Stack.CurrentScreen is PlaylistsRoomFreestyleSelect selectScreen && selectScreen.CarouselItemsPresented);
AddStep("select next beatmap", () => InputManager.Key(Key.Down));
AddStep("abort", () => playlistsScreen.Stack.CurrentScreen.Exit());
@@ -287,7 +287,7 @@ namespace osu.Game.Tests.Visual.Playlists
AddUntilStep("original beatmap", () => Beatmap.Value.BeatmapInfo.Equals(importedSet.Beatmaps[0]));
AddStep("enter freestyle select", () => playlistsScreen.Stack.ChildrenOfType<DrawableRoomPlaylistItem.PlaylistEditButton>().Single(b => b.IsPresent).TriggerClick());
AddUntilStep("wait for select screen", () => playlistsScreen.Stack.CurrentScreen is PlaylistsRoomFreestyleSelectV2 selectScreen && selectScreen.CarouselItemsPresented);
AddUntilStep("wait for select screen", () => playlistsScreen.Stack.CurrentScreen is PlaylistsRoomFreestyleSelect selectScreen && selectScreen.CarouselItemsPresented);
AddStep("select next beatmap", () => InputManager.Key(Key.Down));
AddStep("select (beatmap)", () => InputManager.Key(Key.Enter));
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchFreestyleSelectV2.cs → osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchFreestyleSelect.cs
+2 -2
View File
@@ -12,7 +12,7 @@ using osu.Game.Online.Rooms;
namespace osu.Game.Screens.OnlinePlay.Multiplayer
{
public partial class MultiplayerMatchFreestyleSelectV2 : OnlinePlayFreestyleSelectV2
public partial class MultiplayerMatchFreestyleSelect : OnlinePlayFreestyleSelect
{
[Resolved]
private MultiplayerClient client { get; set; } = null!;
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
private LoadingLayer loadingLayer = null!;
private IDisposable? selectionOperation;
public MultiplayerMatchFreestyleSelectV2(PlaylistItem item)
public MultiplayerMatchFreestyleSelect(PlaylistItem item)
: base(item)
{
}
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+2 -2
View File
@@ -506,7 +506,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
return;
// Check if we need to make this the current screen as a result of the beatmap set changing while the user's selecting a style.
if (this.GetChildScreen() is MultiplayerMatchFreestyleSelectV2)
if (this.GetChildScreen() is MultiplayerMatchFreestyleSelect)
{
MultiplayerPlaylistItem item = client.Room.CurrentPlaylistItem;
@@ -722,7 +722,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
return;
MultiplayerPlaylistItem item = client.Room.CurrentPlaylistItem;
this.Push(new MultiplayerMatchFreestyleSelectV2(new PlaylistItem(item)));
this.Push(new MultiplayerMatchFreestyleSelect(new PlaylistItem(item)));
}
/// <summary>
osu.Game/Screens/OnlinePlay/OnlinePlayFreestyleSelectV2.cs → osu.Game/Screens/OnlinePlay/OnlinePlayFreestyleSelect.cs
+2 -2
View File
@@ -17,7 +17,7 @@ using SongSelect = osu.Game.Screens.SelectV2.SongSelect;
namespace osu.Game.Screens.OnlinePlay
{
public abstract partial class OnlinePlayFreestyleSelectV2 : SongSelect, IHandlePresentBeatmap, IOnlinePlaySubScreen
public abstract partial class OnlinePlayFreestyleSelect : SongSelect, IHandlePresentBeatmap, IOnlinePlaySubScreen
{
private readonly PlaylistItem item;
@@ -30,7 +30,7 @@ namespace osu.Game.Screens.OnlinePlay
[Resolved]
private RealmAccess realm { get; set; } = null!;
protected OnlinePlayFreestyleSelectV2(PlaylistItem item)
protected OnlinePlayFreestyleSelect(PlaylistItem item)
{
this.item = item;
osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+1 -1
View File
@@ -696,7 +696,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
if (!this.IsCurrentScreen() || SelectedItem.Value == null)
return;
this.Push(new PlaylistsRoomFreestyleSelectV2(SelectedItem.Value)
this.Push(new PlaylistsRoomFreestyleSelect(SelectedItem.Value)
{
Beatmap = { BindTarget = UserBeatmap },
Ruleset = { BindTarget = UserRuleset }
osu.Game/Screens/OnlinePlay/PlaylistsRoomFreestyleSelectV2.cs → osu.Game/Screens/OnlinePlay/PlaylistsRoomFreestyleSelect.cs
+2 -2
View File
@@ -9,12 +9,12 @@ using osu.Game.Rulesets;
namespace osu.Game.Screens.OnlinePlay
{
public partial class PlaylistsRoomFreestyleSelectV2 : OnlinePlayFreestyleSelectV2
public partial class PlaylistsRoomFreestyleSelect : OnlinePlayFreestyleSelect
{
public new readonly Bindable<BeatmapInfo?> Beatmap = new Bindable<BeatmapInfo?>();
public new readonly Bindable<RulesetInfo?> Ruleset = new Bindable<RulesetInfo?>();
public PlaylistsRoomFreestyleSelectV2(PlaylistItem item)
public PlaylistsRoomFreestyleSelect(PlaylistItem item)
: base(item)
{
}