From ded71235e9882e19f23c04fbb6a7cd9e8f852c02 Mon Sep 17 00:00:00 2001 From: Nam Tae Gun Date: Tue, 6 Aug 2024 10:24:08 +0900 Subject: [PATCH] =?UTF-8?q?6000.0.13f1=20=EB=B2=84=EC=A0=84=20=EC=97=85?= =?UTF-8?q?=EA=B7=B8=EB=A0=88=EC=9D=B4=EB=93=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/04.Materials/Characters/Gemstone.mat | 1 + .../04.Materials/TransparentReceiveShadow.mat | 1 + .../Tasks/Unity/Rigidbody2D/GetAngularDrag.cs | 2 +- .../Tasks/Unity/Rigidbody2D/GetDrag.cs | 2 +- .../Tasks/Unity/Rigidbody2D/GetVelocity.cs | 2 +- .../Tasks/Unity/Rigidbody2D/SetAngularDrag.cs | 2 +- .../Tasks/Unity/Rigidbody2D/SetDrag.cs | 2 +- .../Tasks/Unity/Rigidbody2D/SetVelocity.cs | 2 +- Assets/DefaultVolumeProfile.asset | 3 ++ .../New Input System/DemoInputControls.cs | 2 +- ...niversalRenderPipelineGlobalSettings.asset | 15 ++----- Packages/manifest.json | 6 +-- Packages/packages-lock.json | 40 +++++++++---------- ProjectSettings/BurstAotSettings_Android.json | 17 ++++++++ .../BurstAotSettings_WSAPlayer.json | 18 +++++++++ ProjectSettings/ProjectSettings.asset | 4 +- ProjectSettings/ProjectVersion.txt | 4 +- 17 files changed, 78 insertions(+), 45 deletions(-) create mode 100644 ProjectSettings/BurstAotSettings_Android.json create mode 100644 ProjectSettings/BurstAotSettings_WSAPlayer.json diff --git a/Assets/04.Materials/Characters/Gemstone.mat b/Assets/04.Materials/Characters/Gemstone.mat index e094c45c8..febd18aaf 100644 --- a/Assets/04.Materials/Characters/Gemstone.mat +++ b/Assets/04.Materials/Characters/Gemstone.mat @@ -40,6 +40,7 @@ Material: disabledShaderPasses: - MOTIONVECTORS - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 diff --git a/Assets/04.Materials/TransparentReceiveShadow.mat b/Assets/04.Materials/TransparentReceiveShadow.mat index 985b7df60..6c8fa1623 100644 --- a/Assets/04.Materials/TransparentReceiveShadow.mat +++ b/Assets/04.Materials/TransparentReceiveShadow.mat @@ -39,6 +39,7 @@ Material: disabledShaderPasses: - MOTIONVECTORS - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 diff --git a/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/GetAngularDrag.cs b/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/GetAngularDrag.cs index a3c812f56..54f6152a6 100644 --- a/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/GetAngularDrag.cs +++ b/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/GetAngularDrag.cs @@ -31,7 +31,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Unity.UnityRigidbody2D return TaskStatus.Failure; } - storeValue.Value = rigidbody2D.angularDrag; + storeValue.Value = rigidbody2D.angularDamping; return TaskStatus.Success; } diff --git a/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/GetDrag.cs b/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/GetDrag.cs index 6cd09404c..1fc1b85aa 100644 --- a/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/GetDrag.cs +++ b/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/GetDrag.cs @@ -31,7 +31,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Unity.UnityRigidbody2D return TaskStatus.Failure; } - storeValue.Value = rigidbody2D.drag; + storeValue.Value = rigidbody2D.linearDamping; return TaskStatus.Success; } diff --git a/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/GetVelocity.cs b/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/GetVelocity.cs index 98b6b4eef..dbf848fe2 100644 --- a/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/GetVelocity.cs +++ b/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/GetVelocity.cs @@ -31,7 +31,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Unity.UnityRigidbody2D return TaskStatus.Failure; } - storeValue.Value = rigidbody2D.velocity; + storeValue.Value = rigidbody2D.linearVelocity; return TaskStatus.Success; } diff --git a/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/SetAngularDrag.cs b/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/SetAngularDrag.cs index 1df126b0a..c75a8c618 100644 --- a/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/SetAngularDrag.cs +++ b/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/SetAngularDrag.cs @@ -30,7 +30,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Unity.UnityRigidbody2D return TaskStatus.Failure; } - rigidbody2D.angularDrag = angularDrag.Value; + rigidbody2D.angularDamping = angularDrag.Value; return TaskStatus.Success; } diff --git a/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/SetDrag.cs b/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/SetDrag.cs index 77b462e97..9cfc72f06 100644 --- a/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/SetDrag.cs +++ b/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/SetDrag.cs @@ -30,7 +30,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Unity.UnityRigidbody2D return TaskStatus.Failure; } - rigidbody2D.drag = drag.Value; + rigidbody2D.linearDamping = drag.Value; return TaskStatus.Success; } diff --git a/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/SetVelocity.cs b/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/SetVelocity.cs index 7ea019c24..05c909508 100644 --- a/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/SetVelocity.cs +++ b/Assets/Behavior Designer/Runtime/Tasks/Unity/Rigidbody2D/SetVelocity.cs @@ -30,7 +30,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Unity.UnityRigidbody2D return TaskStatus.Failure; } - rigidbody2D.velocity = velocity.Value; + rigidbody2D.linearVelocity = velocity.Value; return TaskStatus.Success; } diff --git a/Assets/DefaultVolumeProfile.asset b/Assets/DefaultVolumeProfile.asset index d79dffee4..933d9b2ef 100644 --- a/Assets/DefaultVolumeProfile.asset +++ b/Assets/DefaultVolumeProfile.asset @@ -110,6 +110,9 @@ MonoBehaviour: skyOcclusionIntensityMultiplier: m_OverrideState: 1 m_Value: 1 + worldOffset: + m_OverrideState: 1 + m_Value: {x: 0, y: 0, z: 0} --- !u!114 &-2167246269889133030 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Scenes/New Input System/DemoInputControls.cs b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Scenes/New Input System/DemoInputControls.cs index 7013a015b..4aeaea9f2 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Scenes/New Input System/DemoInputControls.cs +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Scenes/New Input System/DemoInputControls.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator -// version 1.8.2 +// version 1.9.0 // from Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Scenes/New Input System/DemoInputControls.inputactions // // Changes to this file may cause incorrect behavior and will be lost if diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset index c59e5b4d5..1d55ed457 100644 --- a/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -55,18 +55,7 @@ MonoBehaviour: - rid: 5032277253446697262 - rid: 7789285205019197459 m_RuntimeSettings: - m_List: - - rid: 5032277253446697243 - - rid: 5032277253446697244 - - rid: 5032277253446697245 - - rid: 5032277253446697247 - - rid: 5032277253446697248 - - rid: 5032277253446697251 - - rid: 5032277253446697253 - - rid: 5032277253446697255 - - rid: 5032277253446697258 - - rid: 5032277253446697259 - - rid: 5032277253446697262 + m_List: [] m_AssetVersion: 8 m_ObsoleteDefaultVolumeProfile: {fileID: 0} m_RenderingLayerNames: @@ -100,6 +89,7 @@ MonoBehaviour: 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: 5032277253446697245 type: {class: UniversalRendererResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: @@ -170,6 +160,7 @@ MonoBehaviour: 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_DefaultCustomMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} diff --git a/Packages/manifest.json b/Packages/manifest.json index b91ad63d8..44a4fa494 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -8,15 +8,15 @@ "com.esotericsoftware.spine.urp-shaders": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-unity/Modules/com.esotericsoftware.spine.urp-shaders#4.2", "com.github-glitchenzo.nugetforunity": "https://github.com/GlitchEnzo/NuGetForUnity.git?path=/src/NuGetForUnity", "com.unity.cinemachine": "3.1.0", - "com.unity.collab-proxy": "2.3.1", + "com.unity.collab-proxy": "2.4.4", "com.unity.feature.2d": "2.0.1", "com.unity.feature.development": "1.0.2", "com.unity.feature.worldbuilding": "1.0.1", - "com.unity.inputsystem": "1.8.2", + "com.unity.inputsystem": "1.9.0", "com.unity.nuget.newtonsoft-json": "3.2.1", "com.unity.recorder": "5.1.1", "com.unity.render-pipelines.universal": "17.0.3", - "com.unity.timeline": "1.8.6", + "com.unity.timeline": "1.8.7", "com.unity.ugui": "2.0.0", "com.unity.uiextensions": "https://github.com/Unity-UI-Extensions/com.unity.uiextensions.git", "com.unity.visualeffectgraph": "17.0.3", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index a49ae4f28..d153c1372 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -51,7 +51,7 @@ "depth": 0, "source": "git", "dependencies": {}, - "hash": "c79f89b1eb0fcacaab3b3ff9b10f4338699d8152" + "hash": "bc15c4566e780bbf7c801dfa8e43104dbedbe00b" }, "com.esotericsoftware.spine.spine-unity": { "version": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-unity/Assets/Spine#4.2", @@ -60,7 +60,7 @@ "dependencies": { "com.esotericsoftware.spine.spine-csharp": "4.2.0" }, - "hash": "c79f89b1eb0fcacaab3b3ff9b10f4338699d8152" + "hash": "bc15c4566e780bbf7c801dfa8e43104dbedbe00b" }, "com.esotericsoftware.spine.spine-unity-examples": { "version": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-unity/Assets/Spine Examples#4.2", @@ -79,7 +79,7 @@ "com.unity.timeline": "1.2.10", "com.esotericsoftware.spine.spine-unity": "4.2.13" }, - "hash": "82cb7f5cad3e33b11094a7f52c8fdfa70c7c1787" + "hash": "bc15c4566e780bbf7c801dfa8e43104dbedbe00b" }, "com.esotericsoftware.spine.urp-shaders": { "version": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-unity/Modules/com.esotericsoftware.spine.urp-shaders#4.2", @@ -88,7 +88,7 @@ "dependencies": { "com.unity.render-pipelines.universal": "7.1.5" }, - "hash": "c79f89b1eb0fcacaab3b3ff9b10f4338699d8152" + "hash": "bc15c4566e780bbf7c801dfa8e43104dbedbe00b" }, "com.github-glitchenzo.nugetforunity": { "version": "https://github.com/GlitchEnzo/NuGetForUnity.git?path=/src/NuGetForUnity", @@ -107,7 +107,7 @@ } }, "com.unity.2d.animation": { - "version": "10.1.1", + "version": "10.1.2", "depth": 1, "source": "registry", "dependencies": { @@ -132,7 +132,7 @@ "url": "https://packages.unity.com" }, "com.unity.2d.common": { - "version": "9.0.4", + "version": "9.0.5", "depth": 2, "source": "registry", "dependencies": { @@ -168,12 +168,12 @@ "dependencies": {} }, "com.unity.2d.spriteshape": { - "version": "10.0.4", + "version": "10.0.6", "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.1.0", - "com.unity.2d.common": "9.0.4", + "com.unity.2d.common": "9.0.5", "com.unity.modules.physics2d": "1.0.0" }, "url": "https://packages.unity.com" @@ -209,7 +209,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.15", + "version": "1.8.17", "depth": 1, "source": "registry", "dependencies": { @@ -228,7 +228,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.3.1", + "version": "2.4.4", "depth": 0, "source": "registry", "dependencies": {}, @@ -265,11 +265,11 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.2d.animation": "10.1.1", + "com.unity.2d.animation": "10.1.2", "com.unity.2d.pixel-perfect": "5.0.3", "com.unity.2d.psdimporter": "9.0.3", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "10.0.4", + "com.unity.2d.spriteshape": "10.0.6", "com.unity.2d.tilemap": "1.0.0", "com.unity.2d.tilemap.extras": "4.0.2", "com.unity.2d.aseprite": "1.1.4" @@ -281,7 +281,7 @@ "source": "builtin", "dependencies": { "com.unity.ide.visualstudio": "2.0.22", - "com.unity.ide.rider": "3.0.28", + "com.unity.ide.rider": "3.0.31", "com.unity.editorcoroutines": "1.0.0", "com.unity.performance.profile-analyzer": "1.2.2", "com.unity.test-framework": "1.4.4", @@ -294,7 +294,7 @@ "source": "builtin", "dependencies": { "com.unity.probuilder": "6.0.1", - "com.unity.polybrush": "1.1.6", + "com.unity.polybrush": "1.1.8", "com.unity.formats.fbx": "5.1.1", "com.unity.terrain-tools": "5.1.0" } @@ -310,7 +310,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.28", + "version": "3.0.31", "depth": 1, "source": "registry", "dependencies": { @@ -328,7 +328,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.8.2", + "version": "1.9.0", "depth": 0, "source": "registry", "dependencies": { @@ -365,7 +365,7 @@ "url": "https://packages.unity.com" }, "com.unity.polybrush": { - "version": "1.1.6", + "version": "1.1.8", "depth": 1, "source": "registry", "dependencies": { @@ -408,7 +408,7 @@ "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.0" + "com.unity.rendering.light-transport": "1.0.1" } }, "com.unity.render-pipelines.universal": { @@ -463,7 +463,7 @@ } }, "com.unity.splines": { - "version": "2.6.0", + "version": "2.6.1", "depth": 1, "source": "registry", "dependencies": { @@ -515,7 +515,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.8.6", + "version": "1.8.7", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/BurstAotSettings_Android.json b/ProjectSettings/BurstAotSettings_Android.json new file mode 100644 index 000000000..ce2d8aa9e --- /dev/null +++ b/ProjectSettings/BurstAotSettings_Android.json @@ -0,0 +1,17 @@ +{ + "MonoBehaviour": { + "Version": 4, + "EnableBurstCompilation": true, + "EnableOptimisations": true, + "EnableSafetyChecks": false, + "EnableDebugInAllBuilds": false, + "DebugDataKind": 1, + "EnableArmv9SecurityFeatures": false, + "CpuMinTargetX32": 0, + "CpuMaxTargetX32": 0, + "CpuMinTargetX64": 0, + "CpuMaxTargetX64": 0, + "CpuTargetsArm64": 512, + "OptimizeFor": 0 + } +} diff --git a/ProjectSettings/BurstAotSettings_WSAPlayer.json b/ProjectSettings/BurstAotSettings_WSAPlayer.json new file mode 100644 index 000000000..58cf25f24 --- /dev/null +++ b/ProjectSettings/BurstAotSettings_WSAPlayer.json @@ -0,0 +1,18 @@ +{ + "MonoBehaviour": { + "Version": 4, + "EnableBurstCompilation": true, + "EnableOptimisations": true, + "EnableSafetyChecks": false, + "EnableDebugInAllBuilds": false, + "DebugDataKind": 1, + "EnableArmv9SecurityFeatures": false, + "CpuMinTargetX32": 0, + "CpuMaxTargetX32": 0, + "CpuMinTargetX64": 0, + "CpuMaxTargetX64": 0, + "CpuTargetsX32": 6, + "CpuTargetsX64": 72, + "OptimizeFor": 0 + } +} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 3f90c9e23..dd4721ab1 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -77,8 +77,8 @@ PlayerSettings: androidMinimumWindowHeight: 300 androidFullscreenMode: 1 androidAutoRotationBehavior: 1 - androidApplicationEntry: 2 androidPredictiveBackSupport: 0 + androidApplicationEntry: 2 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -887,3 +887,5 @@ PlayerSettings: platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 insecureHttpOption: 1 + androidVulkanDenyFilterList: [] + androidVulkanAllowFilterList: [] diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 250548d69..a31f2d0d9 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.4f1 -m_EditorVersionWithRevision: 6000.0.4f1 (b5d5d06b038a) +m_EditorVersion: 6000.0.13f1 +m_EditorVersionWithRevision: 6000.0.13f1 (53a692e3fca9)