[+] MaimollerIO 按键灯光触摸单独设置

clansty · clansty · commit 4f6048cdeca9 · 2025-12-24T13:27:39.000+08:00
diff --git a/AquaMai.Config/Migration/ConfigMigration_V2_3_V2_4.cs b/AquaMai.Config/Migration/ConfigMigration_V2_3_V2_4.cs
@@ -27,6 +27,22 @@ public ConfigView Migrate(ConfigView src)
             dst.Remove("GameSystem.SkipBoardNoCheck");
         }
 
+        if (src.TryGetValue<bool>("GameSystem.MaimollerIO.P1", out var mml1p))
+        {
+            dst.SetValue("GameSystem.MaimollerIO.Touch1p", mml1p);
+            dst.SetValue("GameSystem.MaimollerIO.Button1p", mml1p);
+            dst.SetValue("GameSystem.MaimollerIO.Led1p", mml1p);
+            dst.Remove("GameSystem.MaimollerIO.P1");
+        }
+
+        if (src.TryGetValue<bool>("GameSystem.MaimollerIO.P2", out var mml2p))
+        {
+            dst.SetValue("GameSystem.MaimollerIO.Touch2p", mml2p);
+            dst.SetValue("GameSystem.MaimollerIO.Button2p", mml2p);
+            dst.SetValue("GameSystem.MaimollerIO.Led2p", mml2p);
+            dst.Remove("GameSystem.MaimollerIO.P2");
+        }
+
         return dst;
     }
 }
diff --git a/AquaMai.Mods/GameSystem/MaimollerIO/MaimollerIO.cs b/AquaMai.Mods/GameSystem/MaimollerIO/MaimollerIO.cs
@@ -3,14 +3,12 @@
 using System.Reflection;
 using AquaMai.Config.Attributes;
 using AquaMai.Config.Types;
+using AquaMai.Core.Attributes;
 using AquaMai.Core.Helpers;
 using AquaMai.Mods.GameSystem.MaimollerIO.Libs;
 using HarmonyLib;
-using IO;
 using Main;
-using Manager;
 using Mecha;
-using MelonLoader;
 using UnityEngine;
 
 namespace AquaMai.Mods.GameSystem.MaimollerIO;
@@ -33,16 +31,65 @@ 请删除 ADXHIDIOMod.dll（如果有）并关闭 mai2.ini 中的 DummyTouchpane
 public class MaimollerIO
 {
     [ConfigEntry(
-        name: "启用 1P",
-        en: "Enable 1P (If you mix Maimoller with other protocols, please disable for the side that is not Maimoller)",
-        zh: "启用 1P（如果混用 Maimoller 与其他协议，请对不是 Maimoller 的一侧禁用）")]
-    private static readonly bool p1 = true;
+        name: "启用 1P 触屏",
+        en: "Enable 1P TouchScreen (If you mix Maimoller with other protocols, please disable for the side that is not Maimoller)",
+        zh: "如果混用 Maimoller 与其他协议，请对不是 Maimoller 的一侧禁用")]
+    private static readonly bool touch1p = true;
 
     [ConfigEntry(
-        name: "启用 2P",
-        en: "Enable 2P (If you mix Maimoller with other protocols, please disable for the side that is not Maimoller)",
-        zh: "启用 2P（如果混用 Maimoller 与其他协议，请对不是 Maimoller 的一侧禁用）")]
-    private static readonly bool p2 = true;
+        name: "启用 1P 按键",
+        en: "Enable 1P Buttons")]
+    private static readonly bool button1p = true;
+
+    [ConfigEntry(
+        name: "启用 1P 灯光",
+        en: "Enable 1P LEDs")]
+    private static readonly bool led1p = true;
+
+    [ConfigEntry(
+        name: "启用 2P 触屏",
+        en: "Enable 2P")]
+    private static readonly bool touch2p = true;
+
+    [ConfigEntry(
+        name: "启用 2P 按键",
+        en: "Enable 2P Buttons")]
+    private static readonly bool button2p = true;
+
+    [ConfigEntry(
+        name: "启用 2P 灯光",
+        en: "Enable 2P LEDs")]
+    private static readonly bool led2p = true;
+
+    private static bool ShouldInitForPlayer(int playerNo) => playerNo switch
+    {
+        0 => touch1p || button1p || led1p,
+        1 => touch2p || button2p || led2p,
+        _ => false,
+    };
+
+    private static bool IsTouchEnabledForPlayer(int playerNo) => playerNo switch
+    {
+        0 => touch1p,
+        1 => touch2p,
+        _ => false,
+    };
+
+    private static bool IsButtonEnabledForPlayer(int playerNo) => playerNo switch
+    {
+        0 => button1p,
+        1 => button2p,
+        _ => false,
+    };
+
+    private static bool IsLedEnabledForPlayer(int playerNo) => playerNo switch
+    {
+        0 => led1p,
+        1 => led2p,
+        _ => false,
+    };
+
+    private static bool IsAnyLedEnabled => led1p || led2p;
 
     [ConfigEntry(name: "按钮 1（三角形）")]
     private static readonly IOKeyMap button1 = IOKeyMap.Select1P;
