UI调整
This commit is contained in:
@@ -9,6 +9,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 338648
|
||||
packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems
|
||||
packageVersion: 1.2.4
|
||||
packageVersion: 1.2.5
|
||||
assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/FlexibleBlur Manual.pdf
|
||||
uploadId: 919710
|
||||
uploadId: 923130
|
||||
|
||||
@@ -9,6 +9,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 338648
|
||||
packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems
|
||||
packageVersion: 1.2.4
|
||||
packageVersion: 1.2.5
|
||||
assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Resources/ComputeBlurs.compute
|
||||
uploadId: 919710
|
||||
uploadId: 923130
|
||||
|
||||
@@ -10,6 +10,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 338648
|
||||
packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems
|
||||
packageVersion: 1.2.4
|
||||
packageVersion: 1.2.5
|
||||
assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Resources/FlexibleBlurIncludedShaders.shadervariants
|
||||
uploadId: 919710
|
||||
uploadId: 923130
|
||||
|
||||
@@ -9,6 +9,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 338648
|
||||
packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems
|
||||
packageVersion: 1.2.4
|
||||
packageVersion: 1.2.5
|
||||
assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Resources/VRComputeBlurs.compute
|
||||
uploadId: 919710
|
||||
uploadId: 923130
|
||||
|
||||
@@ -4,6 +4,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 338648
|
||||
packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems
|
||||
packageVersion: 1.2.4
|
||||
packageVersion: 1.2.5
|
||||
assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/BlurAlgorithms.cs
|
||||
uploadId: 919710
|
||||
uploadId: 923130
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 338648
|
||||
packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems
|
||||
packageVersion: 1.2.4
|
||||
packageVersion: 1.2.5
|
||||
assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/BlurPreset.cs
|
||||
uploadId: 919710
|
||||
uploadId: 923130
|
||||
|
||||
@@ -4,6 +4,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 338648
|
||||
packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems
|
||||
packageVersion: 1.2.4
|
||||
packageVersion: 1.2.5
|
||||
assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/BlurReferenceProvider.cs
|
||||
uploadId: 919710
|
||||
uploadId: 923130
|
||||
|
||||
@@ -4,6 +4,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 338648
|
||||
packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems
|
||||
packageVersion: 1.2.4
|
||||
packageVersion: 1.2.5
|
||||
assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/BlurredImage.cs
|
||||
uploadId: 919710
|
||||
uploadId: 923130
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 338648
|
||||
packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems
|
||||
packageVersion: 1.2.4
|
||||
packageVersion: 1.2.5
|
||||
assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/FlexibleBlurFeature.cs
|
||||
uploadId: 919710
|
||||
uploadId: 923130
|
||||
|
||||
@@ -35,7 +35,7 @@ public partial class FlexibleBlurPass
|
||||
|
||||
blurLayerAdddedThisFrame = false;
|
||||
var cameraData = frameData.Get<UniversalCameraData>();
|
||||
if (cameraData.isPreviewCamera)
|
||||
if (cameraData.isPreviewCamera || cameraData.isSceneViewCamera)
|
||||
return;
|
||||
|
||||
var camera = cameraData.camera;
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 338648
|
||||
packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems
|
||||
packageVersion: 1.2.4
|
||||
packageVersion: 1.2.5
|
||||
assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/FlexibleBlurRenderGraph.cs
|
||||
uploadId: 919710
|
||||
uploadId: 923130
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 338648
|
||||
packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems
|
||||
packageVersion: 1.2.4
|
||||
packageVersion: 1.2.5
|
||||
assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/IBlur.cs
|
||||
uploadId: 919710
|
||||
uploadId: 923130
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 338648
|
||||
packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems
|
||||
packageVersion: 1.2.4
|
||||
packageVersion: 1.2.5
|
||||
assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/PooledDictionary.cs
|
||||
uploadId: 919710
|
||||
uploadId: 923130
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 338648
|
||||
packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems
|
||||
packageVersion: 1.2.4
|
||||
packageVersion: 1.2.5
|
||||
assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/UIBlur.cs
|
||||
uploadId: 919710
|
||||
uploadId: 923130
|
||||
|
||||
@@ -169,7 +169,7 @@ public class UIBlurCommon
|
||||
{
|
||||
hasCachedBlur = false;
|
||||
|
||||
if (!PresentInBlurList || prevKey.prevCamera == null || !blurDict.TryGetValue(prevKey, out var blurList))
|
||||
if (!PresentInBlurList || !blurDict.TryGetValue(prevKey, out var blurList))
|
||||
{
|
||||
prevKey = (null, 0);
|
||||
PresentInBlurList = false;
|
||||
@@ -297,7 +297,7 @@ public class UIBlurCommon
|
||||
var key = GetCameraFeatureKey(canvas);
|
||||
var camera = key.camera;
|
||||
|
||||
if (!camera)
|
||||
if (!camera || !canvas || !canvas.isActiveAndEnabled || !rectTransform.gameObject.activeInHierarchy)
|
||||
{
|
||||
RemoveFromBlurList();
|
||||
return;
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 338648
|
||||
packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems
|
||||
packageVersion: 1.2.4
|
||||
packageVersion: 1.2.5
|
||||
assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/UIBlurCommon.cs
|
||||
uploadId: 919710
|
||||
uploadId: 923130
|
||||
|
||||
@@ -11,6 +11,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 338648
|
||||
packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems
|
||||
packageVersion: 1.2.4
|
||||
packageVersion: 1.2.5
|
||||
assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/BlurredImage.shader
|
||||
uploadId: 919710
|
||||
uploadId: 923130
|
||||
|
||||
@@ -11,6 +11,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 338648
|
||||
packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems
|
||||
packageVersion: 1.2.4
|
||||
packageVersion: 1.2.5
|
||||
assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/Blurs.shader
|
||||
uploadId: 919710
|
||||
uploadId: 923130
|
||||
|
||||
@@ -11,6 +11,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 338648
|
||||
packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems
|
||||
packageVersion: 1.2.4
|
||||
packageVersion: 1.2.5
|
||||
assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/FullScreenBlits.shader
|
||||
uploadId: 919710
|
||||
uploadId: 923130
|
||||
|
||||
@@ -11,6 +11,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 338648
|
||||
packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems
|
||||
packageVersion: 1.2.4
|
||||
packageVersion: 1.2.5
|
||||
assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/QuadBlits.shader
|
||||
uploadId: 919710
|
||||
uploadId: 923130
|
||||
|
||||
@@ -11,6 +11,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 338648
|
||||
packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems
|
||||
packageVersion: 1.2.4
|
||||
packageVersion: 1.2.5
|
||||
assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/RegionalBlits.shader
|
||||
uploadId: 919710
|
||||
uploadId: 923130
|
||||
|
||||
Reference in New Issue
Block a user