mirror of
https://github.com/ppy/osu.git
synced 2024-12-15 01:02:55 +08:00
Merge branch 'master' into fix-beatmap-skin-disables
This commit is contained in:
commit
209f658d05
@ -32,6 +32,7 @@ using osu.Game.Scoring.Legacy;
|
||||
using osu.Game.Screens.Ranking;
|
||||
using osu.Game.Skinning;
|
||||
using osu.Game.Users;
|
||||
using osuTK.Graphics;
|
||||
|
||||
namespace osu.Game.Screens.Play
|
||||
{
|
||||
@ -856,6 +857,7 @@ namespace osu.Game.Screens.Play
|
||||
{
|
||||
b.IgnoreUserSettings.Value = false;
|
||||
b.BlurAmount.Value = 0;
|
||||
b.FadeColour(Color4.White, 250);
|
||||
|
||||
// bind component bindables.
|
||||
b.IsBreakTime.BindTo(breakTracker.IsBreakTime);
|
||||
|
@ -184,8 +184,6 @@ namespace osu.Game.Screens.Play
|
||||
{
|
||||
if (epilepsyWarning != null)
|
||||
epilepsyWarning.DimmableBackground = b;
|
||||
|
||||
b?.FadeColour(Color4.White, 800, Easing.OutQuint);
|
||||
});
|
||||
|
||||
Beatmap.Value.Track.AddAdjustment(AdjustableProperty.Volume, volumeAdjustment);
|
||||
@ -334,6 +332,8 @@ namespace osu.Game.Screens.Play
|
||||
|
||||
content.FadeInFromZero(400);
|
||||
content.ScaleTo(1, 650, Easing.OutQuint).Then().Schedule(prepareNewPlayer);
|
||||
|
||||
ApplyToBackground(b => b?.FadeColour(Color4.White, 800, Easing.OutQuint));
|
||||
}
|
||||
|
||||
private void contentOut()
|
||||
|
@ -13,6 +13,7 @@ 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;
|
||||
@ -257,7 +258,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);
|
||||
@ -265,9 +266,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()
|
||||
|
Loading…
Reference in New Issue
Block a user