From a7165c849c963f7cdc2c13737c57b43ae138ab08 Mon Sep 17 00:00:00 2001 From: Sinai <49360850+sinai-dev@users.noreply.github.com> Date: Fri, 4 Mar 2022 00:09:19 +1100 Subject: [PATCH] Bump UniverseLib, cleanup, bump version --- src/ExplorerCore.cs | 2 +- src/ObjectExplorer/SceneHandler.cs | 1 - src/Tests/TestClass.cs | 32 +++++++++++++++--------------- src/UnityExplorer.csproj | 4 ++-- src/packages.config | 2 +- 5 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/ExplorerCore.cs b/src/ExplorerCore.cs index d8f6c6a..9d9eb23 100644 --- a/src/ExplorerCore.cs +++ b/src/ExplorerCore.cs @@ -18,7 +18,7 @@ namespace UnityExplorer public static class ExplorerCore { public const string NAME = "UnityExplorer"; - public const string VERSION = "4.5.6"; + public const string VERSION = "4.5.7"; public const string AUTHOR = "Sinai"; public const string GUID = "com.sinai.unityexplorer"; diff --git a/src/ObjectExplorer/SceneHandler.cs b/src/ObjectExplorer/SceneHandler.cs index afa5a43..3467d5d 100644 --- a/src/ObjectExplorer/SceneHandler.cs +++ b/src/ObjectExplorer/SceneHandler.cs @@ -21,7 +21,6 @@ namespace UnityExplorer.ObjectExplorer return; selectedScene = value; OnInspectedSceneChanged?.Invoke((Scene)selectedScene); - ExplorerCore.Log($"Set selected scene to {value?.name}"); } } private static Scene? selectedScene; diff --git a/src/Tests/TestClass.cs b/src/Tests/TestClass.cs index cc09f64..009be6a 100644 --- a/src/Tests/TestClass.cs +++ b/src/Tests/TestClass.cs @@ -152,16 +152,16 @@ namespace UnityExplorer.Tests public static Il2CppReferenceArray IL2CPP_ReferenceArray; public static Il2CppSystem.Collections.IDictionary IL2CPP_IDict; public static Il2CppSystem.Collections.IList IL2CPP_IList; - public static Dictionary CppBoxedDict; + public static Dictionary IL2CPP_BoxedDict; public static Il2CppSystem.Collections.Generic.HashSet IL2CPP_HashSet; public static Il2CppSystem.Collections.Generic.Dictionary IL2CPP_Dict; public static Il2CppSystem.Collections.Hashtable IL2CPP_HashTable; - public static Il2CppSystem.Object cppBoxedInt; - public static Il2CppSystem.Int32 cppInt; - public static Il2CppSystem.Decimal cppDecimal; - public static Il2CppSystem.Object cppDecimalBoxed; - public static Il2CppSystem.Object cppVector3Boxed; + public static Il2CppSystem.Object IL2CPP_BoxedInt; + public static Il2CppSystem.Int32 IL2CPP_Int; + public static Il2CppSystem.Decimal IL2CPP_Decimal; + public static Il2CppSystem.Object IL2CPP_DecimalBoxed; + public static Il2CppSystem.Object IL2CPP_Vector3Boxed; public static string IL2CPP_systemString = "Test"; public static Il2CppSystem.Object IL2CPP_objectString = "string boxed as cpp object"; public static Il2CppSystem.String IL2CPP_il2cppString = "string boxed as cpp string"; @@ -203,11 +203,11 @@ namespace UnityExplorer.Tests IL2CPP_HashSet.Add("two"); ExplorerCore.Log($"IL2CPP 7: Dictionary of Il2Cpp String and Il2Cpp Object"); - CppBoxedDict = new Dictionary(); - CppBoxedDict.Add("1", new Il2CppSystem.Int32 { m_value = 1 }.BoxIl2CppObject()); - CppBoxedDict.Add("2", new Il2CppSystem.Int32 { m_value = 2 }.BoxIl2CppObject()); - CppBoxedDict.Add("3", new Il2CppSystem.Int32 { m_value = 3 }.BoxIl2CppObject()); - CppBoxedDict.Add("4", new Il2CppSystem.Int32 { m_value = 4 }.BoxIl2CppObject()); + IL2CPP_BoxedDict = new(); + IL2CPP_BoxedDict[(Il2CppSystem.String)"one"] = new Il2CppSystem.Int32 { m_value = 1 }.BoxIl2CppObject(); + IL2CPP_BoxedDict[(Il2CppSystem.String)"two"] = new Il2CppSystem.Int32 { m_value = 2 }.BoxIl2CppObject(); + IL2CPP_BoxedDict[(Il2CppSystem.String)"three"] = new Il2CppSystem.Int32 { m_value = 3 }.BoxIl2CppObject(); + IL2CPP_BoxedDict[(Il2CppSystem.String)"four"] = new Il2CppSystem.Int32 { m_value = 4 }.BoxIl2CppObject(); ExplorerCore.Log($"IL2CPP 8: List of boxed Il2Cpp Objects"); IL2CPP_listOfBoxedObjects = new List(); @@ -248,11 +248,11 @@ namespace UnityExplorer.Tests IL2CPP_ReferenceArray[2] = (Il2CppSystem.String)"whats up"; ExplorerCore.Log($"IL2CPP 11: Misc il2cpp members"); - cppBoxedInt = new Il2CppSystem.Int32() { m_value = 5 }.BoxIl2CppObject(); - cppInt = new Il2CppSystem.Int32 { m_value = 420 }; - cppDecimal = new Il2CppSystem.Decimal(1f); - cppDecimalBoxed = new Il2CppSystem.Decimal(1f).BoxIl2CppObject(); - cppVector3Boxed = Vector3.down.BoxIl2CppObject(); + IL2CPP_BoxedInt = new Il2CppSystem.Int32() { m_value = 5 }.BoxIl2CppObject(); + IL2CPP_Int = new Il2CppSystem.Int32 { m_value = 420 }; + IL2CPP_Decimal = new Il2CppSystem.Decimal(1f); + IL2CPP_DecimalBoxed = new Il2CppSystem.Decimal(1f).BoxIl2CppObject(); + IL2CPP_Vector3Boxed = Vector3.down.BoxIl2CppObject(); ExplorerCore.Log($"Finished Init_Il2Cpp"); } diff --git a/src/UnityExplorer.csproj b/src/UnityExplorer.csproj index 1711686..93814c8 100644 --- a/src/UnityExplorer.csproj +++ b/src/UnityExplorer.csproj @@ -175,13 +175,13 @@ False - packages\UniverseLib.1.2.8\lib\net35\UniverseLib.Mono.dll + packages\UniverseLib.1.2.9\lib\net35\UniverseLib.Mono.dll - packages\UniverseLib.1.2.8\lib\net472\UniverseLib.IL2CPP.dll + packages\UniverseLib.1.2.9\lib\net472\UniverseLib.IL2CPP.dll packages\Il2CppAssemblyUnhollower.BaseLib.0.4.22\lib\net472\UnhollowerBaseLib.dll diff --git a/src/packages.config b/src/packages.config index a9576a4..dc6c85b 100644 --- a/src/packages.config +++ b/src/packages.config @@ -6,6 +6,6 @@ - + \ No newline at end of file