mirror of
https://github.com/ppy/osu.git
synced 2026-05-18 06:29:52 +08:00
Fix osu! logo appearing in at new playlist song select screen after opening mod select (#36385)
Closes https://github.com/ppy/osu/issues/36363.
This commit is contained in:
committed by
GitHub
Unverified
parent
cf73f8f9e6
commit
c0b644c905
@@ -18,7 +18,6 @@ using osu.Game.Overlays.Mods;
|
||||
using osu.Game.Rulesets;
|
||||
using osu.Game.Rulesets.Mods;
|
||||
using osu.Game.Screens.Footer;
|
||||
using osu.Game.Screens.Menu;
|
||||
using osu.Game.Screens.SelectV2;
|
||||
using osu.Game.Utils;
|
||||
|
||||
@@ -48,6 +47,8 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
|
||||
{
|
||||
this.room = room;
|
||||
|
||||
ShowOsuLogo = false;
|
||||
|
||||
Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
|
||||
LeftPadding = new MarginPadding { Top = CORNER_RADIUS_HIDE_OFFSET + Header.HEIGHT };
|
||||
|
||||
@@ -202,21 +203,6 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
|
||||
return false;
|
||||
}
|
||||
|
||||
protected override void LogoArriving(OsuLogo logo, bool resuming)
|
||||
{
|
||||
// Intentionally not calling base so the logo isn't shown.
|
||||
}
|
||||
|
||||
protected override void LogoExiting(OsuLogo logo)
|
||||
{
|
||||
// Intentionally not calling base so the logo isn't shown.
|
||||
}
|
||||
|
||||
protected override void LogoSuspending(OsuLogo logo)
|
||||
{
|
||||
// Intentionally not calling base so the logo isn't shown.
|
||||
}
|
||||
|
||||
public override IReadOnlyList<ScreenFooterButton> CreateFooterButtons()
|
||||
{
|
||||
var buttons = base.CreateFooterButtons().ToList();
|
||||
|
||||
@@ -93,6 +93,11 @@ namespace osu.Game.Screens.SelectV2
|
||||
/// </summary>
|
||||
protected bool ControlGlobalMusic { get; init; } = true;
|
||||
|
||||
/// <summary>
|
||||
/// Whether the osu! logo should be shown at the bottom-right of the screen.
|
||||
/// </summary>
|
||||
protected bool ShowOsuLogo { get; init; } = true;
|
||||
|
||||
protected MarginPadding LeftPadding { get; init; }
|
||||
|
||||
private ModSelectOverlay modSelectOverlay = null!;
|
||||
@@ -380,7 +385,8 @@ namespace osu.Game.Screens.SelectV2
|
||||
if (!this.IsCurrentScreen())
|
||||
return;
|
||||
|
||||
logo?.FadeTo(v.NewValue == Visibility.Visible ? 0f : 1f, 200, Easing.OutQuint);
|
||||
if (ShowOsuLogo)
|
||||
logo?.FadeTo(v.NewValue == Visibility.Visible ? 0f : 1f, 200, Easing.OutQuint);
|
||||
});
|
||||
|
||||
Beatmap.BindValueChanged(_ =>
|
||||
@@ -755,6 +761,9 @@ namespace osu.Game.Screens.SelectV2
|
||||
{
|
||||
base.LogoArriving(logo, resuming);
|
||||
|
||||
if (!ShowOsuLogo)
|
||||
return;
|
||||
|
||||
if (logo.Alpha > 0.8f && resuming)
|
||||
Footer?.StartTrackingLogo(logo, 400, Easing.OutQuint);
|
||||
else
|
||||
@@ -778,6 +787,10 @@ namespace osu.Game.Screens.SelectV2
|
||||
protected override void LogoSuspending(OsuLogo logo)
|
||||
{
|
||||
base.LogoSuspending(logo);
|
||||
|
||||
if (!ShowOsuLogo)
|
||||
return;
|
||||
|
||||
Footer?.StopTrackingLogo();
|
||||
}
|
||||
|
||||
@@ -785,6 +798,9 @@ namespace osu.Game.Screens.SelectV2
|
||||
{
|
||||
base.LogoExiting(logo);
|
||||
|
||||
if (!ShowOsuLogo)
|
||||
return;
|
||||
|
||||
Footer?.StopTrackingLogo();
|
||||
|
||||
logo.ScaleTo(0.2f, 120, Easing.Out);
|
||||
|
||||
Reference in New Issue
Block a user