diff --git a/Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs b/Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs index f8e479e93..e37857f65 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs @@ -4,8 +4,8 @@ namespace UniGLTF public static partial class PackageVersion { public const int MAJOR = 0; - public const int MINOR = 130; - public const int PATCH = 0; - public const string VERSION = "0.130.0"; + public const int MINOR = 129; + public const int PATCH = 2; + public const string VERSION = "0.129.2"; } } diff --git a/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs b/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs index 4f171fad0..ad4c83d70 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs @@ -4,8 +4,8 @@ namespace UniGLTF public static partial class UniGLTFVersion { public const int MAJOR = 2; - public const int MINOR = 66; - public const int PATCH = 0; - public const string VERSION = "2.66.0"; + public const int MINOR = 65; + public const int PATCH = 2; + public const string VERSION = "2.65.2"; } } diff --git a/Assets/UniGLTF/package.json b/Assets/UniGLTF/package.json index 9defb536e..80a7981d0 100644 --- a/Assets/UniGLTF/package.json +++ b/Assets/UniGLTF/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.gltf", - "version": "0.130.0", + "version": "0.129.2", "displayName": "UniGLTF", "description": "GLTF importer and exporter", "unity": "2021.3", diff --git a/Assets/VRM/package.json b/Assets/VRM/package.json index 88868f576..1d95b13c2 100644 --- a/Assets/VRM/package.json +++ b/Assets/VRM/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.univrm", - "version": "0.130.0", + "version": "0.129.2", "displayName": "VRM", "description": "VRM importer", "unity": "2021.3", @@ -14,7 +14,7 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.gltf": "0.130.0", + "com.vrmc.gltf": "0.129.2", "com.unity.ugui": "1.0.0" }, "samples": [ diff --git a/Assets/VRM10/Samples~/VRM10Viewer/FaceCameraTarget.asset b/Assets/VRM10/Samples~/VRM10Viewer/FaceCameraTarget.asset index 4a4a1220c..dc5b55f8e 100644 --- a/Assets/VRM10/Samples~/VRM10Viewer/FaceCameraTarget.asset +++ b/Assets/VRM10/Samples~/VRM10Viewer/FaceCameraTarget.asset @@ -10,8 +10,10 @@ CustomRenderTexture: m_ImageContentsHash: serializedVersion: 2 Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 - serializedVersion: 6 + serializedVersion: 5 m_Width: 300 m_Height: 300 m_AntiAliasing: 1 @@ -22,7 +24,6 @@ CustomRenderTexture: m_GenerateMips: 1 m_SRGB: 0 m_UseDynamicScale: 0 - m_UseDynamicScaleExplicit: 0 m_BindMS: 0 m_EnableCompatibleFormat: 1 m_EnableRandomWrite: 0 diff --git a/Assets/VRM10/package.json b/Assets/VRM10/package.json index 926543518..66644b5bc 100644 --- a/Assets/VRM10/package.json +++ b/Assets/VRM10/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.vrm", - "version": "0.130.0", + "version": "0.129.2", "displayName": "VRM-1.0", "description": "VRM-1.0 importer", "unity": "2021.3", @@ -15,7 +15,7 @@ }, "dependencies": { "com.unity.timeline": "1.7.6", - "com.vrmc.gltf": "0.130.0" + "com.vrmc.gltf": "0.129.2" }, "samples": [ { diff --git a/Assets/VRM10_Samples/VRM10Viewer/FaceCameraTarget.asset b/Assets/VRM10_Samples/VRM10Viewer/FaceCameraTarget.asset index 4a4a1220c..dc5b55f8e 100644 --- a/Assets/VRM10_Samples/VRM10Viewer/FaceCameraTarget.asset +++ b/Assets/VRM10_Samples/VRM10Viewer/FaceCameraTarget.asset @@ -10,8 +10,10 @@ CustomRenderTexture: m_ImageContentsHash: serializedVersion: 2 Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 - serializedVersion: 6 + serializedVersion: 5 m_Width: 300 m_Height: 300 m_AntiAliasing: 1 @@ -22,7 +24,6 @@ CustomRenderTexture: m_GenerateMips: 1 m_SRGB: 0 m_UseDynamicScale: 0 - m_UseDynamicScaleExplicit: 0 m_BindMS: 0 m_EnableCompatibleFormat: 1 m_EnableRandomWrite: 0 diff --git a/Packages/manifest.json b/Packages/manifest.json index 0a1716d0b..39132c32c 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,18 +1,14 @@ { "dependencies": { - "com.unity.ai.navigation": "2.0.7", "com.unity.burst": "1.8.21", "com.unity.cloud.ktx": "3.3.0", - "com.unity.cloud.ktx.webgl-2023": "1.0.1", + "com.unity.cloud.ktx.webgl-2022": "1.0.1", "com.unity.ide.rider": "3.0.36", - "com.unity.ide.visualstudio": "2.0.23", - "com.unity.multiplayer.center": "1.0.0", "com.unity.postprocessing": "3.4.0", "com.unity.render-pipelines.universal": "17.0.4", - "com.unity.test-framework": "1.5.1", + "com.unity.test-framework": "1.1.33", "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", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 76b9f5749..9d23fdef0 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,14 +1,5 @@ { "dependencies": { - "com.unity.ai.navigation": { - "version": "2.0.7", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.modules.ai": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.burst": { "version": "1.8.21", "depth": 0, @@ -28,30 +19,19 @@ }, "url": "https://packages.unity.com" }, - "com.unity.cloud.ktx.webgl-2023": { + "com.unity.cloud.ktx.webgl-2022": { "version": "1.0.1", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.collections": { - "version": "2.5.1", - "depth": 2, - "source": "registry", - "dependencies": { - "com.unity.burst": "1.8.17", - "com.unity.test-framework": "1.4.5", - "com.unity.nuget.mono-cecil": "1.11.4", - "com.unity.test-framework.performance": "3.0.3" - }, - "url": "https://packages.unity.com" - }, "com.unity.ext.nunit": { - "version": "2.0.5", + "version": "1.0.6", "depth": 1, - "source": "builtin", - "dependencies": {} + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" }, "com.unity.ide.rider": { "version": "3.0.36", @@ -62,37 +42,13 @@ }, "url": "https://packages.unity.com" }, - "com.unity.ide.visualstudio": { - "version": "2.0.23", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.test-framework": "1.1.9" - }, - "url": "https://packages.unity.com" - }, "com.unity.mathematics": { - "version": "1.3.2", + "version": "1.2.6", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.multiplayer.center": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.modules.uielements": "1.0.0" - } - }, - "com.unity.nuget.mono-cecil": { - "version": "1.11.4", - "depth": 3, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.postprocessing": { "version": "3.4.0", "depth": 0, @@ -103,18 +59,14 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "17.0.4", + "version": "14.0.11", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.burst": "1.8.20", - "com.unity.mathematics": "1.3.2", - "com.unity.ugui": "2.0.0", - "com.unity.collections": "2.4.3", + "com.unity.ugui": "1.0.0", "com.unity.modules.physics": "1.0.0", "com.unity.modules.terrain": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.rendering.light-transport": "1.0.1" + "com.unity.modules.jsonserialize": "1.0.0" } }, "com.unity.render-pipelines.universal": { @@ -122,61 +74,44 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.0.4", - "com.unity.shadergraph": "17.0.4", - "com.unity.render-pipelines.universal-config": "17.0.3" + "com.unity.mathematics": "1.2.1", + "com.unity.burst": "1.8.9", + "com.unity.render-pipelines.core": "14.0.11", + "com.unity.shadergraph": "14.0.11", + "com.unity.render-pipelines.universal-config": "14.0.9" } }, "com.unity.render-pipelines.universal-config": { - "version": "17.0.3", + "version": "14.0.10", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.0.3" - } - }, - "com.unity.rendering.light-transport": { - "version": "1.0.1", - "depth": 2, - "source": "builtin", - "dependencies": { - "com.unity.collections": "2.2.0", - "com.unity.mathematics": "1.2.4", - "com.unity.modules.terrain": "1.0.0" + "com.unity.render-pipelines.core": "14.0.10" } }, "com.unity.searcher": { - "version": "4.9.3", + "version": "4.9.2", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "17.0.4", + "version": "14.0.11", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.0.4", - "com.unity.searcher": "4.9.3" + "com.unity.render-pipelines.core": "14.0.11", + "com.unity.searcher": "4.9.2" } }, "com.unity.test-framework": { - "version": "1.5.1", + "version": "1.1.33", "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.ext.nunit": "2.0.3", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" - } - }, - "com.unity.test-framework.performance": { - "version": "3.1.0", - "depth": 3, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.33", + "com.unity.ext.nunit": "1.0.6", + "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" @@ -202,12 +137,6 @@ "com.unity.modules.imgui": "1.0.0" } }, - "com.unity.modules.accessibility": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": {} - }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, @@ -255,12 +184,6 @@ "com.unity.modules.animation": "1.0.0" } }, - "com.unity.modules.hierarchycore": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", - "dependencies": {} - }, "com.unity.modules.imageconversion": { "version": "1.0.0", "depth": 0, @@ -349,8 +272,7 @@ "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.hierarchycore": "1.0.0" + "com.unity.modules.jsonserialize": "1.0.0" } }, "com.unity.modules.umbra": { diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index c856329cd..344a766ac 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 16 + serializedVersion: 15 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -63,12 +63,13 @@ GraphicsSettings: m_FogKeepExp: 1 m_FogKeepExp2: 1 m_AlbedoSwatchInfos: [] - m_RenderPipelineGlobalSettingsMap: - UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 46a76356a8d93364bab3c841a0826a14, - type: 2} m_LightsUseLinearIntensity: 1 m_LightsUseColorTemperature: 1 + m_DefaultRenderingLayerMask: 1 m_LogWhenShaderIsCompiled: 0 + m_SRPDefaultSettings: + UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 46a76356a8d93364bab3c841a0826a14, + type: 2} m_LightProbeOutsideHullStrategy: 0 m_CameraRelativeLightCulling: 0 m_CameraRelativeShadowCulling: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 7a12cc2b7..3b8759d92 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.49f1 -m_EditorVersionWithRevision: 6000.0.49f1 (840e0a9776d9) +m_EditorVersion: 2022.3.52f1 +m_EditorVersionWithRevision: 2022.3.52f1 (1120fcb54228) diff --git a/ProjectSettings/ShaderGraphSettings.asset b/ProjectSettings/ShaderGraphSettings.asset index 0beb39ac9..486aaba59 100644 --- a/ProjectSettings/ShaderGraphSettings.asset +++ b/ProjectSettings/ShaderGraphSettings.asset @@ -15,4 +15,3 @@ MonoBehaviour: shaderVariantLimit: 2048 customInterpolatorErrorThreshold: 32 customInterpolatorWarningThreshold: 16 - customHeatmapValues: {fileID: 0} diff --git a/ProjectSettings/URPProjectSettings.asset b/ProjectSettings/URPProjectSettings.asset index 08faf0336..cd7fd8c61 100644 --- a/ProjectSettings/URPProjectSettings.asset +++ b/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 9 + m_LastMaterialVersion: 7