chore

Author: LeZi9916

Assets/Plugins/MajdataPlay/Platform/iOS/NativeKeyboard.cs

@@ -4,42 +4,26 @@
 namespace MajdataPlay.Platform.iOS;
 public static class NativeKeyboard
 {
-    const string IOSLibraryName = "__Internal";
 #if UNITY_EDITOR_OSX
-    const string MacEditorLibraryName = "NativeKeyboard";
+    const string LibraryName = "NativeKeyboard";
+#else
+    const string LibraryName = "__Internal";
 #endif
 
-#if UNITY_IOS && !UNITY_EDITOR
-    [DllImport(IOSLibraryName, EntryPoint = "Init")]
+    [DllImport(LibraryName, EntryPoint = "Init")]
     static extern ErrorCode InitInternal();
 
-    [DllImport(IOSLibraryName, EntryPoint = "GetKeyboardHandle")]
+    [DllImport(LibraryName, EntryPoint = "GetKeyboardHandle")]
     static extern nint GetKeyboardHandleInternal();
 
-    [DllImport(IOSLibraryName, EntryPoint = "IsPressed")]
+    [DllImport(LibraryName, EntryPoint = "IsPressed")]
     static extern ErrorCode IsPressedInternal(uint keyCode, out byte isPressedOut);
 
-    [DllImport(IOSLibraryName, EntryPoint = "IsPressedWithHandle")]
+    [DllImport(LibraryName, EntryPoint = "IsPressedWithHandle")]
     static extern ErrorCode IsPressedWithHandleInternal(nint keyboardHandle, uint keyCode, out byte isPressedOut);
 
-    [DllImport(IOSLibraryName, EntryPoint = "Free")]
+    [DllImport(LibraryName, EntryPoint = "Free")]
     static extern ErrorCode FreeInternal();
-#elif UNITY_EDITOR_OSX
-    [DllImport(MacEditorLibraryName, EntryPoint = "Init")]
-    static extern ErrorCode InitInternal();
-
-    [DllImport(MacEditorLibraryName, EntryPoint = "GetKeyboardHandle")]
-    static extern nint GetKeyboardHandleInternal();
-
-    [DllImport(MacEditorLibraryName, EntryPoint = "IsPressed")]
-    static extern ErrorCode IsPressedInternal(uint keyCode, out byte isPressedOut);
-
-    [DllImport(MacEditorLibraryName, EntryPoint = "IsPressedWithHandle")]
-    static extern ErrorCode IsPressedWithHandleInternal(nint keyboardHandle, uint keyCode, out byte isPressedOut);
-
-    [DllImport(MacEditorLibraryName, EntryPoint = "Free")]
-    static extern ErrorCode FreeInternal();
-#endif
 
     public static ErrorCode Init()
     {

Assets/Scripts/IO/InputManager/InputManager.KeyboardHelper.cs

@@ -1,7 +1,7 @@
 using System;
 #if UNITY_STANDALONE_WIN
 using MajdataPlay.Platform.Win32;
-#elif UNITY_IOS || UNITY_EDITOR
+#elif UNITY_IOS || UNITY_EDITOR_OSX
 using MajdataPlay.Platform.iOS;
 #endif
 using UnityEngine.InputSystem;
@@ -77,7 +77,7 @@ public static UnityEngine.InputSystem.Key ToUnityKeyCode(KeyCode keyCode)
                     _ => throw new ArgumentOutOfRangeException(nameof(keyCode)),
                 };
             }
-#if UNITY_IOS || UNITY_EDITOR
+#if UNITY_IOS || UNITY_EDITOR_OSX
             public static GCKeyCode ToiOSGCKeyCode(KeyCode keyCode)
             {
                 return keyCode switch