diff --git a/Compatible/Compatible.csproj b/Compatible/Compatible.csproj index 4c64203..66e85c8 100644 --- a/Compatible/Compatible.csproj +++ b/Compatible/Compatible.csproj @@ -8,7 +8,7 @@ - + diff --git a/Igniter/Igniter.csproj b/Igniter/Igniter.csproj index a2d3c23..bf4d90a 100644 --- a/Igniter/Igniter.csproj +++ b/Igniter/Igniter.csproj @@ -160,7 +160,7 @@ all - 8.0.4 + 8.0.5 diff --git a/Qwilight/Compiler/BMSCompiler.cs b/Qwilight/Compiler/BMSCompiler.cs index 6ef9309..9568d56 100644 --- a/Qwilight/Compiler/BMSCompiler.cs +++ b/Qwilight/Compiler/BMSCompiler.cs @@ -1084,7 +1084,7 @@ return Component.InputMode._5_1; } var isMode71 = inputSet.Contains(7) || inputSet.Contains(8); - var isMode102 = inputSet.Contains(9) || inputSet.Contains(10) || inputSet.Contains(11) || inputSet.Contains(12) || inputSet.Contains(13); + var isMode102 = inputSet.Contains(9) || inputSet.Contains(10) || inputSet.Contains(11) || inputSet.Contains(12) || inputSet.Contains(13) || inputSet.Contains(16); var isMode142 = (isMode71 && isMode102) || inputSet.Contains(14) || inputSet.Contains(15); if (isMode142) { diff --git a/Qwilight/Qwilight.csproj b/Qwilight/Qwilight.csproj index 25f20f1..9e55bf6 100644 --- a/Qwilight/Qwilight.csproj +++ b/Qwilight/Qwilight.csproj @@ -10,14 +10,14 @@ Qwilight.ico Taehui 불로그 - 1.16.42 + 1.16.43 true enable true None true 10.0.22621.44 - false + false Qwilight.View.QwilightClass app.manifest true @@ -46,7 +46,7 @@ - + diff --git a/Qwilight/System/AvatarEdgeSystem.cs b/Qwilight/System/AvatarEdgeSystem.cs index a143b05..9cc7f97 100644 --- a/Qwilight/System/AvatarEdgeSystem.cs +++ b/Qwilight/System/AvatarEdgeSystem.cs @@ -61,11 +61,22 @@ try { using var s = await TwilightSystem.Instance.GetWwwParallel($"{QwilightComponent.QwilightAPI}/drawing?avatarID={WebUtility.UrlEncode(avatarID)}&drawingVariety=2"); - avatarEdge = new() + if (s.Length > 0) { - Drawing = DrawingSystem.Instance.Load(s, null), - DefaultDrawing = DrawingSystem.Instance.LoadDefault(s, null) - }; + avatarEdge = new() + { + Drawing = DrawingSystem.Instance.Load(s, null), + DefaultDrawing = DrawingSystem.Instance.LoadDefault(s, null) + }; + } + else + { + avatarEdge = new() + { + Drawing = null, + DefaultDrawing = null + }; + } } catch { diff --git a/Qwilight/System/RGBSystem/RGBSystem.cs b/Qwilight/System/RGBSystem/RGBSystem.cs index 3fd31d1..f6f6f27 100644 --- a/Qwilight/System/RGBSystem/RGBSystem.cs +++ b/Qwilight/System/RGBSystem/RGBSystem.cs @@ -592,7 +592,7 @@ static uint GetInputColor(double status, Component.InputMode inputMode, int noteFrame, int i) { - var averageColor = UI.Instance.NoteDrawings[(int)inputMode]?[i]?[noteFrame]?[InputNote.InputNoteContents]?[LongNote.LongNoteBefore]?.AverageColor; + var averageColor = UI.Instance.NoteDrawings[(int)inputMode]?[i]?.ElementAtOrDefault(noteFrame)?[InputNote.InputNoteContents]?[LongNote.LongNoteBefore]?.AverageColor; if (averageColor.HasValue) { var averageColorValue = averageColor.Value;