mirror of
https://github.com/ppy/osu.git
synced 2025-02-13 10:33:07 +08:00
InGameOverlay -> MenuOverlay.
This commit is contained in:
parent
856696b17e
commit
a18367454d
@ -10,7 +10,7 @@ using osu.Framework.Allocation;
|
||||
|
||||
namespace osu.Game.Screens.Play
|
||||
{
|
||||
public class FailOverlay : InGameOverlay
|
||||
public class FailOverlay : MenuOverlay
|
||||
{
|
||||
|
||||
public override string Header => "failed";
|
||||
|
@ -16,7 +16,7 @@ using osu.Framework.Allocation;
|
||||
|
||||
namespace osu.Game.Screens.Play
|
||||
{
|
||||
public abstract class InGameOverlay : OverlayContainer
|
||||
public abstract class MenuOverlay : OverlayContainer
|
||||
{
|
||||
private const int transition_duration = 200;
|
||||
private const int button_height = 70;
|
||||
@ -185,7 +185,7 @@ namespace osu.Game.Screens.Play
|
||||
Retries = 0;
|
||||
}
|
||||
|
||||
protected InGameOverlay()
|
||||
protected MenuOverlay()
|
||||
{
|
||||
AlwaysReceiveInput = true;
|
||||
RelativeSizeAxes = Axes.Both;
|
@ -11,7 +11,7 @@ using osu.Framework.Allocation;
|
||||
|
||||
namespace osu.Game.Screens.Play
|
||||
{
|
||||
public class PauseOverlay : InGameOverlay
|
||||
public class PauseOverlay : MenuOverlay
|
||||
{
|
||||
public Action OnResume;
|
||||
|
||||
|
@ -119,26 +119,6 @@ namespace osu.Game.Screens.Play
|
||||
hudOverlay.KeyCounter.Add(ruleset.CreateGameplayKeys());
|
||||
hudOverlay.BindProcessor(scoreProcessor);
|
||||
|
||||
pauseOverlay = new PauseOverlay
|
||||
{
|
||||
Depth = -1,
|
||||
OnResume = delegate
|
||||
{
|
||||
Delay(400);
|
||||
Schedule(Resume);
|
||||
},
|
||||
OnRetry = Restart,
|
||||
OnQuit = Exit,
|
||||
};
|
||||
|
||||
failOverlay = new FailOverlay
|
||||
{
|
||||
Depth = -1,
|
||||
OnRetry = Restart,
|
||||
OnQuit = Exit,
|
||||
};
|
||||
|
||||
|
||||
hudOverlay.BindHitRenderer(HitRenderer);
|
||||
|
||||
//bind HitRenderer to ScoreProcessor and ourselves (for a pass situation)
|
||||
@ -163,8 +143,23 @@ namespace osu.Game.Screens.Play
|
||||
}
|
||||
},
|
||||
hudOverlay,
|
||||
pauseOverlay,
|
||||
failOverlay
|
||||
pauseOverlay = new PauseOverlay
|
||||
{
|
||||
Depth = -1,
|
||||
OnResume = delegate
|
||||
{
|
||||
Delay(400);
|
||||
Schedule(Resume);
|
||||
},
|
||||
OnRetry = Restart,
|
||||
OnQuit = Exit,
|
||||
},
|
||||
failOverlay = new FailOverlay
|
||||
{
|
||||
Depth = -1,
|
||||
OnRetry = Restart,
|
||||
OnQuit = Exit,
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -199,7 +199,7 @@
|
||||
<Compile Include="Screens\Multiplayer\Match.cs" />
|
||||
<Compile Include="Screens\Multiplayer\MatchCreate.cs" />
|
||||
<Compile Include="Screens\Play\FailOverlay.cs" />
|
||||
<Compile Include="Screens\Play\InGameOverlay.cs" />
|
||||
<Compile Include="Screens\Play\MenuOverlay.cs" />
|
||||
<Compile Include="Screens\Play\KeyConversionInputManager.cs" />
|
||||
<Compile Include="Screens\Play\PauseOverlay.cs" />
|
||||
<Compile Include="Screens\Play\Pause\PauseButton.cs" />
|
||||
|
Loading…
Reference in New Issue
Block a user