sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 14:46:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add tests.

Browse Source
This commit is contained in:
Lucas A
2020-08-03 16:00:10 +02:00
parent fe97d472df
commit 25ebb8619d
2 changed files with 62 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ namespace osu.Game.Screens.Play
[Resolved]
private IAPIProvider api { get; set; }
[Resolved]
[Resolved(CanBeNull = true)]
private OsuGame game { get; set; }
private SampleChannel sampleRestart;
@ -90,6 +90,8 @@ namespace osu.Game.Screens.Play
private SkipOverlay skipOverlay;
protected readonly Bindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.Disabled);
protected ScoreProcessor ScoreProcessor { get; private set; }
protected HealthProcessor HealthProcessor { get; private set; }
@ -203,12 +205,15 @@ namespace osu.Game.Screens.Play
skipOverlay.Hide();
}
if (game != null)
OverlayActivationMode.BindTo(game.OverlayActivationMode);
gameplayOverlaysDisabled.ValueChanged += disabled =>
{
if (DrawableRuleset.HasReplayLoaded.Value)
game.OverlayActivationMode.Value = OverlayActivation.UserTriggered;
OverlayActivationMode.Value = OverlayActivation.UserTriggered;
else
game.OverlayActivationMode.Value = disabled.NewValue && !DrawableRuleset.IsPaused.Value ? OverlayActivation.Disabled : OverlayActivation.UserTriggered;
OverlayActivationMode.Value = disabled.NewValue && !DrawableRuleset.IsPaused.Value ? OverlayActivation.Disabled : OverlayActivation.UserTriggered;
};
DrawableRuleset.IsPaused.BindValueChanged(_ => gameplayOverlaysDisabled.TriggerChange());
DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => gameplayOverlaysDisabled.TriggerChange());