@@ -64,77 +111,83 @@ public class MaimollerIO
         /* button4 */ MaimollerInputReport.ButtonMask.COIN,
     ];
 
-    private static bool ShouldEnableForPlayer(int playerNo) => playerNo switch
-    {
-        0 => p1,
-        1 => p2,
-        _ => false,
-    };
-
     private static readonly MaimollerDevice[] _devices = [.. Enumerable.Range(0, 2).Select(i => new MaimollerDevice(i))];
     private static readonly MaimollerLedManager[] _ledManagers = [.. Enumerable.Range(0, 2).Select(i => new MaimollerLedManager(_devices[i].output))];
 
     public static void OnBeforePatch()
     {
-        if (p1)
+        for (int i = 0; i < 2; i++)
         {
-            _devices[0].Open();
-            TouchStatusProvider.RegisterTouchStatusProvider(0, GetTouchState);
+            if (!ShouldInitForPlayer(i)) continue;
+            _devices[i].Open();
+
+            if (IsTouchEnabledForPlayer(i))
+            {
+                TouchStatusProvider.RegisterTouchStatusProvider(i, GetTouchState);
+            }
         }
-        if (p2)
+
+        if (button1p || button2p)
         {
-            _devices[1].Open();
-            TouchStatusProvider.RegisterTouchStatusProvider(1, GetTouchState);
+            JvsSwitchHook.RegisterButtonChecker(IsButtonPushed);
+            JvsSwitchHook.RegisterAuxiliaryStateProvider(GetAuxiliaryState);
         }
-        JvsSwitchHook.RegisterButtonChecker(IsButtonPushed);
-        JvsSwitchHook.RegisterAuxiliaryStateProvider(GetAuxiliaryState);
     }
 
-    private static bool IsButtonPushed(int playerNo, int buttonIndex1To8) => buttonIndex1To8 switch
+    #region Button
+
+    private static bool IsButtonPushed(int playerNo, int buttonIndex1To8)
     {
-        1 => _devices[playerNo].input.GetSwitchState(MaimollerInputReport.SwitchClass.BUTTON, MaimollerInputReport.ButtonMask.BTN_1) != 0,
-        2 => _devices[playerNo].input.GetSwitchState(MaimollerInputReport.SwitchClass.BUTTON, MaimollerInputReport.ButtonMask.BTN_2) != 0,
-        3 => _devices[playerNo].input.GetSwitchState(MaimollerInputReport.SwitchClass.BUTTON, MaimollerInputReport.ButtonMask.BTN_3) != 0,
-        4 => _devices[playerNo].input.GetSwitchState(MaimollerInputReport.SwitchClass.BUTTON, MaimollerInputReport.ButtonMask.BTN_4) != 0,
-        5 => _devices[playerNo].input.GetSwitchState(MaimollerInputReport.SwitchClass.BUTTON, MaimollerInputReport.ButtonMask.BTN_5) != 0,
-        6 => _devices[playerNo].input.GetSwitchState(MaimollerInputReport.SwitchClass.BUTTON, MaimollerInputReport.ButtonMask.BTN_6) != 0,
-        7 => _devices[playerNo].input.GetSwitchState(MaimollerInputReport.SwitchClass.BUTTON, MaimollerInputReport.ButtonMask.BTN_7) != 0,
-        8 => _devices[playerNo].input.GetSwitchState(MaimollerInputReport.SwitchClass.BUTTON, MaimollerInputReport.ButtonMask.BTN_8) != 0,
-        _ => false,
-    };
+        if (!IsButtonEnabledForPlayer(playerNo)) return false;
+        return buttonIndex1To8 switch
+        {
+            1 => _devices[playerNo].input.GetSwitchState(MaimollerInputReport.SwitchClass.BUTTON, MaimollerInputReport.ButtonMask.BTN_1) != 0,
+            2 => _devices[playerNo].input.GetSwitchState(MaimollerInputReport.SwitchClass.BUTTON, MaimollerInputReport.ButtonMask.BTN_2) != 0,
+            3 => _devices[playerNo].input.GetSwitchState(MaimollerInputReport.SwitchClass.BUTTON, MaimollerInputReport.ButtonMask.BTN_3) != 0,
+            4 => _devices[playerNo].input.GetSwitchState(MaimollerInputReport.SwitchClass.BUTTON, MaimollerInputReport.ButtonMask.BTN_4) != 0,
+            5 => _devices[playerNo].input.GetSwitchState(MaimollerInputReport.SwitchClass.BUTTON, MaimollerInputReport.ButtonMask.BTN_5) != 0,
+            6 => _devices[playerNo].input.GetSwitchState(MaimollerInputReport.SwitchClass.BUTTON, MaimollerInputReport.ButtonMask.BTN_6) != 0,
+            7 => _devices[playerNo].input.GetSwitchState(MaimollerInputReport.SwitchClass.BUTTON, MaimollerInputReport.ButtonMask.BTN_7) != 0,
+            8 => _devices[playerNo].input.GetSwitchState(MaimollerInputReport.SwitchClass.BUTTON, MaimollerInputReport.ButtonMask.BTN_8) != 0,
+            _ => false,
+        };
+    }
 
     // NOTE: Coin button is not supported yet. AquaMai recommands setting fixed number of credits directly in the configuration.
