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

Merge branch 'master' into fix-test-signalr-connection-failures

Browse Source
This commit is contained in:
Dan Balasescu 2021-02-15 19:35:50 +09:00 committed by GitHub
commit 5f7bfc4304
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/Volume/VolumeMeter.cs
View File

@ -176,6 +176,7 @@ namespace osu.Game.Overlays.Volume
}
}
};
Bindable.ValueChanged += volume =>
{
this.TransformTo("DisplayVolume",
@ -183,6 +184,7 @@ namespace osu.Game.Overlays.Volume
400,
Easing.OutQuint);
};
bgProgress.Current.Value = 0.75f;
}

10
osu.Game/Screens/BackgroundScreen.cs
View File

@ -68,15 +68,19 @@ namespace osu.Game.Screens
public override bool OnExiting(IScreen next)
{
this.FadeOut(transition_length, Easing.OutExpo);
this.MoveToX(x_movement_amount, transition_length, Easing.OutExpo);
if (IsLoaded)
{
this.FadeOut(transition_length, Easing.OutExpo);
this.MoveToX(x_movement_amount, transition_length, Easing.OutExpo);
}
return base.OnExiting(next);
}
public override void OnResuming(IScreen last)
{
this.MoveToX(0, transition_length, Easing.OutExpo);
if (IsLoaded)
this.MoveToX(0, transition_length, Easing.OutExpo);
base.OnResuming(last);
}
}