diff --git a/Qwilight/Assets/AMD64/wooting-rgb-sdk64.dll b/Qwilight/Assets/AMD64/wooting-rgb-sdk64.dll new file mode 100644 index 0000000..90d233f --- /dev/null +++ b/Qwilight/Assets/AMD64/wooting-rgb-sdk64.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2bb7b27f442dd1f542ea3198fed5fac07f93954ae3686f0169ca3251c800011 +size 45832 diff --git a/Qwilight/Assets/UI/@Default/@Default.lua b/Qwilight/Assets/UI/@Default/@Default.lua index 4c4b43c..5b98470 100644 --- a/Qwilight/Assets/UI/@Default/@Default.lua +++ b/Qwilight/Assets/UI/@Default/@Default.lua @@ -202,9 +202,9 @@ function PaintProperty0Etc() if IsNoteFileModeUHD() then - return "0UHD.mp4" + return "[0UHD0.mp4, 0UHD1.mp4]" else - return "0HD.mp4" + return "[0HD0.mp4, 0HD1.mp4]" end end diff --git a/Qwilight/Assets/UI/@Default/@Default.zip b/Qwilight/Assets/UI/@Default/@Default.zip index 91fe85a..01c2174 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:8e507017f34e811cd39b8638a28113cbd30e0d1ae7e9c7b3dc2874f9b27bb0ec -size 150758150 +oid sha256:3571562eab66fb5175370d4b4d681cb1f2b862cf9191cee041654b9fd67c2b84 +size 372243872 diff --git a/Qwilight/Qwilight.csproj b/Qwilight/Qwilight.csproj index d157fa9..5dcc081 100644 --- a/Qwilight/Qwilight.csproj +++ b/Qwilight/Qwilight.csproj @@ -291,6 +291,9 @@ Always + + Always + Always diff --git a/Qwilight/System/RGBSystem/WootingSystem.cs b/Qwilight/System/RGBSystem/WootingSystem.cs index 0551ef5..cd6a6df 100644 --- a/Qwilight/System/RGBSystem/WootingSystem.cs +++ b/Qwilight/System/RGBSystem/WootingSystem.cs @@ -1,4 +1,6 @@ using Microsoft.UI; +using Qwilight.Utilities; +using System.IO; using Windows.System; using Windows.UI; using Wooting; @@ -9,6 +11,13 @@ { public static readonly WootingSystem Instance = new(); + public WootingSystem() + { +#if X64 + Utility.CopyFile(Path.Combine(QwilightComponent.CPUAssetsEntryPath, "wooting-rgb-sdk64.dll"), Path.Combine(AppContext.BaseDirectory, "wooting-rgb-sdk.dll")); +#endif + } + static WootingKey.Keys GetInput(VirtualKey input) => input switch { VirtualKey.Escape => WootingKey.Keys.Esc, @@ -114,11 +123,11 @@ public override bool Init() { - if (RGBControl.IsConnected()) + try { - return true; + return RGBControl.IsConnected(); } - else + catch { return false; } diff --git a/Qwilight/ViewModel/MainViewModel.cs b/Qwilight/ViewModel/MainViewModel.cs index b149281..a81bf99 100644 --- a/Qwilight/ViewModel/MainViewModel.cs +++ b/Qwilight/ViewModel/MainViewModel.cs @@ -3031,7 +3031,10 @@ var defaultHitPointsMode = defaultModeComponentValue.HitPointsModeValue; var defaultMultiplierValue = defaultModeComponentValue.MultiplierValue; ModeComponentValue.CopyAs(Computer.ModeComponentValue, Computer.MyNoteFiles.First()); - ModeComponentValue.HitPointsModeValue = defaultHitPointsMode; + if (Computer.AvatarID != TwilightSystem.Instance.AvatarID) + { + ModeComponentValue.HitPointsModeValue = defaultHitPointsMode; + } ModeComponentValue.CanModifyMultiplier = true; ModeComponentValue.MultiplierValue = defaultMultiplierValue; ModeComponentValue.CanModifyAudioMultiplier = true;