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

InGameOverlay -> MenuOverlay.

Browse Source
This commit is contained in:
Dean Herbert 2017-04-06 15:34:52 +09:00
parent 856696b17e
commit a18367454d
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
5 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/Play/FailOverlay.cs
View File

@ -10,7 +10,7 @@ using osu.Framework.Allocation;
namespace osu.Game.Screens.Play namespace osu.Game.Screens.Play
{ {
public class FailOverlay : InGameOverlay public class FailOverlay : MenuOverlay
{ {
public override string Header => "failed"; public override string Header => "failed";

4
osu.Game/Screens/Play/InGameOverlay.cs → osu.Game/Screens/Play/MenuOverlay.cs
View File

@ -16,7 +16,7 @@ using osu.Framework.Allocation;
namespace osu.Game.Screens.Play namespace osu.Game.Screens.Play
{ {
public abstract class InGameOverlay : OverlayContainer public abstract class MenuOverlay : OverlayContainer
{ {
private const int transition_duration = 200; private const int transition_duration = 200;
private const int button_height = 70; private const int button_height = 70;
@ -185,7 +185,7 @@ namespace osu.Game.Screens.Play
Retries = 0; Retries = 0;
} }
protected InGameOverlay() protected MenuOverlay()
{ {
AlwaysReceiveInput = true; AlwaysReceiveInput = true;
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;

2
osu.Game/Screens/Play/PauseOverlay.cs
View File

@ -11,7 +11,7 @@ using osu.Framework.Allocation;
namespace osu.Game.Screens.Play namespace osu.Game.Screens.Play
{ {
public class PauseOverlay : InGameOverlay public class PauseOverlay : MenuOverlay
{ {
public Action OnResume; public Action OnResume;

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

@ -119,26 +119,6 @@ namespace osu.Game.Screens.Play
hudOverlay.KeyCounter.Add(ruleset.CreateGameplayKeys()); hudOverlay.KeyCounter.Add(ruleset.CreateGameplayKeys());
hudOverlay.BindProcessor(scoreProcessor); 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); hudOverlay.BindHitRenderer(HitRenderer);
//bind HitRenderer to ScoreProcessor and ourselves (for a pass situation) //bind HitRenderer to ScoreProcessor and ourselves (for a pass situation)
@ -163,8 +143,23 @@ namespace osu.Game.Screens.Play
} }
}, },
hudOverlay, hudOverlay,
pauseOverlay, pauseOverlay = new PauseOverlay
failOverlay {
Depth = -1,
OnResume = delegate
{
Delay(400);
Schedule(Resume);
},
OnRetry = Restart,
OnQuit = Exit,
},
failOverlay = new FailOverlay
{
Depth = -1,
OnRetry = Restart,
OnQuit = Exit,
}
}; };
} }

2
osu.Game/osu.Game.csproj
View File

@ -199,7 +199,7 @@
<Compile Include="Screens\Multiplayer\Match.cs" /> <Compile Include="Screens\Multiplayer\Match.cs" />
<Compile Include="Screens\Multiplayer\MatchCreate.cs" /> <Compile Include="Screens\Multiplayer\MatchCreate.cs" />
<Compile Include="Screens\Play\FailOverlay.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\KeyConversionInputManager.cs" />
<Compile Include="Screens\Play\PauseOverlay.cs" /> <Compile Include="Screens\Play\PauseOverlay.cs" />
<Compile Include="Screens\Play\Pause\PauseButton.cs" /> <Compile Include="Screens\Play\Pause\PauseButton.cs" />