mirror of
https://github.com/ppy/osu.git
synced 2025-01-31 06:12:55 +08:00
Fix mod display not fading out after start of play
This was very weird on master - `ModDisplay` applied a fade-in on the `iconsContainer` that lasted 1000ms, and `HUDOverlay` would stack another 200ms fade-in on top if a replay was loaded. Moving that first fadeout to a higher level broke fade-out because transforms got overwritten.
This commit is contained in:
parent
2713ae601a
commit
772ac2d326
@ -35,8 +35,6 @@ namespace osu.Game.Screens.Play
|
|||||||
{
|
{
|
||||||
public const float FADE_DURATION = 300;
|
public const float FADE_DURATION = 300;
|
||||||
|
|
||||||
private const float mods_fade_duration = 1000;
|
|
||||||
|
|
||||||
public const Easing FADE_EASING = Easing.OutQuint;
|
public const Easing FADE_EASING = Easing.OutQuint;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -238,7 +236,7 @@ namespace osu.Game.Screens.Play
|
|||||||
{
|
{
|
||||||
if (e.NewValue)
|
if (e.NewValue)
|
||||||
{
|
{
|
||||||
ModDisplay.FadeIn(200);
|
ModDisplay.FadeIn(1000, FADE_EASING);
|
||||||
InputCountController.Margin = new MarginPadding(10) { Bottom = 30 };
|
InputCountController.Margin = new MarginPadding(10) { Bottom = 30 };
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -255,8 +253,6 @@ namespace osu.Game.Screens.Play
|
|||||||
{
|
{
|
||||||
ModDisplay.ExpansionMode = ExpansionMode.ExpandOnHover;
|
ModDisplay.ExpansionMode = ExpansionMode.ExpandOnHover;
|
||||||
}, 1200);
|
}, 1200);
|
||||||
|
|
||||||
ModDisplay.FadeInFromZero(mods_fade_duration, FADE_EASING);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void Update()
|
protected override void Update()
|
||||||
|
Loading…
Reference in New Issue
Block a user