This commit is contained in:
2026-06-16 16:58:26 +07:00
parent f3963a1fe3
commit 1889f1e032
12 changed files with 149 additions and 78 deletions

View File

@@ -6,11 +6,15 @@
<component name="ChangeListManager">
<list default="true" id="d308d1cb-09fc-4331-ba20-00f7b43d1576" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/.idea.BABA_YAGA/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.BABA_YAGA/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Demo.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Demo.unity" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/AssaultRifle/MuzzleFlash.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/AssaultRifle/MuzzleFlash.mat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/Bullets/BulletDecalWood3.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/Bullets/BulletDecalWood3.mat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Presets/Character/AirborneJumpPreset.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Presets/Character/AirborneJumpPreset.asset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Presets/DemoStateConfiguration.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Presets/DemoStateConfiguration.asset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.XML" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.XML.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Resources/DOTweenSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/DOTweenSettings.asset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/MainMenuController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/MainMenuController.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/SettingsController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/SettingsController.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/vFavorites/VFavorites.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/vFavorites/VFavorites.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ProjectSettings/ProjectSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/ProjectSettings.asset" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -115,7 +119,7 @@
<workItem from="1781015858277" duration="4448000" />
<workItem from="1781181289365" duration="2651000" />
<workItem from="1781412609976" duration="4823000" />
<workItem from="1781599612251" duration="1753000" />
<workItem from="1781599612251" duration="4025000" />
</task>
<servers />
</component>

View File

@@ -1,14 +0,0 @@
<?xml version="1.0"?>
<doc>
<assembly>
<name>DOTweenUpgradeManager</name>
</assembly>
<members>
<member name="T:DG.DOTweenUpgradeManager.Autorun">
<summary>
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
</summary>
</member>
</members>
</doc>

View File

@@ -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

View File

@@ -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

View File

@@ -0,0 +1,3 @@
{
"name": "DOTween.Modules"
}

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 3e6518bd006380c4d8b0cef9e6ea3bce
AssemblyDefinitionImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -50,6 +50,6 @@ MonoBehaviour:
deAudioEnabled: 0
deUnityExtendedEnabled: 0
epoOutlineEnabled: 0
createASMDEF: 0
createASMDEF: 1
showPlayingTweens: 0
showPausedTweens: 0

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -903,10 +903,11 @@ namespace VFavorites
if (browser.GetFieldValue<int>("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<bool>("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)

View File

@@ -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: {}