h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-21 07:49:52 +08:00
Code Issues Releases Wiki Activity

Adjust menu tips and supporter display to not overlap

Browse Source 
Closes https://github.com/ppy/osu/issues/32684.

Also did a very brief pass on timings and animations.
This commit is contained in:
Dean Herbert
2025-04-08 15:12:28 +09:00
Unverified
parent ef63f623a3
commit 38608360b5
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Screens/Menu/MainMenu.cs
+5 -5
View File
@@ -106,7 +106,7 @@ namespace osu.Game.Screens.Menu
private SongTicker songTicker;
private Container logoTarget;
private OnlineMenuBanner onlineMenuBanner;
private MenuTip menuTip;
private MenuTipDisplay menuTipDisplay;
private FillFlowContainer bottomElementsFlow;
private SupporterDisplay supporterDisplay;
@@ -191,7 +191,7 @@ namespace osu.Game.Screens.Menu
Spacing = new Vector2(5),
Children = new Drawable[]
{
menuTip = new MenuTip
menuTipDisplay = new MenuTipDisplay
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
@@ -206,8 +206,8 @@ namespace osu.Game.Screens.Menu
supporterDisplay = new SupporterDisplay
{
Margin = new MarginPadding(5),
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Anchor = Anchor.TopLeft,
Origin = Anchor.TopLeft,
},
holdToExitGameOverlay?.CreateProxy() ?? Empty()
});
@@ -391,7 +391,7 @@ namespace osu.Game.Screens.Menu
musicController.EnsurePlayingSomething();
// Cycle tip on resuming
menuTip.ShowNextTip();
menuTipDisplay.ShowNextTip();
bottomElementsFlow
.ScaleTo(1, 1000, Easing.OutQuint)
osu.Game/Screens/Menu/MenuTip.cs → osu.Game/Screens/Menu/MenuTipDisplay.cs
+7 -2
View File
@@ -18,7 +18,7 @@ using osu.Game.Localisation;
namespace osu.Game.Screens.Menu
{
public partial class MenuTip : CompositeDrawable
public partial class MenuTipDisplay : CompositeDrawable
{
[Resolved]
private OsuConfigManager config { get; set; } = null!;
@@ -86,7 +86,12 @@ namespace osu.Game.Screens.Menu
textFlow.AddParagraph(MenuTipStrings.MenuTipTitle, formatSemiBold);
textFlow.AddParagraph(tip, formatRegular);
this.FadeInFromZero(200, Easing.OutQuint)
this
.FadeOut()
.ScaleTo(0.9f)
.Delay(600)
.FadeInFromZero(800, Easing.OutQuint)
.ScaleTo(1, 800, Easing.OutElasticHalf)
.Delay(1000 + 80 * tip.ToString().Length)
.Then()
.FadeOutFromOne(2000, Easing.OutQuint);
osu.Game/Screens/Menu/SupporterDisplay.cs
+6 -5
View File
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Input.Events;
using osu.Framework.Threading;
using osu.Framework.Utils;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Online.API;
@@ -53,7 +54,7 @@ namespace osu.Game.Screens.Menu
backgroundBox = new Box
{
RelativeSizeAxes = Axes.Both,
Alpha = 0.4f,
Alpha = 0.6f,
},
supportFlow = new LinkFlowContainer
{
@@ -111,7 +112,7 @@ namespace osu.Game.Screens.Menu
this
.FadeOut()
.Delay(1000)
.Delay(RNG.Next(800, 4000))
.FadeInFromZero(800, Easing.OutQuint);
scheduleDismissal();
@@ -128,13 +129,13 @@ namespace osu.Game.Screens.Menu
protected override bool OnHover(HoverEvent e)
{
backgroundBox.FadeTo(0.6f, 500, Easing.OutQuint);
backgroundBox.FadeTo(0.8f, 500, Easing.OutQuint);
return base.OnHover(e);
}
protected override void OnHoverLost(HoverLostEvent e)
{
backgroundBox.FadeTo(0.4f, 500, Easing.OutQuint);
backgroundBox.FadeTo(0.6f, 500, Easing.OutQuint);
base.OnHoverLost(e);
}
@@ -160,7 +161,7 @@ namespace osu.Game.Screens.Menu
this
.Delay(200)
.FadeOut(750, Easing.Out);
}, 6000);
}, 8000);
}
}
}