From b72a35baeff34657f9deaf506e9f836d8c2519c0 Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Fri, 8 Dec 2023 09:54:52 -0500 Subject: [PATCH 01/12] feat: upgrade bitesize samples to NGO v1.7.1 & 2022.3.14f1 (#147) * 4 samples updated to 2022.3.13f1 & by necessity NGO v1.7.0 * upgraded 4 samples to 2022.3.14f1 * updating use cases sample to 2022.3.14f1 & NGO v1.7.0 * upgrading all samples to NGO v1.7.1 * changelog addition --- Basic/2DSpaceShooter/Packages/manifest.json | 14 +- .../Packages/packages-lock.json | 43 +++-- .../ProjectSettings/ProjectVersion.txt | 4 +- .../ProjectSettings/ShaderGraphSettings.asset | 1 + .../Assets/Scenes/Bootstrap.unity | 161 +++++++++++++++--- Basic/ClientDriven/Packages/manifest.json | 14 +- .../ClientDriven/Packages/packages-lock.json | 43 +++-- .../ProjectSettings/ProjectVersion.txt | 4 +- .../ProjectSettings/ShaderGraphSettings.asset | 1 + .../Packages/manifest.json | 10 +- .../Packages/packages-lock.json | 20 +-- .../ProjectSettings/ProjectVersion.txt | 4 +- Basic/Invaders/Packages/manifest.json | 12 +- Basic/Invaders/Packages/packages-lock.json | 41 +++-- .../ProjectSettings/ProjectSettings.asset | 5 +- .../ProjectSettings/ProjectVersion.txt | 4 +- .../ProjectSettings/ShaderGraphSettings.asset | 1 + CHANGELOG.md | 26 +++ .../Packages/manifest.json | 10 +- .../Packages/packages-lock.json | 43 +++-- .../NetcodeForGameObjects.asset | 17 ++ .../ProjectSettings/ProjectVersion.txt | 4 +- .../ProjectSettings/ShaderGraphSettings.asset | 1 + 23 files changed, 338 insertions(+), 145 deletions(-) create mode 100644 Experimental/MultiplayerUseCases/ProjectSettings/NetcodeForGameObjects.asset diff --git a/Basic/2DSpaceShooter/Packages/manifest.json b/Basic/2DSpaceShooter/Packages/manifest.json index 54d2a650..5490a2b7 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.4", - "com.unity.collab-proxy": "2.0.7", - "com.unity.ide.rider": "3.0.24", - "com.unity.ide.visualstudio": "2.0.18", + "com.unity.ai.navigation": "1.1.5", + "com.unity.collab-proxy": "2.2.0", + "com.unity.ide.rider": "3.0.26", + "com.unity.ide.visualstudio": "2.0.22", "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.3.0", - "com.unity.netcode.gameobjects": "1.6.0", + "com.unity.netcode.gameobjects": "1.7.1", "com.unity.postprocessing": "3.2.2", - "com.unity.render-pipelines.universal": "14.0.8", + "com.unity.render-pipelines.universal": "14.0.9", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.7.5", + "com.unity.timeline": "1.7.6", "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 bd3d1488..9f48a0f2 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.4", + "version": "1.1.5", "depth": 0, "source": "registry", "dependencies": { @@ -16,7 +16,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.8", + "version": "1.8.10", "depth": 1, "source": "registry", "dependencies": { @@ -25,7 +25,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.0.7", + "version": "2.2.0", "depth": 0, "source": "registry", "dependencies": {}, @@ -56,7 +56,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.24", + "version": "3.0.26", "depth": 0, "source": "registry", "dependencies": { @@ -65,7 +65,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.18", + "version": "2.0.22", "depth": 0, "source": "registry", "dependencies": { @@ -123,12 +123,12 @@ "url": "https://packages.unity.com" }, "com.unity.netcode.gameobjects": { - "version": "1.6.0", + "version": "1.7.1", "depth": 0, "source": "registry", "dependencies": { "com.unity.nuget.mono-cecil": "1.10.1", - "com.unity.transport": "1.3.4" + "com.unity.transport": "1.4.0" }, "url": "https://packages.unity.com" }, @@ -163,7 +163,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "14.0.8", + "version": "14.0.9", "depth": 1, "source": "builtin", "dependencies": { @@ -174,14 +174,23 @@ } }, "com.unity.render-pipelines.universal": { - "version": "14.0.8", + "version": "14.0.9", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", - "com.unity.burst": "1.8.4", - "com.unity.render-pipelines.core": "14.0.8", - "com.unity.shadergraph": "14.0.8" + "com.unity.burst": "1.8.9", + "com.unity.render-pipelines.core": "14.0.9", + "com.unity.shadergraph": "14.0.9", + "com.unity.render-pipelines.universal-config": "14.0.9" + } + }, + "com.unity.render-pipelines.universal-config": { + "version": "14.0.9", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.render-pipelines.core": "14.0.9" } }, "com.unity.searcher": { @@ -204,7 +213,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.11.0", + "version": "1.12.0", "depth": 2, "source": "registry", "dependencies": { @@ -253,11 +262,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "14.0.8", + "version": "14.0.9", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "14.0.8", + "com.unity.render-pipelines.core": "14.0.9", "com.unity.searcher": "4.9.2" } }, @@ -282,7 +291,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.7.5", + "version": "1.7.6", "depth": 0, "source": "registry", "dependencies": { @@ -294,7 +303,7 @@ "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "1.3.4", + "version": "1.4.0", "depth": 1, "source": "registry", "dependencies": { diff --git a/Basic/2DSpaceShooter/ProjectSettings/ProjectVersion.txt b/Basic/2DSpaceShooter/ProjectSettings/ProjectVersion.txt index a74c35fc..da671891 100644 --- a/Basic/2DSpaceShooter/ProjectSettings/ProjectVersion.txt +++ b/Basic/2DSpaceShooter/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.9f1 -m_EditorVersionWithRevision: 2022.3.9f1 (ea401c316338) +m_EditorVersion: 2022.3.14f1 +m_EditorVersionWithRevision: 2022.3.14f1 (eff2de9070d8) diff --git a/Basic/2DSpaceShooter/ProjectSettings/ShaderGraphSettings.asset b/Basic/2DSpaceShooter/ProjectSettings/ShaderGraphSettings.asset index 9b28428b..3250b068 100644 --- a/Basic/2DSpaceShooter/ProjectSettings/ShaderGraphSettings.asset +++ b/Basic/2DSpaceShooter/ProjectSettings/ShaderGraphSettings.asset @@ -12,5 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: de02f9e1d18f588468e474319d09a723, type: 3} m_Name: m_EditorClassIdentifier: + shaderVariantLimit: 128 customInterpolatorErrorThreshold: 32 customInterpolatorWarningThreshold: 16 diff --git a/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity b/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity index eae816c0..4a1d9259 100644 --- a/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity +++ b/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -128,6 +128,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} @@ -195,6 +196,9 @@ PrefabInstance: value: Ingredient (3) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a6b33b41508134c09957e076f4d53415, type: 3} --- !u!1 &232705322 GameObject: @@ -219,19 +223,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 232705322} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 14.58, y: 0.5, z: -13.27} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1980547847} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &320533761 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} @@ -303,6 +308,9 @@ PrefabInstance: value: Ingredient (2) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a6b33b41508134c09957e076f4d53415, type: 3} --- !u!1 &406937058 GameObject: @@ -327,19 +335,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 406937058} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 10.37, y: 0.75, z: -10.4} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2060465724} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &474653826 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1826537008} m_Modifications: - target: {fileID: 3608989045728912032, guid: ac6c26a13f365254987df3aaf92bf463, type: 3} @@ -395,6 +404,9 @@ PrefabInstance: value: objectReference: {fileID: 1299635455} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ac6c26a13f365254987df3aaf92bf463, type: 3} --- !u!114 &474653827 stripped MonoBehaviour: @@ -435,19 +447,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 500839295} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 14.07, y: 0.5, z: 5.77} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1980547847} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &602928376 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: -2947200286860187156, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} @@ -515,6 +528,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} --- !u!1 &796975752 GameObject: @@ -539,19 +555,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 796975752} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -9.75, y: 0.75, z: 11.52} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2060465724} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &883084307 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} @@ -635,6 +652,9 @@ PrefabInstance: value: Ingredient (1) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a6b33b41508134c09957e076f4d53415, type: 3} --- !u!1 &966089317 GameObject: @@ -659,13 +679,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 966089317} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &986711052 stripped GameObject: @@ -680,9 +700,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 986711052} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 6352809919239313146, guid: ff02a0a00ab750f48b09459b1cafd1b8, type: 3} @@ -726,13 +754,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1038740736} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1038740740 MonoBehaviour: @@ -821,8 +849,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 593a2fe42fa9d37498c96f9a383b6521, type: 3} m_Name: m_EditorClassIdentifier: - RunInBackground: 1 - LogLevel: 1 NetworkConfig: ProtocolVersion: 0 NetworkTransport: {fileID: 1114774666} @@ -846,6 +872,8 @@ MonoBehaviour: SpawnTimeout: 1 EnableNetworkLogs: 1 OldPrefabList: [] + RunInBackground: 1 + LogLevel: 1 --- !u!4 &1114774669 Transform: m_ObjectHideFlags: 0 @@ -853,13 +881,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1114774665} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1265101692 GameObject: @@ -891,14 +919,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 + m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 m_LightLayerMask: 1 + m_RenderingLayers: 1 m_CustomShadowLayers: 0 m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 1 --- !u!108 &1265101694 Light: m_ObjectHideFlags: 0 @@ -968,13 +999,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1265101692} + serializedVersion: 2 m_LocalRotation: {x: 0.32628977, y: 0.3580216, z: -0.13515317, w: 0.8643432} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 41.363, y: 45, z: 0} --- !u!1 &1299635453 GameObject: @@ -1011,6 +1042,7 @@ MonoBehaviour: SynchronizeTransform: 1 ActiveSceneSynchronization: 0 SceneMigrationSynchronization: 1 + SpawnWithObservers: 1 DontDestroyWithOwner: 0 AutoObjectParentSync: 1 --- !u!114 &1299635455 @@ -1032,13 +1064,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1299635453} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 10, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1368949943 stripped GameObject: @@ -1053,9 +1085,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1368949943} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 6352809919239313146, guid: ff02a0a00ab750f48b09459b1cafd1b8, type: 3} @@ -1064,6 +1104,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 2070925441746177671, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} @@ -1115,6 +1156,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} --- !u!1 &1422708175 GameObject: @@ -1139,13 +1183,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1422708175} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -7.09, y: 4.458488, z: -9.44} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2060465724} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1675346221 GameObject: @@ -1170,19 +1214,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1675346221} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.4, y: 0.75, z: 13.97} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2060465724} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1719355277 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} @@ -1266,6 +1311,9 @@ PrefabInstance: value: Ingredient (4) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a6b33b41508134c09957e076f4d53415, type: 3} --- !u!1 &1773263766 GameObject: @@ -1290,13 +1338,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1773263766} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2.91, y: 6.47, z: -15.05} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1980547847} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1826537006 GameObject: @@ -1336,6 +1384,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1826537006} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -1344,13 +1393,13 @@ Transform: - {fileID: 1997149794} - {fileID: 474653828} m_Father: {fileID: 0} - m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1869134603 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} @@ -1406,12 +1455,16 @@ PrefabInstance: value: Ingredient (6) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a6b33b41508134c09957e076f4d53415, type: 3} --- !u!1001 &1895732253 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} @@ -1483,6 +1536,9 @@ PrefabInstance: value: Ingredient (5) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a6b33b41508134c09957e076f4d53415, type: 3} --- !u!1 &1971400596 stripped GameObject: @@ -1497,9 +1553,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1971400596} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 6352809919239313146, guid: ff02a0a00ab750f48b09459b1cafd1b8, type: 3} @@ -1544,6 +1608,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1980547845} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -1554,7 +1619,6 @@ Transform: - {fileID: 1991538230} - {fileID: 1773263767} m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1991538229 GameObject: @@ -1579,19 +1643,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1991538229} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -14.84, y: 0.5, z: -14.71} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1980547847} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1997149792 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1826537008} m_Modifications: - target: {fileID: 3608989045728912032, guid: 2cb44b699415ff447a63b3c87e56fd16, type: 3} @@ -1643,6 +1708,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2cb44b699415ff447a63b3c87e56fd16, type: 3} --- !u!114 &1997149793 stripped MonoBehaviour: @@ -1701,13 +1769,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2051538844} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2060465721 GameObject: @@ -1718,8 +1786,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2060465724} - - component: {fileID: 2060465723} - component: {fileID: 2060465722} + - component: {fileID: 2060465723} m_Layer: 0 m_Name: IngredientSpawnPoints m_TagString: Untagged @@ -1744,6 +1812,7 @@ MonoBehaviour: SynchronizeTransform: 1 ActiveSceneSynchronization: 0 SceneMigrationSynchronization: 1 + SpawnWithObservers: 1 DontDestroyWithOwner: 0 AutoObjectParentSync: 1 --- !u!114 &2060465723 @@ -1773,6 +1842,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2060465721} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -1783,13 +1853,13 @@ Transform: - {fileID: 1422708176} - {fileID: 796975753} m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &330446109092541879 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 299841162335551047, guid: d793abe7ff9aa094eb534e73a82fdab5, type: 3} @@ -2025,12 +2095,25 @@ PrefabInstance: value: 2128896716 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2182991878644361159, guid: d793abe7ff9aa094eb534e73a82fdab5, type: 3} + insertIndex: -1 + addedObject: {fileID: 1971400600} + - targetCorrespondingSourceObject: {fileID: 2454599517974063735, guid: d793abe7ff9aa094eb534e73a82fdab5, type: 3} + insertIndex: -1 + addedObject: {fileID: 986711056} + - targetCorrespondingSourceObject: {fileID: 2904161736621032748, guid: d793abe7ff9aa094eb534e73a82fdab5, type: 3} + insertIndex: -1 + addedObject: {fileID: 1368949947} m_SourcePrefab: {fileID: 100100000, guid: d793abe7ff9aa094eb534e73a82fdab5, type: 3} --- !u!1001 &5723720766742547469 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} @@ -2103,4 +2186,30 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 1702713463106468697, guid: a6b33b41508134c09957e076f4d53415, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a6b33b41508134c09957e076f4d53415, type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1114774669} + - {fileID: 1038740739} + - {fileID: 2060465724} + - {fileID: 1980547847} + - {fileID: 1299635456} + - {fileID: 5723720766742547469} + - {fileID: 883084307} + - {fileID: 320533761} + - {fileID: 181529897} + - {fileID: 1719355277} + - {fileID: 1895732253} + - {fileID: 1869134603} + - {fileID: 966089318} + - {fileID: 330446109092541879} + - {fileID: 2051538846} + - {fileID: 1265101695} + - {fileID: 1826537008} + - {fileID: 602928376} + - {fileID: 1370077996} diff --git a/Basic/ClientDriven/Packages/manifest.json b/Basic/ClientDriven/Packages/manifest.json index 06afe6de..422ca6e3 100644 --- a/Basic/ClientDriven/Packages/manifest.json +++ b/Basic/ClientDriven/Packages/manifest.json @@ -1,18 +1,18 @@ { "dependencies": { - "com.unity.ai.navigation": "1.1.4", + "com.unity.ai.navigation": "1.1.5", "com.unity.cinemachine": "2.9.5", - "com.unity.collab-proxy": "2.0.7", - "com.unity.ide.rider": "3.0.24", - "com.unity.ide.visualstudio": "2.0.18", + "com.unity.collab-proxy": "2.2.0", + "com.unity.ide.rider": "3.0.26", + "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", "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.netcode.gameobjects": "1.7.1", + "com.unity.render-pipelines.universal": "14.0.9", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.7.5", + "com.unity.timeline": "1.7.6", "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 2834e42b..888856dc 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.4", + "version": "1.1.5", "depth": 0, "source": "registry", "dependencies": { @@ -10,7 +10,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.8", + "version": "1.8.10", "depth": 1, "source": "registry", "dependencies": { @@ -28,7 +28,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.0.7", + "version": "2.2.0", "depth": 0, "source": "registry", "dependencies": {}, @@ -59,7 +59,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.24", + "version": "3.0.26", "depth": 0, "source": "registry", "dependencies": { @@ -68,7 +68,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.18", + "version": "2.0.22", "depth": 0, "source": "registry", "dependencies": { @@ -135,12 +135,12 @@ "url": "https://packages.unity.com" }, "com.unity.netcode.gameobjects": { - "version": "1.6.0", + "version": "1.7.1", "depth": 0, "source": "registry", "dependencies": { "com.unity.nuget.mono-cecil": "1.10.1", - "com.unity.transport": "1.3.4" + "com.unity.transport": "1.4.0" }, "url": "https://packages.unity.com" }, @@ -166,7 +166,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "14.0.8", + "version": "14.0.9", "depth": 1, "source": "builtin", "dependencies": { @@ -177,14 +177,23 @@ } }, "com.unity.render-pipelines.universal": { - "version": "14.0.8", + "version": "14.0.9", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", - "com.unity.burst": "1.8.4", - "com.unity.render-pipelines.core": "14.0.8", - "com.unity.shadergraph": "14.0.8" + "com.unity.burst": "1.8.9", + "com.unity.render-pipelines.core": "14.0.9", + "com.unity.shadergraph": "14.0.9", + "com.unity.render-pipelines.universal-config": "14.0.9" + } + }, + "com.unity.render-pipelines.universal-config": { + "version": "14.0.9", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.render-pipelines.core": "14.0.9" } }, "com.unity.searcher": { @@ -207,7 +216,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.11.0", + "version": "1.12.0", "depth": 2, "source": "registry", "dependencies": { @@ -256,11 +265,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "14.0.8", + "version": "14.0.9", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "14.0.8", + "com.unity.render-pipelines.core": "14.0.9", "com.unity.searcher": "4.9.2" } }, @@ -285,7 +294,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.7.5", + "version": "1.7.6", "depth": 0, "source": "registry", "dependencies": { @@ -297,7 +306,7 @@ "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "1.3.4", + "version": "1.4.0", "depth": 1, "source": "registry", "dependencies": { diff --git a/Basic/ClientDriven/ProjectSettings/ProjectVersion.txt b/Basic/ClientDriven/ProjectSettings/ProjectVersion.txt index a74c35fc..da671891 100644 --- a/Basic/ClientDriven/ProjectSettings/ProjectVersion.txt +++ b/Basic/ClientDriven/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.9f1 -m_EditorVersionWithRevision: 2022.3.9f1 (ea401c316338) +m_EditorVersion: 2022.3.14f1 +m_EditorVersionWithRevision: 2022.3.14f1 (eff2de9070d8) diff --git a/Basic/ClientDriven/ProjectSettings/ShaderGraphSettings.asset b/Basic/ClientDriven/ProjectSettings/ShaderGraphSettings.asset index 9b28428b..3250b068 100644 --- a/Basic/ClientDriven/ProjectSettings/ShaderGraphSettings.asset +++ b/Basic/ClientDriven/ProjectSettings/ShaderGraphSettings.asset @@ -12,5 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: de02f9e1d18f588468e474319d09a723, type: 3} m_Name: m_EditorClassIdentifier: + shaderVariantLimit: 128 customInterpolatorErrorThreshold: 32 customInterpolatorWarningThreshold: 16 diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Packages/manifest.json b/Basic/DynamicAddressablesNetworkPrefabs/Packages/manifest.json index 90b20468..f7f252a2 100644 --- a/Basic/DynamicAddressablesNetworkPrefabs/Packages/manifest.json +++ b/Basic/DynamicAddressablesNetworkPrefabs/Packages/manifest.json @@ -1,12 +1,12 @@ { "dependencies": { - "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.addressables": "1.21.19", + "com.unity.ai.navigation": "1.1.5", + "com.unity.ide.rider": "3.0.26", + "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", "com.unity.multiplayer.tools": "1.1.1", - "com.unity.netcode.gameobjects": "1.6.0", + "com.unity.netcode.gameobjects": "1.7.1", "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 af8ce067..ca625803 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.15", + "version": "1.21.19", "depth": 0, "source": "registry", "dependencies": { - "com.unity.scriptablebuildpipeline": "1.21.8", + "com.unity.scriptablebuildpipeline": "1.21.21", "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.4", + "version": "1.1.5", "depth": 0, "source": "registry", "dependencies": { @@ -24,7 +24,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.8", + "version": "1.8.10", "depth": 2, "source": "registry", "dependencies": { @@ -50,7 +50,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.24", + "version": "3.0.26", "depth": 0, "source": "registry", "dependencies": { @@ -59,7 +59,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.18", + "version": "2.0.22", "depth": 0, "source": "registry", "dependencies": { @@ -95,12 +95,12 @@ "url": "https://packages.unity.com" }, "com.unity.netcode.gameobjects": { - "version": "1.6.0", + "version": "1.7.1", "depth": 0, "source": "registry", "dependencies": { "com.unity.nuget.mono-cecil": "1.10.1", - "com.unity.transport": "1.3.4" + "com.unity.transport": "1.4.0" }, "url": "https://packages.unity.com" }, @@ -126,7 +126,7 @@ "url": "https://packages.unity.com" }, "com.unity.scriptablebuildpipeline": { - "version": "1.21.8", + "version": "1.21.21", "depth": 1, "source": "registry", "dependencies": {}, @@ -153,7 +153,7 @@ "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "1.3.4", + "version": "1.4.0", "depth": 1, "source": "registry", "dependencies": { diff --git a/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/ProjectVersion.txt b/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/ProjectVersion.txt index a74c35fc..da671891 100644 --- a/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/ProjectVersion.txt +++ b/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.9f1 -m_EditorVersionWithRevision: 2022.3.9f1 (ea401c316338) +m_EditorVersion: 2022.3.14f1 +m_EditorVersionWithRevision: 2022.3.14f1 (eff2de9070d8) diff --git a/Basic/Invaders/Packages/manifest.json b/Basic/Invaders/Packages/manifest.json index 351fe5e6..55d692d1 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.4", - "com.unity.ide.rider": "3.0.24", - "com.unity.ide.visualstudio": "2.0.18", + "com.unity.ai.navigation": "1.1.5", + "com.unity.ide.rider": "3.0.26", + "com.unity.ide.visualstudio": "2.0.22", "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.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.netcode.gameobjects": "1.7.1", + "com.unity.render-pipelines.universal": "14.0.9", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.7.5", + "com.unity.timeline": "1.7.6", "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 d7580a93..f832a4e0 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.4", + "version": "1.1.5", "depth": 0, "source": "registry", "dependencies": { @@ -16,7 +16,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.8", + "version": "1.8.10", "depth": 1, "source": "registry", "dependencies": { @@ -49,7 +49,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.24", + "version": "3.0.26", "depth": 0, "source": "registry", "dependencies": { @@ -58,7 +58,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.18", + "version": "2.0.22", "depth": 0, "source": "registry", "dependencies": { @@ -116,12 +116,12 @@ "url": "https://packages.unity.com" }, "com.unity.netcode.gameobjects": { - "version": "1.6.0", + "version": "1.7.1", "depth": 0, "source": "registry", "dependencies": { "com.unity.nuget.mono-cecil": "1.10.1", - "com.unity.transport": "1.3.4" + "com.unity.transport": "1.4.0" }, "url": "https://packages.unity.com" }, @@ -147,7 +147,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "14.0.8", + "version": "14.0.9", "depth": 1, "source": "builtin", "dependencies": { @@ -158,14 +158,23 @@ } }, "com.unity.render-pipelines.universal": { - "version": "14.0.8", + "version": "14.0.9", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", - "com.unity.burst": "1.8.4", - "com.unity.render-pipelines.core": "14.0.8", - "com.unity.shadergraph": "14.0.8" + "com.unity.burst": "1.8.9", + "com.unity.render-pipelines.core": "14.0.9", + "com.unity.shadergraph": "14.0.9", + "com.unity.render-pipelines.universal-config": "14.0.9" + } + }, + "com.unity.render-pipelines.universal-config": { + "version": "14.0.9", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.render-pipelines.core": "14.0.9" } }, "com.unity.searcher": { @@ -188,7 +197,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.11.0", + "version": "1.12.0", "depth": 2, "source": "registry", "dependencies": { @@ -237,11 +246,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "14.0.8", + "version": "14.0.9", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "14.0.8", + "com.unity.render-pipelines.core": "14.0.9", "com.unity.searcher": "4.9.2" } }, @@ -266,7 +275,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.7.5", + "version": "1.7.6", "depth": 0, "source": "registry", "dependencies": { @@ -278,7 +287,7 @@ "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "1.3.4", + "version": "1.4.0", "depth": 1, "source": "registry", "dependencies": { diff --git a/Basic/Invaders/ProjectSettings/ProjectSettings.asset b/Basic/Invaders/ProjectSettings/ProjectSettings.asset index 1f5db732..cc49bca2 100644 --- a/Basic/Invaders/ProjectSettings/ProjectSettings.asset +++ b/Basic/Invaders/ProjectSettings/ProjectSettings.asset @@ -48,6 +48,7 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 1 + unsupportedMSAAFallback: 0 m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 @@ -147,6 +148,7 @@ PlayerSettings: isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 + allowHDRDisplaySupport: 0 useHDRDisplay: 0 hdrBitDepth: 0 m_ColorGamuts: 00000000 @@ -567,7 +569,7 @@ PlayerSettings: switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 - switchUseGOLDLinker: 0 + switchEnableFileSystemTrace: 0 switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: @@ -697,7 +699,6 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 switchUseLegacyFmodPriorities: 1 switchUseMicroSleepForYield: 1 diff --git a/Basic/Invaders/ProjectSettings/ProjectVersion.txt b/Basic/Invaders/ProjectSettings/ProjectVersion.txt index a74c35fc..da671891 100644 --- a/Basic/Invaders/ProjectSettings/ProjectVersion.txt +++ b/Basic/Invaders/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.9f1 -m_EditorVersionWithRevision: 2022.3.9f1 (ea401c316338) +m_EditorVersion: 2022.3.14f1 +m_EditorVersionWithRevision: 2022.3.14f1 (eff2de9070d8) diff --git a/Basic/Invaders/ProjectSettings/ShaderGraphSettings.asset b/Basic/Invaders/ProjectSettings/ShaderGraphSettings.asset index 9b28428b..3250b068 100644 --- a/Basic/Invaders/ProjectSettings/ShaderGraphSettings.asset +++ b/Basic/Invaders/ProjectSettings/ShaderGraphSettings.asset @@ -12,5 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: de02f9e1d18f588468e474319d09a723, type: 3} m_Name: m_EditorClassIdentifier: + shaderVariantLimit: 128 customInterpolatorErrorThreshold: 32 customInterpolatorWarningThreshold: 16 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1aec50b9..0f029331 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,31 @@ # Changelog +## [unreleased] - yyyy-mm-dd + +### 2D Space Shooter + +#### Changed +- Upgraded to Netcode for GameObjects v1.7.1 (#147) +- Upgraded sample to 2022.3.14f1 LTS (#147) + +### Client Driven + +#### Changed +- Upgraded to Netcode for GameObjects v1.7.1 (#147) +- Upgraded sample to 2022.3.14f1 LTS (#147) + +### Dynamic Addressables Network Prefabs + +#### Changed +- Upgraded to Netcode for GameObjects v1.7.1 (#147) +- Upgraded sample to 2022.3.14f1 LTS (#147) + +### Invaders + +#### Changed +- Upgraded to Netcode for GameObjects v1.7.1 (#147) +- Upgraded sample to 2022.3.14f1 LTS (#147) + ## [1.4.0] - 2023-09-25 ### 2D Space Shooter diff --git a/Experimental/MultiplayerUseCases/Packages/manifest.json b/Experimental/MultiplayerUseCases/Packages/manifest.json index e9da04b2..39db3ee7 100644 --- a/Experimental/MultiplayerUseCases/Packages/manifest.json +++ b/Experimental/MultiplayerUseCases/Packages/manifest.json @@ -1,17 +1,17 @@ { "dependencies": { - "com.unity.ai.navigation": "1.1.4", + "com.unity.ai.navigation": "1.1.5", "com.unity.feature.development": "1.0.1", - "com.unity.ide.rider": "3.0.24", - "com.unity.ide.visualstudio": "2.0.18", + "com.unity.ide.rider": "3.0.26", + "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", "com.unity.inputsystem": "1.7.0", "com.unity.learn.iet-framework": "3.1.3", "com.unity.learn.iet-framework.authoring": "1.2.2", "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.netcode.gameobjects": "1.7.1", + "com.unity.render-pipelines.universal": "14.0.9", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.6", diff --git a/Experimental/MultiplayerUseCases/Packages/packages-lock.json b/Experimental/MultiplayerUseCases/Packages/packages-lock.json index d7566bfb..bb959ab3 100644 --- a/Experimental/MultiplayerUseCases/Packages/packages-lock.json +++ b/Experimental/MultiplayerUseCases/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.ai.navigation": { - "version": "1.1.4", + "version": "1.1.5", "depth": 0, "source": "registry", "dependencies": { @@ -10,7 +10,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.8", + "version": "1.8.10", "depth": 1, "source": "registry", "dependencies": { @@ -47,8 +47,8 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.ide.visualstudio": "2.0.18", - "com.unity.ide.rider": "3.0.24", + "com.unity.ide.visualstudio": "2.0.22", + "com.unity.ide.rider": "3.0.26", "com.unity.ide.vscode": "1.2.5", "com.unity.editorcoroutines": "1.0.0", "com.unity.performance.profile-analyzer": "1.2.2", @@ -57,7 +57,7 @@ } }, "com.unity.ide.rider": { - "version": "3.0.24", + "version": "3.0.26", "depth": 0, "source": "registry", "dependencies": { @@ -66,7 +66,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.18", + "version": "2.0.22", "depth": 0, "source": "registry", "dependencies": { @@ -142,12 +142,12 @@ "url": "https://packages.unity.com" }, "com.unity.netcode.gameobjects": { - "version": "1.6.0", + "version": "1.7.1", "depth": 0, "source": "registry", "dependencies": { "com.unity.nuget.mono-cecil": "1.10.1", - "com.unity.transport": "1.3.4" + "com.unity.transport": "1.4.0" }, "url": "https://packages.unity.com" }, @@ -180,7 +180,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "14.0.8", + "version": "14.0.9", "depth": 1, "source": "builtin", "dependencies": { @@ -191,14 +191,23 @@ } }, "com.unity.render-pipelines.universal": { - "version": "14.0.8", + "version": "14.0.9", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", - "com.unity.burst": "1.8.4", - "com.unity.render-pipelines.core": "14.0.8", - "com.unity.shadergraph": "14.0.8" + "com.unity.burst": "1.8.9", + "com.unity.render-pipelines.core": "14.0.9", + "com.unity.shadergraph": "14.0.9", + "com.unity.render-pipelines.universal-config": "14.0.9" + } + }, + "com.unity.render-pipelines.universal-config": { + "version": "14.0.9", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.render-pipelines.core": "14.0.9" } }, "com.unity.searcher": { @@ -221,7 +230,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.11.0", + "version": "1.12.0", "depth": 2, "source": "registry", "dependencies": { @@ -270,11 +279,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "14.0.8", + "version": "14.0.9", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "14.0.8", + "com.unity.render-pipelines.core": "14.0.9", "com.unity.searcher": "4.9.2" } }, @@ -335,7 +344,7 @@ "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "1.3.4", + "version": "1.4.0", "depth": 1, "source": "registry", "dependencies": { diff --git a/Experimental/MultiplayerUseCases/ProjectSettings/NetcodeForGameObjects.asset b/Experimental/MultiplayerUseCases/ProjectSettings/NetcodeForGameObjects.asset new file mode 100644 index 00000000..0f6578c3 --- /dev/null +++ b/Experimental/MultiplayerUseCases/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/Experimental/MultiplayerUseCases/ProjectSettings/ProjectVersion.txt b/Experimental/MultiplayerUseCases/ProjectSettings/ProjectVersion.txt index 88bb9cf9..da671891 100644 --- a/Experimental/MultiplayerUseCases/ProjectSettings/ProjectVersion.txt +++ b/Experimental/MultiplayerUseCases/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.10f1 -m_EditorVersionWithRevision: 2022.3.10f1 (ff3792e53c62) +m_EditorVersion: 2022.3.14f1 +m_EditorVersionWithRevision: 2022.3.14f1 (eff2de9070d8) diff --git a/Experimental/MultiplayerUseCases/ProjectSettings/ShaderGraphSettings.asset b/Experimental/MultiplayerUseCases/ProjectSettings/ShaderGraphSettings.asset index 9b28428b..3250b068 100644 --- a/Experimental/MultiplayerUseCases/ProjectSettings/ShaderGraphSettings.asset +++ b/Experimental/MultiplayerUseCases/ProjectSettings/ShaderGraphSettings.asset @@ -12,5 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: de02f9e1d18f588468e474319d09a723, type: 3} m_Name: m_EditorClassIdentifier: + shaderVariantLimit: 128 customInterpolatorErrorThreshold: 32 customInterpolatorWarningThreshold: 16 From 7c54df861a94b4e3426f952692a65cd1d8350be6 Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Fri, 8 Dec 2023 11:56:51 -0500 Subject: [PATCH 02/12] chore: removing LINQ usage in bitesize samples [MTT-7798] (#146) * removing linq usage in bitesize samples * changelog addition --- .../Editor/StarterAssetsDeployMenu.cs | 13 ++++- .../ThirdPersonStarterAssetsDeployMenu.cs | 25 +++++++-- .../Assets/Scripts/Shared/AppController.cs | 28 +++++++--- .../ConnectionStates/ClientPreloadingState.cs | 11 ++-- .../Shared/DynamicPrefabLoadingUtilities.cs | 9 +++- CHANGELOG.md | 7 ++- .../Assets/Common/Scripts/NetworkManagerUI.cs | 8 --- .../Tests/Editor/MissingReferencesFinder.cs | 54 ++++++++++++++----- 8 files changed, 115 insertions(+), 40 deletions(-) diff --git a/Basic/ClientDriven/Assets/StarterAssets/Editor/StarterAssetsDeployMenu.cs b/Basic/ClientDriven/Assets/StarterAssets/Editor/StarterAssetsDeployMenu.cs index d568470c..ad8afa17 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/Editor/StarterAssetsDeployMenu.cs +++ b/Basic/ClientDriven/Assets/StarterAssets/Editor/StarterAssetsDeployMenu.cs @@ -1,5 +1,4 @@ using System; -using System.Linq; using StarterAssetsPackageChecker; using UnityEditor; using UnityEngine; @@ -64,7 +63,17 @@ private static void CheckCameras(Transform targetParent, string prefabFolder) } GameObject[] targets = GameObject.FindGameObjectsWithTag(CinemachineTargetTag); - GameObject target = targets.FirstOrDefault(t => t.transform.IsChildOf(targetParent)); + + GameObject target = null; + foreach (var t in targets) + { + if (t.transform.IsChildOf(targetParent)) + { + target = t; + break; + } + } + if (target == null) { target = new GameObject("PlayerCameraRoot"); diff --git a/Basic/ClientDriven/Assets/StarterAssets/Editor/ThirdPersonStarterAssetsDeployMenu.cs b/Basic/ClientDriven/Assets/StarterAssets/Editor/ThirdPersonStarterAssetsDeployMenu.cs index a299d4d2..fbe8d9b7 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/Editor/ThirdPersonStarterAssetsDeployMenu.cs +++ b/Basic/ClientDriven/Assets/StarterAssets/Editor/ThirdPersonStarterAssetsDeployMenu.cs @@ -1,5 +1,4 @@ using System.IO; -using System.Linq; using System.Text; using UnityEditor; using UnityEngine; @@ -19,8 +18,16 @@ public partial class StarterAssetsDeployMenu : ScriptableObject static void ResetThirdPersonControllerArmature() { var thirdPersonControllers = FindObjectsOfType(); - var player = thirdPersonControllers.FirstOrDefault(controller => - controller.GetComponent() && controller.CompareTag(PlayerTag)); + + ThirdPersonController player = null; + foreach (var controller in thirdPersonControllers) + { + if (controller.GetComponent() && controller.CompareTag(PlayerTag)) + { + player = controller; + break; + } + } GameObject playerGameObject = null; @@ -52,8 +59,16 @@ static void ResetThirdPersonControllerArmature() static void ResetThirdPersonControllerCapsule() { var thirdPersonControllers = FindObjectsOfType(); - var player = thirdPersonControllers.FirstOrDefault(controller => - !controller.GetComponent() && controller.CompareTag(PlayerTag)); + + ThirdPersonController player = null; + foreach (var controller in thirdPersonControllers) + { + if (controller.GetComponent() && controller.CompareTag(PlayerTag)) + { + player = controller; + break; + } + } GameObject playerGameObject = null; diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/AppController.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/AppController.cs index a6a840fa..10bacf15 100644 --- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/AppController.cs +++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/AppController.cs @@ -1,5 +1,4 @@ using System; -using System.Linq; using Game.UI; using Unity.Netcode; using UnityEngine; @@ -72,9 +71,9 @@ void OnClientConnected(ulong clientId) else { // grab all loaded prefabs and represent that on the newly joined client - var loadedHashes = DynamicPrefabLoadingUtilities.LoadedDynamicPrefabResourceHandles.Keys.Select(value => value.GetHashCode()).ToArray(); - var loadedNames = DynamicPrefabLoadingUtilities.LoadedDynamicPrefabResourceHandles.Values.Select(value => value.Result.name).ToArray(); - m_InGameUI.AddConnectionUIInstance(clientId, loadedHashes, loadedNames); + var loadedPrefabs = GetLoadedPrefabsHashesAndNames(); + + m_InGameUI.AddConnectionUIInstance(clientId, loadedPrefabs.Item1, loadedPrefabs.Item2); } } else if (m_NetworkManager.IsClient) @@ -86,12 +85,27 @@ void OnClientConnected(ulong clientId) m_InGameUI.Show(InGameUI.ButtonVisibility.Client); // grab all locally loaded prefabs and represent that on local client - var loadedHashes = DynamicPrefabLoadingUtilities.LoadedDynamicPrefabResourceHandles.Keys.Select(value => value.GetHashCode()).ToArray(); - var loadedNames = DynamicPrefabLoadingUtilities.LoadedDynamicPrefabResourceHandles.Values.Select(value => value.Result.name).ToArray(); - m_InGameUI.AddConnectionUIInstance(clientId, loadedHashes, loadedNames); + var loadedPrefabs = GetLoadedPrefabsHashesAndNames(); + + m_InGameUI.AddConnectionUIInstance(clientId, loadedPrefabs.Item1, loadedPrefabs.Item2); } } } + + static Tuple GetLoadedPrefabsHashesAndNames() + { + var loadedHashes = new int[DynamicPrefabLoadingUtilities.LoadedDynamicPrefabResourceHandles.Keys.Count]; + var loadedNames = new string[DynamicPrefabLoadingUtilities.LoadedDynamicPrefabResourceHandles.Keys.Count]; + int index = 0; + foreach (var loadedPrefab in DynamicPrefabLoadingUtilities.LoadedDynamicPrefabResourceHandles) + { + loadedHashes[index] = loadedPrefab.Key.GetHashCode(); + loadedNames[index] = loadedPrefab.Value.Result.name; + index++; + } + + return Tuple.Create(loadedHashes, loadedNames); + } void OnClientDisconnect(ulong clientId) { diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientPreloadingState.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientPreloadingState.cs index fabce9db..56f5b5c4 100644 --- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientPreloadingState.cs +++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientPreloadingState.cs @@ -1,5 +1,4 @@ using System; -using System.Linq; using UnityEngine; namespace Game @@ -29,9 +28,15 @@ public override void Enter() async void HandleDisconnectReason() { - var guids = disconnectionPayload.guids.Select(item => new AddressableGUID() { Value = item }).ToArray(); + var addressableGuids = new AddressableGUID[disconnectionPayload.guids.Count]; + var index = 0; + foreach (var guid in disconnectionPayload.guids) + { + addressableGuids[index] = new AddressableGUID() { Value = guid }; + index++; + } - await DynamicPrefabLoadingUtilities.LoadDynamicPrefabs(guids); + await DynamicPrefabLoadingUtilities.LoadDynamicPrefabs(addressableGuids); Debug.Log("Restarting client"); m_ConnectionManager.ChangeState(m_ConnectionManager.m_ClientConnecting); } diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/DynamicPrefabLoadingUtilities.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/DynamicPrefabLoadingUtilities.cs index 630bb14a..f713ee6b 100644 --- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/DynamicPrefabLoadingUtilities.cs +++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/DynamicPrefabLoadingUtilities.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using System.Linq; using System.Threading.Tasks; using Unity.Netcode; using UnityEngine; @@ -99,10 +98,16 @@ public static byte[] GenerateRequestPayload() /// public static string GenerateDisconnectionPayload() { + var dynamicPrefabGuidStrings = new List(); + foreach (var dynamicPrefabGuid in s_DynamicPrefabGUIDs) + { + dynamicPrefabGuidStrings.Add(dynamicPrefabGuid.ToString()); + } + var rejectionPayload = new DisconnectionPayload() { reason = DisconnectReason.ClientNeedsToPreload, - guids = s_DynamicPrefabGUIDs.Select(item => item.ToString()).ToList() + guids = dynamicPrefabGuidStrings }; return JsonUtility.ToJson(rejectionPayload); diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f029331..460d5eaa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Changelog -## [unreleased] - yyyy-mm-dd +## [unreleased] yyyy-mm-dd + +### Bitesize Samples Repository + +#### Cleanup +- Removed the usage of System.Linq across the repository (#146) ### 2D Space Shooter diff --git a/Experimental/MultiplayerUseCases/Assets/Common/Scripts/NetworkManagerUI.cs b/Experimental/MultiplayerUseCases/Assets/Common/Scripts/NetworkManagerUI.cs index 54ae1f86..4cccf804 100644 --- a/Experimental/MultiplayerUseCases/Assets/Common/Scripts/NetworkManagerUI.cs +++ b/Experimental/MultiplayerUseCases/Assets/Common/Scripts/NetworkManagerUI.cs @@ -1,5 +1,4 @@ using System; -using System.Linq; using UnityEngine; using UnityEngine.SceneManagement; using UnityEngine.UI; @@ -63,13 +62,6 @@ void StartClient() void Disconnect() { - if (NetworkManager.Singleton.IsServer) - { - foreach (var item in NetworkManager.Singleton.SpawnManager.SpawnedObjectsList.ToList()) - { - item.Despawn(false); - } - } NetworkManager.Singleton.Shutdown(); EnableAndHighlightButtons(null, true); SetButtonStateAndColor(m_DisconnectButton, false, false); diff --git a/Experimental/MultiplayerUseCases/Assets/Tests/Editor/MissingReferencesFinder.cs b/Experimental/MultiplayerUseCases/Assets/Tests/Editor/MissingReferencesFinder.cs index a5ab3927..59f13e22 100644 --- a/Experimental/MultiplayerUseCases/Assets/Tests/Editor/MissingReferencesFinder.cs +++ b/Experimental/MultiplayerUseCases/Assets/Tests/Editor/MissingReferencesFinder.cs @@ -1,5 +1,5 @@ +using System.Collections.Generic; using System.IO; -using System.Linq; using System.Reflection; using UnityEditor; using UnityEditor.SceneManagement; @@ -27,8 +27,13 @@ static void FindMissingReferencesInCurrentScene() /// internal static void FindMissingReferencesInAllBuiltScenes() { - foreach (var scene in EditorBuildSettings.scenes.Where(s => s.enabled)) + foreach (var scene in EditorBuildSettings.scenes) { + if (!scene.enabled) + { + continue; + } + EditorSceneManager.OpenScene(scene.path); FindMissingReferencesInCurrentScene(); } @@ -39,13 +44,29 @@ internal static void FindMissingReferencesInAllBuiltScenes() /// internal static void FindMissingReferencesInAssets() { - string[] assetsPats = AssetDatabase.GetAllAssetPaths().Where(path => path.StartsWith("Assets/")) - .ToArray(); - var gameObjects = assetsPats.Select(a => AssetDatabase.LoadAssetAtPath(a, typeof(GameObject)) as GameObject) - .Where(a => a != null) - .ToArray(); + string[] allAssetPaths = AssetDatabase.GetAllAssetPaths(); + var filteredAssetPaths = new List(); + + foreach (var path in allAssetPaths) + { + if (path.StartsWith("Assets/")) + { + filteredAssetPaths.Add(path); + } + } + + var gameObjects = new List(); - FindMissingReferences("Project", gameObjects); + foreach (var assetPath in filteredAssetPaths) + { + var obj = AssetDatabase.LoadAssetAtPath(assetPath, typeof(GameObject)) as GameObject; + if (obj != null) + { + gameObjects.Add(obj); + } + } + + FindMissingReferences("Project", gameObjects.ToArray()); } static void FindMissingReferences(string context, GameObject[] gameObjects) @@ -97,10 +118,19 @@ static void FindMissingReferences(string context, GameObject[] gameObjects) static GameObject[] GetSceneObjects() { // Use this method since GameObject.FindObjectsOfType will not return disabled objects. - return Resources.FindObjectsOfTypeAll() - .Where(go => string.IsNullOrEmpty(AssetDatabase.GetAssetPath(go)) - && go.hideFlags == HideFlags.None) - .ToArray(); + GameObject[] allGameObjects = Resources.FindObjectsOfTypeAll(); + var matchingGameObjects = new List(); + + // Counting the number of game objects that meet the criteria + foreach (var go in allGameObjects) + { + if (string.IsNullOrEmpty(AssetDatabase.GetAssetPath(go)) && go.hideFlags == HideFlags.None) + { + matchingGameObjects.Add(go); + } + } + + return matchingGameObjects.ToArray(); } static void ShowError(string context, GameObject go, string componentName, string propertyName) From ca173a7ce099cfc5ce55c3ad16c0c1d5cace5c5b Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Tue, 12 Dec 2023 15:16:54 -0500 Subject: [PATCH 03/12] fix: correct variable names used for initialization (external PR #145) (#150) * fix: swapped variable names in ShipControl.cs (#145) Co-authored-by: Fernando Cortez * changelog addition --------- Co-authored-by: alexia6119 <67676619+alexia6119@users.noreply.github.com> --- Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs | 4 ++-- CHANGELOG.md | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs b/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs index 0bc1e338..72b1c45a 100644 --- a/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs +++ b/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs @@ -152,8 +152,8 @@ public override void OnNetworkSpawn() } Energy.OnValueChanged += OnEnergyChanged; Health.OnValueChanged += OnHealthChanged; - OnEnergyChanged(0, Health.Value); - OnHealthChanged(0, Energy.Value); + OnEnergyChanged(0, Energy.Value); + OnHealthChanged(0, Health.Value); SetPlayerName(PlayerName.Value.ToString().ToUpper()); } diff --git a/CHANGELOG.md b/CHANGELOG.md index 460d5eaa..92a5e75e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,9 @@ - Upgraded to Netcode for GameObjects v1.7.1 (#147) - Upgraded sample to 2022.3.14f1 LTS (#147) +### Fixed +- Corrected the variables used for initialization of Health and Energy (#150) + ### Client Driven #### Changed From a1b536715a6b8b8226808d7644bdeb44f6cd7fce Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Tue, 12 Dec 2023 16:08:37 -0500 Subject: [PATCH 04/12] fix: remove unnecessary NetworkVariable in 2DSpaceShooter (#149) * ship thrust varaible converted to float * changelog addition * renaming of variable --- .../2DSpaceShooter/Assets/Prefabs/Ship.prefab | 61 ++++++++++--------- .../Assets/Scripts/ShipControl.cs | 15 +++-- CHANGELOG.md | 1 + 3 files changed, 41 insertions(+), 36 deletions(-) diff --git a/Basic/2DSpaceShooter/Assets/Prefabs/Ship.prefab b/Basic/2DSpaceShooter/Assets/Prefabs/Ship.prefab index 9017b0c7..a4f3de77 100644 --- a/Basic/2DSpaceShooter/Assets/Prefabs/Ship.prefab +++ b/Basic/2DSpaceShooter/Assets/Prefabs/Ship.prefab @@ -11,10 +11,10 @@ GameObject: - component: {fileID: 400000} - component: {fileID: 5000000} - component: {fileID: 5800000} + - component: {fileID: 509584576524893815} - component: {fileID: 11400004} - component: {fileID: 8200000} - component: {fileID: 8200002} - - component: {fileID: 509584576524893815} - component: {fileID: -360930162699739946} - component: {fileID: -8406883944196582507} - component: {fileID: 7896695181562740567} @@ -33,6 +33,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 100000} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 16.686096, y: -1.5172029, z: 0} m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} @@ -41,7 +42,6 @@ Transform: - {fileID: 400004} - {fileID: 1255143139002862940} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!50 &5000000 Rigidbody2D: @@ -105,6 +105,26 @@ CircleCollider2D: m_Offset: {x: 0, y: 0} serializedVersion: 2 m_Radius: 0.64 +--- !u!114 &509584576524893815 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 100000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} + m_Name: + m_EditorClassIdentifier: + GlobalObjectIdHash: 4192032552 + AlwaysReplicateAsRoot: 0 + SynchronizeTransform: 1 + ActiveSceneSynchronization: 0 + SceneMigrationSynchronization: 1 + SpawnWithObservers: 1 + DontDestroyWithOwner: 0 + AutoObjectParentSync: 1 --- !u!114 &11400004 MonoBehaviour: m_ObjectHideFlags: 0 @@ -173,7 +193,7 @@ MonoBehaviour: byte0028: 0 byte0029: 0 m_Friction: {fileID: 19800002} - m_Thrust: {fileID: 19800000} + m_ThrustParticleSystem: {fileID: 19800000} m_ShipGlow: {fileID: 5983711199006031825} m_ShipGlowDefaultColor: {r: 1, g: 1, b: 1, a: 1} m_UIDocument: {fileID: 7896695181562740567} @@ -370,25 +390,6 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!114 &509584576524893815 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 100000} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} - m_Name: - m_EditorClassIdentifier: - GlobalObjectIdHash: 951099334 - AlwaysReplicateAsRoot: 0 - SynchronizeTransform: 1 - ActiveSceneSynchronization: 0 - SceneMigrationSynchronization: 1 - DontDestroyWithOwner: 0 - AutoObjectParentSync: 1 --- !u!114 &-360930162699739946 MonoBehaviour: m_ObjectHideFlags: 0 @@ -485,13 +486,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 100002} + serializedVersion: 2 m_LocalRotation: {x: 0.70710284, y: 0.0023588336, z: -0.70710295, w: 0.0023588329} m_LocalPosition: {x: -1.73, y: 0.05, z: 0.46} m_LocalScale: {x: 1.26, y: 1.26, z: 1.26} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1255143139002862940} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &19800000 ParticleSystem: @@ -5287,13 +5288,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 0 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 0001030405 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -5328,13 +5331,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 100004} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 1, z: 0, w: -0} m_LocalPosition: {x: 0.45, y: -0.019937, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 400000} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &19800002 ParticleSystem: @@ -10130,13 +10133,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 0 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 0001030405 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -10170,6 +10175,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4711364113217113794} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.27, y: 0, z: 0} m_LocalScale: {x: 0.3890193, y: 0.3890193, z: 0.3890193} @@ -10178,7 +10184,6 @@ Transform: - {fileID: 389295837323142884} - {fileID: 400002} m_Father: {fileID: 400000} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &3390849995755675818 SpriteRenderer: @@ -10256,13 +10261,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6021497113750022543} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 0, z: 0.07} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1255143139002862940} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5983711199006031825 SpriteRenderer: diff --git a/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs b/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs index 72b1c45a..dca014d8 100644 --- a/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs +++ b/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs @@ -1,5 +1,4 @@ -using System; -using Unity.Collections; +using Unity.Collections; using Unity.Netcode; using UnityEngine; using UnityEngine.Assertions; @@ -74,7 +73,7 @@ public class ShipControl : NetworkBehaviour ParticleSystem m_Friction; [SerializeField] - ParticleSystem m_Thrust; + ParticleSystem m_ThrustParticleSystem; [SerializeField] SpriteRenderer m_ShipGlow; @@ -107,7 +106,7 @@ public class ShipControl : NetworkBehaviour float m_OldSpin = 0; // server movement - private NetworkVariable m_Thrusting = new NetworkVariable(); + float m_Thrust; float m_Spin; @@ -119,7 +118,7 @@ void Awake() m_ObjectPool = GameObject.FindWithTag(s_ObjectPoolTag).GetComponent(); Assert.IsNotNull(m_ObjectPool, $"{nameof(NetworkObjectPool)} not found in scene. Did you apply the {s_ObjectPoolTag} to the GameObject?"); - m_ThrustMain = m_Thrust.main; + m_ThrustMain = m_ThrustParticleSystem.main; m_ShipGlow.color = m_ShipGlowDefaultColor; m_IsBuffed = false; @@ -271,7 +270,7 @@ void UpdateServer() m_Rigidbody2D.angularVelocity = rotate; // update thrust - if (m_Thrusting.Value != 0) + if (m_Thrust != 0) { float accel = m_Acceleration; if (SpeedBuffTimer.Value > NetworkManager.ServerTime.TimeAsFloat) @@ -279,7 +278,7 @@ void UpdateServer() accel *= 2; } - Vector3 thrustVec = transform.right * (m_Thrusting.Value * accel); + Vector3 thrustVec = transform.right * (m_Thrust * accel); m_Rigidbody2D.AddForce(thrustVec); // restrict max speed @@ -504,7 +503,7 @@ void OnCollisionEnter2D(Collision2D other) [ServerRpc] public void ThrustServerRpc(float thrusting, int spin) { - m_Thrusting.Value = thrusting; + m_Thrust = thrusting; m_Spin = spin; } diff --git a/CHANGELOG.md b/CHANGELOG.md index 92a5e75e..ca3f730e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ ### Fixed - Corrected the variables used for initialization of Health and Energy (#150) +- Converted unnecessary ship thrust NetworkVariable to a float (#149) ### Client Driven From 1107a208c75f4caa29883416ddb6c5db2e452319 Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Tue, 12 Dec 2023 17:30:52 -0500 Subject: [PATCH 05/12] fix: fix the no fire sound problem (external PR #138) (#148) * fix the no fire sound problem (#138) Co-authored-by: Fernando Cortez * changelog addition --------- Co-authored-by: Zhanyu Feng <42690051+Alexander5421@users.noreply.github.com> --- Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs | 10 ++++++++-- CHANGELOG.md | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs b/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs index dca014d8..0f6afe4e 100644 --- a/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs +++ b/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs @@ -193,8 +193,7 @@ public void TakeDamage(int amount) void Fire(Vector3 direction) { - fireSound.Play(); - + PlayFireSoundClientRpc(); var damage = 5; if (QuadDamageTimer.Value > NetworkManager.ServerTime.TimeAsFloat) { @@ -498,6 +497,13 @@ void OnCollisionEnter2D(Collision2D other) } } + // --- ClientRPCs --- + + [ClientRpc] + void PlayFireSoundClientRpc() + { + fireSound.Play(); + } // --- ServerRPCs --- [ServerRpc] diff --git a/CHANGELOG.md b/CHANGELOG.md index ca3f730e..2f9484fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ ### Fixed - Corrected the variables used for initialization of Health and Energy (#150) - Converted unnecessary ship thrust NetworkVariable to a float (#149) +- Fixed non-host clients not hearing the Fire SFX (#148) ### Client Driven From 6ec028ff16f9cf0a85d34043cd981964b04a5bb8 Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Fri, 15 Dec 2023 11:42:34 -0500 Subject: [PATCH 06/12] updating utilities package for samples --- Basic/2DSpaceShooter/Packages/manifest.json | 2 +- Basic/2DSpaceShooter/Packages/packages-lock.json | 6 +++--- Basic/ClientDriven/Packages/manifest.json | 2 +- Basic/ClientDriven/Packages/packages-lock.json | 6 +++--- Basic/Invaders/Packages/manifest.json | 2 +- Basic/Invaders/Packages/packages-lock.json | 6 +++--- Experimental/MultiplayerUseCases/Packages/manifest.json | 2 +- .../MultiplayerUseCases/Packages/packages-lock.json | 6 +++--- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Basic/2DSpaceShooter/Packages/manifest.json b/Basic/2DSpaceShooter/Packages/manifest.json index 5490a2b7..acb568c2 100644 --- a/Basic/2DSpaceShooter/Packages/manifest.json +++ b/Basic/2DSpaceShooter/Packages/manifest.json @@ -6,7 +6,7 @@ "com.unity.ide.rider": "3.0.26", "com.unity.ide.visualstudio": "2.0.22", "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.3.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.4.0", "com.unity.netcode.gameobjects": "1.7.1", "com.unity.postprocessing": "3.2.2", "com.unity.render-pipelines.universal": "14.0.9", diff --git a/Basic/2DSpaceShooter/Packages/packages-lock.json b/Basic/2DSpaceShooter/Packages/packages-lock.json index 9f48a0f2..09caa8fa 100644 --- a/Basic/2DSpaceShooter/Packages/packages-lock.json +++ b/Basic/2DSpaceShooter/Packages/packages-lock.json @@ -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.3.0", + "version": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.4.0", "depth": 0, "source": "git", "dependencies": { "com.unity.learn.iet-framework": "3.1.3", "com.unity.multiplayer.tools": "1.1.0", - "com.unity.netcode.gameobjects": "1.6.0", + "com.unity.netcode.gameobjects": "1.7.1", "com.unity.services.relay": "1.0.5" }, - "hash": "a93b8cee21c60b890838405bb629d245cfae30e6" + "hash": "e48babbbf2e903d65e08a114aac3f3eba824a94a" }, "com.unity.multiplayer.tools": { "version": "1.1.0", diff --git a/Basic/ClientDriven/Packages/manifest.json b/Basic/ClientDriven/Packages/manifest.json index 422ca6e3..73440ec1 100644 --- a/Basic/ClientDriven/Packages/manifest.json +++ b/Basic/ClientDriven/Packages/manifest.json @@ -7,7 +7,7 @@ "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", "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.multiplayer.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.4.0", "com.unity.netcode.gameobjects": "1.7.1", "com.unity.render-pipelines.universal": "14.0.9", "com.unity.test-framework": "1.1.33", diff --git a/Basic/ClientDriven/Packages/packages-lock.json b/Basic/ClientDriven/Packages/packages-lock.json index 888856dc..0a2eee70 100644 --- a/Basic/ClientDriven/Packages/packages-lock.json +++ b/Basic/ClientDriven/Packages/packages-lock.json @@ -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.3.0", + "version": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.4.0", "depth": 0, "source": "git", "dependencies": { "com.unity.learn.iet-framework": "3.1.3", "com.unity.multiplayer.tools": "1.1.0", - "com.unity.netcode.gameobjects": "1.6.0", + "com.unity.netcode.gameobjects": "1.7.1", "com.unity.services.relay": "1.0.5" }, - "hash": "a93b8cee21c60b890838405bb629d245cfae30e6" + "hash": "e48babbbf2e903d65e08a114aac3f3eba824a94a" }, "com.unity.multiplayer.tools": { "version": "1.1.0", diff --git a/Basic/Invaders/Packages/manifest.json b/Basic/Invaders/Packages/manifest.json index 55d692d1..94f24ee8 100644 --- a/Basic/Invaders/Packages/manifest.json +++ b/Basic/Invaders/Packages/manifest.json @@ -5,7 +5,7 @@ "com.unity.ide.rider": "3.0.26", "com.unity.ide.visualstudio": "2.0.22", "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.3.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.4.0", "com.unity.multiplayer.tools": "1.1.1", "com.unity.netcode.gameobjects": "1.7.1", "com.unity.render-pipelines.universal": "14.0.9", diff --git a/Basic/Invaders/Packages/packages-lock.json b/Basic/Invaders/Packages/packages-lock.json index f832a4e0..e73e9fa0 100644 --- a/Basic/Invaders/Packages/packages-lock.json +++ b/Basic/Invaders/Packages/packages-lock.json @@ -91,16 +91,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.3.0", + "version": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.4.0", "depth": 0, "source": "git", "dependencies": { "com.unity.learn.iet-framework": "3.1.3", "com.unity.multiplayer.tools": "1.1.0", - "com.unity.netcode.gameobjects": "1.6.0", + "com.unity.netcode.gameobjects": "1.7.1", "com.unity.services.relay": "1.0.5" }, - "hash": "a93b8cee21c60b890838405bb629d245cfae30e6" + "hash": "e48babbbf2e903d65e08a114aac3f3eba824a94a" }, "com.unity.multiplayer.tools": { "version": "1.1.1", diff --git a/Experimental/MultiplayerUseCases/Packages/manifest.json b/Experimental/MultiplayerUseCases/Packages/manifest.json index 39db3ee7..f8705720 100644 --- a/Experimental/MultiplayerUseCases/Packages/manifest.json +++ b/Experimental/MultiplayerUseCases/Packages/manifest.json @@ -8,7 +8,7 @@ "com.unity.inputsystem": "1.7.0", "com.unity.learn.iet-framework": "3.1.3", "com.unity.learn.iet-framework.authoring": "1.2.2", - "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.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.4.0", "com.unity.multiplayer.tools": "1.1.1", "com.unity.netcode.gameobjects": "1.7.1", "com.unity.render-pipelines.universal": "14.0.9", diff --git a/Experimental/MultiplayerUseCases/Packages/packages-lock.json b/Experimental/MultiplayerUseCases/Packages/packages-lock.json index bb959ab3..657cef94 100644 --- a/Experimental/MultiplayerUseCases/Packages/packages-lock.json +++ b/Experimental/MultiplayerUseCases/Packages/packages-lock.json @@ -117,16 +117,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.3.0", + "version": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.4.0", "depth": 0, "source": "git", "dependencies": { "com.unity.learn.iet-framework": "3.1.3", "com.unity.multiplayer.tools": "1.1.0", - "com.unity.netcode.gameobjects": "1.6.0", + "com.unity.netcode.gameobjects": "1.7.1", "com.unity.services.relay": "1.0.5" }, - "hash": "a93b8cee21c60b890838405bb629d245cfae30e6" + "hash": "e48babbbf2e903d65e08a114aac3f3eba824a94a" }, "com.unity.multiplayer.tools": { "version": "1.1.1", From 02f759f940b7441789c9d9760139945fe1eb79a6 Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Fri, 15 Dec 2023 11:54:52 -0500 Subject: [PATCH 07/12] changelog addition --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f9484fc..45f12ca2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ #### Changed - Upgraded to Netcode for GameObjects v1.7.1 (#147) - Upgraded sample to 2022.3.14f1 LTS (#147) +- Upgraded Samples Utilities package to v1.8.0 (#151) ### Fixed - Corrected the variables used for initialization of Health and Energy (#150) @@ -23,6 +24,7 @@ #### Changed - Upgraded to Netcode for GameObjects v1.7.1 (#147) - Upgraded sample to 2022.3.14f1 LTS (#147) +- Upgraded Samples Utilities package to v1.8.0 (#151) ### Dynamic Addressables Network Prefabs @@ -35,6 +37,7 @@ #### Changed - Upgraded to Netcode for GameObjects v1.7.1 (#147) - Upgraded sample to 2022.3.14f1 LTS (#147) +- Upgraded Samples Utilities package to v1.8.0 (#151) ## [1.4.0] - 2023-09-25 From cc0a585cc1b53fe714a7850a9e0e67c9a12d6900 Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Fri, 15 Dec 2023 13:43:40 -0500 Subject: [PATCH 08/12] project versions updated --- Basic/2DSpaceShooter/ProjectSettings/ProjectSettings.asset | 7 ++++--- Basic/ClientDriven/ProjectSettings/ProjectSettings.asset | 7 ++++--- .../ProjectSettings/ProjectSettings.asset | 7 ++++--- Basic/Invaders/ProjectSettings/ProjectSettings.asset | 2 +- .../ProjectSettings/ProjectSettings.asset | 6 +++--- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Basic/2DSpaceShooter/ProjectSettings/ProjectSettings.asset b/Basic/2DSpaceShooter/ProjectSettings/ProjectSettings.asset index c35e3846..78141d60 100644 --- a/Basic/2DSpaceShooter/ProjectSettings/ProjectSettings.asset +++ b/Basic/2DSpaceShooter/ProjectSettings/ProjectSettings.asset @@ -48,6 +48,7 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 1 + unsupportedMSAAFallback: 0 m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 @@ -135,7 +136,7 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 1.4.0 + bundleVersion: 1.5.0 preloadedAssets: [] metroInputSource: 1 wsaTransparentSwapchain: 0 @@ -147,6 +148,7 @@ PlayerSettings: isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 + allowHDRDisplaySupport: 0 useHDRDisplay: 0 hdrBitDepth: 0 m_ColorGamuts: 00000000 @@ -570,7 +572,7 @@ PlayerSettings: switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 - switchUseGOLDLinker: 0 + switchEnableFileSystemTrace: 0 switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: @@ -700,7 +702,6 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 switchUseLegacyFmodPriorities: 1 switchUseMicroSleepForYield: 1 diff --git a/Basic/ClientDriven/ProjectSettings/ProjectSettings.asset b/Basic/ClientDriven/ProjectSettings/ProjectSettings.asset index 2a2b1dea..6a2bcb72 100644 --- a/Basic/ClientDriven/ProjectSettings/ProjectSettings.asset +++ b/Basic/ClientDriven/ProjectSettings/ProjectSettings.asset @@ -48,6 +48,7 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 1 + unsupportedMSAAFallback: 0 m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 @@ -135,7 +136,7 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 1.4.0 + bundleVersion: 1.5.0 preloadedAssets: - {fileID: 11400000, guid: 9e7be553448fa2546aea5752021cbcf7, type: 2} metroInputSource: 0 @@ -148,6 +149,7 @@ PlayerSettings: isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 + allowHDRDisplaySupport: 0 useHDRDisplay: 0 hdrBitDepth: 0 m_ColorGamuts: 00000000 @@ -481,7 +483,7 @@ PlayerSettings: switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 - switchUseGOLDLinker: 0 + switchEnableFileSystemTrace: 0 switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: @@ -611,7 +613,6 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 switchUseLegacyFmodPriorities: 1 switchUseMicroSleepForYield: 1 diff --git a/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/ProjectSettings.asset b/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/ProjectSettings.asset index 0a184a1f..d93865d4 100644 --- a/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/ProjectSettings.asset +++ b/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/ProjectSettings.asset @@ -48,6 +48,7 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 + unsupportedMSAAFallback: 0 m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 @@ -135,7 +136,7 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 1.4.0 + bundleVersion: 1.5.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -147,6 +148,7 @@ PlayerSettings: isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 + allowHDRDisplaySupport: 0 useHDRDisplay: 0 hdrBitDepth: 0 m_ColorGamuts: 00000000 @@ -401,7 +403,7 @@ PlayerSettings: switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 - switchUseGOLDLinker: 0 + switchEnableFileSystemTrace: 0 switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: @@ -531,7 +533,6 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 switchUseLegacyFmodPriorities: 1 switchUseMicroSleepForYield: 1 diff --git a/Basic/Invaders/ProjectSettings/ProjectSettings.asset b/Basic/Invaders/ProjectSettings/ProjectSettings.asset index cc49bca2..6912ef7d 100644 --- a/Basic/Invaders/ProjectSettings/ProjectSettings.asset +++ b/Basic/Invaders/ProjectSettings/ProjectSettings.asset @@ -136,7 +136,7 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 1.4.0 + bundleVersion: 1.5.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 diff --git a/Experimental/MultiplayerUseCases/ProjectSettings/ProjectSettings.asset b/Experimental/MultiplayerUseCases/ProjectSettings/ProjectSettings.asset index 3db33996..5f3ed85e 100644 --- a/Experimental/MultiplayerUseCases/ProjectSettings/ProjectSettings.asset +++ b/Experimental/MultiplayerUseCases/ProjectSettings/ProjectSettings.asset @@ -48,6 +48,7 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 1 + unsupportedMSAAFallback: 0 m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 @@ -135,7 +136,7 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 0.1 + bundleVersion: 1.0.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -147,6 +148,7 @@ PlayerSettings: isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 + allowHDRDisplaySupport: 0 useHDRDisplay: 0 hdrBitDepth: 0 m_ColorGamuts: 00000000 @@ -402,7 +404,6 @@ PlayerSettings: switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 switchEnableFileSystemTrace: 0 - switchUseGOLDLinker: 0 switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: @@ -532,7 +533,6 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 From fe0bb30a0a9ef15ca01f90a291681d4ced71ba80 Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Fri, 15 Dec 2023 13:55:30 -0500 Subject: [PATCH 09/12] updating readmes and changelog --- Basic/2DSpaceShooter/README.md | 4 ++-- Basic/ClientDriven/README.md | 4 ++-- Basic/DynamicAddressablesNetworkPrefabs/README.md | 4 ++-- Basic/Invaders/README.md | 4 ++-- CHANGELOG.md | 2 +- Experimental/MultiplayerUseCases/README.md | 2 +- README.md | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Basic/2DSpaceShooter/README.md b/Basic/2DSpaceShooter/README.md index a04a1d36..f8deb1ba 100644 --- a/Basic/2DSpaceShooter/README.md +++ b/Basic/2DSpaceShooter/README.md @@ -4,8 +4,8 @@ # 2D Space Shooter [![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) -[![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) +[![NetcodeVersion](https://img.shields.io/badge/Netcode%20Version:-1.7.1-57b9d3.svg?logo=unity&color=2196F3)](https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/releases/tag/ngo%2F1.7.1) +[![LatestRelease](https://img.shields.io/badge/Latest%20%20Github%20Release:-v1.5.0-57b9d3.svg?logo=github&color=brightgreen)](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.bitesize/releases/tag/v1.5.0)

This is a UNET sample project converted to Netcode for GameObjects. The 2DSpaceShooter sample is a bitesize sample designed to demonstrate networked 2D and physics-based character movement. diff --git a/Basic/ClientDriven/README.md b/Basic/ClientDriven/README.md index 0884ecf6..d2319561 100644 --- a/Basic/ClientDriven/README.md +++ b/Basic/ClientDriven/README.md @@ -4,8 +4,8 @@ # Client Driven [![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) -[![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) +[![NetcodeVersion](https://img.shields.io/badge/Netcode%20Version:-1.7.1-57b9d3.svg?logo=unity&color=2196F3)](https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/releases/tag/ngo%2F1.7.1) +[![LatestRelease](https://img.shields.io/badge/Latest%20%20Github%20Release:-v1.5.0-57b9d3.svg?logo=github&color=brightgreen)](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.bitesize/releases/tag/v1.5.0)

The ClientDriven sample is a sample project made with Netcode for GameObjects designed to demonstrate responsive 3rd-person WASD character movements even under unfavourable network conditions. diff --git a/Basic/DynamicAddressablesNetworkPrefabs/README.md b/Basic/DynamicAddressablesNetworkPrefabs/README.md index 14a72866..02bccfe4 100644 --- a/Basic/DynamicAddressablesNetworkPrefabs/README.md +++ b/Basic/DynamicAddressablesNetworkPrefabs/README.md @@ -4,8 +4,8 @@ # Dynamic Addressables Network Prefabs Sample [![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) -[![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) +[![NetcodeVersion](https://img.shields.io/badge/Netcode%20Version:-1.7.1-57b9d3.svg?logo=unity&color=2196F3)](https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/releases/tag/ngo%2F1.7.1) +[![LatestRelease](https://img.shields.io/badge/Latest%20%20Github%20Release:-v1.5.0-57b9d3.svg?logo=github&color=brightgreen)](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.bitesize/releases/tag/v1.5.0)

The Dynamic Prefabs Sample showcases the available use-cases for the dynamic prefab system, which allows us to add new spawnable prefabs at runtime. This sample uses Addressables to load the dynamic prefab, however any GameObject with a NetworkObject component can be used, regardless of its source. This sample also uses in-game UI (created using UI Toolkit) to interface with the dynamic prefabs system with configurable options like artificial latency and network spawn timeout for easy testing. diff --git a/Basic/Invaders/README.md b/Basic/Invaders/README.md index 99040d9f..7d9a8399 100644 --- a/Basic/Invaders/README.md +++ b/Basic/Invaders/README.md @@ -4,8 +4,8 @@ # Invaders [![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) -[![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) +[![NetcodeVersion](https://img.shields.io/badge/Netcode%20Version:-1.7.1-57b9d3.svg?logo=unity&color=2196F3)](https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/releases/tag/ngo%2F1.7.1) +[![LatestRelease](https://img.shields.io/badge/Latest%20%20Github%20Release:-v1.5.0-57b9d3.svg?logo=github&color=brightgreen)](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.bitesize/releases/tag/v1.5.0)

This is a UNET sample project converted to Netcode for GameObjects. The Invaders sample is a sample project designed to demonstrate game flows and game modes. diff --git a/CHANGELOG.md b/CHANGELOG.md index 45f12ca2..d290da96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [unreleased] yyyy-mm-dd +## [1.5.0] 2023-12-15 ### Bitesize Samples Repository diff --git a/Experimental/MultiplayerUseCases/README.md b/Experimental/MultiplayerUseCases/README.md index 78b0c5bf..6962b0f0 100644 --- a/Experimental/MultiplayerUseCases/README.md +++ b/Experimental/MultiplayerUseCases/README.md @@ -1,7 +1,7 @@ # Multiplayer Use Cases [![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) +[![NetcodeVersion](https://img.shields.io/badge/Netcode%20Version:-1.7.1-57b9d3.svg?logo=unity&color=2196F3)](https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/releases/tag/ngo%2F1.7.1)

This sample provides a series of scenes. Each scene explains a specific API or system commonly used in Netcode for GameObjects. In this sample you will learn more about client-server communication, state synchronization, and other typical mechanics of multiplayer games. diff --git a/README.md b/README.md index 19845cda..ed9c4ece 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,8 @@ # 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.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.4.0-57b9d3.svg?logo=github&color=brightgreen)](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.bitesize/releases/tag/v1.4.0) +[![NetcodeVersion](https://img.shields.io/badge/Netcode%20Version:-1.7.1-57b9d3.svg?logo=unity&color=2196F3)](https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/releases/tag/ngo%2F1.7.1) +[![LatestRelease](https://img.shields.io/badge/Latest%20%20Github%20Release:-v1.5.0-57b9d3.svg?logo=github&color=brightgreen)](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.bitesize/releases/tag/v1.5.0)

This repository contains a collection of bitesize sample projects and games that showcase different techniques From 37521e04107d5db27a22efcb40c8fec3c6befdfe Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Fri, 15 Dec 2023 14:11:19 -0500 Subject: [PATCH 10/12] formatting in changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d290da96..80f98253 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ - Upgraded sample to 2022.3.14f1 LTS (#147) - Upgraded Samples Utilities package to v1.8.0 (#151) -### Fixed +#### Fixed - Corrected the variables used for initialization of Health and Energy (#150) - Converted unnecessary ship thrust NetworkVariable to a float (#149) - Fixed non-host clients not hearing the Fire SFX (#148) From ad27d643003d58d0b502031408863f66157f9e8e Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Fri, 15 Dec 2023 14:38:04 -0500 Subject: [PATCH 11/12] chore: Experimental folder contribution guidelines update (#152) experimental contribution guidelines link update --- Experimental/README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Experimental/README.md b/Experimental/README.md index 19d9556c..8cddbaed 100644 --- a/Experimental/README.md +++ b/Experimental/README.md @@ -23,5 +23,4 @@ To connect, find support and share feedback, join the multiplayer community on t ## Contributing -If you're a Unity employee, click [here](https://docs.google.com/document/d/1PCti3N3a78fObtU8fm4EQYMibXFtmjtPFZ_x-f_O5w0/edit?usp=sharing) for the process. - +If you're a Unity employee, click [here](https://confluence.unity3d.com/display/MTT/Experimental+Folder+Contribution+Guidelines) for contribution guidelines. From bf2c738409315fd6fce443b2b06e4a8367820e47 Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Fri, 15 Dec 2023 15:28:06 -0500 Subject: [PATCH 12/12] feat: Updating utilities package for samples to v1.8.0 (#151) * updating utilities package for samples * changelog addition --- Basic/2DSpaceShooter/Packages/manifest.json | 2 +- Basic/2DSpaceShooter/Packages/packages-lock.json | 6 +++--- Basic/ClientDriven/Packages/manifest.json | 2 +- Basic/ClientDriven/Packages/packages-lock.json | 6 +++--- Basic/Invaders/Packages/manifest.json | 2 +- Basic/Invaders/Packages/packages-lock.json | 6 +++--- CHANGELOG.md | 3 +++ Experimental/MultiplayerUseCases/Packages/manifest.json | 2 +- .../MultiplayerUseCases/Packages/packages-lock.json | 6 +++--- 9 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Basic/2DSpaceShooter/Packages/manifest.json b/Basic/2DSpaceShooter/Packages/manifest.json index 5490a2b7..acb568c2 100644 --- a/Basic/2DSpaceShooter/Packages/manifest.json +++ b/Basic/2DSpaceShooter/Packages/manifest.json @@ -6,7 +6,7 @@ "com.unity.ide.rider": "3.0.26", "com.unity.ide.visualstudio": "2.0.22", "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.3.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.4.0", "com.unity.netcode.gameobjects": "1.7.1", "com.unity.postprocessing": "3.2.2", "com.unity.render-pipelines.universal": "14.0.9", diff --git a/Basic/2DSpaceShooter/Packages/packages-lock.json b/Basic/2DSpaceShooter/Packages/packages-lock.json index 9f48a0f2..09caa8fa 100644 --- a/Basic/2DSpaceShooter/Packages/packages-lock.json +++ b/Basic/2DSpaceShooter/Packages/packages-lock.json @@ -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.3.0", + "version": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.4.0", "depth": 0, "source": "git", "dependencies": { "com.unity.learn.iet-framework": "3.1.3", "com.unity.multiplayer.tools": "1.1.0", - "com.unity.netcode.gameobjects": "1.6.0", + "com.unity.netcode.gameobjects": "1.7.1", "com.unity.services.relay": "1.0.5" }, - "hash": "a93b8cee21c60b890838405bb629d245cfae30e6" + "hash": "e48babbbf2e903d65e08a114aac3f3eba824a94a" }, "com.unity.multiplayer.tools": { "version": "1.1.0", diff --git a/Basic/ClientDriven/Packages/manifest.json b/Basic/ClientDriven/Packages/manifest.json index 422ca6e3..73440ec1 100644 --- a/Basic/ClientDriven/Packages/manifest.json +++ b/Basic/ClientDriven/Packages/manifest.json @@ -7,7 +7,7 @@ "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", "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.multiplayer.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.4.0", "com.unity.netcode.gameobjects": "1.7.1", "com.unity.render-pipelines.universal": "14.0.9", "com.unity.test-framework": "1.1.33", diff --git a/Basic/ClientDriven/Packages/packages-lock.json b/Basic/ClientDriven/Packages/packages-lock.json index 888856dc..0a2eee70 100644 --- a/Basic/ClientDriven/Packages/packages-lock.json +++ b/Basic/ClientDriven/Packages/packages-lock.json @@ -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.3.0", + "version": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.4.0", "depth": 0, "source": "git", "dependencies": { "com.unity.learn.iet-framework": "3.1.3", "com.unity.multiplayer.tools": "1.1.0", - "com.unity.netcode.gameobjects": "1.6.0", + "com.unity.netcode.gameobjects": "1.7.1", "com.unity.services.relay": "1.0.5" }, - "hash": "a93b8cee21c60b890838405bb629d245cfae30e6" + "hash": "e48babbbf2e903d65e08a114aac3f3eba824a94a" }, "com.unity.multiplayer.tools": { "version": "1.1.0", diff --git a/Basic/Invaders/Packages/manifest.json b/Basic/Invaders/Packages/manifest.json index 55d692d1..94f24ee8 100644 --- a/Basic/Invaders/Packages/manifest.json +++ b/Basic/Invaders/Packages/manifest.json @@ -5,7 +5,7 @@ "com.unity.ide.rider": "3.0.26", "com.unity.ide.visualstudio": "2.0.22", "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.3.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.4.0", "com.unity.multiplayer.tools": "1.1.1", "com.unity.netcode.gameobjects": "1.7.1", "com.unity.render-pipelines.universal": "14.0.9", diff --git a/Basic/Invaders/Packages/packages-lock.json b/Basic/Invaders/Packages/packages-lock.json index f832a4e0..e73e9fa0 100644 --- a/Basic/Invaders/Packages/packages-lock.json +++ b/Basic/Invaders/Packages/packages-lock.json @@ -91,16 +91,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.3.0", + "version": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.4.0", "depth": 0, "source": "git", "dependencies": { "com.unity.learn.iet-framework": "3.1.3", "com.unity.multiplayer.tools": "1.1.0", - "com.unity.netcode.gameobjects": "1.6.0", + "com.unity.netcode.gameobjects": "1.7.1", "com.unity.services.relay": "1.0.5" }, - "hash": "a93b8cee21c60b890838405bb629d245cfae30e6" + "hash": "e48babbbf2e903d65e08a114aac3f3eba824a94a" }, "com.unity.multiplayer.tools": { "version": "1.1.1", diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f9484fc..45f12ca2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ #### Changed - Upgraded to Netcode for GameObjects v1.7.1 (#147) - Upgraded sample to 2022.3.14f1 LTS (#147) +- Upgraded Samples Utilities package to v1.8.0 (#151) ### Fixed - Corrected the variables used for initialization of Health and Energy (#150) @@ -23,6 +24,7 @@ #### Changed - Upgraded to Netcode for GameObjects v1.7.1 (#147) - Upgraded sample to 2022.3.14f1 LTS (#147) +- Upgraded Samples Utilities package to v1.8.0 (#151) ### Dynamic Addressables Network Prefabs @@ -35,6 +37,7 @@ #### Changed - Upgraded to Netcode for GameObjects v1.7.1 (#147) - Upgraded sample to 2022.3.14f1 LTS (#147) +- Upgraded Samples Utilities package to v1.8.0 (#151) ## [1.4.0] - 2023-09-25 diff --git a/Experimental/MultiplayerUseCases/Packages/manifest.json b/Experimental/MultiplayerUseCases/Packages/manifest.json index 39db3ee7..f8705720 100644 --- a/Experimental/MultiplayerUseCases/Packages/manifest.json +++ b/Experimental/MultiplayerUseCases/Packages/manifest.json @@ -8,7 +8,7 @@ "com.unity.inputsystem": "1.7.0", "com.unity.learn.iet-framework": "3.1.3", "com.unity.learn.iet-framework.authoring": "1.2.2", - "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.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.4.0", "com.unity.multiplayer.tools": "1.1.1", "com.unity.netcode.gameobjects": "1.7.1", "com.unity.render-pipelines.universal": "14.0.9", diff --git a/Experimental/MultiplayerUseCases/Packages/packages-lock.json b/Experimental/MultiplayerUseCases/Packages/packages-lock.json index bb959ab3..657cef94 100644 --- a/Experimental/MultiplayerUseCases/Packages/packages-lock.json +++ b/Experimental/MultiplayerUseCases/Packages/packages-lock.json @@ -117,16 +117,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.3.0", + "version": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.4.0", "depth": 0, "source": "git", "dependencies": { "com.unity.learn.iet-framework": "3.1.3", "com.unity.multiplayer.tools": "1.1.0", - "com.unity.netcode.gameobjects": "1.6.0", + "com.unity.netcode.gameobjects": "1.7.1", "com.unity.services.relay": "1.0.5" }, - "hash": "a93b8cee21c60b890838405bb629d245cfae30e6" + "hash": "e48babbbf2e903d65e08a114aac3f3eba824a94a" }, "com.unity.multiplayer.tools": { "version": "1.1.1",