diff --git a/Qwilight/Assets/Language.json b/Qwilight/Assets/Language.json index 23bc7e6..f86b43a 100644 --- a/Qwilight/Assets/Language.json +++ b/Qwilight/Assets/Language.json @@ -1243,23 +1243,39 @@ "ko-KR": "라이프 게이지를 설정합니다.", "en-US": "Set the life gauge" }, - "HOFAbilityContents": { + "HOFAbilityText": { "ko-KR": "레이팅", "en-US": "Rating" }, - "HOFAtContents": { + "HOFAtText": { "ko-KR": "이번 달", "en-US": "Month" }, - "HOFLevelContents": { + "HOFBand": { + "ko-KR": "콤보", + "en-US": "Combo" + }, + "HOFHighest": { + "ko-KR": "기록", + "en-US": "Record" + }, + "HOFLevelText": { "ko-KR": "레벨", "en-US": "Level" }, + "HOFStand": { + "ko-KR": "점수", + "en-US": "Score" + }, "HOFText": { "ko-KR": "명예의 전당", "en-US": "Hall of Fame" }, - "HOFTotalContents": { + "HOFTotal": { + "ko-KR": "플레이", + "en-US": "Play" + }, + "HOFTotalText": { "ko-KR": "전체", "en-US": "All" }, @@ -3475,22 +3491,6 @@ "ko-KR": "간접 미스를 추가합니다.", "en-US": "Enable indirect miss" }, - "WwwHOFBand": { - "ko-KR": "콤보", - "en-US": "Combo" - }, - "WwwHOFHighest": { - "ko-KR": "기록", - "en-US": "Record" - }, - "WwwHOFStand": { - "ko-KR": "점수", - "en-US": "Score" - }, - "WwwHOFTotal": { - "ko-KR": "플레이", - "en-US": "Play" - }, "WwwLevelAudioMultiplierContents0": { "ko-KR": "음악 속도 {0}배 이상", "en-US": "{0}x Music speed or more" diff --git a/Qwilight/System/BaseUI/BaseUI.cs b/Qwilight/System/BaseUI/BaseUI.cs index a3ee44a..5d9df70 100644 --- a/Qwilight/System/BaseUI/BaseUI.cs +++ b/Qwilight/System/BaseUI/BaseUI.cs @@ -106,8 +106,6 @@ public HandledDrawingItem?[] InputModeDrawings { get; } = new HandledDrawingItem?[17]; - public ImageSource[] InputModeWindowDrawings { get; } = new ImageSource[17]; - public ImageSource[] HandledWallDrawings { get; } = new ImageSource[7]; public ImageSource[] DefaultEntryDrawings { get; } = new ImageSource[5]; @@ -1649,13 +1647,6 @@ SiteSituationDrawings[Utility.ToInt32(fileNameContents[1])] = defaultDrawing; } break; - case "Input Window": - fileNameContents = justFileName.Split(" "); - if (fileNameContents[0] == "IW") - { - InputModeWindowDrawings[Utility.ToInt32(fileNameContents[1])] = defaultDrawing; - } - break; case "Handled": fileNameContents = justFileName.Split(" "); switch (fileNameContents[0]) @@ -1937,11 +1928,6 @@ } } - for (var i = (int)Component.InputMode._48_4; i >= (int)Component.InputMode._4; --i) - { - InputModeWindowDrawings[i] ??= InputModeDrawings[i]?.DefaultDrawing; - } - for (var i = (int)DefaultCompute.QuitStatus.F; i >= (int)DefaultCompute.QuitStatus.SPlus; --i) { QuitDrawings[i][1] ??= QuitDrawings[i][0]; diff --git a/Qwilight/System/LanguageSystem/LanguageSystem.g.cs b/Qwilight/System/LanguageSystem/LanguageSystem.g.cs index e603632..8a296ae 100644 --- a/Qwilight/System/LanguageSystem/LanguageSystem.g.cs +++ b/Qwilight/System/LanguageSystem/LanguageSystem.g.cs @@ -313,11 +313,15 @@ public string HitPoints { get; set; } public string HitPointsLegend { get; set; } public string HitPointsModeAssist { get; set; } - public string HOFAbilityContents { get; set; } - public string HOFAtContents { get; set; } - public string HOFLevelContents { get; set; } + public string HOFAbilityText { get; set; } + public string HOFAtText { get; set; } + public string HOFBand { get; set; } + public string HOFHighest { get; set; } + public string HOFLevelText { get; set; } + public string HOFStand { get; set; } public string HOFText { get; set; } - public string HOFTotalContents { get; set; } + public string HOFTotal { get; set; } + public string HOFTotalText { get; set; } public string HunterVariety1stText { get; set; } public string HunterVarietyContents { get; set; } public string HunterVarietyFavorText { get; set; } @@ -871,10 +875,6 @@ public string WipeTotalNotify { get; set; } public string WipeUbuntuNotify { get; set; } public string WrongLowestJudgmentConditionModeContents { get; set; } - public string WwwHOFBand { get; set; } - public string WwwHOFHighest { get; set; } - public string WwwHOFStand { get; set; } - public string WwwHOFTotal { get; set; } public string WwwLevelAudioMultiplierContents0 { get; set; } public string WwwLevelAudioMultiplierContents1 { get; set; } public string WwwLevelBandContents0 { get; set; } diff --git a/Qwilight/System/LevelSystem.cs b/Qwilight/System/LevelSystem.cs index dfb40ad..648a191 100644 --- a/Qwilight/System/LevelSystem.cs +++ b/Qwilight/System/LevelSystem.cs @@ -21,7 +21,7 @@ public ObservableCollection LevelFileNames { get; } = new(); - public ObservableCollection LevelCollection { get; } = new(); + public ObservableCollection LevelIDCollection { get; } = new(); public Dictionary LevelID128s { get; } = new(); @@ -33,7 +33,7 @@ public LevelSystem() { - WantLevelIDEquality = Comparer.Create((x, y) => LevelCollection.IndexOf(x).CompareTo(LevelCollection.IndexOf(y))); + WantLevelIDEquality = Comparer.Create((x, y) => LevelIDCollection.IndexOf(x).CompareTo(LevelIDCollection.IndexOf(y))); } public void LoadLevelFiles() => Utility.SetUICollection(LevelFileNames, Utility.GetFiles(EntryPath).Where(levelFile => !Path.GetFileName(levelFile).StartsWith('#') && levelFile.IsTailCaselsss(".json")).Select(levelFile => Path.GetFileNameWithoutExtension(levelFile)).ToArray()); @@ -44,7 +44,7 @@ LevelID256s.Clear(); LevelID128NoteFiles.Clear(); LevelID256NoteFiles.Clear(); - LevelCollection.Clear(); + LevelIDCollection.Clear(); var levelName = Configure.Instance.WantLevelName; if (!string.IsNullOrEmpty(levelName)) { @@ -57,14 +57,14 @@ if (File.Exists(levelTableFilePath)) { using var tfs = File.OpenRead(levelTableFilePath); - var levelTable = await Utility.GetJSON(tfs); + var levelTable = await Utility.GetJSON(tfs).ConfigureAwait(false); if (levelTable.HasValue) { var levelTableValue = levelTable.Value; var levelTexts = new List(); var levelTitle = levelTableValue.symbol; using var fs = File.OpenRead(levelFilePath); - foreach (var levelData in await Utility.GetJSON(fs)) + foreach (var levelData in await Utility.GetJSON(fs).ConfigureAwait(false)) { var level = levelData.level; var noteID128 = levelData.md5; @@ -90,7 +90,7 @@ levelTexts.Sort((x, y) => Array.IndexOf(levels, x).CompareTo(Array.IndexOf(levels, y))); foreach (var levelText in levelTexts) { - LevelCollection.Add(levelTitle + levelText); + LevelIDCollection.Add(levelTitle + levelText); } } } @@ -117,7 +117,7 @@ using var s = await TwilightSystem.Instance.GetWwwParallel(WebUtility.HtmlDecode(ModifyDataValue(o.CreateNavigator().SelectSingleNode("/html/head/meta[@name='bmstable']/@content")?.ToString() ?? o.CreateNavigator().SelectSingleNode("/html/body/meta[@name='bmstable']/@content")?.ToString() ?? o.CreateNavigator().SelectSingleNode("/html/head/body/meta[@name='bmstable']/@content")?.ToString()))).ConfigureAwait(false); - var levelTable = await Utility.GetJSON(s); + var levelTable = await Utility.GetJSON(s).ConfigureAwait(false); s.Position = 0; if (levelTable.HasValue) { diff --git a/Qwilight/View/AvatarWindow.xaml b/Qwilight/View/AvatarWindow.xaml index e98e527..84d2514 100644 --- a/Qwilight/View/AvatarWindow.xaml +++ b/Qwilight/View/AvatarWindow.xaml @@ -299,7 +299,7 @@ - + diff --git a/Qwilight/View/ConfigureWindow/InputConfigureWindow.xaml b/Qwilight/View/ConfigureWindow/InputConfigureWindow.xaml index c319382..256e901 100644 --- a/Qwilight/View/ConfigureWindow/InputConfigureWindow.xaml +++ b/Qwilight/View/ConfigureWindow/InputConfigureWindow.xaml @@ -12,45 +12,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -127,45 +101,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -311,45 +259,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/Qwilight/View/LevelWindow.xaml b/Qwilight/View/LevelWindow.xaml index 3148b2b..d7f2df0 100644 --- a/Qwilight/View/LevelWindow.xaml +++ b/Qwilight/View/LevelWindow.xaml @@ -25,22 +25,63 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -65,12 +106,12 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + - -