UPdate
This commit is contained in:
18
.idea/.idea.BABA_YAGA/.idea/workspace.xml
generated
18
.idea/.idea.BABA_YAGA/.idea/workspace.xml
generated
@@ -6,14 +6,16 @@
|
||||
<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/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/Opsive/UltimateCharacterController/Demo/Materials/Scene/Black.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Black.mat" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Blue.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Blue.mat" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/BlueEmissive.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/BlueEmissive.mat" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Exterior/ExteriorDarkGrid.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Exterior/ExteriorDarkGrid.mat" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/FastTimeOrbInner.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/FastTimeOrbInner.mat" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/FastTimeOrbOuter.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/FastTimeOrbOuter.mat" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/SlowTimeOrbInner.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/SlowTimeOrbInner.mat" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/SlowTimeOrbOuter.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/SlowTimeOrbOuter.mat" 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$/Assets/Third Parties/vTabs/VTabs.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/vTabs/VTabs.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" />
|
||||
@@ -119,7 +121,7 @@
|
||||
<workItem from="1781015858277" duration="4448000" />
|
||||
<workItem from="1781181289365" duration="2651000" />
|
||||
<workItem from="1781412609976" duration="4823000" />
|
||||
<workItem from="1781599612251" duration="4025000" />
|
||||
<workItem from="1781599612251" duration="8140000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
|
||||
@@ -119,7 +119,7 @@ Material:
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _BaseColor: {r: 0.11764703, g: 0.11764703, b: 0.11764703, a: 1}
|
||||
- _Color: {r: 0.117646985, g: 0.117646985, b: 0.117646985, a: 1}
|
||||
- _Color: {r: 0.11764703, g: 0.11764703, b: 0.11764703, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
||||
@@ -120,7 +120,7 @@ Material:
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _BaseColor: {r: 0.18101206, g: 0.61652833, b: 0.7941176, a: 1}
|
||||
- _Color: {r: 0.18101203, g: 0.61652833, b: 0.7941176, a: 1}
|
||||
- _Color: {r: 0.18101206, g: 0.61652833, b: 0.7941176, a: 1}
|
||||
- _EmissionColor: {r: 0.05693069, g: 0.1943069, b: 0.25, a: 1}
|
||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
||||
@@ -133,7 +133,7 @@ Material:
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _BaseColor: {r: 0, g: 0.26590908, b: 0.5735295, a: 1}
|
||||
- _Color: {r: 0, g: 0.26590905, b: 0.5735295, a: 1}
|
||||
- _Color: {r: 0, g: 0.26590908, b: 0.5735295, a: 1}
|
||||
- _EmissionColor: {r: 0.585611, g: 1.1171656, b: 1.7207954, a: 1}
|
||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
||||
@@ -120,7 +120,7 @@ Material:
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _BaseColor: {r: 0.08490568, g: 0.08490568, b: 0.08490568, a: 1}
|
||||
- _Color: {r: 0.08490565, g: 0.08490565, b: 0.08490565, a: 1}
|
||||
- _Color: {r: 0.08490568, g: 0.08490568, b: 0.08490568, a: 1}
|
||||
- _EmissionColor: {r: 0.63061863, g: 0.94044524, b: 1.6181911, a: 1}
|
||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
||||
@@ -133,7 +133,7 @@ Material:
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _BaseColor: {r: 0, g: 1, b: 0.090196066, a: 0.36078432}
|
||||
- _Color: {r: 0, g: 1, b: 0.09019602, a: 0.36078432}
|
||||
- _Color: {r: 0, g: 1, b: 0.090196066, a: 0.36078432}
|
||||
- _EmissionColor: {r: 0, g: 1, b: 0.09019608, a: 1}
|
||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
||||
@@ -125,7 +125,7 @@ Material:
|
||||
- _ZWrite: 0
|
||||
m_Colors:
|
||||
- _BaseColor: {r: 0, g: 1, b: 0.089654915, a: 0.359}
|
||||
- _Color: {r: 0, g: 1, b: 0.089654885, a: 0.359}
|
||||
- _Color: {r: 0, g: 1, b: 0.089654915, a: 0.359}
|
||||
- _EmissionColor: {r: 0.315, g: 0.315, b: 0.315, a: 1}
|
||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
||||
@@ -133,7 +133,7 @@ Material:
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _BaseColor: {r: 1, g: 0.17647055, b: 0.17647055, a: 0.36078432}
|
||||
- _Color: {r: 1, g: 0.17647052, b: 0.17647052, a: 0.36078432}
|
||||
- _Color: {r: 1, g: 0.17647055, b: 0.17647055, a: 0.36078432}
|
||||
- _EmissionColor: {r: 1, g: 0.1764706, b: 0.1764706, a: 1}
|
||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
||||
@@ -125,7 +125,7 @@ Material:
|
||||
- _ZWrite: 0
|
||||
m_Colors:
|
||||
- _BaseColor: {r: 1, g: 0.17647055, b: 0.17647055, a: 0.359}
|
||||
- _Color: {r: 1, g: 0.17647052, b: 0.17647052, a: 0.359}
|
||||
- _Color: {r: 1, g: 0.17647055, b: 0.17647055, a: 0.359}
|
||||
- _EmissionColor: {r: 0.315, g: 0.315, b: 0.315, a: 1}
|
||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
||||
@@ -309,8 +309,7 @@ namespace VFavorites
|
||||
}
|
||||
void crossButton()
|
||||
{
|
||||
if (!rowRect.IsHovered()) return;
|
||||
if (draggingItem) return;
|
||||
if (!rowRect.IsHovered()) return; if (draggingItem) return;
|
||||
// if (mousePresesdOnItem) return; // idk
|
||||
|
||||
var buttonRect = rowRect.SetWidthFromRight(0).MoveX(-crossButtonOffsetFromRight).SetWidthFromMid(crossButtonSize);
|
||||
@@ -883,7 +882,8 @@ namespace VFavorites
|
||||
|
||||
|
||||
if (isWrappedBrowserLocked)
|
||||
if (!totalRect_browserSpace.IsHovered() && !animatingDroppedItem && !animatingPageScroll) return;
|
||||
if (EditorApplication.timeSinceStartup - lastLockToggleTime > 1)
|
||||
if (!wrappedBrowser.position.SetPos(0, 0).IsHovered() && !animatingDroppedItem && !animatingPageScroll) return;
|
||||
|
||||
wrappedBrowser.Repaint();
|
||||
|
||||
@@ -1845,6 +1845,11 @@ namespace VFavorites
|
||||
EditorPrefs.SetInt("vFavorites-lockedBrowserHash", lockedBrowser.GetHashCode());
|
||||
EditorPrefs.SetInt("vFavorites-lockedBrowserDockAreaInstanceId", lockedBrowser.GetMemberValue<Object>("m_Parent").GetInstanceID());
|
||||
|
||||
lastLockToggleTime = EditorApplication.timeSinceStartup;
|
||||
|
||||
wrappedBrowser.Repaint();
|
||||
allBrowsers.ForEach(r => r.Repaint());
|
||||
|
||||
curEvent.Use();
|
||||
|
||||
}
|
||||
@@ -1853,12 +1858,18 @@ namespace VFavorites
|
||||
if (!lockedBrowser) return;
|
||||
if (lockedBrowser.GetMemberValue<bool>("isLocked")) return;
|
||||
|
||||
var b = lockedBrowser;
|
||||
|
||||
lockedBrowser = null;
|
||||
|
||||
EditorPrefs.SetInt("vFavorites-lockedBrowserHash", 0);
|
||||
EditorPrefs.SetInt("vFavorites-lockedBrowserDockAreaInstanceId", 0);
|
||||
|
||||
lastLockToggleTime = EditorApplication.timeSinceStartup;
|
||||
|
||||
if (b) b.Repaint();
|
||||
allBrowsers.ForEach(r => r.Repaint());
|
||||
|
||||
curEvent.Use();
|
||||
|
||||
}
|
||||
@@ -1954,6 +1965,7 @@ namespace VFavorites
|
||||
|
||||
static bool CanBrowserBeWrapped_byVTabs(EditorWindow browser) => !IsMarkedAsLocked(browser);
|
||||
|
||||
static double lastLockToggleTime;
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -927,11 +927,13 @@ namespace VTabs
|
||||
if (isWrapped)
|
||||
RestoreDefaultBrowserGUI(browser);
|
||||
|
||||
/*
|
||||
if (browser.GetPropertyValue<bool>("isLocked", exceptionIfNotFound: false))
|
||||
{
|
||||
browser.SetPropertyValue("isLocked", false, exceptionIfNotFound: false);
|
||||
UpdateBrowserTitle(browser);
|
||||
}
|
||||
*/
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
"com.unity.ugui": "2.0.0",
|
||||
"com.unity.visualeffectgraph": "17.3.0",
|
||||
"com.unity.visualscripting": "1.9.9",
|
||||
"com.wooshii.foldericons": "https://github.com/WooshiiDev/Unity-Folder-Icons.git",
|
||||
"com.unity.modules.accessibility": "1.0.0",
|
||||
"com.unity.modules.adaptiveperformance": "1.0.0",
|
||||
"com.unity.modules.ai": "1.0.0",
|
||||
|
||||
@@ -273,6 +273,13 @@
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.wooshii.foldericons": {
|
||||
"version": "https://github.com/WooshiiDev/Unity-Folder-Icons.git",
|
||||
"depth": 0,
|
||||
"source": "git",
|
||||
"dependencies": {},
|
||||
"hash": "201a18f355d3e9bc49b337e7c93423743ab42b2f"
|
||||
},
|
||||
"com.unity.modules.accessibility": {
|
||||
"version": "1.0.0",
|
||||
"depth": 0,
|
||||
|
||||
@@ -791,11 +791,11 @@ PlayerSettings:
|
||||
captureStartupLogs: {}
|
||||
activeInputHandler: 2
|
||||
windowsGamepadBackendHint: 0
|
||||
cloudProjectId:
|
||||
cloudProjectId: f26666dc-3d28-4cad-b5dd-83af9e105972
|
||||
framebufferDepthMemorylessMode: 0
|
||||
qualitySettingsNames: []
|
||||
projectName:
|
||||
organizationId:
|
||||
projectName: HALLUCINATE
|
||||
organizationId: scov3
|
||||
cloudEnabled: 0
|
||||
legacyClampBlendShapeWeights: 0
|
||||
hmiLoadingImage: {fileID: 0}
|
||||
|
||||
Reference in New Issue
Block a user