From 777f47392abaf82c74d1da895fb1a7cc6164ed93 Mon Sep 17 00:00:00 2001 From: Awbugl Date: Sat, 9 Jul 2022 17:48:54 +0800 Subject: [PATCH] Update Code --- Model/Side.cs | 5 +++-- Path.cs | 1 + UI/Color.cs | 15 +++++++++++++-- UI/ImageGenerator/ArcBackgroundGenerator.cs | 4 +--- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/Model/Side.cs b/Model/Side.cs index f8a2b6f..49ac2e5 100644 --- a/Model/Side.cs +++ b/Model/Side.cs @@ -3,5 +3,6 @@ namespace ImageGenerator.Model; internal enum Side { Hikari, - Tairitsu -} + Tairitsu, + Achromic +} \ No newline at end of file diff --git a/Path.cs b/Path.cs index a9b2f9d..7a7a050 100644 --- a/Path.cs +++ b/Path.cs @@ -75,6 +75,7 @@ internal static Path ArcaeaRating(short potential) { var img = potential switch { + >= 1300 => "7", >= 1250 => "6", >= 1200 => "5", >= 1100 => "4", diff --git a/UI/Color.cs b/UI/Color.cs index 463c7b2..9a9e828 100644 --- a/UI/Color.cs +++ b/UI/Color.cs @@ -5,8 +5,9 @@ internal static class Color { internal static readonly System.Drawing.Color White = System.Drawing.Color.White, Black = System.Drawing.Color.Black, - Light = FromArgb(150, 100, 200, 225), - Conflict = FromArgb(150, 50, 20, 75), + Hikari = FromArgb(150, 100, 200, 225), + Tairitsu = FromArgb(150, 50, 20, 75), + Achromic = FromArgb(150, 180, 180, 180), PmColor = FromArgb(150, 180, 200), ArcGray = FromArgb(60, 60, 60), ArcPurple = FromArgb(31, 30, 51), GnaqGray = FromArgb(110, 110, 110), AzusaGray = FromArgb(90, 90, 90); @@ -18,4 +19,14 @@ internal static System.Drawing.Color FromArgb(int alpha, System.Drawing.Color ba internal static System.Drawing.Color FromArgb(int a, int r, int g, int b) => System.Drawing.Color.FromArgb(a, r, g, b); + + + internal static System.Drawing.Color GetBySide(int side) => + side switch + { + 0 => Hikari, + 1 => Tairitsu, + 2 => Achromic, + _ => White + }; } diff --git a/UI/ImageGenerator/ArcBackgroundGenerator.cs b/UI/ImageGenerator/ArcBackgroundGenerator.cs index dcf1a0f..cd1dc89 100644 --- a/UI/ImageGenerator/ArcBackgroundGenerator.cs +++ b/UI/ImageGenerator/ArcBackgroundGenerator.cs @@ -63,9 +63,7 @@ private async Task GenerateArcV2(Path path) new LineModel(Color.White, 3, new(0, 920), new(1920, 920)), new LineModel(Color.White, 1, new(0, 705), new(1920, 705)), new LineModel(Color.White, 1, new(0, 955), new(1920, 955)), - new RectangleModel(_info.Side == (int)Side.Hikari - ? Color.Light - : Color.Conflict, new(145, 685, 320, 320)), + new RectangleModel(Color.GetBySide(_info.Side), new(145, 685, 320, 320)), new ImageModel(song, 130, 670, 320, 320), new TextWithShadowModel(_info.GetSongName(50), Font.Andrea56, 510, 750)); background.SaveAsPng(path);