diff --git a/Assets/AddressableAssetsData/link.xml b/Assets/AddressableAssetsData/link.xml new file mode 100644 index 00000000..7131edb2 --- /dev/null +++ b/Assets/AddressableAssetsData/link.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Assets/AddressableAssetsData/link.xml.meta b/Assets/AddressableAssetsData/link.xml.meta new file mode 100644 index 00000000..09568c28 --- /dev/null +++ b/Assets/AddressableAssetsData/link.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4159b5f02693b614e9328aa0940643ef +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Mat_MapFloor.mat b/Assets/Materials/Mat_MapFloor.mat index 88b039b4..20c02749 100644 --- a/Assets/Materials/Mat_MapFloor.mat +++ b/Assets/Materials/Mat_MapFloor.mat @@ -134,8 +134,8 @@ Material: - _WorkflowMode: 0 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1} - - _Color: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1} + - _BaseColor: {r: 0.254717, g: 0.254717, b: 0.254717, a: 1} + - _Color: {r: 0.254717, g: 0.254717, b: 0.254717, a: 1} - _EmissionColor: {r: 0.24708433, g: 0.24708433, b: 0.24708433, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Models/Sample/Glass_02.mat b/Assets/Models/Sample/Glass_02.mat index 8798676b..a508c531 100644 --- a/Assets/Models/Sample/Glass_02.mat +++ b/Assets/Models/Sample/Glass_02.mat @@ -112,7 +112,7 @@ Material: - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.95 + - _Smoothness: 0.573 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -122,8 +122,8 @@ Material: - _WorkflowMode: 0 - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 0.30588236, g: 0.48235294, b: 0.74509805, a: 1} - - _Color: {r: 0.30588236, g: 0.48235294, b: 0.74509805, a: 1} + - _BaseColor: {r: 0.4056604, g: 0.4056604, b: 0.4056604, a: 1} + - _Color: {r: 0.4056604, g: 0.4056604, b: 0.4056604, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.43529412, g: 0.43529412, b: 0.43529412, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/ProjectSetting/DefaultUniversal Render Pipeline Asset_Renderer.asset b/Assets/ProjectSetting/DefaultUniversal Render Pipeline Asset_Renderer.asset index 409f42d7..f1dcba8e 100644 --- a/Assets/ProjectSetting/DefaultUniversal Render Pipeline Asset_Renderer.asset +++ b/Assets/ProjectSetting/DefaultUniversal Render Pipeline Asset_Renderer.asset @@ -67,5 +67,9 @@ MonoBehaviour: m_Active: 1 settings: renderPassEvent: 500 - outlineThickness: 3 - outlineColor: {r: 0, g: 0, b: 0, a: 1} + outlineThickness: 1 + outlineColor: {r: 0.11320752, g: 0.11320752, b: 0.11320752, a: 1} + layerMask: + serializedVersion: 2 + m_Bits: 1024 + edgeDetectionMaterial: {fileID: 2100000, guid: 1f064310b42f3774c93e76683fe11c3a, type: 2} diff --git a/Assets/ProjectSetting/DefaultUniversalRenderPipelineGlobalSettings.asset b/Assets/ProjectSetting/DefaultUniversalRenderPipelineGlobalSettings.asset index 05549c19..3f15103b 100644 --- a/Assets/ProjectSetting/DefaultUniversalRenderPipelineGlobalSettings.asset +++ b/Assets/ProjectSetting/DefaultUniversalRenderPipelineGlobalSettings.asset @@ -33,28 +33,28 @@ MonoBehaviour: m_Settings: m_SettingsList: m_List: - - rid: 8640070351411478608 - - rid: 8640070351411478609 + - rid: 8640070357602795753 + - rid: 8640070357602795754 - rid: 8640070351411478610 - - rid: 8640070351411478611 + - rid: 8640070357602795755 - rid: 8640070351411478612 - - rid: 8640070351411478613 + - rid: 8640070357602795756 - rid: 8640070351411478614 - rid: 8640070351411478615 - rid: 8640070351411478616 - rid: 8640070351411478617 - - rid: 8640070351411478618 + - rid: 8640070357602795757 - rid: 8640070351411478619 - - rid: 8640070351411478620 + - rid: 8640070357602795758 - rid: 8640070351411478621 - - rid: 8640070351411478622 - - rid: 8640070351411478623 - - rid: 8640070351411478624 + - rid: 8640070357602795759 + - rid: 8640070357602795760 + - rid: 8640070357602795761 - rid: 8640070351411478625 - - rid: 8640070351411478626 - - rid: 8640070351411478627 + - rid: 8640070357602795762 + - rid: 8640070357602795763 - rid: 8640070351411478628 - - rid: 8640070351411478629 + - rid: 8640070357602795764 m_RuntimeSettings: m_List: - rid: 8640070351411478610 @@ -90,57 +90,17 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 8640070351411478608 - type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_DefaultParticleMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} - m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} - m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} - m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} - m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} - - rid: 8640070351411478609 - type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} - m_AutodeskInteractiveTransparent: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, type: 3} - m_AutodeskInteractiveMasked: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3} - m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3} - m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3} - m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3} - m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} - m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} - m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} - rid: 8640070351411478610 type: {class: UniversalRenderPipelineRuntimeXRResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_xrOcclusionMeshPS: {fileID: 4800000, guid: 4431b1f1f743fbf4eb310a967890cbea, type: 3} m_xrMirrorViewPS: {fileID: 4800000, guid: d5a307c014552314b9f560906d708772, type: 3} m_xrMotionVector: {fileID: 4800000, guid: f89aac1e4f84468418fe30e611dff395, type: 3} - - rid: 8640070351411478611 - type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_Version: 0 - m_LightShader: {fileID: 4800000, guid: 3f6c848ca3d7bca4bbe846546ac701a1, type: 3} - m_ProjectedShadowShader: {fileID: 4800000, guid: ce09d4a80b88c5a4eb9768fab4f1ee00, type: 3} - m_SpriteShadowShader: {fileID: 4800000, guid: 44fc62292b65ab04eabcf310e799ccf6, type: 3} - m_SpriteUnshadowShader: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3, type: 3} - m_GeometryShadowShader: {fileID: 4800000, guid: 19349a0f9a7ed4c48a27445bcf92e5e1, type: 3} - m_GeometryUnshadowShader: {fileID: 4800000, guid: 77774d9009bb81447b048c907d4c6273, type: 3} - m_FallOffLookup: {fileID: 2800000, guid: 5688ab254e4c0634f8d6c8e0792331ca, type: 3} - m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} - m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} - m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} - rid: 8640070351411478612 type: {class: RenderGraphSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 m_EnableRenderCompatibilityMode: 0 - - rid: 8640070351411478613 - type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} - rid: 8640070351411478614 type: {class: UniversalRenderPipelineRuntimeTextures, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: @@ -168,13 +128,6 @@ MonoBehaviour: m_DebugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} m_HdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} m_ProbeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959, type: 3} - - rid: 8640070351411478618 - type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_Version: 0 - m_StripUnusedPostProcessingVariants: 0 - m_StripUnusedVariants: 1 - m_StripScreenCoordOverrideVariants: 1 - rid: 8640070351411478619 type: {class: UniversalRendererResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: @@ -183,7 +136,72 @@ MonoBehaviour: m_CameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} m_StencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} m_DBufferClear: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3} - - rid: 8640070351411478620 + - rid: 8640070351411478621 + type: {class: RenderGraphGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_version: 0 + m_EnableCompilationCaching: 1 + m_EnableValidityChecks: 1 + - rid: 8640070351411478625 + type: {class: RenderGraphUtilsResources, ns: UnityEngine.Rendering.RenderGraphModule.Util, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 0 + m_CoreCopyPS: {fileID: 4800000, guid: 12dc59547ea167a4ab435097dd0f9add, type: 3} + - rid: 8640070351411478628 + type: {class: ShaderStrippingSetting, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 0 + m_ExportShaderVariants: 1 + m_ShaderVariantLogLevel: 0 + m_StripRuntimeDebugShaders: 1 + - rid: 8640070357602795753 + type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_DefaultParticleMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} + m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} + m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} + m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} + m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + - rid: 8640070357602795754 + type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} + m_AutodeskInteractiveTransparent: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, type: 3} + m_AutodeskInteractiveMasked: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3} + m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3} + m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3} + m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3} + m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} + m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} + m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} + - rid: 8640070357602795755 + type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_LightShader: {fileID: 4800000, guid: 3f6c848ca3d7bca4bbe846546ac701a1, type: 3} + m_ProjectedShadowShader: {fileID: 4800000, guid: ce09d4a80b88c5a4eb9768fab4f1ee00, type: 3} + m_SpriteShadowShader: {fileID: 4800000, guid: 44fc62292b65ab04eabcf310e799ccf6, type: 3} + m_SpriteUnshadowShader: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3, type: 3} + m_GeometryShadowShader: {fileID: 4800000, guid: 19349a0f9a7ed4c48a27445bcf92e5e1, type: 3} + m_GeometryUnshadowShader: {fileID: 4800000, guid: 77774d9009bb81447b048c907d4c6273, type: 3} + m_FallOffLookup: {fileID: 2800000, guid: 5688ab254e4c0634f8d6c8e0792331ca, type: 3} + m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} + m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} + - rid: 8640070357602795756 + type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} + - rid: 8640070357602795757 + type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_StripUnusedPostProcessingVariants: 0 + m_StripUnusedVariants: 1 + m_StripScreenCoordOverrideVariants: 1 + - rid: 8640070357602795758 type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} data: m_Version: 0 @@ -196,27 +214,21 @@ MonoBehaviour: m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3} m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3} m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3} - - rid: 8640070351411478621 - type: {class: RenderGraphGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} - data: - m_version: 0 - m_EnableCompilationCaching: 1 - m_EnableValidityChecks: 1 - - rid: 8640070351411478622 + - rid: 8640070357602795759 type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3} probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3} probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3} - - rid: 8640070351411478623 + - rid: 8640070357602795760 type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_version: 0 m_IncludeReferencedInScenes: 0 m_IncludeAssetsByLabel: 0 m_LabelToInclude: - - rid: 8640070351411478624 + - rid: 8640070357602795761 type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -229,12 +241,7 @@ MonoBehaviour: skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} - - rid: 8640070351411478625 - type: {class: RenderGraphUtilsResources, ns: UnityEngine.Rendering.RenderGraphModule.Util, asm: Unity.RenderPipelines.Core.Runtime} - data: - m_Version: 0 - m_CoreCopyPS: {fileID: 4800000, guid: 12dc59547ea167a4ab435097dd0f9add, type: 3} - - rid: 8640070351411478626 + - rid: 8640070357602795762 type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -244,19 +251,12 @@ MonoBehaviour: probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} - - rid: 8640070351411478627 + - rid: 8640070357602795763 type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 m_ProbeVolumeDisableStreamingAssets: 0 - - rid: 8640070351411478628 - type: {class: ShaderStrippingSetting, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} - data: - m_Version: 0 - m_ExportShaderVariants: 1 - m_ShaderVariantLogLevel: 0 - m_StripRuntimeDebugShaders: 1 - - rid: 8640070351411478629 + - rid: 8640070357602795764 type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3} diff --git a/Assets/Resources/PerformanceTestRunInfo.json b/Assets/Resources/PerformanceTestRunInfo.json new file mode 100644 index 00000000..01aa933a --- /dev/null +++ b/Assets/Resources/PerformanceTestRunInfo.json @@ -0,0 +1 @@ +{"TestSuite":"","Date":0,"Player":{"Development":false,"ScreenWidth":0,"ScreenHeight":0,"ScreenRefreshRate":0,"Fullscreen":false,"Vsync":0,"AntiAliasing":0,"Batchmode":false,"RenderThreadingMode":"GraphicsJobs","GpuSkinning":true,"Platform":"","ColorSpace":"","AnisotropicFiltering":"","BlendWeights":"","GraphicsApi":"","ScriptingBackend":"IL2CPP","AndroidTargetSdkVersion":"AndroidApiLevelAuto","AndroidBuildSystem":"Gradle","BuildTarget":"StandaloneWindows64","StereoRenderingPath":"MultiPass"},"Hardware":{"OperatingSystem":"","DeviceModel":"","DeviceName":"","ProcessorType":"","ProcessorCount":0,"GraphicsDeviceName":"","SystemMemorySizeMB":0},"Editor":{"Version":"6000.0.34f1","Branch":"6000.0/staging","Changeset":"5ab2d9ed9190","Date":1736176501},"Dependencies":["com.unity.2d.sprite@1.0.0","com.unity.2d.tilemap@1.0.0","com.unity.addressables@2.2.2","com.unity.cinemachine@3.1.2","com.unity.collab-proxy@2.6.0","com.unity.collections@2.5.1","com.unity.feature.development@1.0.2","com.unity.localization@1.5.4","com.unity.multiplayer.center@1.0.0","com.unity.nuget.newtonsoft-json@3.2.1","com.unity.profiling.core@1.0.2","com.unity.render-pipelines.universal@17.0.3","com.unity.timeline@1.8.7","com.unity.ugui@2.0.0","com.unity.modules.accessibility@1.0.0","com.unity.modules.ai@1.0.0","com.unity.modules.androidjni@1.0.0","com.unity.modules.animation@1.0.0","com.unity.modules.assetbundle@1.0.0","com.unity.modules.audio@1.0.0","com.unity.modules.cloth@1.0.0","com.unity.modules.director@1.0.0","com.unity.modules.imageconversion@1.0.0","com.unity.modules.imgui@1.0.0","com.unity.modules.jsonserialize@1.0.0","com.unity.modules.particlesystem@1.0.0","com.unity.modules.physics@1.0.0","com.unity.modules.physics2d@1.0.0","com.unity.modules.screencapture@1.0.0","com.unity.modules.terrain@1.0.0","com.unity.modules.terrainphysics@1.0.0","com.unity.modules.tilemap@1.0.0","com.unity.modules.ui@1.0.0","com.unity.modules.uielements@1.0.0","com.unity.modules.umbra@1.0.0","com.unity.modules.unityanalytics@1.0.0","com.unity.modules.unitywebrequest@1.0.0","com.unity.modules.unitywebrequestassetbundle@1.0.0","com.unity.modules.unitywebrequestaudio@1.0.0","com.unity.modules.unitywebrequesttexture@1.0.0","com.unity.modules.unitywebrequestwww@1.0.0","com.unity.modules.vehicles@1.0.0","com.unity.modules.video@1.0.0","com.unity.modules.vr@1.0.0","com.unity.modules.wind@1.0.0","com.unity.modules.xr@1.0.0","com.tivadar.best.http@3.0.15","com.tivadar.best.mqtt@3.0.4","com.tivadar.best.stomp@1.0.2","com.tivadar.best.websockets@3.0.7","com.unity.burst@1.8.19","com.unity.modules.subsystems@1.0.0","com.unity.modules.hierarchycore@1.0.0","com.unity.render-pipelines.core@17.0.3","com.unity.shadergraph@17.0.3","com.unity.render-pipelines.universal-config@17.0.3","com.unity.ide.visualstudio@2.0.22","com.unity.ide.rider@3.0.31","com.unity.editorcoroutines@1.0.0","com.unity.performance.profile-analyzer@1.2.3","com.unity.test-framework@1.4.5","com.unity.testtools.codecoverage@1.2.6","com.unity.nuget.mono-cecil@1.11.4","com.unity.test-framework.performance@3.0.3","com.unity.splines@2.7.2","com.unity.scriptablebuildpipeline@2.1.4","com.unity.mathematics@1.3.2","com.unity.searcher@4.9.2","com.unity.rendering.light-transport@1.0.1","com.unity.settings-manager@2.0.1","com.unity.ext.nunit@2.0.5"],"Results":[]} \ No newline at end of file diff --git a/Assets/Resources/PerformanceTestRunInfo.json.meta b/Assets/Resources/PerformanceTestRunInfo.json.meta new file mode 100644 index 00000000..afcf86ed --- /dev/null +++ b/Assets/Resources/PerformanceTestRunInfo.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 55dabd84e6f20074c9f6e93989b1d389 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/PerformanceTestRunSettings.json b/Assets/Resources/PerformanceTestRunSettings.json new file mode 100644 index 00000000..49438ae1 --- /dev/null +++ b/Assets/Resources/PerformanceTestRunSettings.json @@ -0,0 +1 @@ +{"MeasurementCount":-1} \ No newline at end of file diff --git a/Assets/Resources/PerformanceTestRunSettings.json.meta b/Assets/Resources/PerformanceTestRunSettings.json.meta new file mode 100644 index 00000000..35e256a5 --- /dev/null +++ b/Assets/Resources/PerformanceTestRunSettings.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 45131d78515c4054e9b29b664dbdff3f +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ExternalAssets/TriLib/TriLibStandaloneFileBrowser/StandaloneFileBrowser/Editor/StandaloneFileBrowserPreprocessor.cs b/Assets/Scripts/ExternalAssets/TriLib/TriLibStandaloneFileBrowser/StandaloneFileBrowser/Editor/StandaloneFileBrowserPreprocessor.cs index 10062603..0927ef8f 100644 --- a/Assets/Scripts/ExternalAssets/TriLib/TriLibStandaloneFileBrowser/StandaloneFileBrowser/Editor/StandaloneFileBrowserPreprocessor.cs +++ b/Assets/Scripts/ExternalAssets/TriLib/TriLibStandaloneFileBrowser/StandaloneFileBrowser/Editor/StandaloneFileBrowserPreprocessor.cs @@ -1,4 +1,5 @@ -using System.Globalization; +#if UNITY_EDITOR +using System.Globalization; using UnityEditor; using UnityEditor.Build; using UnityEditor.Build.Reporting; @@ -39,4 +40,5 @@ namespace TriLibCore.SFB.Editor } } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Assets/Scripts/UVC/ScriptableRenderFeature/EdgeDetection.cs b/Assets/Scripts/UVC/ScriptableRenderFeature/EdgeDetection.cs index ee37e037..ecee6202 100644 --- a/Assets/Scripts/UVC/ScriptableRenderFeature/EdgeDetection.cs +++ b/Assets/Scripts/UVC/ScriptableRenderFeature/EdgeDetection.cs @@ -91,7 +91,8 @@ namespace UVC.Rendering protected override void Dispose(bool disposing) { edgeDetectionPass = null; - CoreUtils.Destroy(edgeDetectionMaterial); + if (edgeDetectionMaterial != null) + GameObject.DestroyImmediate(edgeDetectionMaterial); } } } \ No newline at end of file diff --git a/Assets/Shader/Custom_EdgeDetectionOutline.mat b/Assets/Shader/Custom_EdgeDetectionOutline.mat index a90304c3..063d5543 100644 --- a/Assets/Shader/Custom_EdgeDetectionOutline.mat +++ b/Assets/Shader/Custom_EdgeDetectionOutline.mat @@ -27,6 +27,6 @@ Material: m_Floats: - _OutlineThickness: 1 m_Colors: - - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _OutlineColor: {r: 0.11320752, g: 0.11320752, b: 0.11320752, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 235e4619..a63b1412 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,8 +6,8 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Scenes/pre-0.24.0.unity - guid: e1c09b3e71b9b7742913a7b5e309ec82 + path: Assets/Scenes/0.30.0.unity + guid: 670c979b3a1e1594ea4bb021e7d8a80a m_configObjects: com.unity.addressableassets: {fileID: 11400000, guid: 0e9579a90d161f540a9047e131bc3996, type: 2} com.unity.localization.settings: {fileID: 11400000, guid: d783f8b1535e6be489d55740adbafda0, type: 2}