Backups/UnityExplorer_Fix
1
0
Fork 0
mirror of https://github.com/GrahamKracker/UnityExplorer.git synced 2025-07-01 03:12:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

1.1

Browse Source 
- fixed list and array support
- fixed displaying of certain Unity struct types such as VectorX, color, etc
- improved performance
This commit is contained in:
sinaioutlander
2020-08-08 22:45:06 +10:00
parent 308966e664
commit ab08d9dc96
3 changed files with 106 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CppExplorer.cs
View File

@ -15,7 +15,7 @@ namespace Explorer
public const string ID = "com.sinai.cppexplorer"; public const string ID = "com.sinai.cppexplorer";
public const string NAME = "IL2CPP Runtime Explorer"; public const string NAME = "IL2CPP Runtime Explorer";
public const string VERSION = "1.0.0"; public const string VERSION = "1.1.0";
public const string AUTHOR = "Sinai"; public const string AUTHOR = "Sinai";
// fields // fields

33
src/Inspectors/ReflectionWindow.cs
View File

@ -4,6 +4,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using MelonLoader; using MelonLoader;
using Mono.CSharp;
using UnhollowerBaseLib; using UnhollowerBaseLib;
using UnityEngine; using UnityEngine;
@ -275,10 +276,11 @@ namespace Explorer
public static bool IsList(Type t) public static bool IsList(Type t)
{ {
return t.IsGenericType && t.GetGenericTypeDefinition().IsAssignableFrom(typeof(List<>)); return t.IsGenericType
&& t.GetGenericTypeDefinition() is Type typeDef
&& (typeDef.IsAssignableFrom(typeof(List<>)) || typeDef.IsAssignableFrom(typeof(Il2CppSystem.Collections.Generic.List<>)));
} }
private void GetProperties(object m_object, List<string> names = null) private void GetProperties(object m_object, List<string> names = null)
{ {
if (names == null) if (names == null)
@ -292,6 +294,11 @@ namespace Explorer
{ {
foreach (var pi in type.GetProperties(At.flags)) foreach (var pi in type.GetProperties(At.flags))
{ {
if (pi.Name == "Il2CppType")
{
continue;
}
if (names.Contains(pi.Name)) if (names.Contains(pi.Name))
{ {
continue; continue;
@ -382,15 +389,15 @@ namespace Explorer
} }
catch (Exception e) catch (Exception e)
{ {
MelonLogger.Log("Exception on PropertyInfoHolder.UpdateValue, Name: " + this.propInfo.Name); //MelonLogger.Log("Exception on PropertyInfoHolder.UpdateValue, Name: " + this.propInfo.Name);
MelonLogger.Log(e.GetType() + ", " + e.Message); //MelonLogger.Log(e.GetType() + ", " + e.Message);
var inner = e.InnerException; //var inner = e.InnerException;
while (inner != null) //while (inner != null)
{ //{
MelonLogger.Log("inner: " + inner.GetType() + ", " + inner.Message); // MelonLogger.Log("inner: " + inner.GetType() + ", " + inner.Message);
inner = inner.InnerException; // inner = inner.InnerException;
} //}
m_value = null; m_value = null;
} }
@ -402,7 +409,7 @@ namespace Explorer
{ {
if (propInfo.PropertyType.IsEnum) if (propInfo.PropertyType.IsEnum)
{ {
if (Enum.Parse(propInfo.PropertyType, m_value.ToString()) is object enumValue && enumValue != null) if (System.Enum.Parse(propInfo.PropertyType, m_value.ToString()) is object enumValue && enumValue != null)
{ {
m_value = enumValue; m_value = enumValue;
} }
@ -451,7 +458,7 @@ namespace Explorer
} }
catch catch
{ {
MelonLogger.Log("Exception trying to set property " + this.propInfo.Name); //MelonLogger.Log("Exception trying to set property " + this.propInfo.Name);
} }
} }
} }
@ -496,7 +503,7 @@ namespace Explorer
{ {
if (fieldInfo.FieldType.IsEnum) if (fieldInfo.FieldType.IsEnum)
{ {
if (Enum.Parse(fieldInfo.FieldType, m_value.ToString()) is object enumValue && enumValue != null) if (System.Enum.Parse(fieldInfo.FieldType, m_value.ToString()) is object enumValue && enumValue != null)
{ {
m_value = enumValue; m_value = enumValue;
} }

112
src/UIStyles.cs
View File

@ -2,7 +2,12 @@
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection;
using System.Text; using System.Text;
using Il2CppSystem.Collections;
using Il2CppSystem.Reflection;
using MelonLoader;
using UnhollowerBaseLib;
using UnityEngine; using UnityEngine;
using Object = UnityEngine.Object; using Object = UnityEngine.Object;
@ -234,50 +239,79 @@ namespace Explorer
} }
GUILayout.Label(value.ToString(), null); GUILayout.Label(value.ToString(), null);
} }
else if (valueType.IsArray || ReflectionWindow.IsList(valueType)) else if (value is System.Collections.IEnumerable || ReflectionWindow.IsList(valueType))
{ {
object[] m_array; System.Collections.IEnumerable enumerable;
if (valueType.IsArray)
if (value is System.Collections.IEnumerable isEnumerable)
{ {
m_array = (value as Array).Cast<object>().ToArray(); enumerable = isEnumerable;
} }
else else
{ {
m_array = (value as IEnumerable).Cast<object>().ToArray(); var listValueType = value.GetType().GetGenericArguments()[0];
var listType = typeof(Il2CppSystem.Collections.Generic.List<>).MakeGenericType(new Type[] { listValueType });
var method = listType.GetMethod("ToArray");
enumerable = (System.Collections.IEnumerable)method.Invoke(value, new object[0]);
} }
int count = enumerable.Cast<object>().Count();
GUI.skin.button.alignment = TextAnchor.MiddleLeft; GUI.skin.button.alignment = TextAnchor.MiddleLeft;
if (GUILayout.Button("<color=yellow>[" + m_array.Length + "] " + valueType + "</color>", new GUILayoutOption[] { GUILayout.MaxWidth(rect.width - 230) })) string btnLabel = "<color=yellow>[" + count + "] " + valueType + "</color>";
if (GUILayout.Button(btnLabel, new GUILayoutOption[] { GUILayout.MaxWidth(rect.width - 230) }))
{ {
WindowManager.InspectObject(value, out bool _); WindowManager.InspectObject(value, out bool _);
} }
GUI.skin.button.alignment = TextAnchor.MiddleCenter; GUI.skin.button.alignment = TextAnchor.MiddleCenter;
for (int i = 0; i < m_array.Length; i++) var enumerator = enumerable.GetEnumerator();
if (enumerator != null)
{ {
var obj = m_array[i]; int i = 0;
while (enumerator.MoveNext())
// collapsing the BeginHorizontal called from ReflectionWindow.WindowFunction or previous array entry
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal(null);
GUILayout.Space(190);
if (i > CppExplorer.ArrayLimit)
{ {
GUILayout.Label($"<i><color=red>{m_array.Length - CppExplorer.ArrayLimit} results omitted, array is too long!</color></i>", null); var obj = enumerator.Current;
break;
}
if (obj == null) //collapsing the BeginHorizontal called from ReflectionWindow.WindowFunction or previous array entry
{ GUILayout.EndHorizontal();
GUILayout.Label("<i><color=grey>null</color></i>", null); GUILayout.BeginHorizontal(null);
} GUILayout.Space(190);
else
{ if (i > CppExplorer.ArrayLimit)
var type = obj.GetType(); {
DrawMember(ref obj, type.ToString(), i.ToString(), rect, setTarget, setAction, 25, true); GUILayout.Label($"<i><color=red>{count - CppExplorer.ArrayLimit} results omitted, array is too long!</color></i>", null);
break;
}
if (obj == null)
{
GUILayout.Label("<i><color=grey>null</color></i>", null);
}
else
{
var type = obj.GetType();
var lbl = i + ": <color=cyan>" + obj.ToString() + "</color>";
if (type.IsPrimitive || typeof(string).IsAssignableFrom(type))
{
GUILayout.Label(lbl, null);
}
else
{
GUI.skin.button.alignment = TextAnchor.MiddleLeft;
if (GUILayout.Button(lbl, null))
{
WindowManager.InspectObject(obj, out _);
}
GUI.skin.button.alignment = TextAnchor.MiddleCenter;
}
//var type = obj.GetType();
//DrawMember(ref obj, type.ToString(), i.ToString(), rect, setTarget, setAction, 25, true);
}
i++;
} }
} }
} }
@ -289,6 +323,30 @@ namespace Explorer
{ {
label = (value as Object).name; label = (value as Object).name;
} }
else if (value is Vector4 vec4)
{
label = vec4.ToString();
}
else if (value is Vector3 vec3)
{
label = vec3.ToString();
}
else if (value is Vector2 vec2)
{
label = vec2.ToString();
}
else if (value is Rect rec)
{
label = rec.ToString();
}
else if (value is Matrix4x4 matrix)
{
label = matrix.ToString();
}
else if (value is Color col)
{
label = col.ToString();
}
GUI.skin.button.alignment = TextAnchor.MiddleLeft; GUI.skin.button.alignment = TextAnchor.MiddleLeft;
if (GUILayout.Button("<color=yellow>" + label + "</color>", new GUILayoutOption[] { GUILayout.MaxWidth(rect.width - 230) })) if (GUILayout.Button("<color=yellow>" + label + "</color>", new GUILayoutOption[] { GUILayout.MaxWidth(rect.width - 230) }))