Fix event system control

Author: sinai-dev

src/Core/Input/CursorUnlocker.cs

@@ -89,34 +89,29 @@ public static void UpdateCursorControl()
 
         public static void SetEventSystem()
         {
-            // not overriding EventSystem for new InputSystem, dont seem to need to.
             if (InputManager.CurrentType == InputType.InputSystem)
                 return;
 
-            // Disable current event system object
-            if (m_lastEventSystem || EventSystem.current)
+            if (EventSystem.current && EventSystem.current != UIManager.EventSys)
             {
-                if (!m_lastEventSystem)
-                    m_lastEventSystem = EventSystem.current;
-
+                m_lastEventSystem = EventSystem.current;
                 m_lastEventSystem.enabled = false;
             }
 
             // Set to our current system
             m_settingEventSystem = true;
-            EventSystem.current = UIManager.EventSys;
             UIManager.EventSys.enabled = true;
+            EventSystem.current = UIManager.EventSys;
             InputManager.ActivateUIModule();
             m_settingEventSystem = false;
         }
 
         public static void ReleaseEventSystem()
         {
-            // not overriding EventSystem for new InputSystem, dont seem to need to.
             if (InputManager.CurrentType == InputType.InputSystem)
                 return;
 
-            if (m_lastEventSystem)
+            if (m_lastEventSystem && m_lastEventSystem.gameObject.activeSelf)
             {
                 m_lastEventSystem.enabled = true;
 
@@ -153,13 +148,16 @@ private static void SetupPatches()
 
         public static void Prefix_EventSystem_set_current(ref EventSystem value)
         {
-            if (!m_settingEventSystem)
+            if (!m_settingEventSystem && value != UIManager.EventSys)
             {
                 m_lastEventSystem = value;
                 m_lastInputModule = value?.currentInputModule;
 
                 if (ShouldActuallyUnlock)
+                {
                     value = UIManager.EventSys;
+                    value.enabled = true;
+                }
             }
         }
 

src/ExplorerCore.cs

@@ -13,7 +13,7 @@ namespace UnityExplorer
     public class ExplorerCore
     {
         public const string NAME = "UnityExplorer";
-        public const string VERSION = "3.3.9";
+        public const string VERSION = "3.3.10";
         public const string AUTHOR = "Sinai";
         public const string GUID = "com.sinai.unityexplorer";
 

src/Loader/ML/ExplorerMelonMod.cs

@@ -13,6 +13,7 @@
 
 [assembly: MelonInfo(typeof(ExplorerMelonMod), ExplorerCore.NAME, ExplorerCore.VERSION, ExplorerCore.AUTHOR)]
 [assembly: MelonGame(null, null)]
+//[assembly: MelonPlatformDomain(MelonPlatformDomainAttribute.CompatibleDomains.UNIVERSAL)]
 
 namespace UnityExplorer
 {