h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 19:22:54 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fix-beatmap-skin-disables

Browse Source
This commit is contained in:
Bartłomiej Dach 2021-06-09 20:22:00 +02:00 committed by GitHub
commit 209f658d05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/Play/Player.cs
View File

@ -32,6 +32,7 @@ using osu.Game.Scoring.Legacy;
using osu.Game.Screens.Ranking; using osu.Game.Screens.Ranking;
using osu.Game.Skinning; using osu.Game.Skinning;
using osu.Game.Users; using osu.Game.Users;
using osuTK.Graphics;
namespace osu.Game.Screens.Play namespace osu.Game.Screens.Play
{ {
@ -856,6 +857,7 @@ namespace osu.Game.Screens.Play
{ {
b.IgnoreUserSettings.Value = false; b.IgnoreUserSettings.Value = false;
b.BlurAmount.Value = 0; b.BlurAmount.Value = 0;
b.FadeColour(Color4.White, 250);
// bind component bindables. // bind component bindables.
b.IsBreakTime.BindTo(breakTracker.IsBreakTime); b.IsBreakTime.BindTo(breakTracker.IsBreakTime);

4
osu.Game/Screens/Play/PlayerLoader.cs
View File

@ -184,8 +184,6 @@ namespace osu.Game.Screens.Play
{ {
if (epilepsyWarning != null) if (epilepsyWarning != null)
epilepsyWarning.DimmableBackground = b; epilepsyWarning.DimmableBackground = b;
b?.FadeColour(Color4.White, 800, Easing.OutQuint);
}); });
Beatmap.Value.Track.AddAdjustment(AdjustableProperty.Volume, volumeAdjustment); Beatmap.Value.Track.AddAdjustment(AdjustableProperty.Volume, volumeAdjustment);
@ -334,6 +332,8 @@ namespace osu.Game.Screens.Play
content.FadeInFromZero(400); content.FadeInFromZero(400);
content.ScaleTo(1, 650, Easing.OutQuint).Then().Schedule(prepareNewPlayer); content.ScaleTo(1, 650, Easing.OutQuint).Then().Schedule(prepareNewPlayer);
ApplyToBackground(b => b?.FadeColour(Color4.White, 800, Easing.OutQuint));
} }
private void contentOut() private void contentOut()

9
osu.Game/Screens/Ranking/ResultsScreen.cs
View File

@ -13,6 +13,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Bindings; using osu.Framework.Input.Bindings;
using osu.Framework.Screens; using osu.Framework.Screens;
using osu.Game.Audio; using osu.Game.Audio;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Input.Bindings; using osu.Game.Input.Bindings;
@ -257,7 +258,7 @@ namespace osu.Game.Screens.Ranking
ApplyToBackground(b => ApplyToBackground(b =>
{ {
b.BlurAmount.Value = BACKGROUND_BLUR; b.BlurAmount.Value = BACKGROUND_BLUR;
b.FadeTo(0.5f, 250); b.FadeColour(OsuColour.Gray(0.5f), 250);
}); });
bottomPanel.FadeTo(1, 250); bottomPanel.FadeTo(1, 250);
@ -265,9 +266,11 @@ namespace osu.Game.Screens.Ranking
public override bool OnExiting(IScreen next) 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() public override bool OnBackButton()