From ac7b816a50bff0f3e69d5cf3e8e28c8014b25db9 Mon Sep 17 00:00:00 2001 From: Cameron Date: Fri, 24 May 2024 03:04:20 -0700 Subject: [PATCH] update some files --- .../ParallaxLayerInstance.cs | 2 +- .../ParallaxBackgroundSystem/Plans.txt.meta | 3 -- .../ParallaxBackgroundSystem/README.md.meta | 7 +++ Packages/manifest.json | 7 +-- Packages/packages-lock.json | 50 +++++++++++-------- ProjectSettings/PackageManagerSettings.asset | 25 +++------- ProjectSettings/ProjectVersion.txt | 4 +- ProjectSettings/ShaderGraphSettings.asset | 1 + 8 files changed, 51 insertions(+), 48 deletions(-) delete mode 100644 Assets/CamLib/Runtime/ParallaxBackgroundSystem/Plans.txt.meta create mode 100644 Assets/CamLib/Runtime/ParallaxBackgroundSystem/README.md.meta diff --git a/Assets/CamLib/Runtime/ParallaxBackgroundSystem/ParallaxLayerInstance.cs b/Assets/CamLib/Runtime/ParallaxBackgroundSystem/ParallaxLayerInstance.cs index ad6afcd..9ea036d 100644 --- a/Assets/CamLib/Runtime/ParallaxBackgroundSystem/ParallaxLayerInstance.cs +++ b/Assets/CamLib/Runtime/ParallaxBackgroundSystem/ParallaxLayerInstance.cs @@ -41,7 +41,7 @@ public void Start() { Setup(); } - private void Update() + private void LateUpdate() { if (_debugSetupEveryFrame) { diff --git a/Assets/CamLib/Runtime/ParallaxBackgroundSystem/Plans.txt.meta b/Assets/CamLib/Runtime/ParallaxBackgroundSystem/Plans.txt.meta deleted file mode 100644 index 7a8d457..0000000 --- a/Assets/CamLib/Runtime/ParallaxBackgroundSystem/Plans.txt.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 318cd61a20004398b96e91010c15549d -timeCreated: 1667574993 \ No newline at end of file diff --git a/Assets/CamLib/Runtime/ParallaxBackgroundSystem/README.md.meta b/Assets/CamLib/Runtime/ParallaxBackgroundSystem/README.md.meta new file mode 100644 index 0000000..d6427ce --- /dev/null +++ b/Assets/CamLib/Runtime/ParallaxBackgroundSystem/README.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c3e8a32f74063e648b28de7a81973e6f +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index def8eeb..25c6e64 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,9 +2,10 @@ "dependencies": { "com.needle.compilation-visualizer": "1.4.0", "com.unity.2d.sprite": "1.0.0", - "com.unity.ide.rider": "3.0.15", - "com.unity.render-pipelines.universal": "13.1.8", - "com.unity.test-framework": "1.1.31", + "com.unity.ai.navigation": "1.1.5", + "com.unity.ide.rider": "3.0.27", + "com.unity.render-pipelines.universal": "14.0.9", + "com.unity.test-framework": "1.1.33", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 5b9b6b1..7aaf3f5 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -13,8 +13,17 @@ "source": "builtin", "dependencies": {} }, + "com.unity.ai.navigation": { + "version": "1.1.5", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.ai": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.burst": { - "version": "1.7.3", + "version": "1.8.11", "depth": 1, "source": "registry", "dependencies": { @@ -30,7 +39,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.15", + "version": "3.0.27", "depth": 0, "source": "registry", "dependencies": { @@ -46,24 +55,34 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "13.1.8", + "version": "14.0.9", "depth": 1, "source": "builtin", "dependencies": { "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.render-pipelines.universal": { - "version": "13.1.8", + "version": "14.0.9", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", - "com.unity.burst": "1.5.0", - "com.unity.render-pipelines.core": "13.1.8", - "com.unity.shadergraph": "13.1.8" + "com.unity.burst": "1.8.9", + "com.unity.render-pipelines.core": "14.0.9", + "com.unity.shadergraph": "14.0.9", + "com.unity.render-pipelines.universal-config": "14.0.9" + } + }, + "com.unity.render-pipelines.universal-config": { + "version": "14.0.9", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.render-pipelines.core": "14.0.9" } }, "com.unity.searcher": { @@ -74,16 +93,16 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "13.1.8", + "version": "14.0.9", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "13.1.8", + "com.unity.render-pipelines.core": "14.0.9", "com.unity.searcher": "4.9.2" } }, "com.unity.test-framework": { - "version": "1.1.31", + "version": "1.1.33", "depth": 0, "source": "registry", "dependencies": { @@ -234,17 +253,6 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "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.uielementsnative": "1.0.0" - } - }, - "com.unity.modules.uielementsnative": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index f04674c..1cba97b 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -13,10 +13,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_EnablePreReleasePackages: 0 - m_EnablePackageDependencies: 0 m_AdvancedSettingsExpanded: 1 m_ScopedRegistriesSettingsExpanded: 1 m_SeeAllPackageVersions: 0 + m_DismissPreviewPackagesInUse: 0 oneTimeWarningShown: 0 m_Registries: - m_Id: main @@ -25,7 +25,8 @@ MonoBehaviour: m_Scopes: [] m_IsDefault: 1 m_Capabilities: 7 - - m_Id: scoped:package.openupm.com + m_ConfigSource: 0 + - m_Id: scoped:project:package.openupm.com m_Name: package.openupm.com m_Url: https://package.openupm.com m_Scopes: @@ -33,24 +34,12 @@ MonoBehaviour: - com.openupm m_IsDefault: 0 m_Capabilities: 0 + m_ConfigSource: 4 m_UserSelectedRegistryName: package.openupm.com m_UserAddingNewScopedRegistry: 0 m_RegistryInfoDraft: - m_ErrorMessage: - m_Original: - m_Id: scoped:package.openupm.com - m_Name: package.openupm.com - m_Url: https://package.openupm.com - m_Scopes: - - com.needle.compilation-visualizer - - com.openupm - m_IsDefault: 0 - m_Capabilities: 0 m_Modified: 0 - m_Name: package.openupm.com - m_Url: https://package.openupm.com - m_Scopes: - - com.needle.compilation-visualizer - - com.openupm - m_SelectedScopeIndex: 0 + m_ErrorMessage: + m_UserModificationsInstanceId: -834 + m_OriginalInstanceId: -838 m_LoadAssets: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 5fe8827..0ab53b0 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.1.10f1 -m_EditorVersionWithRevision: 2022.1.10f1 (9aa0f82c4f96) +m_EditorVersion: 2022.3.16f1 +m_EditorVersionWithRevision: 2022.3.16f1 (d2c21f0ef2f1) diff --git a/ProjectSettings/ShaderGraphSettings.asset b/ProjectSettings/ShaderGraphSettings.asset index 9b28428..3250b06 100644 --- a/ProjectSettings/ShaderGraphSettings.asset +++ b/ProjectSettings/ShaderGraphSettings.asset @@ -12,5 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: de02f9e1d18f588468e474319d09a723, type: 3} m_Name: m_EditorClassIdentifier: + shaderVariantLimit: 128 customInterpolatorErrorThreshold: 32 customInterpolatorWarningThreshold: 16