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

Resolve build errors

Browse Source
This commit is contained in:
Derrick Timmermans 2021-07-06 14:11:46 +02:00
parent 07d54d261a
commit ffe18ebe51
No known key found for this signature in database
GPG Key ID: 8681B60806EF4A17
3 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs
View File

@ -87,7 +87,7 @@ namespace osu.Game.Tests.Visual.Gameplay
showOverlay(); showOverlay();
AddStep("Up arrow", () => InputManager.Key(Key.Up)); AddStep("Up arrow", () => InputManager.Key(Key.Up));
AddAssert("Last button selected", () => pauseOverlay.Buttons.Last().Selected); AddAssert("Last button selected", () => pauseOverlay.Buttons.Last().State == SelectionState.Selected);
} }
/// <summary> /// <summary>
@ -99,7 +99,7 @@ namespace osu.Game.Tests.Visual.Gameplay
showOverlay(); showOverlay();
AddStep("Down arrow", () => InputManager.Key(Key.Down)); AddStep("Down arrow", () => InputManager.Key(Key.Down));
AddAssert("First button selected", () => getButton(0).Selected); AddAssert("First button selected", () => getButton(0).State == SelectionState.Selected);
} }
/// <summary> /// <summary>
@ -111,11 +111,11 @@ namespace osu.Game.Tests.Visual.Gameplay
AddStep("Show overlay", () => failOverlay.Show()); AddStep("Show overlay", () => failOverlay.Show());
AddStep("Up arrow", () => InputManager.Key(Key.Up)); AddStep("Up arrow", () => InputManager.Key(Key.Up));
AddAssert("Last button selected", () => failOverlay.Buttons.Last().Selected); AddAssert("Last button selected", () => failOverlay.Buttons.Last().State == SelectionState.Selected);
AddStep("Up arrow", () => InputManager.Key(Key.Up)); AddStep("Up arrow", () => InputManager.Key(Key.Up));
AddAssert("First button selected", () => failOverlay.Buttons.First().Selected); AddAssert("First button selected", () => failOverlay.Buttons.First().State == SelectionState.Selected);
AddStep("Up arrow", () => InputManager.Key(Key.Up)); AddStep("Up arrow", () => InputManager.Key(Key.Up));
AddAssert("Last button selected", () => failOverlay.Buttons.Last().Selected); AddAssert("Last button selected", () => failOverlay.Buttons.Last().State == SelectionState.Selected);
} }
/// <summary> /// <summary>
@ -127,11 +127,11 @@ namespace osu.Game.Tests.Visual.Gameplay
AddStep("Show overlay", () => failOverlay.Show()); AddStep("Show overlay", () => failOverlay.Show());
AddStep("Down arrow", () => InputManager.Key(Key.Down)); AddStep("Down arrow", () => InputManager.Key(Key.Down));
AddAssert("First button selected", () => failOverlay.Buttons.First().Selected); AddAssert("First button selected", () => failOverlay.Buttons.First().State == SelectionState.Selected);
AddStep("Down arrow", () => InputManager.Key(Key.Down)); AddStep("Down arrow", () => InputManager.Key(Key.Down));
AddAssert("Last button selected", () => failOverlay.Buttons.Last().Selected); AddAssert("Last button selected", () => failOverlay.Buttons.Last().State == SelectionState.Selected);
AddStep("Down arrow", () => InputManager.Key(Key.Down)); AddStep("Down arrow", () => InputManager.Key(Key.Down));
AddAssert("First button selected", () => failOverlay.Buttons.First().Selected); AddAssert("First button selected", () => failOverlay.Buttons.First().State == SelectionState.Selected);
} }
/// <summary> /// <summary>
@ -145,7 +145,7 @@ namespace osu.Game.Tests.Visual.Gameplay
AddStep("Hover first button", () => InputManager.MoveMouseTo(failOverlay.Buttons.First())); AddStep("Hover first button", () => InputManager.MoveMouseTo(failOverlay.Buttons.First()));
AddStep("Hide overlay", () => failOverlay.Hide()); AddStep("Hide overlay", () => failOverlay.Hide());
AddAssert("Overlay state is reset", () => !failOverlay.Buttons.Any(b => b.Selected)); AddAssert("Overlay state is reset", () => !failOverlay.Buttons.Any(b => b.State == SelectionState.Selected));
} }
/// <summary> /// <summary>
@ -162,11 +162,11 @@ namespace osu.Game.Tests.Visual.Gameplay
AddStep("Hide overlay", () => pauseOverlay.Hide()); AddStep("Hide overlay", () => pauseOverlay.Hide());
showOverlay(); showOverlay();
AddAssert("First button not selected", () => !getButton(0).Selected); AddAssert("First button not selected", () => getButton(0).State == SelectionState.NotSelected);
AddStep("Move slightly", () => InputManager.MoveMouseTo(InputManager.CurrentState.Mouse.Position + new Vector2(1))); AddStep("Move slightly", () => InputManager.MoveMouseTo(InputManager.CurrentState.Mouse.Position + new Vector2(1)));
AddAssert("First button selected", () => getButton(0).Selected); AddAssert("First button selected", () => getButton(0).State == SelectionState.Selected);
} }
/// <summary> /// <summary>
@ -179,8 +179,8 @@ namespace osu.Game.Tests.Visual.Gameplay
AddStep("Down arrow", () => InputManager.Key(Key.Down)); AddStep("Down arrow", () => InputManager.Key(Key.Down));
AddStep("Hover second button", () => InputManager.MoveMouseTo(getButton(1))); AddStep("Hover second button", () => InputManager.MoveMouseTo(getButton(1)));
AddAssert("First button not selected", () => !getButton(0).Selected); AddAssert("First button not selected", () => getButton(0).State == SelectionState.NotSelected);
AddAssert("Second button selected", () => getButton(1).Selected); AddAssert("Second button selected", () => getButton(1).State == SelectionState.Selected);
} }
/// <summary> /// <summary>
@ -196,8 +196,8 @@ namespace osu.Game.Tests.Visual.Gameplay
AddStep("Hover second button", () => InputManager.MoveMouseTo(getButton(1))); AddStep("Hover second button", () => InputManager.MoveMouseTo(getButton(1)));
AddStep("Up arrow", () => InputManager.Key(Key.Up)); AddStep("Up arrow", () => InputManager.Key(Key.Up));
AddAssert("Second button not selected", () => !getButton(1).Selected); AddAssert("Second button not selected", () => getButton(1).State == SelectionState.NotSelected);
AddAssert("First button selected", () => getButton(0).Selected); AddAssert("First button selected", () => getButton(0).State == SelectionState.Selected);
} }
/// <summary> /// <summary>
@ -211,7 +211,7 @@ namespace osu.Game.Tests.Visual.Gameplay
AddStep("Hover second button", () => InputManager.MoveMouseTo(getButton(1))); AddStep("Hover second button", () => InputManager.MoveMouseTo(getButton(1)));
AddStep("Unhover second button", () => InputManager.MoveMouseTo(Vector2.Zero)); AddStep("Unhover second button", () => InputManager.MoveMouseTo(Vector2.Zero));
AddStep("Down arrow", () => InputManager.Key(Key.Down)); AddStep("Down arrow", () => InputManager.Key(Key.Down));
AddAssert("First button selected", () => getButton(0).Selected); // Initial state condition AddAssert("First button selected", () => getButton(0).State == SelectionState.Selected); // Initial state condition
} }
/// <summary> /// <summary>
@ -282,7 +282,7 @@ namespace osu.Game.Tests.Visual.Gameplay
showOverlay(); showOverlay();
AddAssert("No button selected", AddAssert("No button selected",
() => pauseOverlay.Buttons.All(button => !button.Selected)); () => pauseOverlay.Buttons.All(button => button.State == SelectionState.NotSelected));
} }
private void showOverlay() => AddStep("Show overlay", () => pauseOverlay.Show()); private void showOverlay() => AddStep("Show overlay", () => pauseOverlay.Show());

