h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 08:32:57 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fix-mania-rewinding

Browse Source
This commit is contained in:
Dean Herbert 2022-10-07 18:17:19 +09:00 committed by GitHub
commit 42afc8e568
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
View File

@ -14,7 +14,6 @@ using osu.Game.Rulesets.Mania.Beatmaps;
using osu.Game.Rulesets.Objects.Legacy;
using osu.Game.Rulesets.Scoring;
using osu.Game.Skinning;
using osuTK.Graphics;
namespace osu.Game.Rulesets.Mania.Skinning.Legacy
{
@ -151,18 +150,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
{
if (lookup is ManiaSkinConfigurationLookup maniaLookup)
{
var legacyLookup =
base.GetConfig<LegacyManiaSkinConfigurationLookup, TValue>(new LegacyManiaSkinConfigurationLookup(beatmap.TotalColumns, maniaLookup.Lookup, maniaLookup.ColumnIndex));
if (legacyLookup != null)
return legacyLookup;
// default legacy fallback.
switch (maniaLookup.Lookup)
{
case LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour:
return SkinUtils.As<TValue>(new Bindable<Color4>(Color4.Black));
}
return base.GetConfig<LegacyManiaSkinConfigurationLookup, TValue>(new LegacyManiaSkinConfigurationLookup(beatmap.TotalColumns, maniaLookup.Lookup, maniaLookup.ColumnIndex));
}
return base.GetConfig<TLookup, TValue>(lookup);

2
osu.Game.Rulesets.Mania/UI/Components/DefaultKeyArea.cs
View File

@ -89,7 +89,7 @@ namespace osu.Game.Rulesets.Mania.UI.Components
Radius = 5,
Colour = colour.NewValue.Opacity(0.5f),
};
});
}, true);
}
private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)