sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-08 07:07:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23439 from peppy/fix-mania-head-note-animation

Browse Source 
Fix osu!mania head note incorrectly scrolling off screen on late releases
This commit is contained in:
Bartłomiej Dach 2023-05-08 23:43:54 +02:00 committed by GitHub
commit 9a65b364c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
View File

@ -59,6 +59,44 @@ namespace osu.Game.Rulesets.Mania.Tests
assertNoteJudgement(HitResult.IgnoreMiss); assertNoteJudgement(HitResult.IgnoreMiss);
} }
/// <summary>
/// -----[ ]-----
/// x o
/// </summary>
[Test]
public void TestCorrectInput()
{
performTest(new List<ReplayFrame>
{
new ManiaReplayFrame(time_head, ManiaAction.Key1),
new ManiaReplayFrame(time_tail),
});
assertHeadJudgement(HitResult.Perfect);
assertTickJudgement(HitResult.LargeTickHit);
assertTailJudgement(HitResult.Perfect);
assertNoteJudgement(HitResult.IgnoreHit);
}
/// <summary>
/// -----[ ]-----
/// x o
/// </summary>
[Test]
public void TestLateRelease()
{
performTest(new List<ReplayFrame>
{
new ManiaReplayFrame(time_head, ManiaAction.Key1),
new ManiaReplayFrame(time_after_tail),
});
assertHeadJudgement(HitResult.Perfect);
assertTickJudgement(HitResult.LargeTickHit);
assertTailJudgement(HitResult.Miss);
assertNoteJudgement(HitResult.IgnoreMiss);
}
/// <summary> /// <summary>
/// -----[ ]----- /// -----[ ]-----
/// x o /// x o

7
osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
View File

@ -3,7 +3,6 @@
#nullable disable #nullable disable
using System;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
@ -248,9 +247,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
// 2. The head note will move along with the new "head position" in the container. // 2. The head note will move along with the new "head position" in the container.
if (Head.IsHit && releaseTime == null && DrawHeight > 0) if (Head.IsHit && releaseTime == null && DrawHeight > 0)
{ {
// How far past the hit target this hold note is. Always a positive value. // How far past the hit target this hold note is.
float yOffset = Math.Max(0, Direction.Value == ScrollingDirection.Up ? -Y : Y); float yOffset = Direction.Value == ScrollingDirection.Up ? -Y : Y;
sizingContainer.Height = Math.Clamp(1 - yOffset / DrawHeight, 0, 1); sizingContainer.Height = 1 - yOffset / DrawHeight;
} }
} }