1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-19 04:22:55 +08:00

Make all hit objects before the start time marked as hit.

This commit is contained in:
Nitrous 2024-01-10 15:19:38 +08:00
parent a4c9e9f84d
commit b74c3b1c5c
No known key found for this signature in database
GPG Key ID: A5D82BAEC7C1D1F5
3 changed files with 40 additions and 4 deletions

View File

@ -452,7 +452,7 @@ namespace osu.Game.Screens.Edit
pushEditorPlayer();
}
void pushEditorPlayer() => this.Push(new EditorPlayerLoader(this));
void pushEditorPlayer() => this.Push(new EditorPlayerLoader(this, playableBeatmap));
}
/// <summary>

View File

@ -1,11 +1,17 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Screens;
using osu.Game.Beatmaps;
using osu.Game.Online.Spectator;
using osu.Game.Overlays;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Replays;
using osu.Game.Rulesets.Scoring;
using osu.Game.Scoring;
using osu.Game.Screens.Play;
using osu.Game.Users;
@ -15,17 +21,19 @@ namespace osu.Game.Screens.Edit.GameplayTest
{
private readonly Editor editor;
private readonly EditorState editorState;
private readonly IBeatmap playableBeatmap;
protected override UserActivity InitialActivity => new UserActivity.TestingBeatmap(Beatmap.Value.BeatmapInfo, Ruleset.Value);
[Resolved]
private MusicController musicController { get; set; } = null!;
public EditorPlayer(Editor editor)
public EditorPlayer(Editor editor, IBeatmap playableBeatmap)
: base(new PlayerConfiguration { ShowResults = false })
{
this.editor = editor;
editorState = editor.GetState();
this.playableBeatmap = playableBeatmap;
}
protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
@ -43,6 +51,22 @@ namespace osu.Game.Screens.Edit.GameplayTest
protected override void LoadComplete()
{
base.LoadComplete();
var frame = new ReplayFrame { Header = new FrameHeader(new ScoreInfo(), new ScoreProcessorStatistics()) };
foreach (var hitObject in enumerateHitObjects(playableBeatmap.HitObjects.Where(h => h.StartTime < editorState.Time)))
{
var judgement = hitObject.CreateJudgement();
if (!frame.Header.Statistics.ContainsKey(judgement.MaxResult))
frame.Header.Statistics.Add(judgement.MaxResult, 0);
frame.Header.Statistics[judgement.MaxResult]++;
}
HealthProcessor.ResetFromReplayFrame(frame);
ScoreProcessor.ResetFromReplayFrame(frame);
ScoreProcessor.HasCompleted.BindValueChanged(completed =>
{
if (completed.NewValue)
@ -54,6 +78,17 @@ namespace osu.Game.Screens.Edit.GameplayTest
}, RESULTS_DISPLAY_DELAY);
}
});
static IEnumerable<HitObject> enumerateHitObjects(IEnumerable<HitObject> hitObjects)
{
foreach (var hitObject in hitObjects)
{
foreach (var nested in hitObject.NestedHitObjects)
yield return nested;
yield return hitObject;
}
}
}
protected override void PrepareReplay()

View File

@ -4,6 +4,7 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Screens;
using osu.Game.Beatmaps;
using osu.Game.Screens.Menu;
using osu.Game.Screens.Play;
@ -14,8 +15,8 @@ namespace osu.Game.Screens.Edit.GameplayTest
[Resolved]
private OsuLogo osuLogo { get; set; } = null!;
public EditorPlayerLoader(Editor editor)
: base(() => new EditorPlayer(editor))
public EditorPlayerLoader(Editor editor, IBeatmap playableBeatmap)
: base(() => new EditorPlayer(editor, playableBeatmap))
{
}