+
     private static AuxiliaryState GetAuxiliaryState()
     {
         var auxiliaryState = new AuxiliaryState();
         IOKeyMap[] keyMaps = [button1, button2, button3, button4];
         for (int i = 0; i < 4; i++)
         {
-            var is1PPushed = p1 && _devices[0].input.GetSwitchState(MaimollerInputReport.SwitchClass.SYSTEM, auxiliaryMaskMap[i]) != 0;
-            var is2PPushed = p2 && _devices[1].input.GetSwitchState(MaimollerInputReport.SwitchClass.SYSTEM, auxiliaryMaskMap[i]) != 0;
+            var is1PPushed = button1p && _devices[0].input.GetSwitchState(MaimollerInputReport.SwitchClass.SYSTEM, auxiliaryMaskMap[i]) != 0;
+            var is2PPushed = button2p && _devices[1].input.GetSwitchState(MaimollerInputReport.SwitchClass.SYSTEM, auxiliaryMaskMap[i]) != 0;
             switch (keyMaps[i])
             {
-            case IOKeyMap.Select1P:
-                auxiliaryState.select1P |= is1PPushed || is2PPushed;
-                break;
-            case IOKeyMap.Select2P:
-                auxiliaryState.select2P |= is1PPushed || is2PPushed;
-                break;
-            case IOKeyMap.Select:
-                auxiliaryState.select1P |= is1PPushed;
-                auxiliaryState.select2P |= is2PPushed;
-                break;
-            case IOKeyMap.Service:
-                auxiliaryState.service = is1PPushed || is2PPushed;
-                break;
-            case IOKeyMap.Test:
-                auxiliaryState.test = is1PPushed || is2PPushed;
-                break;
+                case IOKeyMap.Select1P:
+                    auxiliaryState.select1P |= is1PPushed || is2PPushed;
+                    break;
+                case IOKeyMap.Select2P:
+                    auxiliaryState.select2P |= is1PPushed || is2PPushed;
+                    break;
+                case IOKeyMap.Select:
+                    auxiliaryState.select1P |= is1PPushed;
+                    auxiliaryState.select2P |= is2PPushed;
+                    break;
+                case IOKeyMap.Service:
+                    auxiliaryState.service = is1PPushed || is2PPushed;
+                    break;
+                case IOKeyMap.Test:
+                    auxiliaryState.test = is1PPushed || is2PPushed;
+                    break;
             }
         }
         return auxiliaryState;
     }
 
