Compare commits

...

3 Commits
3.1.2 ... 3.1.4

5 changed files with 22 additions and 4 deletions

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.2"; public const string VERSION = "3.1.4";
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";

View File

@ -15,6 +15,16 @@ namespace UnityExplorer.Helpers
private static MethodInfo EncodeToPNGMethod => m_encodeToPNGMethod ?? GetEncodeToPNGMethod(); private static MethodInfo EncodeToPNGMethod => m_encodeToPNGMethod ?? GetEncodeToPNGMethod();
private static MethodInfo m_encodeToPNGMethod; private static MethodInfo m_encodeToPNGMethod;
public static byte[] EncodeToPNGSafe(this Texture2D tex)
{
var method = EncodeToPNGMethod;
if (method.IsStatic)
return (byte[])method.Invoke(null, new object[] { tex });
else
return (byte[])method.Invoke(tex, new object[0]);
}
private static MethodInfo GetEncodeToPNGMethod() private static MethodInfo GetEncodeToPNGMethod()
{ {
if (ReflectionHelpers.GetTypeByName("UnityEngine.ImageConversion") is Type imageConversion) if (ReflectionHelpers.GetTypeByName("UnityEngine.ImageConversion") is Type imageConversion)

View File

@ -272,7 +272,14 @@ namespace UnityExplorer.Inspectors.Reflection
if (File.Exists(path)) if (File.Exists(path))
File.Delete(path); File.Delete(path);
var data = tex.EncodeToPNG(); if (!tex.IsReadable())
tex = Texture2DHelpers.ForceReadTexture(tex);
#if CPP
byte[] data = tex.EncodeToPNG();
#else
byte[] data = tex.EncodeToPNGSafe();
#endif
File.WriteAllBytes(path, data); File.WriteAllBytes(path, data);
} }
}); });

View File

@ -170,7 +170,7 @@ namespace UnityExplorer.UI
//ExplorerCore.Log("Disabling current event system..."); //ExplorerCore.Log("Disabling current event system...");
m_lastEventSystem.enabled = false; m_lastEventSystem.enabled = false;
m_lastEventSystem.gameObject.SetActive(false); //m_lastEventSystem.gameObject.SetActive(false);
} }
// Set to our current system // Set to our current system
@ -188,7 +188,7 @@ namespace UnityExplorer.UI
if (m_lastEventSystem) if (m_lastEventSystem)
{ {
m_lastEventSystem.enabled = true; m_lastEventSystem.enabled = true;
m_lastEventSystem.gameObject.SetActive(true); //m_lastEventSystem.gameObject.SetActive(true);
m_settingEventSystem = true; m_settingEventSystem = true;
EventSystem.current = m_lastEventSystem; EventSystem.current = m_lastEventSystem;

View File

@ -229,6 +229,7 @@ namespace UnityExplorer.UI.Modules
} }
m_sceneDropdown.transform.Find("Label").GetComponent<Text>().text = "Any"; m_sceneDropdown.transform.Find("Label").GetComponent<Text>().text = "Any";
m_sceneFilter = SceneFilter.Any;
} }
// ~~~~~ UI Callbacks ~~~~~ // ~~~~~ UI Callbacks ~~~~~