Backups/UnityExplorer
1
0
Fork 0
mirror of https://github.com/sinai-dev/UnityExplorer.git synced 2025-01-07 10:03:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix an issue causing duplicated clicks in some IL2CPP games, fix setting Component.enabled in IL2CPP

Browse Source
This commit is contained in:
sinaioutlander 2020-12-15 19:32:50 +11:00
parent 82e52de557
commit 97325a5f3a
4 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ExplorerCore.cs
View File

@ -16,7 +16,7 @@ namespace UnityExplorer
public class ExplorerCore public class ExplorerCore
{ {
public const string NAME = "UnityExplorer"; public const string NAME = "UnityExplorer";
public const string VERSION = "3.1.0"; public const string VERSION = "3.1.1";
public const string AUTHOR = "Sinai"; public const string AUTHOR = "Sinai";
public const string GUID = "com.sinai.unityexplorer"; public const string GUID = "com.sinai.unityexplorer";
public const string EXPLORER_FOLDER = @"Mods\UnityExplorer"; public const string EXPLORER_FOLDER = @"Mods\UnityExplorer";

5
src/Inspectors/GameObjects/ComponentList.cs
View File

@ -111,8 +111,11 @@ namespace UnityExplorer.Inspectors.GameObjects
internal static void OnCompToggleClicked(int index, bool value) internal static void OnCompToggleClicked(int index, bool value)
{ {
var comp = s_compShortlist[index]; var comp = s_compShortlist[index];
#if CPP
comp.TryCast<Behaviour>().enabled = value;
#else
(comp as Behaviour).enabled = value; (comp as Behaviour).enabled = value;
#endif
} }
internal static void OnCompListObjectClicked(int index) internal static void OnCompListObjectClicked(int index)

9
src/UI/Modules/SearchPage.cs
View File

@ -1,7 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
//using TMPro;
using UnityEngine; using UnityEngine;
using UnityEngine.SceneManagement; using UnityEngine.SceneManagement;
using UnityEngine.UI; using UnityEngine.UI;
@ -51,8 +50,6 @@ namespace UnityExplorer.UI.Modules
private SceneFilter m_sceneFilter; private SceneFilter m_sceneFilter;
private ChildFilter m_childFilter; private ChildFilter m_childFilter;
internal bool m_isStaticClassSearching;
// ui elements // ui elements
private Text m_resultCountText; private Text m_resultCountText;
@ -257,8 +254,6 @@ namespace UnityExplorer.UI.Modules
internal void StaticClassSearch() internal void StaticClassSearch()
{ {
m_isStaticClassSearching = true;
var list = new List<Type>(); var list = new List<Type>();
var nameFilter = ""; var nameFilter = "";
@ -295,8 +290,6 @@ namespace UnityExplorer.UI.Modules
private void SingletonSearch() private void SingletonSearch()
{ {
m_isStaticClassSearching = false;
var instances = new List<object>(); var instances = new List<object>();
var nameFilter = ""; var nameFilter = "";
@ -356,8 +349,6 @@ namespace UnityExplorer.UI.Modules
internal void UnityObjectSearch() internal void UnityObjectSearch()
{ {
m_isStaticClassSearching = false;
Type searchType = null; Type searchType = null;
switch (m_context) switch (m_context)
{ {

18
src/UI/UIManager.cs
View File

@ -46,6 +46,9 @@ namespace UnityExplorer.UI
SearchPage.Instance?.OnSceneChange(); SearchPage.Instance?.OnSceneChange();
} }
#if CPP
internal static float s_timeOfLastClick;
#endif
public static void Update() public static void Update()
{ {
MainMenu.Instance?.Update(); MainMenu.Instance?.Update();
@ -54,6 +57,7 @@ namespace UnityExplorer.UI
{ {
if (EventSystem.current != EventSys) if (EventSystem.current != EventSys)
{ {
ExplorerCore.Log("Forcing EventSystem to UnityExplorer's");
ForceUnlockCursor.SetEventSystem(); ForceUnlockCursor.SetEventSystem();
} }
@ -62,8 +66,18 @@ namespace UnityExplorer.UI
var evt = InputManager.InputPointerEvent; var evt = InputManager.InputPointerEvent;
if (evt != null) if (evt != null)
{ {
if (!evt.eligibleForClick && evt.selectedObject) if (Time.realtimeSinceStartup - s_timeOfLastClick > 0.1f)
evt.eligibleForClick = true; {
s_timeOfLastClick = Time.realtimeSinceStartup;
if (!evt.eligibleForClick && evt.selectedObject)
evt.eligibleForClick = true;
}
else
{
if (evt.eligibleForClick)
evt.eligibleForClick = false;
}
} }
#endif #endif
} }