RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-24 15:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26117 from peppy/add-slider-tick-end-miss-sprites

Browse Source 
Add classic skin sprites for slider tick and slider end misses
This commit is contained in:
Bartłomiej Dach 2023-12-25 15:26:41 +01:00 committed by GitHub
commit dde88bb05e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Skinning/LegacyJudgementPieceOld.cs
View File

@ -58,14 +58,24 @@ namespace osu.Game.Skinning
if (result.IsMiss())
{
decimal? legacyVersion = skin.GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version)?.Value;
// missed ticks / slider end don't get the normal animation.
if (isMissedTick())
applyMissedTickScaling();
else
{
this.ScaleTo(1.6f);
this.ScaleTo(1, 100, Easing.In);
decimal? legacyVersion = skin.GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version)?.Value;
if (legacyVersion > 1.0m)
{
this.MoveTo(new Vector2(0, -2f));
this.MoveToOffset(new Vector2(0, 10), fade_out_delay + fade_out_length, Easing.In);
}
}
else
{
this.ScaleTo(1.6f);
this.ScaleTo(1, 100, Easing.In);
if (legacyVersion > 1.0m)
{

12
osu.Game/Skinning/LegacySkin.cs
View File

@ -453,11 +453,17 @@ namespace osu.Game.Skinning
private Drawable? getJudgementAnimation(HitResult result)
{
if (result.IsMiss())
return this.GetAnimation("hit0", true, false);
switch (result)
{
case HitResult.Miss:
return this.GetAnimation("hit0", true, false);
case HitResult.LargeTickMiss:
return this.GetAnimation("slidertickmiss", true, false);
case HitResult.IgnoreMiss:
return this.GetAnimation("sliderendmiss", true, false);
case HitResult.Meh:
return this.GetAnimation("hit50", true, false);

2
osu.Game/osu.Game.csproj
View File

@ -37,7 +37,7 @@
</PackageReference>
<PackageReference Include="Realm" Version="11.5.0" />
<PackageReference Include="ppy.osu.Framework" Version="2023.1219.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2023.1215.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2023.1225.0" />
<PackageReference Include="Sentry" Version="3.40.0" />
<!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
<PackageReference Include="SharpCompress" Version="0.33.0" />