h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 21:42:55 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into sort-skins-alphabetically

Browse Source
This commit is contained in:
Dan Balasescu 2021-01-20 21:15:16 +09:00 committed by GitHub
commit 12f2067357
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Overlays/HoldToConfirmOverlay.cs
View File

@ -24,6 +24,13 @@ namespace osu.Game.Overlays
[Resolved] [Resolved]
private AudioManager audio { get; set; } private AudioManager audio { get; set; }
private readonly float finalFillAlpha;
protected HoldToConfirmOverlay(float finalFillAlpha = 1)
{
this.finalFillAlpha = finalFillAlpha;
}
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
{ {
@ -42,8 +49,10 @@ namespace osu.Game.Overlays
Progress.ValueChanged += p => Progress.ValueChanged += p =>
{ {
audioVolume.Value = 1 - p.NewValue; var target = p.NewValue * finalFillAlpha;
overlay.Alpha = (float)p.NewValue;
audioVolume.Value = 1 - target;
overlay.Alpha = (float)target;
}; };
audio.Tracks.AddAdjustment(AdjustableProperty.Volume, audioVolume); audio.Tracks.AddAdjustment(AdjustableProperty.Volume, audioVolume);

5
osu.Game/Screens/Menu/ExitConfirmOverlay.cs
View File

@ -13,6 +13,11 @@ namespace osu.Game.Screens.Menu
public void Abort() => AbortConfirm(); public void Abort() => AbortConfirm();
public ExitConfirmOverlay()
: base(0.7f)
{
}
public bool OnPressed(GlobalAction action) public bool OnPressed(GlobalAction action)
{ {
if (action == GlobalAction.Back) if (action == GlobalAction.Back)

2
osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs
View File

@ -17,7 +17,7 @@ using osuTK.Graphics;
namespace osu.Game.Tests.Beatmaps namespace osu.Game.Tests.Beatmaps
{ {
public class LegacyBeatmapSkinColourTest : ScreenTestScene public abstract class LegacyBeatmapSkinColourTest : ScreenTestScene
{ {
protected readonly Bindable<bool> BeatmapSkins = new Bindable<bool>(); protected readonly Bindable<bool> BeatmapSkins = new Bindable<bool>();
protected readonly Bindable<bool> BeatmapColours = new Bindable<bool>(); protected readonly Bindable<bool> BeatmapColours = new Bindable<bool>();