Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix lyric playback issue. #1284

Merged
merged 3 commits into from
Apr 23, 2022
Merged

Fix lyric playback issue. #1284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c86ea9
Use hit state transforms instead.
andy840119 Apr 20, 2022
bf17ced
Update update the font package, karaoke font will clear the transform…
andy840119 Apr 20, 2022
49eaf21
Update the package to fix the playback issue.
andy840119 Apr 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions osu.Game.Rulesets.Karaoke/Edit/Lyrics/Rows/Components/EditorLyricPiece.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@ static FontUsage getFont(float? charSize = null)
}, true);
}

public override bool RemoveCompletedTransforms => false;

public class EditorLyricSpriteText : LyricSpriteText
{
public RectangleF GetRubyTagPosition(RubyTag rubyTag)
Expand Down
19 changes: 12 additions & 7 deletions osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableLyric.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
using osu.Game.Rulesets.Karaoke.Scoring;
using osu.Game.Rulesets.Karaoke.Skinning.Default;
using osu.Game.Rulesets.Karaoke.Skinning.Elements;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Skinning;
using osuTK;

Expand Down Expand Up @@ -220,15 +221,19 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
}
}

protected override void UpdateStartTimeStateTransforms()
protected override void UpdateInitialTransforms()
{
base.UpdateStartTimeStateTransforms();
base.UpdateInitialTransforms();

using (BeginDelayedSequence(HitObject.Duration))
{
const float fade_out_time = 500;
this.FadeOut(fade_out_time);
}
lyricPieces.ForEach(x => x.RefreshStateTransforms());
}

protected override void UpdateHitStateTransforms(ArmedState state)
{
base.UpdateHitStateTransforms(state);

const float fade_out_time = 500;
this.FadeOut(fade_out_time);
}

public void ApplyToLyricPieces(Action<DefaultLyricPiece> action)
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<PackageReference Include="ILRepack.Lib.MSBuild" Version="2.1.18" />
<PackageReference Include="LanguageDetection.karaoke-dev" Version="1.3.3-alpha" />
<PackageReference Include="Octokit" Version="0.50.0" />
<PackageReference Include="osu.Framework.KaraokeFont" Version="2022.417.0" />
<PackageReference Include="osu.Framework.KaraokeFont" Version="2022.423.1" />
<PackageReference Include="osu.Framework.Microphone" Version="2022.327.0" />
<PackageReference Include="ppy.osu.Game" Version="2022.418.0" />
<PackageReference Include="LyricMaker" Version="1.1.1" />
Expand Down