+    #endregion
+
     private static ulong GetTouchState(int i)
     {
         ulong s = 0;
@@ -148,62 +201,94 @@ private static ulong GetTouchState(int i)
 
     [HarmonyPrefix]
     [HarmonyPatch(typeof(GameMain), "Update")]
+    [EnableIf(nameof(IsAnyLedEnabled))]
     public static void PreGameMainUpdate(bool ____isInitialize)
     {
         if (!____isInitialize) return;
         for (int i = 0; i < 2; i++)
         {
-            if (!ShouldEnableForPlayer(i)) continue;
+            if (!ShouldInitForPlayer(i)) continue;
             _devices[i].Update();
         }
     }
 
     [HarmonyPatch]
+    [EnableIf(typeof(MaimollerIO), nameof(IsAnyLedEnabled))]
     public static class JvsOutputPwmPatch
     {
         public static MethodInfo TargetMethod() => typeof(IO.Jvs).GetNestedType("JvsOutputPwm", BindingFlags.NonPublic | BindingFlags.Public).GetMethod("Set");
 
-        public static void Prefix(byte index, Color32 color) => _ledManagers[index].SetBillboardColor(color);
+        public static void Prefix(byte index, Color32 color)
+        {
+            if (!IsLedEnabledForPlayer(index)) return;
+            _ledManagers[index].SetBillboardColor(color);
+        }
     }
 
     [HarmonyPostfix]
     [HarmonyPatch(typeof(Bd15070_4IF), "PreExecute")]
-    public static void PostPreExecute(Bd15070_4IF.InitParam ____initParam) =>
+    [EnableIf(nameof(IsAnyLedEnabled))]
+    public static void PostPreExecute(Bd15070_4IF.InitParam ____initParam)
+    {
+        if (!IsLedEnabledForPlayer(____initParam.index)) return;
         _ledManagers[____initParam.index].PreExecute();
+    }
+
 
     [HarmonyPrefix]
     [HarmonyPatch(typeof(Bd15070_4IF), "_setColor")]
-    public static void Pre_setColor(byte ledPos, Color32 color, Bd15070_4IF.InitParam ____initParam) =>
+    [EnableIf(nameof(IsAnyLedEnabled))]
+    public static void Pre_setColor(byte ledPos, Color32 color, Bd15070_4IF.InitParam ____initParam)
+    {
+        if (!IsLedEnabledForPlayer(____initParam.index)) return;
         _ledManagers[____initParam.index].SetButtonColor(ledPos, color);
+    }
 
     [HarmonyPrefix]
     [HarmonyPatch(typeof(Bd15070_4IF), "_setColorMulti")]
-    public static void Pre_setColorMulti(Color32 color, byte speed, Bd15070_4IF.InitParam ____initParam) =>
+    [EnableIf(nameof(IsAnyLedEnabled))]
+    public static void Pre_setColorMulti(Color32 color, byte speed, Bd15070_4IF.InitParam ____initParam)
+    {
+        if (!IsLedEnabledForPlayer(____initParam.index)) return;
         _ledManagers[____initParam.index].SetButtonColor(-1, color);
+    }
 
     [HarmonyPrefix]
     [HarmonyPatch(typeof(Bd15070_4IF), "_setColorMultiFade")]
-    public static void Pre_setColorMultiFade(Color32 color, byte speed, Bd15070_4IF.InitParam ____initParam) =>
+    [EnableIf(nameof(IsAnyLedEnabled))]
+    public static void Pre_setColorMultiFade(Color32 color, byte speed, Bd15070_4IF.InitParam ____initParam)
+    {
+        if (!IsLedEnabledForPlayer(____initParam.index)) return;
         _ledManagers[____initParam.index].SetButtonColorFade(-1, color, GetByte2Msec(speed));
+    }
 
     [HarmonyPrefix]
     [HarmonyPatch(typeof(Bd15070_4IF), "_setColorMultiFet")]
+    [EnableIf(nameof(IsAnyLedEnabled))]
     public static void Pre_setColorMultiFet(Color32 color, Bd15070_4IF.InitParam ____initParam)
     {
+        if (!IsLedEnabledForPlayer(____initParam.index)) return;
         _ledManagers[____initParam.index].SetBodyIntensity(8, color.r);
         _ledManagers[____initParam.index].SetBodyIntensity(9, color.g);
         _ledManagers[____initParam.index].SetBodyIntensity(10, color.b);
     }
 
     [HarmonyPrefix]
     [HarmonyPatch(typeof(Bd15070_4IF), "_setColorFet")]
-    public static void Pre_setColorFet(byte ledPos, byte color, Bd15070_4IF.InitParam ____initParam) =>
+    [EnableIf(nameof(IsAnyLedEnabled))]
+    public static void Pre_setColorFet(byte ledPos, byte color, Bd15070_4IF.InitParam ____initParam)
+    {
+        if (!IsLedEnabledForPlayer(____initParam.index)) return;
         _ledManagers[____initParam.index].SetBodyIntensity(ledPos, color);
+    }
+
 
     [HarmonyPrefix]
     [HarmonyPatch(typeof(Bd15070_4IF), "_setLedAllOff")]
+    [EnableIf(nameof(IsAnyLedEnabled))]
     public static void Pre_setLedAllOff(Bd15070_4IF.InitParam ____initParam)
     {
+        if (!IsLedEnabledForPlayer(____initParam.index)) return;
         _ledManagers[____initParam.index].SetBodyIntensity(-1, 0);
         _ledManagers[____initParam.index].SetButtonColor(-1, new Color32(0, 0, 0, byte.MaxValue));
     }
