mirror of
https://github.com/ppy/osu.git
synced 2024-12-05 09:42:54 +08:00
Merge branch 'master' into xxx-add-localisation-support-for-menu-tip
This commit is contained in:
commit
cfaf972813
@ -976,7 +976,9 @@ namespace osu.Game.Screens.Play
|
|||||||
if (PauseOverlay.State.Value == Visibility.Visible)
|
if (PauseOverlay.State.Value == Visibility.Visible)
|
||||||
PauseOverlay.Hide();
|
PauseOverlay.Hide();
|
||||||
|
|
||||||
failAnimationContainer.Start();
|
bool restartOnFail = GameplayState.Mods.OfType<IApplicableFailOverride>().Any(m => m.RestartOnFail);
|
||||||
|
if (!restartOnFail)
|
||||||
|
failAnimationContainer.Start();
|
||||||
|
|
||||||
// Failures can be triggered either by a judgement, or by a mod.
|
// Failures can be triggered either by a judgement, or by a mod.
|
||||||
//
|
//
|
||||||
@ -990,7 +992,7 @@ namespace osu.Game.Screens.Play
|
|||||||
ScoreProcessor.FailScore(Score.ScoreInfo);
|
ScoreProcessor.FailScore(Score.ScoreInfo);
|
||||||
OnFail();
|
OnFail();
|
||||||
|
|
||||||
if (GameplayState.Mods.OfType<IApplicableFailOverride>().Any(m => m.RestartOnFail))
|
if (restartOnFail)
|
||||||
Restart(true);
|
Restart(true);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user