Backups/UnityExplorer
1
0
Fork 0
mirror of https://github.com/sinai-dev/UnityExplorer.git synced 2025-09-20 13:36:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanups

Browse Source
This commit is contained in:
Sinai
2021-03-11 17:57:58 +11:00
parent 5c588e5a03
commit ade7539fde
22 changed files with 700 additions and 609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/UI/ForceUnlockCursor.cs
View File

@ -28,7 +28,7 @@ namespace UnityExplorer.UI
UpdateCursorControl();
}
public static bool ShouldForceMouse => ExplorerCore.ShowMenu && Unlock;
public static bool ShouldForceMouse => UIManager.ShowMenu && Unlock;
private static CursorLockMode m_lastLockMode;
private static bool m_lastVisibleState;
@ -42,7 +42,7 @@ namespace UnityExplorer.UI
public static void Init()
{
ModConfig.OnConfigChanged += ModConfig_OnConfigChanged;
ExplorerConfig.OnConfigChanged += ModConfig_OnConfigChanged;
SetupPatches();
@ -51,7 +51,7 @@ namespace UnityExplorer.UI
internal static void ModConfig_OnConfigChanged()
{
Unlock = ModConfig.Instance.Force_Unlock_Mouse;
Unlock = ExplorerConfig.Instance.Force_Unlock_Mouse;
}
private static void SetupPatches()
@ -102,14 +102,7 @@ namespace UnityExplorer.UI
{
try
{
var harmony =
#if ML
ExplorerMelonMod.Instance.Harmony;
#elif BIE
ExplorerBepInPlugin.HarmonyInstance;
#elif STANDALONE
ExplorerStandalone.HarmonyInstance;
#endif
var harmony = ExplorerCore.Loader.HarmonyInstance;
System.Reflection.PropertyInfo prop = type.GetProperty(property);
@ -208,7 +201,7 @@ namespace UnityExplorer.UI
m_lastEventSystem = value;
m_lastInputModule = value?.currentInputModule;
if (ExplorerCore.ShowMenu)
if (UIManager.ShowMenu)
{
value = UIManager.EventSys;
}

8
src/UI/MainMenu.cs
View File

@ -208,7 +208,7 @@ namespace UnityExplorer.UI
GameObject hideBtnObj = UIFactory.CreateButton(titleBar);
Button hideBtn = hideBtnObj.GetComponent<Button>();
hideBtn.onClick.AddListener(() => { ExplorerCore.ShowMenu = false; });
hideBtn.onClick.AddListener(() => { UIManager.ShowMenu = false; });
ColorBlock colorBlock = hideBtn.colors;
colorBlock.normalColor = new Color(65f / 255f, 23f / 255f, 23f / 255f);
colorBlock.pressedColor = new Color(35f / 255f, 10f / 255f, 10f / 255f);
@ -224,13 +224,13 @@ namespace UnityExplorer.UI
hideText.resizeTextForBestFit = true;
hideText.resizeTextMinSize = 8;
hideText.resizeTextMaxSize = 14;
hideText.text = $"Hide ({ModConfig.Instance.Main_Menu_Toggle})";
hideText.text = $"Hide ({ExplorerConfig.Instance.Main_Menu_Toggle})";
ModConfig.OnConfigChanged += ModConfig_OnConfigChanged;
ExplorerConfig.OnConfigChanged += ModConfig_OnConfigChanged;
void ModConfig_OnConfigChanged()
{
hideText.text = $"Hide ({ModConfig.Instance.Main_Menu_Toggle})";
hideText.text = $"Hide ({ExplorerConfig.Instance.Main_Menu_Toggle})";
}
}

20
src/UI/Modules/DebugConsole.cs
View File

@ -15,7 +15,7 @@ namespace UnityExplorer.UI.Modules
{
public static DebugConsole Instance { get; private set; }
public static bool LogUnity { get; set; } = ModConfig.Instance.Log_Unity_Debug;
public static bool LogUnity { get; set; } = ExplorerConfig.Instance.Log_Unity_Debug;
//public static bool SaveToDisk { get; set; } = ModConfig.Instance.Save_Logs_To_Disk;
internal static StreamWriter s_streamWriter;
@ -52,7 +52,7 @@ namespace UnityExplorer.UI.Modules
//if (!SaveToDisk)
// return;
var path = ExplorerCore.EXPLORER_FOLDER + @"\Logs";
var path = ExplorerCore.ExplorerFolder + @"\Logs";
if (!Directory.Exists(path))
Directory.CreateDirectory(path);
@ -69,7 +69,7 @@ namespace UnityExplorer.UI.Modules
}
var fileName = "UnityExplorer " + DateTime.Now.ToString("u") + ".txt";
fileName = ExplorerCore.RemoveInvalidFilenameChars(fileName);
fileName = RemoveInvalidFilenameChars(fileName);
var stream = File.Create(path + @"\" + fileName);
s_streamWriter = new StreamWriter(stream)
@ -81,6 +81,16 @@ namespace UnityExplorer.UI.Modules
s_streamWriter.WriteLine(msg);
}
public static string RemoveInvalidFilenameChars(string s)
{
var invalid = Path.GetInvalidFileNameChars();
foreach (var c in invalid)
{
s = s.Replace(c.ToString(), "");
}
return s;
}
public static void Log(string message)
{
Log(message, null);
@ -256,8 +266,8 @@ namespace UnityExplorer.UI.Modules
void ToggleLogUnity(bool val)
{
LogUnity = val;
ModConfig.Instance.Log_Unity_Debug = val;
ModConfig.SaveSettings();
ExplorerConfig.Instance.Log_Unity_Debug = val;
ExplorerConfig.SaveSettings();
}
var unityToggleLayout = unityToggleObj.AddComponent<LayoutElement>();

24
src/UI/Modules/OptionsPage.cs
View File

@ -32,19 +32,19 @@ namespace UnityExplorer.UI.Modules
internal void OnApply()
{
if (!string.IsNullOrEmpty(m_keycodeInput.text) && Enum.Parse(typeof(KeyCode), m_keycodeInput.text) is KeyCode keyCode)
ModConfig.Instance.Main_Menu_Toggle = keyCode;
ExplorerConfig.Instance.Main_Menu_Toggle = keyCode;
ModConfig.Instance.Force_Unlock_Mouse = m_unlockMouseToggle.isOn;
ExplorerConfig.Instance.Force_Unlock_Mouse = m_unlockMouseToggle.isOn;
if (!string.IsNullOrEmpty(m_pageLimitInput.text) && int.TryParse(m_pageLimitInput.text, out int lim))
ModConfig.Instance.Default_Page_Limit = lim;
ExplorerConfig.Instance.Default_Page_Limit = lim;
ModConfig.Instance.Default_Output_Path = m_defaultOutputInput.text;
ExplorerConfig.Instance.Default_Output_Path = m_defaultOutputInput.text;
ModConfig.Instance.Hide_On_Startup = m_hideOnStartupToggle.isOn;
ExplorerConfig.Instance.Hide_On_Startup = m_hideOnStartupToggle.isOn;
ModConfig.SaveSettings();
ModConfig.InvokeConfigChanged();
ExplorerConfig.SaveSettings();
ExplorerConfig.InvokeConfigChanged();
}
#region UI CONSTRUCTION
@ -131,7 +131,7 @@ namespace UnityExplorer.UI.Modules
labelLayout.minHeight = 25;
UIFactory.CreateToggle(rowObj, out m_hideOnStartupToggle, out Text toggleText);
m_hideOnStartupToggle.isOn = ModConfig.Instance.Hide_On_Startup;
m_hideOnStartupToggle.isOn = ExplorerConfig.Instance.Hide_On_Startup;
toggleText.text = "";
}
@ -159,7 +159,7 @@ namespace UnityExplorer.UI.Modules
var keycodeInputObj = UIFactory.CreateInputField(rowObj);
m_keycodeInput = keycodeInputObj.GetComponent<InputField>();
m_keycodeInput.text = ModConfig.Instance.Main_Menu_Toggle.ToString();
m_keycodeInput.text = ExplorerConfig.Instance.Main_Menu_Toggle.ToString();
m_keycodeInput.placeholder.gameObject.GetComponent<Text>().text = "KeyCode, eg. F7";
}
@ -186,7 +186,7 @@ namespace UnityExplorer.UI.Modules
labelLayout.minHeight = 25;
UIFactory.CreateToggle(rowObj, out m_unlockMouseToggle, out Text toggleText);
m_unlockMouseToggle.isOn = ModConfig.Instance.Force_Unlock_Mouse;
m_unlockMouseToggle.isOn = ExplorerConfig.Instance.Force_Unlock_Mouse;
toggleText.text = "";
}
@ -216,7 +216,7 @@ namespace UnityExplorer.UI.Modules
var inputObj = UIFactory.CreateInputField(rowObj);
m_pageLimitInput = inputObj.GetComponent<InputField>();
m_pageLimitInput.text = ModConfig.Instance.Default_Page_Limit.ToString();
m_pageLimitInput.text = ExplorerConfig.Instance.Default_Page_Limit.ToString();
m_pageLimitInput.placeholder.gameObject.GetComponent<Text>().text = "Integer, eg. 20";
}
@ -247,7 +247,7 @@ namespace UnityExplorer.UI.Modules
var inputObj = UIFactory.CreateInputField(rowObj);
m_defaultOutputInput = inputObj.GetComponent<InputField>();
m_defaultOutputInput.text = ModConfig.Instance.Default_Output_Path.ToString();
m_defaultOutputInput.text = ExplorerConfig.Instance.Default_Output_Path.ToString();
m_defaultOutputInput.placeholder.gameObject.GetComponent<Text>().text = @"Directory, eg. Mods\UnityExplorer";
}

