mirror of
https://github.com/GrahamKracker/UnityExplorer.git
synced 2025-07-15 07:56:41 +08:00
3.1.7
* Added standalone release build (thanks @Alloc86) * Improved formatting for ToString methods which accept an IFormatProvider * When editing a struct, the reference to the parent member will now be updated if you modify the struct values.
This commit is contained in:
@ -38,7 +38,7 @@ namespace UnityExplorer.Inspectors
|
||||
}
|
||||
}
|
||||
|
||||
public void Inspect(object obj)
|
||||
public void Inspect(object obj, CacheObjectBase parentMember = null)
|
||||
{
|
||||
#if CPP
|
||||
obj = obj.Il2CppCast(ReflectionHelpers.GetActualType(obj));
|
||||
@ -76,6 +76,9 @@ namespace UnityExplorer.Inspectors
|
||||
else
|
||||
inspector = new InstanceInspector(obj);
|
||||
|
||||
if (inspector is ReflectionInspector ri)
|
||||
ri.ParentMember = parentMember;
|
||||
|
||||
m_currentInspectors.Add(inspector);
|
||||
SetInspectorTab(inspector);
|
||||
}
|
||||
|
@ -33,6 +33,9 @@ namespace UnityExplorer.Inspectors.Reflection
|
||||
{
|
||||
var fi = MemInfo as FieldInfo;
|
||||
fi.SetValue(fi.IsStatic ? null : DeclaringInstance, IValue.Value);
|
||||
|
||||
if (this.ParentInspector?.ParentMember != null)
|
||||
this.ParentInspector.ParentMember.SetValue();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -19,6 +19,7 @@ namespace UnityExplorer.Inspectors.Reflection
|
||||
|
||||
public override Type FallbackType { get; }
|
||||
|
||||
public ReflectionInspector ParentInspector { get; set; }
|
||||
public MemberInfo MemInfo { get; set; }
|
||||
public Type DeclaringType { get; set; }
|
||||
public object DeclaringInstance { get; set; }
|
||||
|
@ -63,6 +63,9 @@ namespace UnityExplorer.Inspectors.Reflection
|
||||
var target = pi.GetAccessors()[0].IsStatic ? null : DeclaringInstance;
|
||||
|
||||
pi.SetValue(target, IValue.Value, ParseArguments());
|
||||
|
||||
if (this.ParentInspector?.ParentMember != null)
|
||||
this.ParentInspector.ParentMember.SetValue();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -176,6 +176,10 @@ namespace UnityExplorer.Inspectors.Reflection
|
||||
ConstructSubcontent();
|
||||
}
|
||||
|
||||
internal MethodInfo m_toStringMethod;
|
||||
internal MethodInfo m_toStringFormatMethod;
|
||||
internal bool m_gotToStringMethods;
|
||||
|
||||
public string GetDefaultLabel(bool updateType = true)
|
||||
{
|
||||
var valueType = Value?.GetType() ?? this.FallbackType;
|
||||
@ -205,8 +209,33 @@ namespace UnityExplorer.Inspectors.Reflection
|
||||
}
|
||||
else
|
||||
{
|
||||
var toString = (string)valueType.GetMethod("ToString", new Type[0])?.Invoke(Value, null)
|
||||
?? Value.ToString();
|
||||
if (!m_gotToStringMethods)
|
||||
{
|
||||
m_gotToStringMethods = true;
|
||||
|
||||
m_toStringMethod = valueType.GetMethod("ToString", new Type[0]);
|
||||
m_toStringFormatMethod = valueType.GetMethod("ToString", new Type[] { typeof(string) });
|
||||
|
||||
// test format method actually works
|
||||
try
|
||||
{
|
||||
m_toStringFormatMethod.Invoke(Value, new object[] { "F3" });
|
||||
}
|
||||
catch
|
||||
{
|
||||
m_toStringFormatMethod = null;
|
||||
}
|
||||
}
|
||||
|
||||
string toString;
|
||||
if (m_toStringFormatMethod != null)
|
||||
{
|
||||
toString = (string)m_toStringFormatMethod.Invoke(Value, new object[] { "F3" });
|
||||
}
|
||||
else
|
||||
{
|
||||
toString = (string)m_toStringMethod.Invoke(Value, new object[0]);
|
||||
}
|
||||
|
||||
var fullnametemp = valueType.ToString();
|
||||
if (fullnametemp.StartsWith("Il2CppSystem"))
|
||||
@ -303,7 +332,7 @@ namespace UnityExplorer.Inspectors.Reflection
|
||||
void OnInspectClicked()
|
||||
{
|
||||
if (!Value.IsNullOrDestroyed(false))
|
||||
InspectorManager.Instance.Inspect(this.Value);
|
||||
InspectorManager.Instance.Inspect(this.Value, this.Owner);
|
||||
}
|
||||
|
||||
m_inspectButton.SetActive(false);
|
||||
|
@ -58,6 +58,8 @@ namespace UnityExplorer.Inspectors
|
||||
|
||||
public override string TabLabel => m_targetTypeShortName;
|
||||
|
||||
internal CacheObjectBase ParentMember { get; set; }
|
||||
|
||||
internal readonly Type m_targetType;
|
||||
internal readonly string m_targetTypeShortName;
|
||||
|
||||
@ -202,6 +204,8 @@ namespace UnityExplorer.Inspectors
|
||||
list.Add(new CacheProperty(pi, target, m_scrollContent));
|
||||
else
|
||||
list.Add(new CacheField(fi, target, m_scrollContent));
|
||||
|
||||
list.Last().ParentInspector = this;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
|
Reference in New Issue
Block a user