diff --git a/Basic/2DSpaceShooter/Assets/Scripts/Asteroid.cs b/Basic/2DSpaceShooter/Assets/Scripts/Asteroid.cs index 046ffa024..efcd1d334 100644 --- a/Basic/2DSpaceShooter/Assets/Scripts/Asteroid.cs +++ b/Basic/2DSpaceShooter/Assets/Scripts/Asteroid.cs @@ -24,7 +24,6 @@ void Awake() 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 void Explode() 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 451a7230c..d8ff63191 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 0bede2154..3d0b1f453 100644 --- a/Basic/2DSpaceShooter/Assets/Scripts/Spawner.cs +++ b/Basic/2DSpaceShooter/Assets/Scripts/Spawner.cs @@ -80,16 +80,19 @@ void SpawnAsteroids() 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 de6be61b1..c8aef0b1f 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 763b7c95f..54d2a6503 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 a772bd55d..bd3d14881 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 000000000..0f6578c3f --- /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 afcf8d725..60e665214 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 56ddb83a4..a74c35fcb 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 7027c8161..430f7def1 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 0ef51b310..06afe6de9 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 f967a4e6e..2834e42b5 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 000000000..0f6578c3f --- /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 56ddb83a4..a74c35fcb 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 8d118d3bf..90b20468e 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 6dd8d95bc..af8ce067c 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 000000000..0f6578c3f --- /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 56ddb83a4..a74c35fcb 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 c42357a57..eab04c424 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 8ee961b3c..351fe5e65 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 8f5c699dc..d7580a93b 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 000000000..0f6578c3f --- /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 56ddb83a4..a74c35fcb 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 1a1a13e27..48d721560 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 bb4708c53..b384462d6 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)