diff --git a/Qwilight/Assets/Language.json b/Qwilight/Assets/Language.json index 375cd7e..82c36ed 100644 --- a/Qwilight/Assets/Language.json +++ b/Qwilight/Assets/Language.json @@ -1364,8 +1364,8 @@ "en-US": "Up to 0 BPM" }, "HighestWantInputCountContents": { - "ko-KR": "0/s 까지", - "en-US": "Up to 0/s" + "ko-KR": "#,##0/s 까지", + "en-US": "Up to #,##0/s" }, "HighestWantLevelTextValue": { "ko-KR": "0 난이도 까지", @@ -2000,8 +2000,8 @@ "en-US": "From 0 BPM" }, "LowestWantInputCountContents": { - "ko-KR": "0/s 부터", - "en-US": "From 0/s" + "ko-KR": "#,##0/s 부터", + "en-US": "From #,##0/s" }, "LowestWantLevelTextValue": { "ko-KR": "0 난이도 부터", @@ -2804,8 +2804,8 @@ "en-US": "■ Accuracy" }, "PointLevelContents": { - "ko-KR": "0 픽셀", - "en-US": "0 pixel" + "ko-KR": "#,##0 픽셀", + "en-US": "#,##0 pixel" }, "PointValidHunterModeText": { "ko-KR": "정확도 우선", diff --git a/Qwilight/System/Configure/Configure.cs b/Qwilight/System/Configure/Configure.cs index 87c8e3e..83f0892 100644 --- a/Qwilight/System/Configure/Configure.cs +++ b/Qwilight/System/Configure/Configure.cs @@ -578,15 +578,13 @@ set { - if (SetProperty(ref _valueVeilDrawingHeight, value, nameof(VeilDrawingHeightContents)) && _isLoaded) + if (SetProperty(ref _valueVeilDrawingHeight, value, nameof(VeilDrawingHeight)) && _isLoaded) { ViewModels.Instance.MainValue.ModeComponentValue.NotifyIIDXMultiplierMillisText(); } } } - public string VeilDrawingHeightContents => VeilDrawingHeight.ToString(LanguageSystem.Instance.PointLevelContents); - public int NoteFormatID { get => _noteFormatID; diff --git a/Qwilight/System/Configure/UIConfigure.cs b/Qwilight/System/Configure/UIConfigure.cs index da58af4..d9ba1eb 100644 --- a/Qwilight/System/Configure/UIConfigure.cs +++ b/Qwilight/System/Configure/UIConfigure.cs @@ -86,12 +86,9 @@ { MainPositions[(int)InputMode] = value; OnPropertyChanged(nameof(MainPosition)); - OnPropertyChanged(nameof(MainPositionContents)); } } - public string MainPositionContents => MainPosition.ToString(LanguageSystem.Instance.PointLevelContents); - public Dictionary NoteLengths { get; set; } = new(); [JsonIgnore] @@ -103,12 +100,9 @@ { NoteLengths[(int)InputMode] = value; OnPropertyChanged(nameof(NoteLength)); - OnPropertyChanged(nameof(NoteLengthContents)); } } - public string NoteLengthContents => NoteLength.ToString(LanguageSystem.Instance.PointLevelContents); - public Dictionary NoteHeights { get; set; } = new(); [JsonIgnore] @@ -120,59 +114,32 @@ { NoteHeights[(int)InputMode] = value; OnPropertyChanged(nameof(NoteHeight)); - OnPropertyChanged(nameof(NoteHeightContents)); } } - public string NoteHeightContents => NoteHeight.ToString(LanguageSystem.Instance.PointLevelContents); - public Component.InputMode InputMode => ViewModels.Instance.MainValue.GetHandlingComputing()?.InputMode ?? default; public double BandPositionV2 { get => _bandPosition; - set - { - if (SetProperty(ref _bandPosition, value, nameof(BandPositionV2))) - { - OnPropertyChanged(nameof(BandPositionContents)); - } - } + set => SetProperty(ref _bandPosition, value, nameof(BandPositionV2)); } - public string BandPositionContents => BandPositionV2.ToString(LanguageSystem.Instance.PointLevelContents); - public double JudgmentPaintPosition { get => _judgmentPaintPosition; - set - { - if (SetProperty(ref _judgmentPaintPosition, value, nameof(JudgmentPaintPosition))) - { - OnPropertyChanged(nameof(JudgmentPaintPositionContents)); - } - } + set => SetProperty(ref _judgmentPaintPosition, value, nameof(JudgmentPaintPosition)); } - public string JudgmentPaintPositionContents => JudgmentPaintPosition.ToString(LanguageSystem.Instance.PointLevelContents); - public double JudgmentVisualizerPosition { get => _judgmentVisualizerPosition; - set - { - if (SetProperty(ref _judgmentVisualizerPosition, value, nameof(JudgmentVisualizerPosition))) - { - OnPropertyChanged(nameof(JudgmentVisualizerPositionContents)); - } - } + set =>SetProperty(ref _judgmentVisualizerPosition, value, nameof(JudgmentVisualizerPosition)); } - public string JudgmentVisualizerPositionContents => JudgmentVisualizerPosition.ToString(LanguageSystem.Instance.PointLevelContents); - public Dictionary HitNotePaintAreas { get; set; } = new(); [JsonIgnore] @@ -184,22 +151,15 @@ { HitNotePaintAreas[(int)InputMode] = value; OnPropertyChanged(nameof(HitNotePaintArea)); - OnPropertyChanged(nameof(HitNotePaintAreaContents)); } } - public string HitNotePaintAreaContents => HitNotePaintArea.ToString(LanguageSystem.Instance.PointLevelContents); - public void NotifyInputMode() { OnPropertyChanged(nameof(MainPosition)); - OnPropertyChanged(nameof(MainPositionContents)); OnPropertyChanged(nameof(NoteLength)); - OnPropertyChanged(nameof(NoteLengthContents)); OnPropertyChanged(nameof(NoteHeight)); - OnPropertyChanged(nameof(NoteHeightContents)); OnPropertyChanged(nameof(HitNotePaintArea)); - OnPropertyChanged(nameof(HitNotePaintAreaContents)); OnPropertyChanged(nameof(InputMode)); } } diff --git a/Qwilight/View/ConfigureWindow/ComputingGUIConfigureWindow.xaml b/Qwilight/View/ConfigureWindow/ComputingGUIConfigureWindow.xaml index 0eebf6d..3d4486e 100644 --- a/Qwilight/View/ConfigureWindow/ComputingGUIConfigureWindow.xaml +++ b/Qwilight/View/ConfigureWindow/ComputingGUIConfigureWindow.xaml @@ -70,19 +70,19 @@ - + - + - + - - + + @@ -100,32 +100,32 @@ - - + + - + - + - - + + - - + + - - + + - +