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

Remove all references to "score submission" from Player

Browse Source
This commit is contained in:
Dean Herbert 2021-03-23 15:45:22 +09:00
parent 194b2d05d3
commit 571124669d
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
View File

@ -133,9 +133,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
private void onResultsReady() => resultsReady.SetResult(true); private void onResultsReady() => resultsReady.SetResult(true);
protected override async Task SubmitScore(Score score) protected override async Task PrepareScoreForResultsAsync(Score score)
{ {
await base.SubmitScore(score).ConfigureAwait(false); await base.PrepareScoreForResultsAsync(score).ConfigureAwait(false);
await client.ChangeState(MultiplayerUserState.FinishedPlay).ConfigureAwait(false); await client.ChangeState(MultiplayerUserState.FinishedPlay).ConfigureAwait(false);

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

@ -559,7 +559,7 @@ namespace osu.Game.Screens.Play
} }
private ScheduledDelegate completionProgressDelegate; private ScheduledDelegate completionProgressDelegate;
private Task<ScoreInfo> scoreSubmissionTask; private Task<ScoreInfo> prepareScoreForDisplayTask;
private void updateCompletionState(ValueChangedEvent<bool> completionState) private void updateCompletionState(ValueChangedEvent<bool> completionState)
{ {
@ -586,17 +586,17 @@ namespace osu.Game.Screens.Play
if (!Configuration.ShowResults) return; if (!Configuration.ShowResults) return;
scoreSubmissionTask ??= Task.Run(async () => prepareScoreForDisplayTask ??= Task.Run(async () =>
{ {
var score = CreateScore(); var score = CreateScore();
try try
{ {
await SubmitScore(score).ConfigureAwait(false); await PrepareScoreForResultsAsync(score).ConfigureAwait(false);
} }
catch (Exception ex) catch (Exception ex)
{ {
Logger.Error(ex, "Score submission failed!"); Logger.Error(ex, "Score preparation failed!");
} }
try try
@ -617,7 +617,7 @@ namespace osu.Game.Screens.Play
private void scheduleCompletion() => completionProgressDelegate = Schedule(() => private void scheduleCompletion() => completionProgressDelegate = Schedule(() =>
{ {
if (!scoreSubmissionTask.IsCompleted) if (!prepareScoreForDisplayTask.IsCompleted)
{ {
scheduleCompletion(); scheduleCompletion();
return; return;
@ -625,7 +625,7 @@ namespace osu.Game.Screens.Play
// screen may be in the exiting transition phase. // screen may be in the exiting transition phase.
if (this.IsCurrentScreen()) if (this.IsCurrentScreen())
this.Push(CreateResults(scoreSubmissionTask.Result)); this.Push(CreateResults(prepareScoreForDisplayTask.Result));
}); });
protected override bool OnScroll(ScrollEvent e) => mouseWheelDisabled.Value && !GameplayClockContainer.IsPaused.Value; protected override bool OnScroll(ScrollEvent e) => mouseWheelDisabled.Value && !GameplayClockContainer.IsPaused.Value;
@ -895,11 +895,11 @@ namespace osu.Game.Screens.Play
} }
/// <summary> /// <summary>
/// Submits the player's <see cref="Score"/>. /// Prepare the <see cref="Score"/> for display at results.
/// </summary> /// </summary>
/// <param name="score">The <see cref="Score"/> to submit.</param> /// <param name="score">The <see cref="Score"/> to prepare.</param>
/// <returns>The submitted score.</returns> /// <returns>A task that prepares the provided score. On completion, the score is assumed to be ready for display.</returns>
protected virtual Task SubmitScore(Score score) => Task.CompletedTask; protected virtual Task PrepareScoreForResultsAsync(Score score) => Task.CompletedTask;
/// <summary> /// <summary>
/// Creates the <see cref="ResultsScreen"/> for a <see cref="ScoreInfo"/>. /// Creates the <see cref="ResultsScreen"/> for a <see cref="ScoreInfo"/>.

4
osu.Game/Screens/Play/SubmittingPlayer.cs
View File

@ -59,9 +59,9 @@ namespace osu.Game.Screens.Play
Thread.Sleep(1000); Thread.Sleep(1000);
} }
protected override async Task SubmitScore(Score score) protected override async Task PrepareScoreForResultsAsync(Score score)
{ {
await base.SubmitScore(score).ConfigureAwait(false); await base.PrepareScoreForResultsAsync(score).ConfigureAwait(false);
Debug.Assert(Token != null); Debug.Assert(Token != null);