mirror of
https://github.com/osukey/osukey.git
synced 2025-08-03 06:36:31 +09:00
Merge branch 'master' into results-screen-sfx
This commit is contained in:
@ -12,6 +12,8 @@ using osu.Framework.Graphics.Containers;
|
||||
using osu.Framework.Graphics.Shapes;
|
||||
using osu.Framework.Input.Bindings;
|
||||
using osu.Framework.Screens;
|
||||
using osu.Game.Audio;
|
||||
using osu.Game.Graphics;
|
||||
using osu.Game.Graphics.Containers;
|
||||
using osu.Game.Graphics.UserInterface;
|
||||
using osu.Game.Input.Bindings;
|
||||
@ -237,7 +239,7 @@ namespace osu.Game.Screens.Ranking
|
||||
ApplyToBackground(b =>
|
||||
{
|
||||
b.BlurAmount.Value = BACKGROUND_BLUR;
|
||||
b.FadeTo(0.5f, 250);
|
||||
b.FadeColour(OsuColour.Gray(0.5f), 250);
|
||||
});
|
||||
|
||||
bottomPanel.FadeTo(1, 250);
|
||||
@ -245,9 +247,11 @@ namespace osu.Game.Screens.Ranking
|
||||
|
||||
public override bool OnExiting(IScreen next)
|
||||
{
|
||||
ApplyToBackground(b => b.FadeTo(1, 250));
|
||||
if (base.OnExiting(next))
|
||||
return true;
|
||||
|
||||
return base.OnExiting(next);
|
||||
this.FadeOut(100);
|
||||
return false;
|
||||
}
|
||||
|
||||
public override bool OnBackButton()
|
||||
|
Reference in New Issue
Block a user