From 50cd4fbcde549f00ac7c15d0a8b8f545c8391ae8 Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Fri, 11 Aug 2023 17:08:28 -0400 Subject: [PATCH 1/5] fix: DynamicAddressablesNetworkPrefabs showing loading status on already spawned prefabs [MTT-6688] (#132) * fix showing loading status on already spawned prefabs * changelog addition --- .../Assets/Scripts/05_API Playground/APIPlayground.cs | 2 +- CHANGELOG.md | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/05_API Playground/APIPlayground.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/05_API Playground/APIPlayground.cs index 5550b8af..f1cc3e08 100644 --- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/05_API Playground/APIPlayground.cs +++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/05_API Playground/APIPlayground.cs @@ -337,7 +337,7 @@ namespace Game.APIPlayground m_InGameUI.ClientLoadedPrefabStatusChanged(client, assetGuid.GetHashCode(), prefab.Result.name, - InGameUI.LoadStatus.Loading); + InGameUI.LoadStatus.Loaded); } return obj; diff --git a/CHANGELOG.md b/CHANGELOG.md index b13f2a30..1a1a13e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,11 @@ -# Change log +# Changelog + +## [unreleased] - yyyy-mm-dd + +### Dynamic Addressables Network Prefabs + +#### Fixed +- Fixed loaded status displayed on UI for synchronous prefab spawns inside 05_API Playground Showcasing All Post-Connection Use-Cases scene (#132) ## [1.3.0] - 2023-07-07 From 96bbf2dabb9d8b0cfc74a4062a5f177d469963dc Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Wed, 20 Sep 2023 14:32:27 -0400 Subject: [PATCH 2/5] feat: Bitesize samples 2022.3.9 LTS & NGO v1.6.0 upgrade [MTT-7247] (#134) * bitesize projects updated to 2022.3.9f1 & NGO v1.6.0 * 2DSpaceShooter URP asset added * readme update and changelog additions * 2DSpaceShooter: spawner script formatted * dependencies update for projects --- .../2DSpaceShooter/Assets/Scripts/Asteroid.cs | 3 +- .../Scripts/RandomPositionPlayerSpawner.cs | 1 - .../2DSpaceShooter/Assets/Scripts/Spawner.cs | 13 ++++-- ...niversalRenderPipelineAsset_Renderer.asset | 2 + Basic/2DSpaceShooter/Packages/manifest.json | 14 +++--- .../Packages/packages-lock.json | 44 +++++++++--------- .../NetcodeForGameObjects.asset | 17 +++++++ .../ProjectSettings/ProjectSettings.asset | 9 +++- .../ProjectSettings/ProjectVersion.txt | 4 +- ...niversalRenderPipelineAsset_Renderer.asset | 1 + Basic/ClientDriven/Packages/manifest.json | 16 +++---- .../ClientDriven/Packages/packages-lock.json | 46 +++++++++---------- .../NetcodeForGameObjects.asset | 17 +++++++ .../ProjectSettings/ProjectVersion.txt | 4 +- .../Packages/manifest.json | 10 ++-- .../Packages/packages-lock.json | 18 ++++---- .../NetcodeForGameObjects.asset | 17 +++++++ .../ProjectSettings/ProjectVersion.txt | 4 +- ...niversalRenderPipelineAsset_Renderer.asset | 2 + Basic/Invaders/Packages/manifest.json | 14 +++--- Basic/Invaders/Packages/packages-lock.json | 46 +++++++++---------- .../NetcodeForGameObjects.asset | 17 +++++++ .../ProjectSettings/ProjectVersion.txt | 4 +- CHANGELOG.md | 25 ++++++++++ README.md | 2 +- 25 files changed, 228 insertions(+), 122 deletions(-) create mode 100644 Basic/2DSpaceShooter/ProjectSettings/NetcodeForGameObjects.asset create mode 100644 Basic/ClientDriven/ProjectSettings/NetcodeForGameObjects.asset create mode 100644 Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/NetcodeForGameObjects.asset create mode 100644 Basic/Invaders/ProjectSettings/NetcodeForGameObjects.asset diff --git a/Basic/2DSpaceShooter/Assets/Scripts/Asteroid.cs b/Basic/2DSpaceShooter/Assets/Scripts/Asteroid.cs index 046ffa02..efcd1d33 100644 --- a/Basic/2DSpaceShooter/Assets/Scripts/Asteroid.cs +++ b/Basic/2DSpaceShooter/Assets/Scripts/Asteroid.cs @@ -24,7 +24,6 @@ public class Asteroid : NetworkBehaviour Assert.IsNotNull(m_ObjectPool, $"{nameof(NetworkObjectPool)} not found in scene. Did you apply the {s_ObjectPoolTag} to the GameObject?"); } - // Use this for initialization void Start() { numAsteroids += 1; @@ -61,7 +60,7 @@ public class Asteroid : NetworkBehaviour var go = m_ObjectPool.GetNetworkObject(asteroidPrefab, transform.position + diff, Quaternion.identity); var asteroid = go.GetComponent(); - asteroid.Size.Value = newSize; + asteroid.Size = new NetworkVariable(newSize); asteroid.asteroidPrefab = asteroidPrefab; go.GetComponent().Spawn(); go.GetComponent().AddForce(diff * 10, ForceMode2D.Impulse); diff --git a/Basic/2DSpaceShooter/Assets/Scripts/RandomPositionPlayerSpawner.cs b/Basic/2DSpaceShooter/Assets/Scripts/RandomPositionPlayerSpawner.cs index 451a7230..d8ff6319 100644 --- a/Basic/2DSpaceShooter/Assets/Scripts/RandomPositionPlayerSpawner.cs +++ b/Basic/2DSpaceShooter/Assets/Scripts/RandomPositionPlayerSpawner.cs @@ -1,5 +1,4 @@ using System; -using System.Collections; using System.Collections.Generic; using Unity.Netcode; using UnityEngine; diff --git a/Basic/2DSpaceShooter/Assets/Scripts/Spawner.cs b/Basic/2DSpaceShooter/Assets/Scripts/Spawner.cs index 0bede215..3d0b1f45 100644 --- a/Basic/2DSpaceShooter/Assets/Scripts/Spawner.cs +++ b/Basic/2DSpaceShooter/Assets/Scripts/Spawner.cs @@ -80,16 +80,19 @@ public class Spawner : MonoBehaviour go.transform.position = new Vector3(Random.Range(-40, 40), Random.Range(-40, 40)); go.transform.localScale = new Vector3(4, 4, 4); - go.GetComponent().Size.Value = 4; + + var asteroid = go.GetComponent(); + asteroid.Size = new NetworkVariable(4); float dx = Random.Range(-40, 40) / 10.0f; float dy = Random.Range(-40, 40) / 10.0f; float dir = Random.Range(-40, 40); go.transform.rotation = Quaternion.Euler(0, 0, dir); - go.GetComponent().angularVelocity = dir; - go.GetComponent().velocity = new Vector2(dx, dy); - go.GetComponent().asteroidPrefab = m_AsteroidPrefab; - go.GetComponent().Spawn( true); // TODO + var rigidbody2D = go.GetComponent(); + rigidbody2D.angularVelocity = dir; + rigidbody2D.velocity = new Vector2(dx, dy); + asteroid.asteroidPrefab = m_AsteroidPrefab; + asteroid.NetworkObject.Spawn(true); } } diff --git a/Basic/2DSpaceShooter/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset b/Basic/2DSpaceShooter/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset index de6be61b..c8aef0b1 100644 --- a/Basic/2DSpaceShooter/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset +++ b/Basic/2DSpaceShooter/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset @@ -39,6 +39,8 @@ MonoBehaviour: type: 3} objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3} + dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, + type: 3} m_AssetVersion: 2 m_OpaqueLayerMask: serializedVersion: 2 diff --git a/Basic/2DSpaceShooter/Packages/manifest.json b/Basic/2DSpaceShooter/Packages/manifest.json index 763b7c95..54d2a650 100644 --- a/Basic/2DSpaceShooter/Packages/manifest.json +++ b/Basic/2DSpaceShooter/Packages/manifest.json @@ -1,18 +1,18 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.ai.navigation": "1.1.3", - "com.unity.collab-proxy": "2.0.4", - "com.unity.ide.rider": "3.0.21", + "com.unity.ai.navigation": "1.1.4", + "com.unity.collab-proxy": "2.0.7", + "com.unity.ide.rider": "3.0.24", "com.unity.ide.visualstudio": "2.0.18", "com.unity.ide.vscode": "1.2.5", - "com.unity.multiplayer.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.2.0", - "com.unity.netcode.gameobjects": "1.4.0", + "com.unity.multiplayer.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.3.0", + "com.unity.netcode.gameobjects": "1.6.0", "com.unity.postprocessing": "3.2.2", - "com.unity.render-pipelines.universal": "14.0.7", + "com.unity.render-pipelines.universal": "14.0.8", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.7.4", + "com.unity.timeline": "1.7.5", "com.unity.ugui": "1.0.0", "com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync#bb3d5067e49e403d8b8ba15c036d313b4dd2c696", "com.unity.modules.ai": "1.0.0", diff --git a/Basic/2DSpaceShooter/Packages/packages-lock.json b/Basic/2DSpaceShooter/Packages/packages-lock.json index a772bd55..bd3d1488 100644 --- a/Basic/2DSpaceShooter/Packages/packages-lock.json +++ b/Basic/2DSpaceShooter/Packages/packages-lock.json @@ -7,7 +7,7 @@ "dependencies": {} }, "com.unity.ai.navigation": { - "version": "1.1.3", + "version": "1.1.4", "depth": 0, "source": "registry", "dependencies": { @@ -16,7 +16,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.4", + "version": "1.8.8", "depth": 1, "source": "registry", "dependencies": { @@ -25,7 +25,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.0.4", + "version": "2.0.7", "depth": 0, "source": "registry", "dependencies": {}, @@ -56,7 +56,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.21", + "version": "3.0.24", "depth": 0, "source": "registry", "dependencies": { @@ -98,16 +98,16 @@ "url": "https://packages.unity.com" }, "com.unity.multiplayer.samples.coop": { - "version": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.2.0", + "version": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.3.0", "depth": 0, "source": "git", "dependencies": { - "com.unity.learn.iet-framework": "1.2.1", + "com.unity.learn.iet-framework": "3.1.3", "com.unity.multiplayer.tools": "1.1.0", - "com.unity.netcode.gameobjects": "1.4.0", - "com.unity.services.relay": "1.0.3" + "com.unity.netcode.gameobjects": "1.6.0", + "com.unity.services.relay": "1.0.5" }, - "hash": "0cd402eaea1969d4e9f894a5bc6c90432e12ab02" + "hash": "a93b8cee21c60b890838405bb629d245cfae30e6" }, "com.unity.multiplayer.tools": { "version": "1.1.0", @@ -123,12 +123,12 @@ "url": "https://packages.unity.com" }, "com.unity.netcode.gameobjects": { - "version": "1.4.0", + "version": "1.6.0", "depth": 0, "source": "registry", "dependencies": { "com.unity.nuget.mono-cecil": "1.10.1", - "com.unity.transport": "1.3.3" + "com.unity.transport": "1.3.4" }, "url": "https://packages.unity.com" }, @@ -163,7 +163,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "14.0.7", + "version": "14.0.8", "depth": 1, "source": "builtin", "dependencies": { @@ -174,14 +174,14 @@ } }, "com.unity.render-pipelines.universal": { - "version": "14.0.7", + "version": "14.0.8", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", "com.unity.burst": "1.8.4", - "com.unity.render-pipelines.core": "14.0.7", - "com.unity.shadergraph": "14.0.7" + "com.unity.render-pipelines.core": "14.0.8", + "com.unity.shadergraph": "14.0.8" } }, "com.unity.searcher": { @@ -192,19 +192,19 @@ "url": "https://packages.unity.com" }, "com.unity.services.authentication": { - "version": "2.5.0", + "version": "2.7.2", "depth": 2, "source": "registry", "dependencies": { "com.unity.nuget.newtonsoft-json": "3.2.1", - "com.unity.services.core": "1.9.0", + "com.unity.services.core": "1.10.1", "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.ugui": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.9.0", + "version": "1.11.0", "depth": 2, "source": "registry", "dependencies": { @@ -215,7 +215,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.qos": { - "version": "1.2.0", + "version": "1.2.1", "depth": 2, "source": "registry", "dependencies": { @@ -253,11 +253,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "14.0.7", + "version": "14.0.8", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "14.0.7", + "com.unity.render-pipelines.core": "14.0.8", "com.unity.searcher": "4.9.2" } }, @@ -282,7 +282,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.7.4", + "version": "1.7.5", "depth": 0, "source": "registry", "dependencies": { diff --git a/Basic/2DSpaceShooter/ProjectSettings/NetcodeForGameObjects.asset b/Basic/2DSpaceShooter/ProjectSettings/NetcodeForGameObjects.asset new file mode 100644 index 00000000..0f6578c3 --- /dev/null +++ b/Basic/2DSpaceShooter/ProjectSettings/NetcodeForGameObjects.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 53 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2727d53a542a4c1aa312905c3a02d807, type: 3} + m_Name: + m_EditorClassIdentifier: + NetworkPrefabsPath: Assets/DefaultNetworkPrefabs.asset + TempNetworkPrefabsPath: Assets/DefaultNetworkPrefabs.asset + GenerateDefaultNetworkPrefabs: 0 diff --git a/Basic/2DSpaceShooter/ProjectSettings/ProjectSettings.asset b/Basic/2DSpaceShooter/ProjectSettings/ProjectSettings.asset index afcf8d72..60e66521 100644 --- a/Basic/2DSpaceShooter/ProjectSettings/ProjectSettings.asset +++ b/Basic/2DSpaceShooter/ProjectSettings/ProjectSettings.asset @@ -86,6 +86,7 @@ PlayerSettings: hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 + dedicatedServerOptimizations: 0 bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 @@ -125,6 +126,7 @@ PlayerSettings: switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 switchNVNGraphicsFirmwareMemory: 32 + switchMaxWorkerMultiple: 8 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 @@ -160,6 +162,7 @@ PlayerSettings: tvOS: com.Company.ProductName buildNumber: Standalone: 0 + VisionOS: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 @@ -184,6 +187,8 @@ PlayerSettings: tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 tvOSTargetOSVersionString: 12.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -231,8 +236,10 @@ PlayerSettings: appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 @@ -817,6 +824,7 @@ PlayerSettings: QNX: UNITY_POST_PROCESSING_STACK_V2 Stadia: UNITY_POST_PROCESSING_STACK_V2 Standalone: UNITY_POST_PROCESSING_STACK_V2 + VisionOS: UNITY_POST_PROCESSING_STACK_V2 WebGL: UNITY_POST_PROCESSING_STACK_V2 Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2 XboxOne: UNITY_POST_PROCESSING_STACK_V2 @@ -845,7 +853,6 @@ PlayerSettings: suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 - selectedPlatform: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 diff --git a/Basic/2DSpaceShooter/ProjectSettings/ProjectVersion.txt b/Basic/2DSpaceShooter/ProjectSettings/ProjectVersion.txt index 56ddb83a..a74c35fc 100644 --- a/Basic/2DSpaceShooter/ProjectSettings/ProjectVersion.txt +++ b/Basic/2DSpaceShooter/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.0f1 -m_EditorVersionWithRevision: 2022.3.0f1 (fb119bb0b476) +m_EditorVersion: 2022.3.9f1 +m_EditorVersionWithRevision: 2022.3.9f1 (ea401c316338) diff --git a/Basic/ClientDriven/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset b/Basic/ClientDriven/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset index 7027c816..430f7def 100644 --- a/Basic/ClientDriven/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset +++ b/Basic/ClientDriven/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset @@ -34,6 +34,7 @@ MonoBehaviour: blitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3} cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3} + dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, type: 3} m_AssetVersion: 2 m_OpaqueLayerMask: serializedVersion: 2 diff --git a/Basic/ClientDriven/Packages/manifest.json b/Basic/ClientDriven/Packages/manifest.json index 0ef51b31..06afe6de 100644 --- a/Basic/ClientDriven/Packages/manifest.json +++ b/Basic/ClientDriven/Packages/manifest.json @@ -1,18 +1,18 @@ { "dependencies": { - "com.unity.ai.navigation": "1.1.3", + "com.unity.ai.navigation": "1.1.4", "com.unity.cinemachine": "2.9.5", - "com.unity.collab-proxy": "2.0.4", - "com.unity.ide.rider": "3.0.21", + "com.unity.collab-proxy": "2.0.7", + "com.unity.ide.rider": "3.0.24", "com.unity.ide.visualstudio": "2.0.18", "com.unity.ide.vscode": "1.2.5", - "com.unity.inputsystem": "1.5.1", - "com.unity.multiplayer.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.2.0", - "com.unity.netcode.gameobjects": "1.4.0", - "com.unity.render-pipelines.universal": "14.0.7", + "com.unity.inputsystem": "1.7.0", + "com.unity.multiplayer.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.3.0", + "com.unity.netcode.gameobjects": "1.6.0", + "com.unity.render-pipelines.universal": "14.0.8", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.7.4", + "com.unity.timeline": "1.7.5", "com.unity.ugui": "1.0.0", "com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync#bb3d5067e49e403d8b8ba15c036d313b4dd2c696", "com.unity.modules.ai": "1.0.0", diff --git a/Basic/ClientDriven/Packages/packages-lock.json b/Basic/ClientDriven/Packages/packages-lock.json index f967a4e6..2834e42b 100644 --- a/Basic/ClientDriven/Packages/packages-lock.json +++ b/Basic/ClientDriven/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.ai.navigation": { - "version": "1.1.3", + "version": "1.1.4", "depth": 0, "source": "registry", "dependencies": { @@ -10,7 +10,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.4", + "version": "1.8.8", "depth": 1, "source": "registry", "dependencies": { @@ -28,7 +28,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.0.4", + "version": "2.0.7", "depth": 0, "source": "registry", "dependencies": {}, @@ -59,7 +59,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.21", + "version": "3.0.24", "depth": 0, "source": "registry", "dependencies": { @@ -84,7 +84,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.5.1", + "version": "1.7.0", "depth": 0, "source": "registry", "dependencies": { @@ -110,16 +110,16 @@ "url": "https://packages.unity.com" }, "com.unity.multiplayer.samples.coop": { - "version": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.2.0", + "version": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.3.0", "depth": 0, "source": "git", "dependencies": { - "com.unity.learn.iet-framework": "1.2.1", + "com.unity.learn.iet-framework": "3.1.3", "com.unity.multiplayer.tools": "1.1.0", - "com.unity.netcode.gameobjects": "1.4.0", - "com.unity.services.relay": "1.0.3" + "com.unity.netcode.gameobjects": "1.6.0", + "com.unity.services.relay": "1.0.5" }, - "hash": "0cd402eaea1969d4e9f894a5bc6c90432e12ab02" + "hash": "a93b8cee21c60b890838405bb629d245cfae30e6" }, "com.unity.multiplayer.tools": { "version": "1.1.0", @@ -135,12 +135,12 @@ "url": "https://packages.unity.com" }, "com.unity.netcode.gameobjects": { - "version": "1.4.0", + "version": "1.6.0", "depth": 0, "source": "registry", "dependencies": { "com.unity.nuget.mono-cecil": "1.10.1", - "com.unity.transport": "1.3.3" + "com.unity.transport": "1.3.4" }, "url": "https://packages.unity.com" }, @@ -166,7 +166,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "14.0.7", + "version": "14.0.8", "depth": 1, "source": "builtin", "dependencies": { @@ -177,14 +177,14 @@ } }, "com.unity.render-pipelines.universal": { - "version": "14.0.7", + "version": "14.0.8", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", "com.unity.burst": "1.8.4", - "com.unity.render-pipelines.core": "14.0.7", - "com.unity.shadergraph": "14.0.7" + "com.unity.render-pipelines.core": "14.0.8", + "com.unity.shadergraph": "14.0.8" } }, "com.unity.searcher": { @@ -195,19 +195,19 @@ "url": "https://packages.unity.com" }, "com.unity.services.authentication": { - "version": "2.5.0", + "version": "2.7.2", "depth": 2, "source": "registry", "dependencies": { "com.unity.nuget.newtonsoft-json": "3.2.1", - "com.unity.services.core": "1.9.0", + "com.unity.services.core": "1.10.1", "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.ugui": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.9.0", + "version": "1.11.0", "depth": 2, "source": "registry", "dependencies": { @@ -218,7 +218,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.qos": { - "version": "1.2.0", + "version": "1.2.1", "depth": 2, "source": "registry", "dependencies": { @@ -256,11 +256,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "14.0.7", + "version": "14.0.8", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "14.0.7", + "com.unity.render-pipelines.core": "14.0.8", "com.unity.searcher": "4.9.2" } }, @@ -285,7 +285,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.7.4", + "version": "1.7.5", "depth": 0, "source": "registry", "dependencies": { diff --git a/Basic/ClientDriven/ProjectSettings/NetcodeForGameObjects.asset b/Basic/ClientDriven/ProjectSettings/NetcodeForGameObjects.asset new file mode 100644 index 00000000..0f6578c3 --- /dev/null +++ b/Basic/ClientDriven/ProjectSettings/NetcodeForGameObjects.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 53 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2727d53a542a4c1aa312905c3a02d807, type: 3} + m_Name: + m_EditorClassIdentifier: + NetworkPrefabsPath: Assets/DefaultNetworkPrefabs.asset + TempNetworkPrefabsPath: Assets/DefaultNetworkPrefabs.asset + GenerateDefaultNetworkPrefabs: 0 diff --git a/Basic/ClientDriven/ProjectSettings/ProjectVersion.txt b/Basic/ClientDriven/ProjectSettings/ProjectVersion.txt index 56ddb83a..a74c35fc 100644 --- a/Basic/ClientDriven/ProjectSettings/ProjectVersion.txt +++ b/Basic/ClientDriven/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.0f1 -m_EditorVersionWithRevision: 2022.3.0f1 (fb119bb0b476) +m_EditorVersion: 2022.3.9f1 +m_EditorVersionWithRevision: 2022.3.9f1 (ea401c316338) diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Packages/manifest.json b/Basic/DynamicAddressablesNetworkPrefabs/Packages/manifest.json index 8d118d3b..90b20468 100644 --- a/Basic/DynamicAddressablesNetworkPrefabs/Packages/manifest.json +++ b/Basic/DynamicAddressablesNetworkPrefabs/Packages/manifest.json @@ -1,12 +1,12 @@ { "dependencies": { - "com.unity.addressables": "1.21.12", - "com.unity.ai.navigation": "1.1.3", - "com.unity.ide.rider": "3.0.21", + "com.unity.addressables": "1.21.15", + "com.unity.ai.navigation": "1.1.4", + "com.unity.ide.rider": "3.0.24", "com.unity.ide.visualstudio": "2.0.18", "com.unity.ide.vscode": "1.2.5", - "com.unity.multiplayer.tools": "1.0.0", - "com.unity.netcode.gameobjects": "1.4.0", + "com.unity.multiplayer.tools": "1.1.1", + "com.unity.netcode.gameobjects": "1.6.0", "com.unity.textmeshpro": "3.0.6", "com.unity.ugui": "1.0.0", "com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync" diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Packages/packages-lock.json b/Basic/DynamicAddressablesNetworkPrefabs/Packages/packages-lock.json index 6dd8d95b..af8ce067 100644 --- a/Basic/DynamicAddressablesNetworkPrefabs/Packages/packages-lock.json +++ b/Basic/DynamicAddressablesNetworkPrefabs/Packages/packages-lock.json @@ -1,11 +1,11 @@ { "dependencies": { "com.unity.addressables": { - "version": "1.21.12", + "version": "1.21.15", "depth": 0, "source": "registry", "dependencies": { - "com.unity.scriptablebuildpipeline": "1.21.5", + "com.unity.scriptablebuildpipeline": "1.21.8", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", @@ -15,7 +15,7 @@ "url": "https://packages.unity.com" }, "com.unity.ai.navigation": { - "version": "1.1.3", + "version": "1.1.4", "depth": 0, "source": "registry", "dependencies": { @@ -24,7 +24,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.4", + "version": "1.8.8", "depth": 2, "source": "registry", "dependencies": { @@ -50,7 +50,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.21", + "version": "3.0.24", "depth": 0, "source": "registry", "dependencies": { @@ -82,7 +82,7 @@ "url": "https://packages.unity.com" }, "com.unity.multiplayer.tools": { - "version": "1.0.0", + "version": "1.1.1", "depth": 0, "source": "registry", "dependencies": { @@ -95,12 +95,12 @@ "url": "https://packages.unity.com" }, "com.unity.netcode.gameobjects": { - "version": "1.4.0", + "version": "1.6.0", "depth": 0, "source": "registry", "dependencies": { "com.unity.nuget.mono-cecil": "1.10.1", - "com.unity.transport": "1.3.3" + "com.unity.transport": "1.3.4" }, "url": "https://packages.unity.com" }, @@ -126,7 +126,7 @@ "url": "https://packages.unity.com" }, "com.unity.scriptablebuildpipeline": { - "version": "1.21.5", + "version": "1.21.8", "depth": 1, "source": "registry", "dependencies": {}, diff --git a/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/NetcodeForGameObjects.asset b/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/NetcodeForGameObjects.asset new file mode 100644 index 00000000..0f6578c3 --- /dev/null +++ b/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/NetcodeForGameObjects.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 53 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2727d53a542a4c1aa312905c3a02d807, type: 3} + m_Name: + m_EditorClassIdentifier: + NetworkPrefabsPath: Assets/DefaultNetworkPrefabs.asset + TempNetworkPrefabsPath: Assets/DefaultNetworkPrefabs.asset + GenerateDefaultNetworkPrefabs: 0 diff --git a/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/ProjectVersion.txt b/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/ProjectVersion.txt index 56ddb83a..a74c35fc 100644 --- a/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/ProjectVersion.txt +++ b/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.0f1 -m_EditorVersionWithRevision: 2022.3.0f1 (fb119bb0b476) +m_EditorVersion: 2022.3.9f1 +m_EditorVersionWithRevision: 2022.3.9f1 (ea401c316338) diff --git a/Basic/Invaders/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset b/Basic/Invaders/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset index c42357a5..eab04c42 100644 --- a/Basic/Invaders/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset +++ b/Basic/Invaders/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset @@ -38,6 +38,8 @@ MonoBehaviour: type: 3} objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3} + dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, + type: 3} m_AssetVersion: 2 m_OpaqueLayerMask: serializedVersion: 2 diff --git a/Basic/Invaders/Packages/manifest.json b/Basic/Invaders/Packages/manifest.json index 8ee961b3..351fe5e6 100644 --- a/Basic/Invaders/Packages/manifest.json +++ b/Basic/Invaders/Packages/manifest.json @@ -1,16 +1,16 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.ai.navigation": "1.1.3", - "com.unity.ide.rider": "3.0.21", + "com.unity.ai.navigation": "1.1.4", + "com.unity.ide.rider": "3.0.24", "com.unity.ide.visualstudio": "2.0.18", "com.unity.ide.vscode": "1.2.5", - "com.unity.multiplayer.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.2.0", - "com.unity.multiplayer.tools": "1.0.0", - "com.unity.netcode.gameobjects": "1.4.0", - "com.unity.render-pipelines.universal": "14.0.7", + "com.unity.multiplayer.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.3.0", + "com.unity.multiplayer.tools": "1.1.1", + "com.unity.netcode.gameobjects": "1.6.0", + "com.unity.render-pipelines.universal": "14.0.8", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.7.4", + "com.unity.timeline": "1.7.5", "com.unity.ugui": "1.0.0", "com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync#bb3d5067e49e403d8b8ba15c036d313b4dd2c696", "com.unity.modules.ai": "1.0.0", diff --git a/Basic/Invaders/Packages/packages-lock.json b/Basic/Invaders/Packages/packages-lock.json index 8f5c699d..d7580a93 100644 --- a/Basic/Invaders/Packages/packages-lock.json +++ b/Basic/Invaders/Packages/packages-lock.json @@ -7,7 +7,7 @@ "dependencies": {} }, "com.unity.ai.navigation": { - "version": "1.1.3", + "version": "1.1.4", "depth": 0, "source": "registry", "dependencies": { @@ -16,7 +16,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.4", + "version": "1.8.8", "depth": 1, "source": "registry", "dependencies": { @@ -49,7 +49,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.21", + "version": "3.0.24", "depth": 0, "source": "registry", "dependencies": { @@ -91,20 +91,20 @@ "url": "https://packages.unity.com" }, "com.unity.multiplayer.samples.coop": { - "version": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.2.0", + "version": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.3.0", "depth": 0, "source": "git", "dependencies": { - "com.unity.learn.iet-framework": "1.2.1", + "com.unity.learn.iet-framework": "3.1.3", "com.unity.multiplayer.tools": "1.1.0", - "com.unity.netcode.gameobjects": "1.4.0", - "com.unity.services.relay": "1.0.3" + "com.unity.netcode.gameobjects": "1.6.0", + "com.unity.services.relay": "1.0.5" }, - "hash": "0cd402eaea1969d4e9f894a5bc6c90432e12ab02" + "hash": "a93b8cee21c60b890838405bb629d245cfae30e6" }, "com.unity.multiplayer.tools": { - "version": "1.1.0", - "depth": 1, + "version": "1.1.1", + "depth": 0, "source": "registry", "dependencies": { "com.unity.profiling.core": "1.0.0-pre.1", @@ -116,12 +116,12 @@ "url": "https://packages.unity.com" }, "com.unity.netcode.gameobjects": { - "version": "1.4.0", + "version": "1.6.0", "depth": 0, "source": "registry", "dependencies": { "com.unity.nuget.mono-cecil": "1.10.1", - "com.unity.transport": "1.3.3" + "com.unity.transport": "1.3.4" }, "url": "https://packages.unity.com" }, @@ -147,7 +147,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "14.0.7", + "version": "14.0.8", "depth": 1, "source": "builtin", "dependencies": { @@ -158,14 +158,14 @@ } }, "com.unity.render-pipelines.universal": { - "version": "14.0.7", + "version": "14.0.8", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", "com.unity.burst": "1.8.4", - "com.unity.render-pipelines.core": "14.0.7", - "com.unity.shadergraph": "14.0.7" + "com.unity.render-pipelines.core": "14.0.8", + "com.unity.shadergraph": "14.0.8" } }, "com.unity.searcher": { @@ -176,19 +176,19 @@ "url": "https://packages.unity.com" }, "com.unity.services.authentication": { - "version": "2.5.0", + "version": "2.7.2", "depth": 2, "source": "registry", "dependencies": { "com.unity.nuget.newtonsoft-json": "3.2.1", - "com.unity.services.core": "1.9.0", + "com.unity.services.core": "1.10.1", "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.ugui": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.9.0", + "version": "1.11.0", "depth": 2, "source": "registry", "dependencies": { @@ -199,7 +199,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.qos": { - "version": "1.2.0", + "version": "1.2.1", "depth": 2, "source": "registry", "dependencies": { @@ -237,11 +237,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "14.0.7", + "version": "14.0.8", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "14.0.7", + "com.unity.render-pipelines.core": "14.0.8", "com.unity.searcher": "4.9.2" } }, @@ -266,7 +266,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.7.4", + "version": "1.7.5", "depth": 0, "source": "registry", "dependencies": { diff --git a/Basic/Invaders/ProjectSettings/NetcodeForGameObjects.asset b/Basic/Invaders/ProjectSettings/NetcodeForGameObjects.asset new file mode 100644 index 00000000..0f6578c3 --- /dev/null +++ b/Basic/Invaders/ProjectSettings/NetcodeForGameObjects.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 53 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2727d53a542a4c1aa312905c3a02d807, type: 3} + m_Name: + m_EditorClassIdentifier: + NetworkPrefabsPath: Assets/DefaultNetworkPrefabs.asset + TempNetworkPrefabsPath: Assets/DefaultNetworkPrefabs.asset + GenerateDefaultNetworkPrefabs: 0 diff --git a/Basic/Invaders/ProjectSettings/ProjectVersion.txt b/Basic/Invaders/ProjectSettings/ProjectVersion.txt index 56ddb83a..a74c35fc 100644 --- a/Basic/Invaders/ProjectSettings/ProjectVersion.txt +++ b/Basic/Invaders/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.0f1 -m_EditorVersionWithRevision: 2022.3.0f1 (fb119bb0b476) +m_EditorVersion: 2022.3.9f1 +m_EditorVersionWithRevision: 2022.3.9f1 (ea401c316338) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a1a13e2..48d72156 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,36 @@ ## [unreleased] - yyyy-mm-dd +### 2D Space Shooter + +#### Changed +- Upgraded to Netcode for GameObjects v1.6.0 (#134) +- Upgraded sample to 2022.3.9f1 LTS (#134) + +#### Fixed +- Fixed warnings when spawning new bullets or asteroids by instantiating a new NetworkVariable pre-spawn (#134) + +### Client Driven + +#### Changed +- Upgraded to Netcode for GameObjects v1.6.0 (#134) +- Upgraded sample to 2022.3.9f1 LTS (#134) + ### Dynamic Addressables Network Prefabs +#### Changed +- Upgraded to Netcode for GameObjects v1.6.0 (#134) +- Upgraded sample to 2022.3.9f1 LTS (#134) + #### Fixed - Fixed loaded status displayed on UI for synchronous prefab spawns inside 05_API Playground Showcasing All Post-Connection Use-Cases scene (#132) +### Invaders + +#### Changed +- Upgraded to Netcode for GameObjects v1.6.0 (#134) +- Upgraded sample to 2022.3.9f1 LTS (#134) + ## [1.3.0] - 2023-07-07 ### Dynamic Addressables Network Prefabs diff --git a/README.md b/README.md index bb4708c5..b384462d 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ # Netcode for GameObjects Bitesize Samples [![UnityVersion](https://img.shields.io/badge/Unity%20Version:-2022.3%20LTS-57b9d3.svg?logo=unity&color=2196F3)](https://unity.com/releases/editor/whats-new/2022.3.0) -[![NetcodeVersion](https://img.shields.io/badge/Netcode%20Version:-1.4.0-57b9d3.svg?logo=unity&color=2196F3)](https://docs-multiplayer.unity3d.com/netcode/current/about) +[![NetcodeVersion](https://img.shields.io/badge/Netcode%20Version:-1.6.0-57b9d3.svg?logo=unity&color=2196F3)](https://docs-multiplayer.unity3d.com/netcode/current/about) [![LatestRelease](https://img.shields.io/badge/Latest%20%20Github%20Release:-v1.3.0-57b9d3.svg?logo=github&color=brightgreen)](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.bitesize/releases/tag/v1.3.0)

From 823f0085087b6225119610a1a04afddaa3ff65fd Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Fri, 22 Sep 2023 15:22:13 -0400 Subject: [PATCH 3/5] fix: listening for NetworkObject parent changes to fix stuck ingredients on disconnects [MTT-7103] (#136) * listening for NetworkObject parent changes to fix stuck ingredients on disconnects * changelog addition --- .../Assets/Prefabs/Ingredient.prefab | 18 ++++++++++++- .../Scripts/ClientObjectWithIngredientType.cs | 17 +++++++----- .../Assets/Scripts/ClientPlayerMove.cs | 2 +- .../Assets/Scripts/ServerIngredientPhysics.cs | 26 +++++++++++++++++++ .../Scripts/ServerIngredientPhysics.cs.meta | 11 ++++++++ .../Assets/Scripts/ServerPlayerMove.cs | 11 ++------ CHANGELOG.md | 3 +++ 7 files changed, 70 insertions(+), 18 deletions(-) create mode 100644 Basic/ClientDriven/Assets/Scripts/ServerIngredientPhysics.cs create mode 100644 Basic/ClientDriven/Assets/Scripts/ServerIngredientPhysics.cs.meta diff --git a/Basic/ClientDriven/Assets/Prefabs/Ingredient.prefab b/Basic/ClientDriven/Assets/Prefabs/Ingredient.prefab index 1d42614b..d36c425b 100644 --- a/Basic/ClientDriven/Assets/Prefabs/Ingredient.prefab +++ b/Basic/ClientDriven/Assets/Prefabs/Ingredient.prefab @@ -16,6 +16,7 @@ GameObject: - component: {fileID: 5818429371130516787} - component: {fileID: 5607146804455042385} - component: {fileID: 2549828380439460752} + - component: {fileID: -5120166168328346616} m_Layer: 6 m_Name: Ingredient m_TagString: Untagged @@ -30,6 +31,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8321201880322001125} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -11.03, y: 1.42, z: 7.558644} m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} @@ -41,7 +43,6 @@ Transform: - {fileID: 2558306008476788773} - {fileID: 7478805024049242977} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &4840591773774142929 SphereCollider: @@ -152,6 +153,7 @@ MonoBehaviour: SynchronizeTransform: 1 ActiveSceneSynchronization: 0 SceneMigrationSynchronization: 1 + SpawnWithObservers: 1 DontDestroyWithOwner: 0 AutoObjectParentSync: 1 --- !u!114 &5607146804455042385 @@ -182,6 +184,20 @@ MonoBehaviour: m_BlueMaterial: {fileID: 2100000, guid: b423dced7a4ac4f40a119b84a23cfc9b, type: 2} m_RedMaterial: {fileID: 2100000, guid: d1a9058ddc5c2461298f65541af6fcd9, type: 2} m_ColorMesh: {fileID: 6206319821543937579} +--- !u!114 &-5120166168328346616 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8321201880322001125} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 18eacd80d71f7c948a562ba85d3618d7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_NetworkTransform: {fileID: 2014424453305718345} + m_Rigidbody: {fileID: 7759258758774188825} --- !u!1001 &2596981318218469326 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Basic/ClientDriven/Assets/Scripts/ClientObjectWithIngredientType.cs b/Basic/ClientDriven/Assets/Scripts/ClientObjectWithIngredientType.cs index 621ac50a..3e97c756 100644 --- a/Basic/ClientDriven/Assets/Scripts/ClientObjectWithIngredientType.cs +++ b/Basic/ClientDriven/Assets/Scripts/ClientObjectWithIngredientType.cs @@ -27,11 +27,19 @@ namespace Unity.Netcode.Samples { base.OnNetworkSpawn(); enabled = IsClient; + + UpdateMaterial(default(IngredientType), m_Server.currentIngredientType.Value); + m_Server.currentIngredientType.OnValueChanged += UpdateMaterial; } - void UpdateMaterial() + public override void OnNetworkDespawn() { - switch (m_Server.currentIngredientType.Value) + m_Server.currentIngredientType.OnValueChanged -= UpdateMaterial; + } + + void UpdateMaterial(IngredientType previousValue, IngredientType newValue) + { + switch (newValue) { case IngredientType.Blue: m_ColorMesh.material = m_BlueMaterial; @@ -44,10 +52,5 @@ namespace Unity.Netcode.Samples break; } } - - protected void Update() - { - UpdateMaterial(); // this is not performant to be called every update, don't do this. - } } } \ No newline at end of file diff --git a/Basic/ClientDriven/Assets/Scripts/ClientPlayerMove.cs b/Basic/ClientDriven/Assets/Scripts/ClientPlayerMove.cs index e8c9706e..2c6430f4 100644 --- a/Basic/ClientDriven/Assets/Scripts/ClientPlayerMove.cs +++ b/Basic/ClientDriven/Assets/Scripts/ClientPlayerMove.cs @@ -41,7 +41,7 @@ public class ClientPlayerMove : NetworkBehaviour // these two components disabled, and will enable a CapsuleCollider. Per the CharacterController documentation: // https://docs.unity3d.com/Manual/CharacterControllers.html, a Character controller can push rigidbody // objects aside while moving but will not be accelerated by incoming collisions. This means that a primitive - // CapusleCollider must instead be used for ghost clients to simulate collisions between owning players and + // CapsuleCollider must instead be used for ghost clients to simulate collisions between owning players and // ghost clients. m_ThirdPersonController.enabled = false; m_CapsuleCollider.enabled = false; diff --git a/Basic/ClientDriven/Assets/Scripts/ServerIngredientPhysics.cs b/Basic/ClientDriven/Assets/Scripts/ServerIngredientPhysics.cs new file mode 100644 index 00000000..866e4ca7 --- /dev/null +++ b/Basic/ClientDriven/Assets/Scripts/ServerIngredientPhysics.cs @@ -0,0 +1,26 @@ +using System; +using Unity.Netcode; +using Unity.Netcode.Components; +using UnityEngine; + +[RequireComponent(typeof(Rigidbody))] +public class ServerIngredientPhysics : NetworkBehaviour +{ + [SerializeField] + NetworkTransform m_NetworkTransform; + + [SerializeField] + Rigidbody m_Rigidbody; + + public override void OnNetworkObjectParentChanged(NetworkObject parentNetworkObject) + { + SetPhysics(parentNetworkObject == null); + } + + void SetPhysics(bool isEnabled) + { + m_Rigidbody.isKinematic = !isEnabled; + m_Rigidbody.interpolation = isEnabled ? RigidbodyInterpolation.Interpolate : RigidbodyInterpolation.None; + m_NetworkTransform.InLocalSpace = !isEnabled; + } +} diff --git a/Basic/ClientDriven/Assets/Scripts/ServerIngredientPhysics.cs.meta b/Basic/ClientDriven/Assets/Scripts/ServerIngredientPhysics.cs.meta new file mode 100644 index 00000000..1cc90ff2 --- /dev/null +++ b/Basic/ClientDriven/Assets/Scripts/ServerIngredientPhysics.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 18eacd80d71f7c948a562ba85d3618d7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Basic/ClientDriven/Assets/Scripts/ServerPlayerMove.cs b/Basic/ClientDriven/Assets/Scripts/ServerPlayerMove.cs index 94d68aba..d145d24f 100644 --- a/Basic/ClientDriven/Assets/Scripts/ServerPlayerMove.cs +++ b/Basic/ClientDriven/Assets/Scripts/ServerPlayerMove.cs @@ -56,14 +56,10 @@ public class ServerPlayerMove : NetworkBehaviour if (objectToPickup.TryGetComponent(out NetworkObject networkObject) && networkObject.TrySetParent(transform)) { - var pickUpObjectRigidbody = objectToPickup.GetComponent(); - pickUpObjectRigidbody.isKinematic = true; - pickUpObjectRigidbody.interpolation = RigidbodyInterpolation.None; - objectToPickup.GetComponent().InLocalSpace = true; + m_PickedUpObject = networkObject; objectToPickup.transform.localPosition = m_LocalHeldPosition; objectToPickup.GetComponent().ingredientDespawned += IngredientDespawned; isObjectPickedUp.Value = true; - m_PickedUpObject = objectToPickup; } } @@ -78,12 +74,9 @@ public class ServerPlayerMove : NetworkBehaviour { if (m_PickedUpObject != null) { + m_PickedUpObject.GetComponent().ingredientDespawned -= IngredientDespawned; // can be null if enter drop zone while carrying m_PickedUpObject.transform.parent = null; - var pickedUpObjectRigidbody = m_PickedUpObject.GetComponent(); - pickedUpObjectRigidbody.isKinematic = false; - pickedUpObjectRigidbody.interpolation = RigidbodyInterpolation.Interpolate; - m_PickedUpObject.GetComponent().InLocalSpace = false; m_PickedUpObject = null; } diff --git a/CHANGELOG.md b/CHANGELOG.md index 48d72156..e964749c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,9 @@ - Upgraded to Netcode for GameObjects v1.6.0 (#134) - Upgraded sample to 2022.3.9f1 LTS (#134) +#### Fixed +- Added a script to handle NetworkObject parent changes on Ingredients to address a bug where Ingredients would not get stuck on client disconnect events (#136) + ### Dynamic Addressables Network Prefabs #### Changed From 0a6030fb88695163b1d7dd6d4cea99d058cfdb71 Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Mon, 25 Sep 2023 10:58:29 -0400 Subject: [PATCH 4/5] feat: adding CODEOWNERS (#135) * adding samples dev team as codeowners --- .github/CODEOWNERS | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 00000000..e635cda3 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,16 @@ + +# Lines starting with '#' are comments. +# Each line is a file pattern followed by one or more owners. + +# More details are here: https://help.github.com/articles/about-codeowners/ + +# The '*' pattern is global owners. + +# Order is important. The last matching pattern has the most precedence. +# The folders are ordered as follows: + +# In each subsection folders are ordered first by depth, then alphabetically. +# This should make it easy to add new rules without breaking existing ones. + +# Global rule: +* @Unity-Technologies/mtt-samples-dev From 329f120e118522c21e8001945d248599ba450ef7 Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Mon, 25 Sep 2023 13:53:09 -0400 Subject: [PATCH 5/5] chore: project versions updated and changelog updated with 1.4.0 release (#139) * project versions updated and changelog updated with 1.4.0 release * updating latest release badge --- .../ProjectSettings/ProjectSettings.asset | 2 +- .../ProjectSettings/ProjectSettings.asset | 77 ++++++++++++----- .../ProjectSettings/ProjectSettings.asset | 83 ++++++++++++++----- .../ProjectSettings/ProjectSettings.asset | 83 ++++++++++++++----- CHANGELOG.md | 2 +- README.md | 2 +- 6 files changed, 186 insertions(+), 63 deletions(-) diff --git a/Basic/2DSpaceShooter/ProjectSettings/ProjectSettings.asset b/Basic/2DSpaceShooter/ProjectSettings/ProjectSettings.asset index 60e66521..c35e3846 100644 --- a/Basic/2DSpaceShooter/ProjectSettings/ProjectSettings.asset +++ b/Basic/2DSpaceShooter/ProjectSettings/ProjectSettings.asset @@ -135,7 +135,7 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 1.2.1 + bundleVersion: 1.4.0 preloadedAssets: [] metroInputSource: 1 wsaTransparentSwapchain: 0 diff --git a/Basic/ClientDriven/ProjectSettings/ProjectSettings.asset b/Basic/ClientDriven/ProjectSettings/ProjectSettings.asset index 224f4033..2a2b1dea 100644 --- a/Basic/ClientDriven/ProjectSettings/ProjectSettings.asset +++ b/Basic/ClientDriven/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 23 + serializedVersion: 26 productGUID: 1f656a74dbea041a6a02abd58cb7ed28 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -48,14 +48,15 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 1 + m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosUseCustomAppBackgroundBehavior: 0 - iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -85,6 +86,7 @@ PlayerSettings: hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 + dedicatedServerOptimizations: 0 bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 @@ -119,8 +121,12 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 + switchNVNGraphicsFirmwareMemory: 32 + switchMaxWorkerMultiple: 8 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 @@ -128,13 +134,8 @@ PlayerSettings: vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 - bundleVersion: 1.2.1 + loadStoreDebugModeEnabled: 0 + bundleVersion: 1.4.0 preloadedAssets: - {fileID: 11400000, guid: 9e7be553448fa2546aea5752021cbcf7, type: 2} metroInputSource: 0 @@ -148,7 +149,7 @@ PlayerSettings: enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 useHDRDisplay: 0 - D3DHDRBitDepth: 0 + hdrBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 @@ -159,6 +160,7 @@ PlayerSettings: Standalone: com.Unity.ClientDriven buildNumber: Standalone: 0 + VisionOS: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 @@ -176,12 +178,15 @@ PlayerSettings: APKExpansionFiles: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 1 + strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 11.0 + iOSTargetOSVersionString: 12.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 11.0 + tvOSTargetOSVersionString: 12.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -229,8 +234,10 @@ PlayerSettings: appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 @@ -245,6 +252,7 @@ PlayerSettings: useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 1 AndroidTargetDevices: 0 @@ -252,6 +260,7 @@ PlayerSettings: androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: + AndroidEnableArmv9SecurityFeatures: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 @@ -265,7 +274,6 @@ PlayerSettings: banner: {fileID: 0} androidGamepadSupportLevel: 0 chromeosInputEmulation: 1 - AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 @@ -450,7 +458,9 @@ PlayerSettings: iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] + m_BuildTargetGroupHDRCubemapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 @@ -463,6 +473,7 @@ PlayerSettings: locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: + macOSTargetOSVersion: 10.13.0 switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -474,6 +485,7 @@ PlayerSettings: switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: + switchCompilerFlags: switchTitleNames_0: switchTitleNames_1: switchTitleNames_2: @@ -547,7 +559,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -589,6 +600,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -689,6 +701,7 @@ PlayerSettings: webGLMemorySize: 16 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 webGLDataCaching: 1 webGLDebugSymbols: 0 webGLEmscriptenArgs: @@ -701,6 +714,12 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLInitialMemorySize: 32 + webGLMaximumMemorySize: 2048 + webGLMemoryGrowthMode: 2 + webGLMemoryLinearGrowthStep: 16 + webGLMemoryGeometricGrowthStep: 0.2 + webGLMemoryGeometricGrowthCap: 96 webGLPowerPreference: 2 scriptingDefineSymbols: Standalone: ENABLE_INPUT_SYSTEM;STARTER_ASSETS_PACKAGES_CHECKED @@ -708,17 +727,29 @@ PlayerSettings: platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} - managedStrippingLevel: {} + il2cppCodeGeneration: {} + managedStrippingLevel: + EmbeddedLinux: 1 + GameCoreScarlett: 1 + GameCoreXboxOne: 1 + Nintendo Switch: 1 + PS4: 1 + PS5: 1 + QNX: 1 + Stadia: 1 + VisionOS: 1 + WebGL: 1 + Windows Store Apps: 1 + XboxOne: 1 + iPhone: 1 + tvOS: 1 incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 - enableRoslynAnalyzers: 1 - selectedPlatform: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 - assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 @@ -791,6 +822,11 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: + hmiPlayerDataPath: + hmiForceSRGBBlit: 1 + embeddedLinuxEnableGamepadInput: 1 + hmiLogStartupTiming: 0 + hmiCpuConfiguration: apiCompatibilityLevel: 6 activeInputHandler: 2 windowsGamepadBackendHint: 0 @@ -801,6 +837,7 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 0 - playerDataPath: - forceSRGBBlit: 1 + hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 + insecureHttpOption: 0 diff --git a/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/ProjectSettings.asset b/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/ProjectSettings.asset index f3ad067f..0a184a1f 100644 --- a/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/ProjectSettings.asset +++ b/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 23 + serializedVersion: 26 productGUID: 167fe391b84a24a449fee6148b049c82 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -48,14 +48,15 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 + m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosUseCustomAppBackgroundBehavior: 0 - iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -85,6 +86,7 @@ PlayerSettings: hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 + dedicatedServerOptimizations: 0 bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 @@ -119,8 +121,12 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 + switchNVNGraphicsFirmwareMemory: 32 + switchMaxWorkerMultiple: 8 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 @@ -128,13 +134,8 @@ PlayerSettings: vulkanEnablePreTransform: 1 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 - bundleVersion: 1.2.1 + loadStoreDebugModeEnabled: 0 + bundleVersion: 1.4.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -147,7 +148,7 @@ PlayerSettings: enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 useHDRDisplay: 0 - D3DHDRBitDepth: 0 + hdrBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 @@ -158,6 +159,7 @@ PlayerSettings: Standalone: com.Unity.DynamicAddressablesNetworkPrefabs buildNumber: Standalone: 0 + VisionOS: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 @@ -175,12 +177,15 @@ PlayerSettings: APKExpansionFiles: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 1 + strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 11.0 + iOSTargetOSVersionString: 12.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 11.0 + tvOSTargetOSVersionString: 12.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -228,8 +233,10 @@ PlayerSettings: appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 @@ -244,6 +251,7 @@ PlayerSettings: useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 1 AndroidTargetDevices: 0 @@ -251,6 +259,7 @@ PlayerSettings: androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: + AndroidEnableArmv9SecurityFeatures: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 @@ -264,7 +273,6 @@ PlayerSettings: banner: {fileID: 0} androidGamepadSupportLevel: 0 chromeosInputEmulation: 1 - AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 @@ -350,6 +358,13 @@ PlayerSettings: iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: + - m_BuildTarget: Android + m_EncodingQuality: 1 + - m_BuildTarget: iPhone + m_EncodingQuality: 1 + - m_BuildTarget: tvOS + m_EncodingQuality: 1 + m_BuildTargetGroupHDRCubemapEncodingQuality: - m_BuildTarget: Android m_EncodingQuality: 1 - m_BuildTarget: iPhone @@ -357,6 +372,7 @@ PlayerSettings: - m_BuildTarget: tvOS m_EncodingQuality: 1 m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: - m_BuildTarget: Android m_Encoding: 1 @@ -377,6 +393,7 @@ PlayerSettings: locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: + macOSTargetOSVersion: 10.13.0 switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -388,6 +405,7 @@ PlayerSettings: switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: + switchCompilerFlags: switchTitleNames_0: switchTitleNames_1: switchTitleNames_2: @@ -461,7 +479,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -503,6 +520,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -603,6 +621,7 @@ PlayerSettings: webGLMemorySize: 16 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 webGLDataCaching: 1 webGLDebugSymbols: 0 webGLEmscriptenArgs: @@ -615,6 +634,12 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLInitialMemorySize: 32 + webGLMaximumMemorySize: 2048 + webGLMemoryGrowthMode: 2 + webGLMemoryLinearGrowthStep: 16 + webGLMemoryGeometricGrowthStep: 0.2 + webGLMemoryGeometricGrowthCap: 96 webGLPowerPreference: 2 scriptingDefineSymbols: Standalone: @@ -622,17 +647,29 @@ PlayerSettings: platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} - managedStrippingLevel: {} + il2cppCodeGeneration: {} + managedStrippingLevel: + EmbeddedLinux: 1 + GameCoreScarlett: 1 + GameCoreXboxOne: 1 + Nintendo Switch: 1 + PS4: 1 + PS5: 1 + QNX: 1 + Stadia: 1 + VisionOS: 1 + WebGL: 1 + Windows Store Apps: 1 + XboxOne: 1 + iPhone: 1 + tvOS: 1 incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 1 useDeterministicCompilation: 1 - enableRoslynAnalyzers: 1 - selectedPlatform: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 - assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 @@ -705,6 +742,11 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: + hmiPlayerDataPath: + hmiForceSRGBBlit: 1 + embeddedLinuxEnableGamepadInput: 1 + hmiLogStartupTiming: 0 + hmiCpuConfiguration: apiCompatibilityLevel: 6 activeInputHandler: 0 windowsGamepadBackendHint: 0 @@ -715,6 +757,7 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 0 - playerDataPath: - forceSRGBBlit: 1 + hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 + insecureHttpOption: 0 diff --git a/Basic/Invaders/ProjectSettings/ProjectSettings.asset b/Basic/Invaders/ProjectSettings/ProjectSettings.asset index 9b7d97b6..1f5db732 100644 --- a/Basic/Invaders/ProjectSettings/ProjectSettings.asset +++ b/Basic/Invaders/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 23 + serializedVersion: 26 productGUID: da850e936425cf74d88e93d1747db28a AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -48,14 +48,15 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 1 + m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosUseCustomAppBackgroundBehavior: 0 - iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -85,6 +86,7 @@ PlayerSettings: hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 + dedicatedServerOptimizations: 0 bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 @@ -119,8 +121,12 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 + switchNVNGraphicsFirmwareMemory: 32 + switchMaxWorkerMultiple: 8 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 @@ -128,13 +134,8 @@ PlayerSettings: vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 - bundleVersion: 1.2.1 + loadStoreDebugModeEnabled: 0 + bundleVersion: 1.4.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -147,7 +148,7 @@ PlayerSettings: enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 useHDRDisplay: 0 - D3DHDRBitDepth: 0 + hdrBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 @@ -161,6 +162,7 @@ PlayerSettings: tvOS: buildNumber: Standalone: 0 + VisionOS: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 @@ -178,12 +180,15 @@ PlayerSettings: APKExpansionFiles: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 0 + strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 11.0 + iOSTargetOSVersionString: 12.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 11.0 + tvOSTargetOSVersionString: 12.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -231,8 +236,10 @@ PlayerSettings: appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 @@ -247,6 +254,7 @@ PlayerSettings: useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 1 AndroidTargetDevices: 0 @@ -254,6 +262,7 @@ PlayerSettings: androidSplashScreen: {fileID: 0} AndroidKeystoreName: '{inproject}: ' AndroidKeyaliasName: + AndroidEnableArmv9SecurityFeatures: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 @@ -267,7 +276,6 @@ PlayerSettings: banner: {fileID: 0} androidGamepadSupportLevel: 0 chromeosInputEmulation: 1 - AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 @@ -530,7 +538,15 @@ PlayerSettings: m_EncodingQuality: 1 - m_BuildTarget: PS4 m_EncodingQuality: 1 + m_BuildTargetGroupHDRCubemapEncodingQuality: + - m_BuildTarget: Standalone + m_EncodingQuality: 2 + - m_BuildTarget: XboxOne + m_EncodingQuality: 2 + - m_BuildTarget: PS4 + m_EncodingQuality: 2 m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 @@ -543,6 +559,7 @@ PlayerSettings: locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: + macOSTargetOSVersion: 10.13.0 switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -554,6 +571,7 @@ PlayerSettings: switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: + switchCompilerFlags: switchTitleNames_0: switchTitleNames_1: switchTitleNames_2: @@ -627,7 +645,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -669,6 +686,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -769,6 +787,7 @@ PlayerSettings: webGLMemorySize: 32 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 webGLDataCaching: 1 webGLDebugSymbols: 0 webGLEmscriptenArgs: @@ -781,6 +800,12 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLInitialMemorySize: 32 + webGLMaximumMemorySize: 2048 + webGLMemoryGrowthMode: 2 + webGLMemoryLinearGrowthStep: 16 + webGLMemoryGeometricGrowthStep: 0.2 + webGLMemoryGeometricGrowthCap: 96 webGLPowerPreference: 2 scriptingDefineSymbols: {} additionalCompilerArguments: {} @@ -788,17 +813,29 @@ PlayerSettings: scriptingBackend: Standalone: 0 il2cppCompilerConfiguration: {} - managedStrippingLevel: {} + il2cppCodeGeneration: {} + managedStrippingLevel: + EmbeddedLinux: 1 + GameCoreScarlett: 1 + GameCoreXboxOne: 1 + Nintendo Switch: 1 + PS4: 1 + PS5: 1 + QNX: 1 + Stadia: 1 + VisionOS: 1 + WebGL: 1 + Windows Store Apps: 1 + XboxOne: 1 + iPhone: 1 + tvOS: 1 incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 - enableRoslynAnalyzers: 1 - selectedPlatform: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 - assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: Standalone: 3 @@ -881,6 +918,11 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: + hmiPlayerDataPath: + hmiForceSRGBBlit: 1 + embeddedLinuxEnableGamepadInput: 1 + hmiLogStartupTiming: 0 + hmiCpuConfiguration: apiCompatibilityLevel: 6 activeInputHandler: 0 windowsGamepadBackendHint: 0 @@ -891,6 +933,7 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 1 - playerDataPath: - forceSRGBBlit: 1 + hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 + insecureHttpOption: 0 diff --git a/CHANGELOG.md b/CHANGELOG.md index e964749c..1aec50b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [unreleased] - yyyy-mm-dd +## [1.4.0] - 2023-09-25 ### 2D Space Shooter diff --git a/README.md b/README.md index b384462d..19845cda 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![UnityVersion](https://img.shields.io/badge/Unity%20Version:-2022.3%20LTS-57b9d3.svg?logo=unity&color=2196F3)](https://unity.com/releases/editor/whats-new/2022.3.0) [![NetcodeVersion](https://img.shields.io/badge/Netcode%20Version:-1.6.0-57b9d3.svg?logo=unity&color=2196F3)](https://docs-multiplayer.unity3d.com/netcode/current/about) -[![LatestRelease](https://img.shields.io/badge/Latest%20%20Github%20Release:-v1.3.0-57b9d3.svg?logo=github&color=brightgreen)](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.bitesize/releases/tag/v1.3.0) +[![LatestRelease](https://img.shields.io/badge/Latest%20%20Github%20Release:-v1.4.0-57b9d3.svg?logo=github&color=brightgreen)](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.bitesize/releases/tag/v1.4.0)

This repository contains a collection of bitesize sample projects and games that showcase different techniques