diff --git a/.idea/.idea.BABA_YAGA/.idea/workspace.xml b/.idea/.idea.BABA_YAGA/.idea/workspace.xml index e560a547..83f7091a 100644 --- a/.idea/.idea.BABA_YAGA/.idea/workspace.xml +++ b/.idea/.idea.BABA_YAGA/.idea/workspace.xml @@ -6,11 +6,15 @@ - - - - - + + + + + + + + + diff --git a/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.XML b/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.XML deleted file mode 100644 index 02c3c95e..00000000 --- a/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.XML +++ /dev/null @@ -1,14 +0,0 @@ - - - - DOTweenUpgradeManager - - - - - This class and its whole library are deleted the first time DOTween's setup is run after an upgrade (or after a new install). - NOTE: DidReloadScripts doesn't work on first install so it's useless, InitializeOnLoad is the only way - - - - diff --git a/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.XML.meta b/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.XML.meta deleted file mode 100644 index f37f6be0..00000000 --- a/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.XML.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3df9fdaadcb4c394e826a4d8d20bb952 -TextScriptImporter: - userData: -AssetOrigin: - serializedVersion: 1 - productId: 27676 - packageName: DOTween (HOTween v2) - packageVersion: 1.2.825 - assetPath: Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.XML - uploadId: 862444 diff --git a/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll b/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll deleted file mode 100644 index d8c36d80..00000000 Binary files a/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll and /dev/null differ diff --git a/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll.meta b/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll.meta deleted file mode 100644 index 7b3b0634..00000000 --- a/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll.meta +++ /dev/null @@ -1,29 +0,0 @@ -fileFormatVersion: 2 -guid: 2bf936a5d80799e4e88ec9270fea75a4 -PluginImporter: - serializedVersion: 1 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - platformData: - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - settings: - DefaultValueInitialized: true - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 27676 - packageName: DOTween (HOTween v2) - packageVersion: 1.2.825 - assetPath: Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll - uploadId: 862444 diff --git a/Assets/Plugins/Demigiant/DOTween/Modules/DOTween.Modules.asmdef b/Assets/Plugins/Demigiant/DOTween/Modules/DOTween.Modules.asmdef new file mode 100644 index 00000000..42ef5aba --- /dev/null +++ b/Assets/Plugins/Demigiant/DOTween/Modules/DOTween.Modules.asmdef @@ -0,0 +1,3 @@ +{ + "name": "DOTween.Modules" +} diff --git a/Assets/Plugins/Demigiant/DOTween/Modules/DOTween.Modules.asmdef.meta b/Assets/Plugins/Demigiant/DOTween/Modules/DOTween.Modules.asmdef.meta new file mode 100644 index 00000000..06623295 --- /dev/null +++ b/Assets/Plugins/Demigiant/DOTween/Modules/DOTween.Modules.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3e6518bd006380c4d8b0cef9e6ea3bce +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/DOTweenSettings.asset b/Assets/Resources/DOTweenSettings.asset index e193ed27..6cb0c0cb 100644 --- a/Assets/Resources/DOTweenSettings.asset +++ b/Assets/Resources/DOTweenSettings.asset @@ -50,6 +50,6 @@ MonoBehaviour: deAudioEnabled: 0 deUnityExtendedEnabled: 0 epoOutlineEnabled: 0 - createASMDEF: 0 + createASMDEF: 1 showPlayingTweens: 0 showPausedTweens: 0 diff --git a/Assets/Scripts/UI/MainMenuController.cs b/Assets/Scripts/UI/MainMenuController.cs index 44fd96af..2516fa38 100644 --- a/Assets/Scripts/UI/MainMenuController.cs +++ b/Assets/Scripts/UI/MainMenuController.cs @@ -2,7 +2,7 @@ using UnityEngine; using UnityEngine.UIElements; using PrimeTween; using System.Threading.Tasks; -using DG.Tweening; +using Tween = PrimeTween.Tween; namespace Hallucinate.UI { diff --git a/Assets/Scripts/UI/SettingsController.cs b/Assets/Scripts/UI/SettingsController.cs index 80b021b0..ac4685c6 100644 --- a/Assets/Scripts/UI/SettingsController.cs +++ b/Assets/Scripts/UI/SettingsController.cs @@ -6,10 +6,9 @@ using System.Collections.Generic; using System.Linq; using System; using System.Threading.Tasks; -using DG.Tweening; using OnlyScove.Scripts; using Hallucinate.Audio; -using PrimeTween; +using Tween = PrimeTween.Tween; namespace Hallucinate.UI { diff --git a/Assets/Third Parties/vFavorites/VFavorites.cs b/Assets/Third Parties/vFavorites/VFavorites.cs index e50dadee..c497a2f4 100644 --- a/Assets/Third Parties/vFavorites/VFavorites.cs +++ b/Assets/Third Parties/vFavorites/VFavorites.cs @@ -903,10 +903,11 @@ namespace VFavorites if (browser.GetFieldValue("m_ViewMode") == 1) { - TryOpenFolderInProjectBrowser(browser, folderInstanceId); - - Selection.activeObject = folderAsset; - EditorGUIUtility.PingObject(folderAsset); + if (!TryOpenFolderInProjectBrowser(browser, folderInstanceId)) + { + Selection.activeObject = folderAsset; + EditorGUIUtility.PingObject(folderAsset); + } } else { @@ -959,7 +960,7 @@ namespace VFavorites if (!isWrappedBrowserLocked) return; var unlockedBrowser = allBrowsers.FirstOrDefault(r => !r.GetMemberValue("isLocked")); - var browserToUse = isOneColumn ? unlockedBrowser : lockedBrowser; + var browserToUse = isOneColumn ? (unlockedBrowser ?? wrappedBrowser) : wrappedBrowser; if (!browserToUse) return; @@ -977,29 +978,31 @@ namespace VFavorites } - static void TryOpenFolderInProjectBrowser(EditorWindow browser, int folderInstanceId) + static bool TryOpenFolderInProjectBrowser(EditorWindow browser, int folderInstanceId) { - if (TryInvoke(browser, "ShowFolderContents", folderInstanceId, true)) return; + if (TryInvoke(browser, "ShowFolderContents", folderInstanceId, true)) return true; t_BrowserWindow.SetFieldValue("s_LastInteractedProjectBrowser", browser, exceptionIfNotFound: false); if (TryInvoke(browser, "SetFolderSelection", new[] { folderInstanceId }, false)) - if (TryInvoke(t_BrowserWindow, "OpenSelectedFolders")) return; + if (TryInvoke(t_BrowserWindow, "OpenSelectedFolders")) return true; var listAreaState = browser.GetFieldValue("m_ListAreaState", exceptionIfNotFound: false); if (TrySetSelectedInstanceId(listAreaState, folderInstanceId)) - if (TryInvoke(t_BrowserWindow, "OpenSelectedFolders")) return; + if (TryInvoke(t_BrowserWindow, "OpenSelectedFolders")) return true; var folderAsset = EditorUtility.InstanceIDToObject(folderInstanceId); - if (folderAsset && AssetDatabase.OpenAsset(folderAsset)) return; + if (folderAsset && AssetDatabase.OpenAsset(folderAsset)) return true; - if (TryInvoke(browser, "FrameObjectPrivate", folderInstanceId, true, false)) return; - if (TryInvoke(browser, "FrameObject", folderInstanceId, true)) return; + if (TryInvoke(browser, "FrameObjectPrivate", folderInstanceId, true, false)) return true; + if (TryInvoke(browser, "FrameObject", folderInstanceId, true)) return true; if (folderAsset) EditorGUIUtility.PingObject(folderAsset); + return false; + } static bool TryInvoke(object target, string methodName, params object[] parameters) diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 7171be53..6d89d60e 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -294,7 +294,99 @@ PlayerSettings: AndroidReportGooglePlayAppDependencies: 1 androidSymbolsSizeThreshold: 800 m_BuildTargetIcons: [] - m_BuildTargetPlatformIcons: [] + m_BuildTargetPlatformIcons: + - m_BuildTarget: Android + m_Icons: + - m_Textures: [] + m_Width: 432 + m_Height: 432 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 324 + m_Height: 324 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 216 + m_Height: 216 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 162 + m_Height: 162 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 108 + m_Height: 108 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 81 + m_Height: 81 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 0 + m_SubKind: m_BuildTargetBatching: [] m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: [] @@ -584,7 +676,24 @@ PlayerSettings: webWasm2023: 0 webEnableSubmoduleStrippingCompatibility: 0 scriptingDefineSymbols: - Standalone: FUSION_WEAVER;FUSION2;FUSION_2;FUSION_2_0;FUSION_2_0_12;FUSION_2_OR_NEWER;FUSION_2_0_OR_NEWER;FUSION_LOGLEVEL_INFO;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3 + Android: DOTWEEN + EmbeddedLinux: DOTWEEN + GameCoreScarlett: DOTWEEN + GameCoreXboxOne: DOTWEEN + Kepler: DOTWEEN + LinuxHeadlessSimulation: DOTWEEN + Nintendo Switch: DOTWEEN + Nintendo Switch 2: DOTWEEN + PS4: DOTWEEN + PS5: DOTWEEN + QNX: DOTWEEN + Standalone: FUSION_WEAVER;FUSION2;FUSION_2;FUSION_2_0;FUSION_2_0_12;FUSION_2_OR_NEWER;FUSION_2_0_OR_NEWER;FUSION_LOGLEVEL_INFO;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;INVECTOR_MELEE;INVECTOR_SHOOTER;INVECTOR_BASIC;FIRST_PERSON_CONTROLLER;THIRD_PERSON_CONTROLLER;ULTIMATE_CHARACTER_CONTROLLER_SHOOTER;FIRST_PERSON_SHOOTER;ULTIMATE_CHARACTER_CONTROLLER_MELEE;FIRST_PERSON_MELEE;ULTIMATE_CHARACTER_CONTROLLER_UNIVERSALRP;DOTWEEN + VisionOS: DOTWEEN + WebGL: DOTWEEN + Windows Store Apps: DOTWEEN + XboxOne: DOTWEEN + iPhone: DOTWEEN + tvOS: DOTWEEN additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {}