diff --git a/Qwilight/Assets/Language.json b/Qwilight/Assets/Language.json index 196378b..be21d25 100644 --- a/Qwilight/Assets/Language.json +++ b/Qwilight/Assets/Language.json @@ -1624,8 +1624,8 @@ "en-US": "Open Source Library" }, "Limiter57Variety": { - "ko-KR": "5/7 (24K+2S, 48K+4S 전용)", - "en-US": "5/7 (24K+2S, 48K+4S only)" + "ko-KR": "5 | 7 (24, 48 전용)", + "en-US": "5 | 7 (24, 48 only)" }, "LimiterColor": { "ko-KR": "\uD83C\uDFA8 라인 구분선", @@ -1653,11 +1653,11 @@ }, "LoadedModeComponent": { "ko-KR": "【F{0}】{1} 불러옴", - "en-US": "【F{0}】{1} loaded" + "en-US": "[F{2}] {1} loaded" }, "LoadedMultiplier": { "ko-KR": "【F{0}】{1} 불러옴 (속도만)", - "en-US": "【F{0}】{1} Loaded (speed only)" + "en-US": "[F{3}] {1} loaded (speed only)" }, "LoadingBinText": { "ko-KR": "노트 파일 목록을 불러올 때 사용할 스레드 개수입니다.", @@ -2572,8 +2572,8 @@ "en-US": "Does not exist ({0}%)" }, "PutCopyNotesContents": { - "ko-KR": "1P를 2P로 복사합니다. (5K+1S, 7K+1S만 적용)", - "en-US": "Copy 1P to 2P. (5K+1S, 7K+1S only)" + "ko-KR": "1P를 2P로 복사합니다. (⑤K, ⑦K만 적용)", + "en-US": "Copy 1P to 2P. (⑤K, ⑦K only)" }, "PutSetNoteModeContents": { "ko-KR": "BGM을 추가 노트로 만듭니다.", @@ -3024,8 +3024,8 @@ "en-US": "⌨️ To set the key" }, "Tutorial220": { - "ko-KR": "BMS 키 설정을 하려면 5K, 7K 대신 5K+1S, 7K+1S를 클릭하세요", - "en-US": "Click 5K+1S or 7K+1S instead of 5K or 7K to set the BMS key" + "ko-KR": "BMS 키 설정을 하려면 5K, 7K 대신 ⑤K, ⑦K를 클릭하세요", + "en-US": "Click ⑤K or ⑦K instead of 5K or 7K to set the BMS key" }, "TutorialAssistText": { "ko-KR": "매뉴얼", @@ -3555,4 +3555,4 @@ "ko-KR": "노트가 압축되다가 다시 튀어오릅니다. (고난이도)", "en-US": "The note bounces (Hard difficulty)" } -} +} \ No newline at end of file diff --git a/Qwilight/Assets/UI/@Default/@Default.zip b/Qwilight/Assets/UI/@Default/@Default.zip index a5a0a2d..3151f2a 100644 --- a/Qwilight/Assets/UI/@Default/@Default.zip +++ b/Qwilight/Assets/UI/@Default/@Default.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2db901279bed27116ce029b3c89d6904183c955152898cd9c571d6e57ae15a2 -size 71425380 +oid sha256:19f770b07a0f5fa980e818301077ed6db81d9d02c88514384fbb1e7b74698029 +size 70959138 diff --git a/Qwilight/Assets/UI/Default/Default.yaml b/Qwilight/Assets/UI/Default/Default.yaml index a136464..be07d59 100644 --- a/Qwilight/Assets/UI/Default/Default.yaml +++ b/Qwilight/Assets/UI/Default/Default.yaml @@ -16,6 +16,15 @@ 스킨 세부 설정에서 O4U를 선택하면 원형 노트로 플레이 가능합니다. 스킨 세부 설정에서 Floating을 선택하면 턴 테이블이 사이드 트랙 노트로 수정됩니다. +paint: + title: White + artist: LightGray + genre: DarkGray + wantLevelID: DodgerBlue + + netText: White + netWall: Black + frame: note-frame: 1 note-framerate: 60 diff --git a/Qwilight/Qwilight/System/BaseUI/BaseUI.cs b/Qwilight/Qwilight/System/BaseUI/BaseUI.cs index e18d3c7..4e9dc42 100644 --- a/Qwilight/Qwilight/System/BaseUI/BaseUI.cs +++ b/Qwilight/Qwilight/System/BaseUI/BaseUI.cs @@ -809,7 +809,7 @@ StandQuitColor = GetCalledText(Utility.GetText(paintNode, "standQuit", nameof(Colors.White))).GetColor(); PointQuitColor = GetCalledText(Utility.GetText(paintNode, "pointQuit", nameof(Colors.White))).GetColor(); BandQuitColor = GetCalledText(Utility.GetText(paintNode, "bandQuit", nameof(Colors.White))).GetColor(); - CommentPlaceColor = GetCalledText(Utility.GetText(paintNode, "commentPlace", nameof(Colors.White))).GetColor()); + CommentPlaceColor = GetCalledText(Utility.GetText(paintNode, "commentPlace", nameof(Colors.White))).GetColor(); foreach (var pair in new[] { ("lowestHitPoints", ModeComponent.HitPointsMode.Lowest), @@ -1036,30 +1036,30 @@ DrawingSystem.Instance.SetFontLevel(CommentPlace1Font, (float)commentPlacePoint[4] / 2); DrawingSystem.Instance.SetFontSystem(CommentPlace1Font, (int)CanvasHorizontalAlignment.Right, (int)CanvasVerticalAlignment.Bottom); - SetFontSystem(TitleQuitPoint, TitleQuitFont); - SetFontSystem(ArtistQuitPoint, ArtistQuitFont); - SetFontSystem(GenreQuitPoint, GenreQuitFont); - SetFontSystem(LevelQuitPoint, LevelQuitFont); - SetFontSystem(WantLevelIDQuitPoint, WantLevelIDQuitFont); + SetQuitFont(TitleQuitPoint, TitleQuitFont); + SetQuitFont(ArtistQuitPoint, ArtistQuitFont); + SetQuitFont(GenreQuitPoint, GenreQuitFont); + SetQuitFont(LevelQuitPoint, LevelQuitFont); + SetQuitFont(WantLevelIDQuitPoint, WantLevelIDQuitFont); - SetFontSystem(JudgmentStageContentsQuitPoint, JudgmentStageQuitFont); - SetFontSystem(HighestInputCountContentsQuitPoint, HighestInputCountQuitFont); - SetFontSystem(LengthContentsQuitPoint, LengthQuitFont); - SetFontSystem(BPMContentsQuitPoint, BPMQuitFont); + SetQuitFont(JudgmentStageContentsQuitPoint, JudgmentStageQuitFont); + SetQuitFont(HighestInputCountContentsQuitPoint, HighestInputCountQuitFont); + SetQuitFont(LengthContentsQuitPoint, LengthQuitFont); + SetQuitFont(BPMContentsQuitPoint, BPMQuitFont); - SetFontSystem(TotalNotesJudgmentContentsQuitPoint, TotalNotesQuitFont); - SetFontSystem(HighestJudgmentContentsQuitPoint, HighestJudgmentQuitFont); - SetFontSystem(HigherJudgmentContentsQuitPoint, HigherJudgmentQuitFont); - SetFontSystem(HighJudgmentContentsQuitPoint, HighJudgmentQuitFont); - SetFontSystem(LowJudgmentContentsQuitPoint, LowJudgmentQuitFont); - SetFontSystem(LowerJudgmentContentsQuitPoint, LowerJudgmentQuitFont); - SetFontSystem(LowestJudgmentContentsQuitPoint, LowestJudgmentQuitFont); + SetQuitFont(TotalNotesJudgmentContentsQuitPoint, TotalNotesQuitFont); + SetQuitFont(HighestJudgmentContentsQuitPoint, HighestJudgmentQuitFont); + SetQuitFont(HigherJudgmentContentsQuitPoint, HigherJudgmentQuitFont); + SetQuitFont(HighJudgmentContentsQuitPoint, HighJudgmentQuitFont); + SetQuitFont(LowJudgmentContentsQuitPoint, LowJudgmentQuitFont); + SetQuitFont(LowerJudgmentContentsQuitPoint, LowerJudgmentQuitFont); + SetQuitFont(LowestJudgmentContentsQuitPoint, LowestJudgmentQuitFont); - SetFontSystem(StandContentsQuitPoint, StandQuitFont); - SetFontSystem(PointContentsQuitPoint, PointQuitFont); - SetFontSystem(BandContentsQuitPoint, BandQuitFont); + SetQuitFont(StandContentsQuitPoint, StandQuitFont); + SetQuitFont(PointContentsQuitPoint, PointQuitFont); + SetQuitFont(BandContentsQuitPoint, BandQuitFont); - void SetFontSystem(float[] point, CanvasTextFormat font) + static void SetQuitFont(float[] point, CanvasTextFormat font) { DrawingSystem.Instance.SetFontLevel(font, (float)point[4]); DrawingSystem.Instance.SetFontSystem(font, (int)point[5], (int)point[6]); diff --git a/Qwilight/Qwilight/System/Configure/Configure.cs b/Qwilight/Qwilight/System/Configure/Configure.cs index fcfceba..9d515e6 100644 --- a/Qwilight/Qwilight/System/Configure/Configure.cs +++ b/Qwilight/Qwilight/System/Configure/Configure.cs @@ -1029,7 +1029,7 @@ UI.Instance.SetFontFamily(); } - public string GetAFontFamily() => (FontFamilyValues.FirstOrDefault() ?? QwilightComponent.GetBuiltInData("DefaultFontFamily")).ToString(); + public string GetFontFamily() => (FontFamilyValues.FirstOrDefault() ?? QwilightComponent.GetBuiltInData("DefaultFontFamily")).ToString(); public int CommentViewTabPosition { diff --git a/Qwilight/Qwilight/System/DrawingSystem/DrawingSystem.cs b/Qwilight/Qwilight/System/DrawingSystem/DrawingSystem.cs index 851fbed..c86f505 100644 --- a/Qwilight/Qwilight/System/DrawingSystem/DrawingSystem.cs +++ b/Qwilight/Qwilight/System/DrawingSystem/DrawingSystem.cs @@ -3525,10 +3525,7 @@ WordWrapping = CanvasWordWrapping.NoWrap }; - public virtual void SetFontLevel(CanvasTextFormat font, float fontLevel) - { - font.FontSize = fontLevel; - } + public virtual void SetFontLevel(CanvasTextFormat font, float fontLevel) => font.FontSize = fontLevel; public virtual void SetFontSystem(CanvasTextFormat font, int fontSystem0, int fontSystem1) { @@ -3548,9 +3545,6 @@ }; } - public virtual void SetFontFamily(CanvasTextFormat font) - { - font.FontFamily = Configure.Instance.GetAFontFamily(); - } + public virtual void SetFontFamily(CanvasTextFormat font) => font.FontFamily = Configure.Instance.GetFontFamily(); } } \ No newline at end of file diff --git a/Qwilight/Qwilight/System/UI/UI.cs b/Qwilight/Qwilight/System/UI/UI.cs index 507f539..8b75fd4 100644 --- a/Qwilight/Qwilight/System/UI/UI.cs +++ b/Qwilight/Qwilight/System/UI/UI.cs @@ -410,8 +410,8 @@ ArtistColor = Utility.GetText(paintNode, "artist", nameof(Colors.White)).GetColor(); GenreColor = Utility.GetText(paintNode, "genre", nameof(Colors.White)).GetColor(); WantLevelIDColor = Utility.GetText(paintNode, "wantLevelID", nameof(Colors.White)).GetColor(); - parallelItems.Add(() => DrawingSystem.Instance.SetFaintPaints(this, NetTextPaints, Utility.GetText(paintNode, "netText", nameof(Colors.White)).GetColor())); - parallelItems.Add(() => DrawingSystem.Instance.SetFaintPaints(this, NetWallPaints, Utility.GetText(paintNode, "netWall", nameof(Colors.Black)).GetColor())); + DrawingSystem.Instance.SetFaintPaints(this, NetTextPaints, Utility.GetText(paintNode, "netText", nameof(Colors.White)).GetColor()); + DrawingSystem.Instance.SetFaintPaints(this, NetWallPaints, Utility.GetText(paintNode, "netWall", nameof(Colors.Black)).GetColor()); SaveValueMap(pointNode, "mainPosition"); SaveValueMap(pointNode, "p2Position"); diff --git a/Qwilight/Qwilight/UIComponent/FitMode.cs b/Qwilight/Qwilight/UIComponent/FitMode.cs index eee336c..7e0cf81 100644 --- a/Qwilight/Qwilight/UIComponent/FitMode.cs +++ b/Qwilight/Qwilight/UIComponent/FitMode.cs @@ -216,7 +216,7 @@ lowestHighestInputCount = Math.Min(lowestHighestInputCount, highestInputCount); highestHighestInputCount = Math.Max(highestHighestInputCount, highestInputCount); } - entryItem.FittedText = lowestHighestInputCount != highestHighestInputCount ? $"{lowestHighestInputCount:#,##0.##/s} ~ {highestHighestInputCount:#,##0.##/s}" : lowestHighestInputCount.ToString("#,##0.##/s"); + entryItem.FittedText = lowestHighestInputCount != highestHighestInputCount ? $"{lowestHighestInputCount:#,##0.## / s} ~ {highestHighestInputCount:#,##0.## / s}" : lowestHighestInputCount.ToString("#,##0.## / s"); break; case AverageInputCount: var lowestAverageInputCount = double.MaxValue; @@ -228,7 +228,7 @@ lowestAverageInputCount = Math.Min(lowestAverageInputCount, averageInputCount); highestAverageInputCount = Math.Max(highestAverageInputCount, averageInputCount); } - entryItem.FittedText = lowestAverageInputCount != highestAverageInputCount ? $"{lowestAverageInputCount:#,##0.##/s} ~ {highestAverageInputCount:#,##0.##/s}" : lowestAverageInputCount.ToString("#,##0.##/s"); + entryItem.FittedText = lowestAverageInputCount != highestAverageInputCount ? $"{lowestAverageInputCount:#,##0.## / s} ~ {highestAverageInputCount:#,##0.## / s}" : lowestAverageInputCount.ToString("#,##0.## / s"); break; } } diff --git a/Qwilight/Qwilight/Utilities/Utility.cs b/Qwilight/Qwilight/Utilities/Utility.cs index 4a42df8..a9f5c99 100644 --- a/Qwilight/Qwilight/Utilities/Utility.cs +++ b/Qwilight/Qwilight/Utilities/Utility.cs @@ -483,7 +483,7 @@ } } - public static string GetHighestInputCountText(double averageInputCount, int highestInputCount, double audioMultiplier) => $"{(audioMultiplier * averageInputCount).ToString("#,##0.##/s")} (PEAK: {(audioMultiplier * highestInputCount).ToString("#,##0.##/s")})"; + public static string GetHighestInputCountText(double averageInputCount, int highestInputCount, double audioMultiplier) => $"{(audioMultiplier * averageInputCount).ToString("#,##0.## / s")} (PEAK: {(audioMultiplier * highestInputCount).ToString("#,##0.## / s")})"; public static string GetGenreText(string genre) => string.IsNullOrEmpty(genre) || genre.StartsWith('#') ? genre : $"#{genre}";