2
src/UI/Shared/PageHandler.cs
View File

@ -21,7 +21,7 @@ namespace UnityExplorer.UI.Shared
{
public PageHandler(SliderScrollbar scroll)
{
ItemsPerPage = ModConfig.Instance?.Default_Page_Limit ?? 20;
ItemsPerPage = ExplorerConfig.Instance?.Default_Page_Limit ?? 20;
m_scrollbar = scroll;
}

66
src/UI/UIManager.cs
View File

@ -8,6 +8,8 @@ using System.Reflection;
using UnityExplorer.Helpers;
using UnityExplorer.UI.Shared;
using UnityExplorer.Input;
using System;
using UnityExplorer.Config;
#if CPP
using UnityExplorer.Unstrip;
#endif
@ -24,6 +26,43 @@ namespace UnityExplorer.UI
internal static Sprite ResizeCursor { get; private set; }
internal static Shader BackupShader { get; private set; }
public static bool ShowMenu
{
get => s_showMenu;
set => SetShowMenu(value);
}
public static bool s_showMenu;
private static bool s_doneUIInit;
private static float s_timeSinceStartup;
internal static void CheckUIInit()
{
if (s_doneUIInit)
return;
s_timeSinceStartup += Time.deltaTime;
if (s_timeSinceStartup > 0.1f)
{
s_doneUIInit = true;
try
{
Init();
ExplorerCore.Log("Initialized UnityExplorer UI.");
if (ExplorerConfig.Instance.Hide_On_Startup)
ShowMenu = false;
// InspectorManager.Instance.Inspect(Tests.TestClass.Instance);
}
catch (Exception e)
{
ExplorerCore.LogWarning($"Exception setting up UI: {e}");
}
}
}
public static void Init()
{
LoadBundle();
@ -40,13 +79,40 @@ namespace UnityExplorer.UI
Canvas.ForceUpdateCanvases();
}
private static void SetShowMenu(bool show)
{
if (s_showMenu == show)
return;
s_showMenu = show;
if (CanvasRoot)
{
CanvasRoot.SetActive(show);
if (show)
ForceUnlockCursor.SetEventSystem();
else
ForceUnlockCursor.ReleaseEventSystem();
}
ForceUnlockCursor.UpdateCursorControl();
}
public static void OnSceneChange()
{
SceneExplorer.Instance?.OnSceneChange();
SearchPage.Instance?.OnSceneChange();
}
public static void Update()
{
if (InputManager.GetKeyDown(ExplorerConfig.Instance.Main_Menu_Toggle))
ShowMenu = !ShowMenu;
if (!ShowMenu || !s_doneUIInit || !CanvasRoot)
return;
MainMenu.Instance?.Update();
if (EventSys)