mirror of
https://github.com/ppy/osu.git
synced 2024-12-24 22:32:55 +08:00
Merge branch 'ppy:master' into master
This commit is contained in:
commit
c64c9144c0
@ -4,7 +4,6 @@
|
||||
#nullable disable
|
||||
|
||||
using Markdig.Syntax;
|
||||
using Markdig.Syntax.Inlines;
|
||||
using osu.Framework.Graphics.Containers.Markdown;
|
||||
using osu.Game.Graphics.Containers.Markdown;
|
||||
|
||||
@ -12,16 +11,8 @@ namespace osu.Game.Overlays.Comments
|
||||
{
|
||||
public class CommentMarkdownContainer : OsuMarkdownContainer
|
||||
{
|
||||
public override MarkdownTextFlowContainer CreateTextFlow() => new CommentMarkdownTextFlowContainer();
|
||||
|
||||
protected override MarkdownHeading CreateHeading(HeadingBlock headingBlock) => new CommentMarkdownHeading(headingBlock);
|
||||
|
||||
private class CommentMarkdownTextFlowContainer : OsuMarkdownTextFlowContainer
|
||||
{
|
||||
// Don't render image in comment for now
|
||||
protected override void AddImage(LinkInline linkInline) { }
|
||||
}
|
||||
|
||||
private class CommentMarkdownHeading : OsuMarkdownHeading
|
||||
{
|
||||
public CommentMarkdownHeading(HeadingBlock headingBlock)
|
||||
|
@ -94,6 +94,9 @@ namespace osu.Game.Screens.Play.HUD
|
||||
double objectOffsetCurrent = currentTime - FirstHitTime;
|
||||
|
||||
double objectDuration = LastHitTime - FirstHitTime;
|
||||
if (objectDuration == 0)
|
||||
UpdateProgress(0, false);
|
||||
else
|
||||
UpdateProgress(objectOffsetCurrent / objectDuration, false);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user