h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 15:52:54 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into dont-confine-skins

Browse Source
This commit is contained in:
Dan Balasescu 2019-12-08 03:14:24 +09:00 committed by GitHub
commit 299daa26da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
View File

@ -168,7 +168,7 @@ namespace osu.Game.Beatmaps.Drawables
difficultyName.Text = beatmap.Version; difficultyName.Text = beatmap.Version;
starRating.Text = $"{beatmap.StarDifficulty:0.##}"; starRating.Text = $"{beatmap.StarDifficulty:0.##}";
difficultyFlow.Colour = colours.ForDifficultyRating(beatmap.DifficultyRating); difficultyFlow.Colour = colours.ForDifficultyRating(beatmap.DifficultyRating, true);
return true; return true;
} }

6
osu.Game/Graphics/OsuColour.cs
View File

@ -38,7 +38,7 @@ namespace osu.Game.Graphics
} }
} }
public Color4 ForDifficultyRating(DifficultyRating difficulty) public Color4 ForDifficultyRating(DifficultyRating difficulty, bool useLighterColour = false)
{ {
switch (difficulty) switch (difficulty)
{ {
@ -56,10 +56,10 @@ namespace osu.Game.Graphics
return Pink; return Pink;
case DifficultyRating.Expert: case DifficultyRating.Expert:
return Purple; return useLighterColour ? PurpleLight : Purple;
case DifficultyRating.ExpertPlus: case DifficultyRating.ExpertPlus:
return Gray0; return useLighterColour ? Gray9 : Gray0;
} }
} }