Adjust RankedPlayCard to always show card back (when loading content) (ppy#37129)

peppy · web-flow · commit ee2f7a75d734 · 2026-03-30T15:48:41.000+09:00
This was mentioned in vivi's feedback. Basically now the card backside
is always loaded and there, rather than faffing with switching the
content around.

&gt; Cards have a stale grey background when they are spawning in before
they get changed into the cards they’re supposed to be. This can be
changed to the backside of the card or maybe a bright white card. Makes
it look less placeholdery.

Keeping it simple for now. Can probably hide it when not in use in the
future.
diff --git a/osu.Game.Tests/Visual/RankedPlay/TestSceneDiscardScreen.cs b/osu.Game.Tests/Visual/RankedPlay/TestSceneDiscardScreen.cs
@@ -2,15 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Extensions;
+using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.MatchTypes.RankedPlay;
 using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Matchmaking.RankedPlay;
-using osu.Game.Tests.Visual.Multiplayer;
 
 namespace osu.Game.Tests.Visual.RankedPlay
 {
-    public partial class TestSceneDiscardScreen : MultiplayerTestScene
+    public partial class TestSceneDiscardScreen : RankedPlayTestScene
     {
         private RankedPlayScreen screen = null!;
 
@@ -26,7 +26,26 @@ public override void SetUpSteps()
             AddStep("load screen", () => LoadScreen(screen = new RankedPlayScreen(MultiplayerClient.ClientRoom!)));
             AddUntilStep("screen loaded", () => screen.IsLoaded);
 
+            var requestHandler = new BeatmapRequestHandler();
+
+            AddStep("setup request handler", () => ((DummyAPIAccess)API).HandleRequest = requestHandler.HandleRequest);
+
             AddStep("set pick state", () => MultiplayerClient.RankedPlayChangeStage(RankedPlayStage.CardDiscard).WaitSafely());
+
+            AddWaitStep("wait some", 5);
+
+            AddStep("reveal cards", () =>
+            {
+                for (int i = 0; i < 5; i++)
+                {
+                    int i2 = i;
+                    MultiplayerClient.RankedPlayRevealCard(hand => hand[i2], new MultiplayerPlaylistItem
+                    {
+                        ID = i2,
+                        BeatmapID = requestHandler.Beatmaps[i2].OnlineID
+                    }).WaitSafely();
+                }
+            });
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/RankedPlay/TestSceneOpponentPickScreen.cs b/osu.Game.Tests/Visual/RankedPlay/TestSceneOpponentPickScreen.cs
@@ -2,15 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Extensions;
+using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.MatchTypes.RankedPlay;
 using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Matchmaking.RankedPlay;
-using osu.Game.Tests.Visual.Multiplayer;
 
 namespace osu.Game.Tests.Visual.RankedPlay
 {
-    public partial class TestSceneOpponentPickScreen : MultiplayerTestScene
+    public partial class TestSceneOpponentPickScreen : RankedPlayTestScene
     {
         private RankedPlayScreen screen = null!;
 
@@ -26,7 +26,26 @@ public override void SetUpSteps()
             AddStep("load screen", () => LoadScreen(screen = new RankedPlayScreen(MultiplayerClient.ClientRoom!)));
             AddUntilStep("screen loaded", () => screen.IsLoaded);
 
+            var requestHandler = new BeatmapRequestHandler();
+
+            AddStep("setup request handler", () => ((DummyAPIAccess)API).HandleRequest = requestHandler.HandleRequest);
+
             AddStep("set pick state", () => MultiplayerClient.RankedPlayChangeStage(RankedPlayStage.CardPlay, state => state.ActiveUserId = 2).WaitSafely());
+
+            AddWaitStep("wait some", 5);
+
+            AddStep("reveal cards", () =>
+            {
+                for (int i = 0; i < 5; i++)
+                {
+                    int i2 = i;
+                    MultiplayerClient.RankedPlayRevealCard(hand => hand[i2], new MultiplayerPlaylistItem
+                    {
+                        ID = i2,
+                        BeatmapID = requestHandler.Beatmaps[i2].OnlineID
+                    }).WaitSafely();
+                }
+            });
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/RankedPlay/TestScenePickScreen.cs b/osu.Game.Tests/Visual/RankedPlay/TestScenePickScreen.cs
@@ -2,15 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Extensions;
+using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.MatchTypes.RankedPlay;
 using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Matchmaking.RankedPlay;
-using osu.Game.Tests.Visual.Multiplayer;
 
 namespace osu.Game.Tests.Visual.RankedPlay
 {
-    public partial class TestScenePickScreen : MultiplayerTestScene
+    public partial class TestScenePickScreen : RankedPlayTestScene
     {
         private RankedPlayScreen screen = null!;
 
@@ -26,7 +26,26 @@ public override void SetUpSteps()
             AddStep("load screen", () => LoadScreen(screen = new RankedPlayScreen(MultiplayerClient.ClientRoom!)));
             AddUntilStep("screen loaded", () => screen.IsLoaded);
 
+            var requestHandler = new BeatmapRequestHandler();
+
+            AddStep("setup request handler", () => ((DummyAPIAccess)API).HandleRequest = requestHandler.HandleRequest);
+
             AddStep("set pick state", () => MultiplayerClient.RankedPlayChangeStage(RankedPlayStage.CardPlay, state => state.ActiveUserId = API.LocalUser.Value.OnlineID).WaitSafely());
+
+            AddWaitStep("wait some", 5);
+
+            AddStep("reveal cards", () =>
+            {
+                for (int i = 0; i < 5; i++)
+                {
+                    int i2 = i;
+                    MultiplayerClient.RankedPlayRevealCard(hand => hand[i2], new MultiplayerPlaylistItem
+                    {
+                        ID = i2,
+                        BeatmapID = requestHandler.Beatmaps[i2].OnlineID
+                    }).WaitSafely();
+                }
+            });
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Matchmaking/RankedPlay/Card/RankedPlayCard.cs b/osu.Game/Screens/OnlinePlay/Matchmaking/RankedPlay/Card/RankedPlayCard.cs
@@ -97,10 +97,11 @@ public RankedPlayCard(RankedPlayCardWithPlaylistItem item)
                         Origin = Anchor.Centre,
                         Children =
                         [
+                            new RankedPlayCardBackSide(),
                             cardContent = new Container
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                Child = new RankedPlayCardBackSide()
+                                Child = Empty(),
                             },
                             selectionOutline = new SelectionOutline
                             {
@@ -123,9 +124,7 @@ protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            playlistItem.BindValueChanged(e => onPlaylistItemChanged(e.NewValue));
-            if (playlistItem.Value != null)
-                loadCardContent(playlistItem.Value, false);
+            playlistItem.BindValueChanged(e => onPlaylistItemChanged(e.NewValue), true);
         }
 
         protected override void UpdateAfterChildren()
@@ -147,14 +146,14 @@ private void onPlaylistItemChanged(MultiplayerPlaylistItem? playlistItem)
         {
             if (playlistItem == null)
             {
-                SetContent(new RankedPlayCardBackSide(), true);
+                SetContent(null);
                 return;
             }
 
-            loadCardContent(playlistItem, true);
+            loadCardContentAsync(playlistItem);
         }
 
-        private void loadCardContent(MultiplayerPlaylistItem playlistItem, bool flip) => Task.Run(async () =>
+        private void loadCardContentAsync(MultiplayerPlaylistItem playlistItem) => Task.Run(async () =>
         {
             var beatmap = await beatmapLookupCache.GetBeatmapAsync(playlistItem.BeatmapID).ConfigureAwait(false);
 
@@ -168,22 +167,22 @@ private void loadCardContent(MultiplayerPlaylistItem playlistItem, bool flip) =>
 
             Schedule(() =>
             {
-                SetContent(new RankedPlayCardContent(beatmap), flip);
+                SetContent(new RankedPlayCardContent(beatmap));
                 songPreviewContainer.LoadPreview(beatmap);
             });
         });
 
-        public void SetContent(Drawable newContent, bool flip)
+        private bool hasContent;
+
+        public void SetContent(Drawable? newContent)
         {
-            if (!flip)
-            {
-                cardContent.Child = newContent;
+            if (newContent == null && !hasContent)
                 return;
-            }
 
+            hasContent = newContent != null;
             content.ScaleTo(new Vector2(0, 1), 100, Easing.In)
                    .Then()
-                   .Schedule(() => cardContent.Child = newContent)
+                   .Schedule(() => cardContent.Child = newContent ?? Empty())
                    .ScaleTo(new Vector2(1), 300, Easing.OutElasticQuarter);
 
             SamplePlaybackHelper.PlayWithRandomPitch(cardFlipSample);

Original file line number	Diff line number	Diff line change
`@@ -97,10 +97,11 @@ public RankedPlayCard(RankedPlayCardWithPlaylistItem item)`
`97`	`97`	`Origin = Anchor.Centre,`
`98`	`98`	`Children =`
`99`	`99`	`[`
	`100`	`+ new RankedPlayCardBackSide(),`
`100`	`101`	`cardContent = new Container`
`101`	`102`	`{`
`102`	`103`	`RelativeSizeAxes = Axes.Both,`
`103`		`- Child = new RankedPlayCardBackSide()`
	`104`	`+ Child = Empty(),`
`104`	`105`	`},`
`105`	`106`	`selectionOutline = new SelectionOutline`
`106`	`107`	`{`
`@@ -123,9 +124,7 @@ protected override void LoadComplete()`
`123`	`124`	`{`
`124`	`125`	`base.LoadComplete();`
`125`	`126`
`126`		`- playlistItem.BindValueChanged(e => onPlaylistItemChanged(e.NewValue));`
`127`		`- if (playlistItem.Value != null)`
`128`		`- loadCardContent(playlistItem.Value, false);`
	`127`	`+ playlistItem.BindValueChanged(e => onPlaylistItemChanged(e.NewValue), true);`
`129`	`128`	`}`
`130`	`129`
`131`	`130`	`protected override void UpdateAfterChildren()`
`@@ -147,14 +146,14 @@ private void onPlaylistItemChanged(MultiplayerPlaylistItem? playlistItem)`
`147`	`146`	`{`
`148`	`147`	`if (playlistItem == null)`
`149`	`148`	`{`
`150`		`- SetContent(new RankedPlayCardBackSide(), true);`
	`149`	`+ SetContent(null);`
`151`	`150`	`return;`
`152`	`151`	`}`
`153`	`152`
`154`		`- loadCardContent(playlistItem, true);`
	`153`	`+ loadCardContentAsync(playlistItem);`
`155`	`154`	`}`
`156`	`155`
`157`		`- private void loadCardContent(MultiplayerPlaylistItem playlistItem, bool flip) => Task.Run(async () =>`
	`156`	`+ private void loadCardContentAsync(MultiplayerPlaylistItem playlistItem) => Task.Run(async () =>`
`158`	`157`	`{`
`159`	`158`	`var beatmap = await beatmapLookupCache.GetBeatmapAsync(playlistItem.BeatmapID).ConfigureAwait(false);`
`160`	`159`
`@@ -168,22 +167,22 @@ private void loadCardContent(MultiplayerPlaylistItem playlistItem, bool flip) =>`
`168`	`167`
`169`	`168`	`Schedule(() =>`
`170`	`169`	`{`
`171`		`- SetContent(new RankedPlayCardContent(beatmap), flip);`
	`170`	`+ SetContent(new RankedPlayCardContent(beatmap));`
`172`	`171`	`songPreviewContainer.LoadPreview(beatmap);`
`173`	`172`	`});`
`174`	`173`	`});`
`175`	`174`
`176`		`- public void SetContent(Drawable newContent, bool flip)`
	`175`	`+ private bool hasContent;`
	`176`	`+`
	`177`	`+ public void SetContent(Drawable? newContent)`
`177`	`178`	`{`
`178`		`- if (!flip)`
`179`		`- {`
`180`		`- cardContent.Child = newContent;`
	`179`	`+ if (newContent == null && !hasContent)`
`181`	`180`	`return;`
`182`		`- }`
`183`	`181`
	`182`	`+ hasContent = newContent != null;`
`184`	`183`	`content.ScaleTo(new Vector2(0, 1), 100, Easing.In)`
`185`	`184`	`.Then()`
`186`		`- .Schedule(() => cardContent.Child = newContent)`
	`185`	`+ .Schedule(() => cardContent.Child = newContent ?? Empty())`
`187`	`186`	`.ScaleTo(new Vector2(1), 300, Easing.OutElasticQuarter);`
`188`	`187`
`189`	`188`	`SamplePlaybackHelper.PlayWithRandomPitch(cardFlipSample);`