From 1889f1e03278f59d6c3058688e640a56fec493c3 Mon Sep 17 00:00:00 2001 From: Scove Date: Tue, 16 Jun 2026 16:58:26 +0700 Subject: [PATCH] update --- .idea/.idea.BABA_YAGA/.idea/workspace.xml | 16 ++- .../DOTween/Editor/DOTweenUpgradeManager.XML | 14 --- .../Editor/DOTweenUpgradeManager.XML.meta | 11 -- .../DOTween/Editor/DOTweenUpgradeManager.dll | Bin 11264 -> 0 bytes .../Editor/DOTweenUpgradeManager.dll.meta | 29 ----- .../DOTween/Modules/DOTween.Modules.asmdef | 3 + .../Modules/DOTween.Modules.asmdef.meta | 7 ++ Assets/Resources/DOTweenSettings.asset | 2 +- Assets/Scripts/UI/MainMenuController.cs | 2 +- Assets/Scripts/UI/SettingsController.cs | 3 +- Assets/Third Parties/vFavorites/VFavorites.cs | 27 +++-- ProjectSettings/ProjectSettings.asset | 113 +++++++++++++++++- 12 files changed, 149 insertions(+), 78 deletions(-) delete mode 100644 Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.XML delete mode 100644 Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.XML.meta delete mode 100644 Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll delete mode 100644 Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll.meta create mode 100644 Assets/Plugins/Demigiant/DOTween/Modules/DOTween.Modules.asmdef create mode 100644 Assets/Plugins/Demigiant/DOTween/Modules/DOTween.Modules.asmdef.meta 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 d8c36d8004beca623e72294a6a2b1c935181edb0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11264 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 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: {}