12
osu.Game/Graphics/Containers/SelectionCycleFillFlowContainer.cs
View File

@ -69,7 +69,9 @@ namespace osu.Game.Graphics.Containers
{ {
// This event is used to update selection state when modified within the drawable itself. // This event is used to update selection state when modified within the drawable itself.
// It is added to a dictionary so that we can unsubscribe if the drawable is removed from this container // It is added to a dictionary so that we can unsubscribe if the drawable is removed from this container
drawable.StateChanged += handlerMap[drawable] = state => selectionChanged(drawable, state); handlerMap[drawable] = state => selectionChanged(drawable, state);
drawable.StateChanged += handlerMap[drawable];
base.Add(drawable); base.Add(drawable);
} }
@ -79,8 +81,12 @@ namespace osu.Game.Graphics.Containers
if (!base.Remove(drawable)) if (!base.Remove(drawable))
return false; return false;
drawable.StateChanged -= handlerMap[drawable]; if (handlerMap.TryGetValue(drawable, out var action))
handlerMap.Remove(drawable); {
drawable.StateChanged -= action;
handlerMap.Remove(drawable);
}
return true; return true;
} }

1
osu.Game/Screens/Play/GameplayMenuOverlay.cs
View File

@ -213,6 +213,7 @@ namespace osu.Game.Screens.Play
public void OnReleased(GlobalAction action) public void OnReleased(GlobalAction action)
{ {
} }
private void updateRetryCount() private void updateRetryCount()
{ {
// "You've retried 1,065 times in this session" // "You've retried 1,065 times in this session"