From a8a31a22fa195d4ee6d3fe990acd73fa48841edf Mon Sep 17 00:00:00 2001
From: Elfi0Kuhndorf <93766359+Elfi0Kuhndorf@users.noreply.github.com>
Date: Fri, 16 Feb 2024 14:08:19 +0100
Subject: [PATCH 01/20] MTT-7858: Make ParrelSync window interactable in
 tutorial (#155)

* change the masking settings of that tutorial page so that users can use the ParrelSync window

* Revert "change the masking settings of that tutorial page so that users can use the ParrelSync window"

This reverts commit 86fe3b2553301da224e7809f0d96db57fc73c5ee.

* add parrelsync clones window to tutorial
---
 .../50-TestNetworkBehaviour.asset                    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Experimental/MultiplayerUseCases/Assets/Editor/Tutorials/NetworkVariablesVsRPC/50-TestNetworkBehaviour.asset b/Experimental/MultiplayerUseCases/Assets/Editor/Tutorials/NetworkVariablesVsRPC/50-TestNetworkBehaviour.asset
index 1521453a..a4af59fe 100644
--- a/Experimental/MultiplayerUseCases/Assets/Editor/Tutorials/NetworkVariablesVsRPC/50-TestNetworkBehaviour.asset
+++ b/Experimental/MultiplayerUseCases/Assets/Editor/Tutorials/NetworkVariablesVsRPC/50-TestNetworkBehaviour.asset
@@ -78,6 +78,18 @@ MonoBehaviour:
           m_MaskType: 0
           m_MaskSizeModifier: 0
           m_UnmaskedControls: []
+        - m_SelectorType: 1
+          m_ViewType:
+            m_TypeName: UnityEditor.Toolbar, UnityEditor.CoreModule, Version=0.0.0.0,
+              Culture=neutral, PublicKeyToken=null
+          m_EditorWindowType:
+            m_TypeName: ParrelSync.ClonesManagerWindow, ParrelSync, Version=0.0.0.0,
+              Culture=neutral, PublicKeyToken=null
+          m_AlternateEditorWindowTypes:
+            m_Items: []
+          m_MaskType: 0
+          m_MaskSizeModifier: 0
+          m_UnmaskedControls: []
       m_Summary: 
       m_Description: 
       m_InstructionBoxTitle: 

From 66e05ca1c03a633da49225e41fb9eb3829d55e87 Mon Sep 17 00:00:00 2001
From: Fernando Cortez <fernando.cortez@unity3d.com>
Date: Thu, 14 Mar 2024 13:24:11 -0400
Subject: [PATCH 02/20] feat: dotnet standards tests + formatting pass on
 samples [MTT-5183] (#156)

* standards job added per sample project

* indentation

* descriptive job name per project

* relative path to projects

* editorconfig added

* actual netcode standards csproj file

* removing test job, paths sorted

* Invaders formatted

* 2DSpaceShooter formatted

* ClientDriven formatted

* DynamicAddressablesNetworkPrefabs formatted

* MultiplayerUseCases formatted

* changelog addition

* test: update editorconfig

* line separators change

* file in Addressables project formatted

* formatted straggler scripts in invaders
---
 .editorconfig                                 | 200 ++++++++
 .yamato/build.yml                             |   1 +
 .yamato/project-standards.yml                 |  22 +
 .yamato/project.metafile                      |   2 +-
 .../2DSpaceShooter/Assets/Scripts/Asteroid.cs |  16 +-
 Basic/2DSpaceShooter/Assets/Scripts/Bullet.cs |   2 +-
 .../Assets/Scripts/NetworkManagerHud.cs       |  62 +--
 .../2DSpaceShooter/Assets/Scripts/Powerup.cs  |  26 +-
 .../Scripts/RandomPositionPlayerSpawner.cs    |   8 +-
 .../Assets/Scripts/ShipControl.cs             |  98 ++--
 .../2DSpaceShooter/Assets/Scripts/Spawner.cs  |  22 +-
 .../Scripts/ClientObjectWithIngredientType.cs |   6 +-
 .../Assets/Scripts/ClientPlayerColor.cs       |   2 +-
 .../Assets/Scripts/ClientPlayerMove.cs        |   4 +-
 .../ClientDriven/Assets/Scripts/HostJoinUI.cs |  22 +-
 Basic/ClientDriven/Assets/Scripts/ScoreUI.cs  |   6 +-
 .../Assets/Scripts/ServerIngredient.cs        |   2 +-
 .../Assets/Scripts/ServerIngredientPhysics.cs |   4 +-
 .../Assets/Scripts/ServerPlayerMove.cs        |  10 +-
 .../Assets/Scripts/ServerPlayerSpawnPoints.cs |   2 +-
 .../Assets/Scripts/ServerScoreReplicator.cs   |   2 +-
 .../Editor/StarterAssetsDeployMenu.cs         |  24 +-
 .../ThirdPersonStarterAssetsDeployMenu.cs     |   8 +-
 .../InputSystem/StarterAssetsInputs.cs        | 116 ++---
 .../CanvasInputs/UICanvasControllerInput.cs   |   2 +-
 .../MobileDisableAutoSwitchControls.cs        |   4 +-
 .../Scripts/VirtualInputs/UIVirtualButton.cs  |   2 +-
 .../VirtualInputs/UIVirtualJoystick.cs        |  28 +-
 .../VirtualInputs/UIVirtualTouchZone.cs       |  18 +-
 .../Scripts/BasicRigidBodyPush.cs             |  50 +-
 .../Scripts/ThirdPersonController.cs          |   6 +-
 .../Scripts/00_Preloading/Preloading.cs       |  12 +-
 .../ConnectionApproval.cs                     |  54 +--
 .../ServerAuthoritativeLoadAllAsync.cs        |  64 +--
 .../ServerAuthoritativeSynchronousSpawning.cs |  88 ++--
 ...rAuthoritativeNetworkVisibilitySpawning.cs |  88 ++--
 .../05_API Playground/APIPlayground.cs        | 156 +++---
 .../Scripts/Readme/Editor/ReadmeEditor.cs     |  10 +-
 .../Assets/Scripts/Shared/AddressableGUID.cs  |   2 +-
 .../Assets/Scripts/Shared/AppController.cs    |  20 +-
 .../Scripts/Shared/ConnectionPayload.cs       |   2 +-
 .../Assets/Scripts/Shared/ConnectionState.cs  |   4 +-
 .../ConnectionStates/ClientConnectedState.cs  |   4 +-
 .../ConnectionStates/ClientConnectingState.cs |  18 +-
 .../ConnectionStates/ClientPreloadingState.cs |   2 +-
 .../Shared/ConnectionStates/HostingState.cs   |   4 +-
 .../Shared/ConnectionStates/OfflineState.cs   |   2 +-
 .../ConnectionStates/StartingHostState.cs     |   6 +-
 .../Shared/DynamicPrefabLoadingUtilities.cs   |  38 +-
 .../Shared/OptionalConnectionManager.cs       |  32 +-
 .../Assets/Scripts/UI/IPMenuUI.cs             |  14 +-
 .../Assets/Scripts/UI/InGameUI.cs             |  16 +-
 Basic/Invaders/Assets/Scripts/EnemyAgent.cs   |   4 +-
 Basic/Invaders/Assets/Scripts/EnemyBullet.cs  |   2 +-
 Basic/Invaders/Assets/Scripts/InvadersGame.cs |  92 ++--
 Basic/Invaders/Assets/Scripts/LobbyControl.cs |   8 +-
 Basic/Invaders/Assets/Scripts/MenuControl.cs  |   2 +-
 Basic/Invaders/Assets/Scripts/PlayerBullet.cs |   8 +-
 .../Invaders/Assets/Scripts/PlayerControl.cs  |  12 +-
 .../Assets/Scripts/SceneTransitionHandler.cs  |  16 +-
 Basic/Invaders/Assets/Scripts/Shield.cs       |   2 +-
 .../Assets/Scripts/SuperEnemyMovement.cs      |   4 +-
 CHANGELOG.md                                  |   7 +
 .../Scripts/MultiplayerUseCasesUtilities.cs   |   2 +-
 .../Assets/Common/Scripts/NetworkManagerUI.cs |   4 +-
 .../Assets/Common/Scripts/PlayerManager.cs    |   2 +-
 .../Editor/Tutorials/TutorialCallbacks.cs     |   4 +-
 .../InputSystem/StarterAssetsInputs.cs        | 116 ++---
 .../Scripts/BasicRigidBodyPush.cs             |  50 +-
 .../Scripts/ThirdPersonController.cs          |   4 +-
 .../Tests/Editor/MissingReferencesFinder.cs   |   4 +-
 .../Assets/Tests/Editor/ProjectTests.cs       |   2 +-
 .../NetvarVsRpc/Scripts/ColorManager.cs       |   2 +-
 .../Scripts/CharacterManager.cs               |   2 +-
 .../NetworkVariables/Scripts/ColorManager.cs  |   2 +-
 .../Scripts/SceneSelectionElement.cs          |   2 +-
 .../Scripts/SceneSelectionUI.cs               |   2 +-
 dotnet-tools/.gitignore                       | 454 ++++++++++++++++++
 dotnet-tools/README.md                        |  61 +++
 dotnet-tools/netcode.standards/Program.cs     |  66 +++
 .../netcode.standards.csproj                  |  15 +
 81 files changed, 1595 insertions(+), 769 deletions(-)
 create mode 100644 .editorconfig
 create mode 100644 .yamato/project-standards.yml
 create mode 100644 dotnet-tools/.gitignore
 create mode 100644 dotnet-tools/README.md
 create mode 100644 dotnet-tools/netcode.standards/Program.cs
 create mode 100644 dotnet-tools/netcode.standards/netcode.standards.csproj

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..e29a8018
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,200 @@
+; see http://editorconfig.org/ for docs on this file
+
+root = true
+
+[*]
+ignore_if_in_header = This code was generated by a tool|<auto-generated>
+indent_style = space
+indent_size = 4
+; uncomment to help with sharing files across os's (i.e. network share or through local vm)
+#end_of_line = lf
+; avoid a bom, which causes endless problems with naive text tooling
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+; keeping auto-format enabled helps avoid merge hell for projects without CI-based format validation
+#disable_auto_format = true
+
+[*.cs]
+; uncomment to enable full formatting of c# files
+formatters = generic, uncrustify
+
+[*.asmdef]
+scrape_api = true
+
+[**/Tests/**.asmdef]
+scrape_api = false
+
+[*.Tests.asmdef]
+scrape_api = false
+
+[*.md]
+indent_size = 2
+; trailing whitespace is unfortunately significant in markdown
+trim_trailing_whitespace = false
+; uncomment to enable basic formatting of markdown files
+#formatters = generic
+
+[{Makefile,makefile}]
+; tab characters are part of the Makefile format
+indent_style = tab
+
+[*.asmdef]
+indent_size = 4
+
+[*.json]
+indent_size = 2
+
+[*.{vcproj,bat,cmd,xaml,tt,t4,ttinclude}]
+end_of_line = crlf
+
+; this VS-specific stuff is based on experiments to see how VS will modify a file after it has been manually edited.
+; the settings are meant to closely match what VS does to minimize unnecessary diffs.
+[*.{vcxproj,vcxproj.filters}]
+indent_style = space
+indent_size = 2
+end_of_line = crlf
+charset = utf-8-bom
+trim_trailing_whitespace = true
+insert_final_newline = false
+; must be broken out because of 51-char bug (https://github.com/editorconfig/editorconfig-visualstudio/issues/21)
+[*.{csproj,pyproj,props,targets}]
+indent_style = space
+indent_size = 2
+end_of_line = crlf
+charset = utf-8-bom
+trim_trailing_whitespace = true
+insert_final_newline = false
+[*.{sln,sln.template}]
+indent_style = tab
+indent_size = 4
+end_of_line = crlf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = false
+
+#### naming styles ####
+
+# naming rules
+[*.cs]
+dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
+dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
+dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
+
+dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.types_should_be_pascal_case.symbols = types
+dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
+dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.method_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.method_should_be_pascal_case.symbols = method
+dotnet_naming_rule.method_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.private_or_internal_field_should_be_begins_with_m_.severity = suggestion
+dotnet_naming_rule.private_or_internal_field_should_be_begins_with_m_.symbols = private_or_internal_field
+dotnet_naming_rule.private_or_internal_field_should_be_begins_with_m_.style = begins_with_m_
+
+dotnet_naming_rule.private_or_internal_static_field_should_be_begins_with_s_.severity = suggestion
+dotnet_naming_rule.private_or_internal_static_field_should_be_begins_with_s_.symbols = private_or_internal_static_field
+dotnet_naming_rule.private_or_internal_static_field_should_be_begins_with_s_.style = begins_with_s_
+
+dotnet_naming_rule.non_public_const_fields_should_be_begins_with_k_.severity = suggestion
+dotnet_naming_rule.non_public_const_fields_should_be_begins_with_k_.symbols = non_public_const_fields
+dotnet_naming_rule.non_public_const_fields_should_be_begins_with_k_.style = begins_with_k_
+
+dotnet_naming_rule.non_public_static_readonly_fields_should_be_begins_with_k_.severity = suggestion
+dotnet_naming_rule.non_public_static_readonly_fields_should_be_begins_with_k_.symbols = non_public_static_readonly_fields
+dotnet_naming_rule.non_public_static_readonly_fields_should_be_begins_with_k_.style = begins_with_k_
+
+dotnet_naming_rule.event_should_be_camel_case.severity = suggestion
+dotnet_naming_rule.event_should_be_camel_case.symbols = event
+dotnet_naming_rule.event_should_be_camel_case.style = camel_case
+
+dotnet_naming_rule.method_parameters_should_be_camel_case.severity = suggestion
+dotnet_naming_rule.method_parameters_should_be_camel_case.symbols = method_parameters
+dotnet_naming_rule.method_parameters_should_be_camel_case.style = camel_case
+
+dotnet_naming_rule.local_should_be_camel_case.severity = suggestion
+dotnet_naming_rule.local_should_be_camel_case.symbols = local
+dotnet_naming_rule.local_should_be_camel_case.style = camel_case
+
+# symbol specifications
+
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.interface.required_modifiers = 
+
+dotnet_naming_symbols.event.applicable_kinds = event
+dotnet_naming_symbols.event.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.event.required_modifiers = 
+
+dotnet_naming_symbols.method.applicable_kinds = method
+dotnet_naming_symbols.method.applicable_accessibilities = public
+dotnet_naming_symbols.method.required_modifiers = 
+
+dotnet_naming_symbols.private_or_internal_field.applicable_kinds = field
+dotnet_naming_symbols.private_or_internal_field.applicable_accessibilities = internal, private, private_protected
+dotnet_naming_symbols.private_or_internal_field.required_modifiers = 
+
+dotnet_naming_symbols.private_or_internal_static_field.applicable_kinds = field
+dotnet_naming_symbols.private_or_internal_static_field.applicable_accessibilities = internal, private, private_protected
+dotnet_naming_symbols.private_or_internal_static_field.required_modifiers = static
+
+dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.types.required_modifiers = 
+
+dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.non_field_members.required_modifiers = 
+
+dotnet_naming_symbols.non_public_const_fields.applicable_kinds = field
+dotnet_naming_symbols.non_public_const_fields.applicable_accessibilities = internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.non_public_const_fields.required_modifiers = const
+
+dotnet_naming_symbols.non_public_static_readonly_fields.applicable_kinds = field
+dotnet_naming_symbols.non_public_static_readonly_fields.applicable_accessibilities = private, protected, protected_internal, private_protected
+dotnet_naming_symbols.non_public_static_readonly_fields.required_modifiers = readonly, static
+
+dotnet_naming_symbols.method_parameters.applicable_kinds = parameter
+dotnet_naming_symbols.method_parameters.applicable_accessibilities = 
+dotnet_naming_symbols.method_parameters.required_modifiers = 
+
+dotnet_naming_symbols.local.applicable_kinds = local
+dotnet_naming_symbols.local.applicable_accessibilities = local
+dotnet_naming_symbols.local.required_modifiers = 
+
+# naming styles
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+
+dotnet_naming_style.begins_with_i.required_prefix = I
+dotnet_naming_style.begins_with_i.required_suffix = 
+dotnet_naming_style.begins_with_i.word_separator = 
+dotnet_naming_style.begins_with_i.capitalization = pascal_case
+
+dotnet_naming_style.begins_with_m_.required_prefix = m_
+dotnet_naming_style.begins_with_m_.required_suffix = 
+dotnet_naming_style.begins_with_m_.word_separator = 
+dotnet_naming_style.begins_with_m_.capitalization = pascal_case
+
+dotnet_naming_style.begins_with_s_.required_prefix = s_
+dotnet_naming_style.begins_with_s_.required_suffix = 
+dotnet_naming_style.begins_with_s_.word_separator = 
+dotnet_naming_style.begins_with_s_.capitalization = pascal_case
+
+dotnet_naming_style.begins_with_k_.required_prefix = k_
+dotnet_naming_style.begins_with_k_.required_suffix = 
+dotnet_naming_style.begins_with_k_.word_separator = 
+dotnet_naming_style.begins_with_k_.capitalization = pascal_case
+
+dotnet_naming_style.camel_case.required_prefix = 
+dotnet_naming_style.camel_case.required_suffix = 
+dotnet_naming_style.camel_case.word_separator = 
+dotnet_naming_style.camel_case.capitalization = camel_case
diff --git a/.yamato/build.yml b/.yamato/build.yml
index 87af8f98..5082fca8 100644
--- a/.yamato/build.yml
+++ b/.yamato/build.yml
@@ -40,6 +40,7 @@ develop_pull_request_trigger:
   name: Develop Branch Triggers
   dependencies:
 {% for project in projects -%}
+    - .yamato/project-standards.yml#standards_{{ project.name }}
 {% for editor in test_editors -%}
 {% for platform in test_platforms -%}
     - .yamato/build.yml#build_{{ project.name }}_{{ editor }}_{{ platform.name }}
diff --git a/.yamato/project-standards.yml b/.yamato/project-standards.yml
new file mode 100644
index 00000000..e785f1c7
--- /dev/null
+++ b/.yamato/project-standards.yml
@@ -0,0 +1,22 @@
+{% metadata_file .yamato/project.metafile %}
+---
+  
+{% for project in projects -%}
+{% for editor in test_editors -%}
+
+standards_{{ project.name }}:
+  name: Standards Check {{ project.name }} - {{ editor }}
+  agent:
+    type: Unity::VM
+    image: desktop/logging-testing-linux:v0.1.2-926285
+    flavor: b1.large
+  commands:
+    - dotnet --version
+    - dotnet format --version
+    - pip install unity-downloader-cli --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
+    - unity-downloader-cli -u {{ test_editors.first }} -c editor --wait --fast
+    - .Editor/Unity -batchmode -nographics -logFile - -executeMethod Packages.Rider.Editor.RiderScriptEditor.SyncSolution -projectPath {{ project.path }} -quit
+    - dotnet run --project dotnet-tools/netcode.standards -- --project={{ project.path }} --check
+  
+{% endfor -%}
+{% endfor -%}
diff --git a/.yamato/project.metafile b/.yamato/project.metafile
index 589d945e..77b7f0f4 100644
--- a/.yamato/project.metafile
+++ b/.yamato/project.metafile
@@ -32,4 +32,4 @@ projects:
   - name: dynamicaddressablesnetworkprefabs
     path: Basic/DynamicAddressablesNetworkPrefabs
   - name: multiplayerusecases
-    path: Experimental/MultiplayerUsecases
\ No newline at end of file
+    path: Experimental/MultiplayerUseCases
\ No newline at end of file
diff --git a/Basic/2DSpaceShooter/Assets/Scripts/Asteroid.cs b/Basic/2DSpaceShooter/Assets/Scripts/Asteroid.cs
index efcd1d33..b78a58c1 100644
--- a/Basic/2DSpaceShooter/Assets/Scripts/Asteroid.cs
+++ b/Basic/2DSpaceShooter/Assets/Scripts/Asteroid.cs
@@ -1,11 +1,11 @@
-using Unity.Netcode;
+using Unity.Netcode;
 using UnityEngine;
 using UnityEngine.Assertions;
 
 public class Asteroid : NetworkBehaviour
 {
     static string s_ObjectPoolTag = "ObjectPool";
-    
+
     public static int numAsteroids = 0;
 
     NetworkObjectPool m_ObjectPool;
@@ -14,7 +14,7 @@ public class Asteroid : NetworkBehaviour
 
     [SerializeField]
     private int m_NumCreates = 3;
-    
+
     [HideInInspector]
     public GameObject asteroidPrefab;
 
@@ -42,9 +42,9 @@ public void Explode()
             return;
         }
         Assert.IsTrue(NetworkManager.IsServer);
-        
+
         numAsteroids -= 1;
-        
+
         var newSize = Size.Value - 1;
 
         if (newSize > 0)
@@ -56,9 +56,9 @@ public void Explode()
                 int dx = Random.Range(0, 4) - 2;
                 int dy = Random.Range(0, 4) - 2;
                 Vector3 diff = new Vector3(dx * 0.3f, dy * 0.3f, 0);
-                
+
                 var go = m_ObjectPool.GetNetworkObject(asteroidPrefab, transform.position + diff, Quaternion.identity);
-                
+
                 var asteroid = go.GetComponent<Asteroid>();
                 asteroid.Size = new NetworkVariable<int>(newSize);
                 asteroid.asteroidPrefab = asteroidPrefab;
@@ -66,7 +66,7 @@ public void Explode()
                 go.GetComponent<Rigidbody2D>().AddForce(diff * 10, ForceMode2D.Impulse);
             }
         }
-        
+
         NetworkObject.Despawn(true);
     }
 }
diff --git a/Basic/2DSpaceShooter/Assets/Scripts/Bullet.cs b/Basic/2DSpaceShooter/Assets/Scripts/Bullet.cs
index ad398c6e..6ea5772c 100644
--- a/Basic/2DSpaceShooter/Assets/Scripts/Bullet.cs
+++ b/Basic/2DSpaceShooter/Assets/Scripts/Bullet.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Unity.Netcode;
 using UnityEngine;
 
diff --git a/Basic/2DSpaceShooter/Assets/Scripts/NetworkManagerHud.cs b/Basic/2DSpaceShooter/Assets/Scripts/NetworkManagerHud.cs
index 30ed035f..9b56af39 100644
--- a/Basic/2DSpaceShooter/Assets/Scripts/NetworkManagerHud.cs
+++ b/Basic/2DSpaceShooter/Assets/Scripts/NetworkManagerHud.cs
@@ -14,35 +14,35 @@ public class NetworkManagerHud : MonoBehaviour
     NetworkManager m_NetworkManager;
 
     UnityTransport m_Transport;
-    
+
     // This is needed to make the port field more convenient. GUILayout.TextField is very limited and we want to be able to clear the field entirely so we can't cache this as ushort.
     string m_PortString = "7777";
     string m_ConnectAddress = "127.0.0.1";
-    
+
     [SerializeField]
     UIDocument m_MainMenuUIDocument;
 
     [SerializeField]
     UIDocument m_InGameUIDocument;
-    
+
     VisualElement m_MainMenuRootVisualElement;
 
     VisualElement m_InGameRootVisualElement;
-    
+
     Button m_HostButton;
-    
+
     Button m_ServerButton;
-    
+
     Button m_ClientButton;
 
     Button m_ShutdownButton;
-    
+
     TextField m_IPAddressField;
-    
+
     TextField m_PortField;
 
     TextElement m_MenuStatusText;
-    
+
     TextElement m_InGameStatusText;
 
     void Awake()
@@ -51,7 +51,7 @@ void Awake()
         m_NetworkManager = GetComponent<NetworkManager>();
 
         m_MainMenuRootVisualElement = m_MainMenuUIDocument.rootVisualElement;
-        
+
         m_IPAddressField = m_MainMenuRootVisualElement.Q<TextField>("IPAddressField");
         m_PortField = m_MainMenuRootVisualElement.Q<TextField>("PortField");
         m_HostButton = m_MainMenuRootVisualElement.Q<Button>("HostButton");
@@ -65,21 +65,21 @@ void Awake()
 
         m_IPAddressField.value = m_ConnectAddress;
         m_PortField.value = m_PortString;
-        
+
         m_HostButton.clickable.clickedWithEventInfo += HostButtonClicked;
         m_ServerButton.clickable.clickedWithEventInfo += ServerButtonClicked;
         m_ClientButton.clickable.clickedWithEventInfo += ClientButtonClicked;
         m_ShutdownButton.clickable.clickedWithEventInfo += ShutdownButtonClicked;
     }
-    
+
     void Start()
     {
         m_Transport = (UnityTransport)m_NetworkManager.NetworkConfig.NetworkTransport;
-        
+
         ShowMainMenuUI(true);
         ShowInGameUI(false);
         ShowStatusText(false);
-        
+
         NetworkManager.Singleton.OnClientConnectedCallback += OnOnClientConnectedCallback;
         NetworkManager.Singleton.OnClientDisconnectCallback += OnOnClientDisconnectCallback;
     }
@@ -99,7 +99,7 @@ void OnOnClientDisconnectCallback(ulong clientId)
         ShowMainMenuUI(true);
         ShowInGameUI(false);
     }
-    
+
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     bool IsRunning(NetworkManager networkManager) => networkManager.IsServer || networkManager.IsClient;
 
@@ -115,7 +115,7 @@ bool SetConnectionData()
             StartCoroutine(ShowInvalidInputStatus());
             return false;
         }
-        
+
         if (m_PortString == "")
         {
             m_MenuStatusText.text = "Port Invalid";
@@ -134,13 +134,13 @@ bool SetConnectionData()
         }
         return true;
     }
-    
+
     static string SanitizeInput(string dirtyString)
     {
         // sanitize the input for the ip address
         return Regex.Replace(dirtyString, "[^0-9.]", "");
     }
-    
+
     void HostButtonClicked(EventBase obj)
     {
         if (SetConnectionData())
@@ -148,7 +148,7 @@ void HostButtonClicked(EventBase obj)
             NetworkManager.Singleton.StartHost();
         }
     }
-    
+
     void ClientButtonClicked(EventBase obj)
     {
         if (SetConnectionData())
@@ -158,7 +158,7 @@ void ClientButtonClicked(EventBase obj)
             StartCoroutine(ShowConnectingStatus());
         }
     }
-    
+
     void ServerButtonClicked(EventBase obj)
     {
         if (SetConnectionData())
@@ -168,14 +168,14 @@ void ServerButtonClicked(EventBase obj)
             ShowInGameUI(true);
         }
     }
-    
+
     void ShutdownButtonClicked(EventBase obj)
     {
         m_NetworkManager.Shutdown();
         ShowMainMenuUI(true);
         ShowInGameUI(false);
     }
-    
+
     void ShowStatusText(bool visible)
     {
         m_MenuStatusText.style.display = visible ? DisplayStyle.Flex : DisplayStyle.None;
@@ -186,18 +186,18 @@ IEnumerator ShowInvalidInputStatus()
         ShowStatusText(true);
 
         yield return new WaitForSeconds(3f);
-        
+
         ShowStatusText(false);
     }
-    
+
     IEnumerator ShowConnectingStatus()
     {
         m_MenuStatusText.text = "Attempting to Connect...";
         ShowStatusText(true);
-        
+
         m_HostButton.SetEnabled(false);
         m_ServerButton.SetEnabled(false);
-        
+
         var unityTransport = m_NetworkManager.GetComponent<UnityTransport>();
         var connectTimeoutMs = unityTransport.ConnectTimeoutMS;
         var maxConnectAttempts = unityTransport.MaxConnectAttempts;
@@ -206,13 +206,13 @@ IEnumerator ShowConnectingStatus()
 
         // wait to verify connect status
         yield return new WaitForSeconds(1f);
-        
+
         m_MenuStatusText.text = "Connection Attempt Failed";
         m_HostButton.SetEnabled(true);
         m_ServerButton.SetEnabled(true);
-        
+
         yield return new WaitForSeconds(3f);
-        
+
         ShowStatusText(false);
     }
 
@@ -224,7 +224,7 @@ void ShowMainMenuUI(bool visible)
     void ShowInGameUI(bool visible)
     {
         m_InGameRootVisualElement.style.display = visible ? DisplayStyle.Flex : DisplayStyle.None;
-        
+
         if (m_NetworkManager.IsServer)
         {
             var mode = m_NetworkManager.IsHost ? "Host" : "Server";
@@ -240,7 +240,7 @@ void ShowInGameUI(bool visible)
             }
         }
     }
-    
+
     void OnDestroy()
     {
         if (m_HostButton != null)
diff --git a/Basic/2DSpaceShooter/Assets/Scripts/Powerup.cs b/Basic/2DSpaceShooter/Assets/Scripts/Powerup.cs
index ecb84e32..32bdb14b 100644
--- a/Basic/2DSpaceShooter/Assets/Scripts/Powerup.cs
+++ b/Basic/2DSpaceShooter/Assets/Scripts/Powerup.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Unity.Netcode;
 using UnityEngine;
 using UnityEngine.Assertions;
@@ -9,14 +9,14 @@ public class Powerup : NetworkBehaviour
     static string s_ObjectPoolTag = "ObjectPool";
 
     public static int numPowerUps = 0;
-    
+
     NetworkObjectPool m_ObjectPool;
 
     public NetworkVariable<Buff.BuffType> buffType = new NetworkVariable<Buff.BuffType>();
 
-    [SerializeField] 
+    [SerializeField]
     Renderer m_PowerUpGlow;
-    
+
     [SerializeField]
     Renderer m_PowerUpGlow2;
 
@@ -24,17 +24,17 @@ public class Powerup : NetworkBehaviour
     UIDocument m_PowerUpUIDocument;
 
     VisualElement m_PowerUpRootVisualElement;
-    
+
     VisualElement m_PowerUpUIWrapper;
-    
+
     TextElement m_PowerUpLabel;
 
     Camera m_MainCamera;
-    
+
     public Vector2 m_ScreenPosition;
 
     IPanel m_Panel;
-    
+
     void Awake()
     {
         m_ObjectPool = GameObject.FindWithTag(s_ObjectPoolTag).GetComponent<NetworkObjectPool>();
@@ -61,7 +61,7 @@ public override void OnNetworkSpawn()
         {
             OnStartServer();
         }
-        
+
         UpdateVisuals(buffType.Value);
         buffType.OnValueChanged += OnBuffTypeChanged;
     }
@@ -87,7 +87,7 @@ void OnStartServer()
     {
         numPowerUps += 1;
     }
-    
+
     void OnBuffTypeChanged(Buff.BuffType previousValue, Buff.BuffType newValue)
     {
         UpdateVisuals(newValue);
@@ -103,12 +103,12 @@ void UpdateVisuals(Buff.BuffType buffType)
         m_PowerUpGlow2.material.SetColor("_EmissiveColor", buffColor);
 
         m_PowerUpLabel.text = buffType.ToString().ToUpper();
-        
+
         if (buffType == Buff.BuffType.QuadDamage)
         {
             m_PowerUpLabel.text = "Quad Damage";
         }
-        
+
         m_PowerUpLabel.style.color = buffColor;
     }
 
@@ -145,7 +145,7 @@ void DestroyPowerUp()
     {
         AudioSource.PlayClipAtPoint(GetComponent<AudioSource>().clip, transform.position);
         numPowerUps -= 1;
-       
+
         NetworkObject.Despawn(true);
     }
 }
diff --git a/Basic/2DSpaceShooter/Assets/Scripts/RandomPositionPlayerSpawner.cs b/Basic/2DSpaceShooter/Assets/Scripts/RandomPositionPlayerSpawner.cs
index d8ff6319..46267bbc 100644
--- a/Basic/2DSpaceShooter/Assets/Scripts/RandomPositionPlayerSpawner.cs
+++ b/Basic/2DSpaceShooter/Assets/Scripts/RandomPositionPlayerSpawner.cs
@@ -5,15 +5,15 @@
 using Random = UnityEngine.Random;
 
 [RequireComponent(typeof(NetworkManager))]
-public class RandomPositionPlayerSpawner: MonoBehaviour
+public class RandomPositionPlayerSpawner : MonoBehaviour
 {
     NetworkManager m_NetworkManager;
 
     int m_RoundRobinIndex = 0;
-    
+
     [SerializeField]
     SpawnMethod m_SpawnMethod;
-    
+
     [SerializeField]
     List<Vector3> m_SpawnPositions = new List<Vector3>() { Vector3.zero };
 
@@ -36,7 +36,7 @@ public Vector3 GetNextSpawnPosition()
                 throw new NotImplementedException();
         }
     }
-    
+
     private void Awake()
     {
         var networkManager = gameObject.GetComponent<NetworkManager>();
diff --git a/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs b/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs
index 0f6afe4e..7f31af39 100644
--- a/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs
+++ b/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs
@@ -1,4 +1,4 @@
-using Unity.Collections;
+using Unity.Collections;
 using Unity.Netcode;
 using UnityEngine;
 using UnityEngine.Assertions;
@@ -19,7 +19,7 @@ public enum BuffType
         Last
     };
 
-    public static Color[] buffColors = { Color.red, new Color(0.5f,0.3f,1), Color.cyan, Color.yellow, Color.green, Color.magenta, new Color(1, 0.5f, 0), new Color(0, 1, 0.5f) };
+    public static Color[] buffColors = { Color.red, new Color(0.5f, 0.3f, 1), Color.cyan, Color.yellow, Color.green, Color.magenta, new Color(1, 0.5f, 0), new Color(0, 1, 0.5f) };
 
     public static Color GetColor(BuffType bt)
     {
@@ -32,77 +32,77 @@ public class ShipControl : NetworkBehaviour
     static string s_ObjectPoolTag = "ObjectPool";
 
     NetworkObjectPool m_ObjectPool;
-    
+
     public GameObject BulletPrefab;
-    
+
     public AudioSource fireSound;
-    
+
     float m_RotateSpeed = 200f;
-    
+
     float m_Acceleration = 12f;
-    
+
     float m_BulletLifetime = 2;
-    
+
     float m_TopSpeed = 7.0f;
-    
+
     public NetworkVariable<int> Health = new NetworkVariable<int>(100);
-    
+
     public NetworkVariable<int> Energy = new NetworkVariable<int>(100);
-    
+
     public NetworkVariable<float> SpeedBuffTimer = new NetworkVariable<float>(0f);
-    
+
     public NetworkVariable<float> RotateBuffTimer = new NetworkVariable<float>(0f);
-    
+
     public NetworkVariable<float> TripleShotTimer = new NetworkVariable<float>(0f);
-    
+
     public NetworkVariable<float> DoubleShotTimer = new NetworkVariable<float>(0f);
-    
+
     public NetworkVariable<float> QuadDamageTimer = new NetworkVariable<float>(0f);
-    
+
     public NetworkVariable<float> BounceTimer = new NetworkVariable<float>(0f);
-    
+
     public NetworkVariable<Color> LatestShipColor = new NetworkVariable<Color>();
 
     float m_EnergyTimer = 0;
-    
+
     bool m_IsBuffed;
 
     public NetworkVariable<FixedString32Bytes> PlayerName = new NetworkVariable<FixedString32Bytes>(new FixedString32Bytes(""));
 
-    [SerializeField] 
+    [SerializeField]
     ParticleSystem m_Friction;
-    
-    [SerializeField] 
+
+    [SerializeField]
     ParticleSystem m_ThrustParticleSystem;
-    
-    [SerializeField] 
+
+    [SerializeField]
     SpriteRenderer m_ShipGlow;
-    
-    [SerializeField] 
+
+    [SerializeField]
     Color m_ShipGlowDefaultColor;
 
     [SerializeField]
     UIDocument m_UIDocument;
-    
+
     VisualElement m_RootVisualElement;
-    
+
     ProgressBar m_HealthBar;
-    
+
     ProgressBar m_EnergyBar;
-    
+
     VisualElement m_PlayerUIWrapper;
-    
+
     TextElement m_PlayerName;
-    
+
     Camera m_MainCamera;
-    
+
     ParticleSystem.MainModule m_ThrustMain;
 
     private NetworkVariable<float> m_FrictionEffectStartTimer = new NetworkVariable<float>(-10);
 
     // for client movement command throttling
     float m_OldMoveForce = 0;
-    
+
     float m_OldSpin = 0;
 
     // server movement
@@ -117,15 +117,15 @@ void Awake()
         m_Rigidbody2D = GetComponent<Rigidbody2D>();
         m_ObjectPool = GameObject.FindWithTag(s_ObjectPoolTag).GetComponent<NetworkObjectPool>();
         Assert.IsNotNull(m_ObjectPool, $"{nameof(NetworkObjectPool)} not found in scene. Did you apply the {s_ObjectPoolTag} to the GameObject?");
-        
+
         m_ThrustMain = m_ThrustParticleSystem.main;
         m_ShipGlow.color = m_ShipGlowDefaultColor;
         m_IsBuffed = false;
-        
+
         m_RootVisualElement = m_UIDocument.rootVisualElement;
         m_PlayerUIWrapper = m_RootVisualElement.Q<VisualElement>("PlayerUIWrapper");
-        m_HealthBar = m_RootVisualElement.Q<ProgressBar>(name:"HealthBar");
-        m_EnergyBar = m_RootVisualElement.Q<ProgressBar>(name:"EnergyBar");
+        m_HealthBar = m_RootVisualElement.Q<ProgressBar>(name: "HealthBar");
+        m_EnergyBar = m_RootVisualElement.Q<ProgressBar>(name: "EnergyBar");
         m_PlayerName = m_RootVisualElement.Q<TextElement>("PlayerName");
         m_MainCamera = Camera.main;
     }
@@ -141,9 +141,9 @@ public override void OnNetworkSpawn()
         if (IsServer)
         {
             LatestShipColor.Value = m_ShipGlowDefaultColor;
-            
+
             PlayerName.Value = $"Player {OwnerClientId}";
-            
+
             if (!IsHost)
             {
                 SetPlayerUIVisibility(false);
@@ -153,7 +153,7 @@ public override void OnNetworkSpawn()
         Health.OnValueChanged += OnHealthChanged;
         OnEnergyChanged(0, Energy.Value);
         OnHealthChanged(0, Health.Value);
-        
+
         SetPlayerName(PlayerName.Value.ToString().ToUpper());
     }
 
@@ -183,7 +183,7 @@ public void TakeDamage(int amount)
             Health.Value = 0;
 
             //todo: reset all buffs
-            
+
             Health.Value = 100;
             transform.position = NetworkManager.GetComponent<RandomPositionPlayerSpawner>().GetNextSpawnPosition();
             GetComponent<Rigidbody2D>().velocity = Vector3.zero;
@@ -211,7 +211,7 @@ void Fire(Vector3 direction)
         var bullet = bulletGo.GetComponent<Bullet>();
         bullet.Config(this, damage, bounce, m_BulletLifetime);
         bullet.SetVelocity(velocity);
-        
+
     }
 
     void Update()
@@ -299,7 +299,7 @@ private void HandleFrictionGraphics()
         var time = NetworkManager.ServerTime.Time;
         var start = m_FrictionEffectStartTimer.Value;
         var duration = m_Friction.main.duration;
-        
+
         bool frictionShouldBeActive = time >= start && time < start + duration; // 1f is the duration of the effect
 
         if (frictionShouldBeActive)
@@ -317,7 +317,7 @@ private void HandleFrictionGraphics()
             }
         }
     }
-    
+
     // changes color of the ship glow sprite and the trail effects based on the latest buff color
     void HandleBuffColors()
     {
@@ -460,7 +460,7 @@ public void AddBuff(Buff.BuffType buff)
                 Health.Value = 100;
             }
         }
-        
+
         if (buff == Buff.BuffType.QuadDamage)
         {
             QuadDamageTimer.Value = NetworkManager.ServerTime.TimeAsFloat + 10;
@@ -498,7 +498,7 @@ void OnCollisionEnter2D(Collision2D other)
     }
 
     // --- ClientRPCs ---
-    
+
     [ClientRpc]
     void PlayFireSoundClientRpc()
     {
@@ -548,13 +548,13 @@ public void SetNameServerRpc(string name)
     {
         PlayerName.Value = name;
     }
-    
+
     void SetWrapperPosition()
     {
         Vector2 screenPosition = RuntimePanelUtils.CameraTransformWorldToPanel(m_PlayerUIWrapper.panel, transform.position, m_MainCamera);
         m_PlayerUIWrapper.transform.position = screenPosition;
     }
-    
+
     void SetHealthBarValue(int healthBarValue)
     {
         m_HealthBar.value = healthBarValue;
@@ -569,7 +569,7 @@ void SetPlayerName(string playerName)
     {
         m_PlayerName.text = playerName;
     }
-    
+
     void SetPlayerUIVisibility(bool visible)
     {
         m_RootVisualElement.style.display = visible ? DisplayStyle.Flex : DisplayStyle.None;
diff --git a/Basic/2DSpaceShooter/Assets/Scripts/Spawner.cs b/Basic/2DSpaceShooter/Assets/Scripts/Spawner.cs
index 3d0b1f45..6aa27872 100644
--- a/Basic/2DSpaceShooter/Assets/Scripts/Spawner.cs
+++ b/Basic/2DSpaceShooter/Assets/Scripts/Spawner.cs
@@ -1,11 +1,11 @@
-using Unity.Netcode;
+using Unity.Netcode;
 using UnityEngine;
 
 public class Spawner : MonoBehaviour
 {
     [SerializeField]
     NetworkObjectPool m_ObjectPool;
-    
+
     [SerializeField]
     private int m_Amount = 4;
 
@@ -15,13 +15,13 @@ public class Spawner : MonoBehaviour
     private GameObject m_AsteroidPrefab;
     [SerializeField]
     private GameObject m_ObstaclePrefab;
-    [SerializeField] 
+    [SerializeField]
     private GameObject m_ObstaclePrefab2;
-    [SerializeField] 
+    [SerializeField]
     private GameObject m_ObstaclePrefab3;
-    [SerializeField] 
+    [SerializeField]
     private GameObject m_ObstacleCornerPrefab;
-    
+
     // to easily visualize, search for "0". Blocks are spawned as shown below, but flipped horizontally. 
     static int[] s_Obstacles = new int[]
     {
@@ -95,11 +95,11 @@ void SpawnAsteroids()
             asteroid.NetworkObject.Spawn(true);
         }
     }
-    
+
     void SpawnObstacles()
     {
         // Obstacles are not networked we just spawn them as static objects on each peer
-        
+
         int y = 0;
         int x = 0;
         for (int i = 0; i < s_Obstacles.Length; i++)
@@ -108,17 +108,17 @@ void SpawnObstacles()
             {
                 Instantiate(m_ObstaclePrefab, new Vector3(-40 + x * 2, -40 + y * 2, 0), Quaternion.identity);
             }
-            
+
             if (s_Obstacles[i] == 2)
             {
                 Instantiate(m_ObstacleCornerPrefab, new Vector3(-40 + x * 2, -40 + y * 2, 0), Quaternion.identity);
             }
-            
+
             if (s_Obstacles[i] == 3)
             {
                 Instantiate(m_ObstaclePrefab2, new Vector3(-40 + x * 2, -40 + y * 2, 0), Quaternion.identity);
             }
-            
+
             if (s_Obstacles[i] == 4)
             {
                 Instantiate(m_ObstaclePrefab3, new Vector3(-40 + x * 2, -40 + y * 2, 0), Quaternion.identity);
diff --git a/Basic/ClientDriven/Assets/Scripts/ClientObjectWithIngredientType.cs b/Basic/ClientDriven/Assets/Scripts/ClientObjectWithIngredientType.cs
index 3e97c756..fde87ca3 100644
--- a/Basic/ClientDriven/Assets/Scripts/ClientObjectWithIngredientType.cs
+++ b/Basic/ClientDriven/Assets/Scripts/ClientObjectWithIngredientType.cs
@@ -14,7 +14,7 @@ public class ClientObjectWithIngredientType : NetworkBehaviour
         Material m_RedMaterial;
 
         ServerObjectWithIngredientType m_Server;
-        
+
         [SerializeField]
         Renderer m_ColorMesh;
 
@@ -27,7 +27,7 @@ public override void OnNetworkSpawn()
         {
             base.OnNetworkSpawn();
             enabled = IsClient;
-            
+
             UpdateMaterial(default(IngredientType), m_Server.currentIngredientType.Value);
             m_Server.currentIngredientType.OnValueChanged += UpdateMaterial;
         }
@@ -53,4 +53,4 @@ void UpdateMaterial(IngredientType previousValue, IngredientType newValue)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Basic/ClientDriven/Assets/Scripts/ClientPlayerColor.cs b/Basic/ClientDriven/Assets/Scripts/ClientPlayerColor.cs
index 3d493cc1..17f94f6d 100644
--- a/Basic/ClientDriven/Assets/Scripts/ClientPlayerColor.cs
+++ b/Basic/ClientDriven/Assets/Scripts/ClientPlayerColor.cs
@@ -17,6 +17,6 @@ public override void OnNetworkSpawn()
             // OwnerClientId is used here for debugging purposes. A live game should use a session manager to make sure reconnecting players still get the same color, as client IDs could be reused for other clients between disconnect and reconnect. See Boss Room for a session manager example.
             material.SetFloat("_Color_Index", OwnerClientId);
         }
-        
+
     }
 }
diff --git a/Basic/ClientDriven/Assets/Scripts/ClientPlayerMove.cs b/Basic/ClientDriven/Assets/Scripts/ClientPlayerMove.cs
index 2c6430f4..5c5d2399 100644
--- a/Basic/ClientDriven/Assets/Scripts/ClientPlayerMove.cs
+++ b/Basic/ClientDriven/Assets/Scripts/ClientPlayerMove.cs
@@ -36,7 +36,7 @@ void Awake()
     {
         Cursor.lockState = CursorLockMode.Locked;
         Cursor.visible = false;
-        
+
         // ThirdPersonController & CharacterController are enabled only on owning clients. Ghost player objects have
         // these two components disabled, and will enable a CapsuleCollider. Per the CharacterController documentation: 
         // https://docs.unity3d.com/Manual/CharacterControllers.html, a Character controller can push rigidbody
@@ -64,7 +64,7 @@ public override void OnNetworkSpawn()
         // player input is only enabled on owning players
         m_PlayerInput.enabled = true;
         m_ThirdPersonController.enabled = true;
-        
+
         // see the note inside ServerPlayerMove why this step is also necessary for synchronizing initial player
         // position on owning clients
         m_CharacterController.enabled = true;
diff --git a/Basic/ClientDriven/Assets/Scripts/HostJoinUI.cs b/Basic/ClientDriven/Assets/Scripts/HostJoinUI.cs
index e09131f7..bb021c52 100644
--- a/Basic/ClientDriven/Assets/Scripts/HostJoinUI.cs
+++ b/Basic/ClientDriven/Assets/Scripts/HostJoinUI.cs
@@ -14,30 +14,30 @@ public class HostJoinUI : MonoBehaviour
     UIDocument m_InGameUIDocument;
 
     VisualElement m_MainMenuRootVisualElement;
-    
+
     VisualElement m_InGameRootVisualElement;
-    
+
     Button m_HostButton;
-    
+
     Button m_ServerButton;
-    
+
     Button m_ClientButton;
 
     TextField m_IPAddressTextField;
-    
+
     TextField m_PortTextField;
-    
+
     void Awake()
     {
         m_MainMenuRootVisualElement = m_MainMenuUIDocument.rootVisualElement;
         m_InGameRootVisualElement = m_InGameUIDocument.rootVisualElement;
-        
+
         m_HostButton = m_MainMenuRootVisualElement.Query<Button>("HostButton");
         m_ClientButton = m_MainMenuRootVisualElement.Query<Button>("ClientButton");
         m_ServerButton = m_MainMenuRootVisualElement.Query<Button>("ServerButton");
         m_IPAddressTextField = m_MainMenuRootVisualElement.Query<TextField>("IPAddressField");
         m_PortTextField = m_MainMenuRootVisualElement.Query<TextField>("PortField");
-        
+
         m_HostButton.clickable.clickedWithEventInfo += StartHost;
         m_ServerButton.clickable.clickedWithEventInfo += StartServer;
         m_ClientButton.clickable.clickedWithEventInfo += StartClient;
@@ -93,7 +93,7 @@ void ToggleMainMenuUI(bool isVisible)
     {
         m_MainMenuRootVisualElement.style.display = isVisible ? DisplayStyle.Flex : DisplayStyle.None;
     }
-    
+
     void ToggleInGameUI(bool isVisible)
     {
         m_InGameRootVisualElement.style.display = isVisible ? DisplayStyle.Flex : DisplayStyle.None;
@@ -105,11 +105,11 @@ void SetUtpConnectionData()
         var sanitizedPortText = Sanitize(m_PortTextField.text);
 
         ushort.TryParse(sanitizedPortText, out var port);
-        
+
         var utp = (UnityTransport)NetworkManager.Singleton.NetworkConfig.NetworkTransport;
         utp.SetConnectionData(sanitizedIPText, port);
     }
-    
+
     /// <summary>
     /// Sanitize user port InputField box allowing only alphanumerics and '.'
     /// </summary>
diff --git a/Basic/ClientDriven/Assets/Scripts/ScoreUI.cs b/Basic/ClientDriven/Assets/Scripts/ScoreUI.cs
index f83095d7..a7ce7485 100644
--- a/Basic/ClientDriven/Assets/Scripts/ScoreUI.cs
+++ b/Basic/ClientDriven/Assets/Scripts/ScoreUI.cs
@@ -9,15 +9,15 @@ public class ScoreUI : MonoBehaviour
 
     [SerializeField]
     UIDocument m_InGameUIDocument;
-    
+
     VisualElement m_InGameRootVisualElement;
-    
+
     TextElement m_ScoreText;
 
     void Awake()
     {
         m_InGameRootVisualElement = m_InGameUIDocument.rootVisualElement;
-        
+
         m_ScoreText = m_InGameRootVisualElement.Query<TextElement>("ScoreText");
     }
 
diff --git a/Basic/ClientDriven/Assets/Scripts/ServerIngredient.cs b/Basic/ClientDriven/Assets/Scripts/ServerIngredient.cs
index 057dad66..0998867f 100644
--- a/Basic/ClientDriven/Assets/Scripts/ServerIngredient.cs
+++ b/Basic/ClientDriven/Assets/Scripts/ServerIngredient.cs
@@ -19,7 +19,7 @@ public class ServerObjectWithIngredientType : NetworkBehaviour
     public NetworkVariable<IngredientType> currentIngredientType;
 
     public event Action ingredientDespawned;
-    
+
     public override void OnNetworkSpawn()
     {
         base.OnNetworkSpawn();
diff --git a/Basic/ClientDriven/Assets/Scripts/ServerIngredientPhysics.cs b/Basic/ClientDriven/Assets/Scripts/ServerIngredientPhysics.cs
index 866e4ca7..ad2d8819 100644
--- a/Basic/ClientDriven/Assets/Scripts/ServerIngredientPhysics.cs
+++ b/Basic/ClientDriven/Assets/Scripts/ServerIngredientPhysics.cs
@@ -8,10 +8,10 @@ public class ServerIngredientPhysics : NetworkBehaviour
 {
     [SerializeField]
     NetworkTransform m_NetworkTransform;
-    
+
     [SerializeField]
     Rigidbody m_Rigidbody;
-    
+
     public override void OnNetworkObjectParentChanged(NetworkObject parentNetworkObject)
     {
         SetPhysics(parentNetworkObject == null);
diff --git a/Basic/ClientDriven/Assets/Scripts/ServerPlayerMove.cs b/Basic/ClientDriven/Assets/Scripts/ServerPlayerMove.cs
index d145d24f..b1f1dab8 100644
--- a/Basic/ClientDriven/Assets/Scripts/ServerPlayerMove.cs
+++ b/Basic/ClientDriven/Assets/Scripts/ServerPlayerMove.cs
@@ -11,7 +11,7 @@
 public class ServerPlayerMove : NetworkBehaviour
 {
     public NetworkVariable<bool> isObjectPickedUp = new NetworkVariable<bool>();
-    
+
     NetworkObject m_PickedUpObject;
 
     [SerializeField]
@@ -27,7 +27,7 @@ public override void OnNetworkSpawn()
         }
 
         OnServerSpawnPlayer();
-        
+
         base.OnNetworkSpawn();
     }
 
@@ -37,7 +37,7 @@ void OnServerSpawnPlayer()
         var spawnPoint = ServerPlayerSpawnPoints.Instance.ConsumeNextSpawnPoint();
         var spawnPosition = spawnPoint ? spawnPoint.transform.position : Vector3.zero;
         transform.position = spawnPosition;
-        
+
         // A note specific to owner authority:
         // Side Note:  Specific to Owner Authoritative
         // Setting the position works as and can be set in OnNetworkSpawn server-side unless there is a
@@ -50,7 +50,7 @@ void OnServerSpawnPlayer()
 
     [ServerRpc]
     public void PickupObjectServerRpc(ulong objToPickupID)
-    {        
+    {
         NetworkManager.SpawnManager.SpawnedObjects.TryGetValue(objToPickupID, out var objectToPickup);
         if (objectToPickup == null || objectToPickup.transform.parent != null) return; // object already picked up, server authority says no
 
@@ -68,7 +68,7 @@ void IngredientDespawned()
         m_PickedUpObject = null;
         isObjectPickedUp.Value = false;
     }
-    
+
     [ServerRpc]
     public void DropObjectServerRpc()
     {
diff --git a/Basic/ClientDriven/Assets/Scripts/ServerPlayerSpawnPoints.cs b/Basic/ClientDriven/Assets/Scripts/ServerPlayerSpawnPoints.cs
index 222aa170..70b2e0c7 100644
--- a/Basic/ClientDriven/Assets/Scripts/ServerPlayerSpawnPoints.cs
+++ b/Basic/ClientDriven/Assets/Scripts/ServerPlayerSpawnPoints.cs
@@ -32,7 +32,7 @@ public GameObject ConsumeNextSpawnPoint()
         {
             return null;
         }
-        
+
         var toReturn = m_SpawnPoints[m_SpawnPoints.Count - 1];
         m_SpawnPoints.RemoveAt(m_SpawnPoints.Count - 1);
         return toReturn;
diff --git a/Basic/ClientDriven/Assets/Scripts/ServerScoreReplicator.cs b/Basic/ClientDriven/Assets/Scripts/ServerScoreReplicator.cs
index 137b0b62..d49a3398 100644
--- a/Basic/ClientDriven/Assets/Scripts/ServerScoreReplicator.cs
+++ b/Basic/ClientDriven/Assets/Scripts/ServerScoreReplicator.cs
@@ -4,7 +4,7 @@ public class ServerScoreReplicator : NetworkBehaviour
 {
     NetworkVariable<int> m_ReplicatedScore = new NetworkVariable<int>();
 
-    public NetworkVariable<int> ReplicatedScore => m_ReplicatedScore; 
+    public NetworkVariable<int> ReplicatedScore => m_ReplicatedScore;
 
     public override void OnNetworkSpawn()
     {
diff --git a/Basic/ClientDriven/Assets/StarterAssets/Editor/StarterAssetsDeployMenu.cs b/Basic/ClientDriven/Assets/StarterAssets/Editor/StarterAssetsDeployMenu.cs
index ad8afa17..b0a1516d 100644
--- a/Basic/ClientDriven/Assets/StarterAssets/Editor/StarterAssetsDeployMenu.cs
+++ b/Basic/ClientDriven/Assets/StarterAssets/Editor/StarterAssetsDeployMenu.cs
@@ -27,7 +27,7 @@ public partial class StarterAssetsDeployMenu : ScriptableObject
         private const string CinemachineTargetTag = "CinemachineTarget";
 
         private static GameObject _cinemachineVirtualCamera;
-        
+
         /// <summary>
         /// Deletes the scripting define set by the Package Checker.
         /// See Assets/Editor/PackageChecker/PackageChecker.cs for more information
@@ -47,7 +47,7 @@ private static void CheckCameras(Transform targetParent, string prefabFolder)
 
             if (!vcam)
             {
-                if (TryLocatePrefab(CinemachineVirtualCameraName, new string[]{prefabFolder}, new[] { typeof(CinemachineVirtualCamera) }, out GameObject vcamPrefab, out string _))
+                if (TryLocatePrefab(CinemachineVirtualCameraName, new string[] { prefabFolder }, new[] { typeof(CinemachineVirtualCamera) }, out GameObject vcamPrefab, out string _))
                 {
                     HandleInstantiatingPrefab(vcamPrefab, out vcam);
                     _cinemachineVirtualCamera = vcam;
@@ -63,7 +63,7 @@ private static void CheckCameras(Transform targetParent, string prefabFolder)
             }
 
             GameObject[] targets = GameObject.FindGameObjectsWithTag(CinemachineTargetTag);
-            
+
             GameObject target = null;
             foreach (var t in targets)
             {
@@ -73,7 +73,7 @@ private static void CheckCameras(Transform targetParent, string prefabFolder)
                     break;
                 }
             }
-            
+
             if (target == null)
             {
                 target = new GameObject("PlayerCameraRoot");
@@ -93,7 +93,7 @@ private static void CheckMainCamera(string inFolder)
             if (mainCameras.Length < 1)
             {
                 // if there are no MainCameras, add one
-                if (TryLocatePrefab(MainCameraPrefabName, new string[]{inFolder}, new[] { typeof(CinemachineBrain), typeof(Camera) }, out GameObject camera, out string _))
+                if (TryLocatePrefab(MainCameraPrefabName, new string[] { inFolder }, new[] { typeof(CinemachineBrain), typeof(Camera) }, out GameObject camera, out string _))
                 {
                     HandleInstantiatingPrefab(camera, out _);
                 }
@@ -148,12 +148,12 @@ private static bool TryLocatePrefab(string name, string[] inFolders, System.Type
 
                         if (hasRequiredComponents)
                         {
-                             if (loadedGo.name == name)
-                             {
-                                 prefab = loadedGo;
-                                 path = assetPath;
-                                 return true;
-                             }                           
+                            if (loadedGo.name == name)
+                            {
+                                prefab = loadedGo;
+                                path = assetPath;
+                                return true;
+                            }
                         }
                     }
                 }
@@ -175,4 +175,4 @@ private static void HandleInstantiatingPrefab(GameObject prefab, out GameObject
         }
 #endif
     }
-}
\ No newline at end of file
+}
diff --git a/Basic/ClientDriven/Assets/StarterAssets/Editor/ThirdPersonStarterAssetsDeployMenu.cs b/Basic/ClientDriven/Assets/StarterAssets/Editor/ThirdPersonStarterAssetsDeployMenu.cs
index fbe8d9b7..58c8b96d 100644
--- a/Basic/ClientDriven/Assets/StarterAssets/Editor/ThirdPersonStarterAssetsDeployMenu.cs
+++ b/Basic/ClientDriven/Assets/StarterAssets/Editor/ThirdPersonStarterAssetsDeployMenu.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Text;
 using UnityEditor;
 using UnityEngine;
@@ -18,7 +18,7 @@ public partial class StarterAssetsDeployMenu : ScriptableObject
         static void ResetThirdPersonControllerArmature()
         {
             var thirdPersonControllers = FindObjectsOfType<ThirdPersonController>();
-            
+
             ThirdPersonController player = null;
             foreach (var controller in thirdPersonControllers)
             {
@@ -59,7 +59,7 @@ static void ResetThirdPersonControllerArmature()
         static void ResetThirdPersonControllerCapsule()
         {
             var thirdPersonControllers = FindObjectsOfType<ThirdPersonController>();
-            
+
             ThirdPersonController player = null;
             foreach (var controller in thirdPersonControllers)
             {
@@ -116,4 +116,4 @@ static string GetThirdPersonPrefabPath()
         }
 #endif
     }
-}
\ No newline at end of file
+}
diff --git a/Basic/ClientDriven/Assets/StarterAssets/InputSystem/StarterAssetsInputs.cs b/Basic/ClientDriven/Assets/StarterAssets/InputSystem/StarterAssetsInputs.cs
index d1aa1572..57f0c21b 100644
--- a/Basic/ClientDriven/Assets/StarterAssets/InputSystem/StarterAssetsInputs.cs
+++ b/Basic/ClientDriven/Assets/StarterAssets/InputSystem/StarterAssetsInputs.cs
@@ -5,76 +5,76 @@
 
 namespace StarterAssets
 {
-	public class StarterAssetsInputs : MonoBehaviour
-	{
-		[Header("Character Input Values")]
-		public Vector2 move;
-		public Vector2 look;
-		public bool jump;
-		public bool sprint;
+    public class StarterAssetsInputs : MonoBehaviour
+    {
+        [Header("Character Input Values")]
+        public Vector2 move;
+        public Vector2 look;
+        public bool jump;
+        public bool sprint;
 
-		[Header("Movement Settings")]
-		public bool analogMovement;
+        [Header("Movement Settings")]
+        public bool analogMovement;
 
-		[Header("Mouse Cursor Settings")]
-		public bool cursorLocked = true;
-		public bool cursorInputForLook = true;
+        [Header("Mouse Cursor Settings")]
+        public bool cursorLocked = true;
+        public bool cursorInputForLook = true;
 
 #if ENABLE_INPUT_SYSTEM && STARTER_ASSETS_PACKAGES_CHECKED
-		public void OnMove(InputValue value)
-		{
-			MoveInput(value.Get<Vector2>());
-		}
+        public void OnMove(InputValue value)
+        {
+            MoveInput(value.Get<Vector2>());
+        }
 
-		public void OnLook(InputValue value)
-		{
-			if(cursorInputForLook)
-			{
-				LookInput(value.Get<Vector2>());
-			}
-		}
+        public void OnLook(InputValue value)
+        {
+            if (cursorInputForLook)
+            {
+                LookInput(value.Get<Vector2>());
+            }
+        }
 
-		public void OnJump(InputValue value)
-		{
-			JumpInput(value.isPressed);
-		}
+        public void OnJump(InputValue value)
+        {
+            JumpInput(value.isPressed);
+        }
 
-		public void OnSprint(InputValue value)
-		{
-			SprintInput(value.isPressed);
-		}
+        public void OnSprint(InputValue value)
+        {
+            SprintInput(value.isPressed);
+        }
 #endif
 
 
-		public void MoveInput(Vector2 newMoveDirection)
-		{
-			move = newMoveDirection;
-		} 
+        public void MoveInput(Vector2 newMoveDirection)
+        {
+            move = newMoveDirection;
+        }
 
-		public void LookInput(Vector2 newLookDirection)
-		{
-			look = newLookDirection;
-		}
+        public void LookInput(Vector2 newLookDirection)
+        {
+            look = newLookDirection;
+        }
 
-		public void JumpInput(bool newJumpState)
-		{
-			jump = newJumpState;
-		}
+        public void JumpInput(bool newJumpState)
+        {
+            jump = newJumpState;
+        }
 
-		public void SprintInput(bool newSprintState)
-		{
-			sprint = newSprintState;
-		}
+        public void SprintInput(bool newSprintState)
+        {
+            sprint = newSprintState;
+        }
 
-		private void OnApplicationFocus(bool hasFocus)
-		{
-			SetCursorState(cursorLocked);
-		}
+        private void OnApplicationFocus(bool hasFocus)
+        {
+            SetCursorState(cursorLocked);
+        }
 
-		private void SetCursorState(bool newState)
-		{
-			Cursor.lockState = newState ? CursorLockMode.Locked : CursorLockMode.None;
-		}
-	}
-	
-}
\ No newline at end of file
+        private void SetCursorState(bool newState)
+        {
+            Cursor.lockState = newState ? CursorLockMode.Locked : CursorLockMode.None;
+        }
+    }
+
+}
diff --git a/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/CanvasInputs/UICanvasControllerInput.cs b/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/CanvasInputs/UICanvasControllerInput.cs
index a7b41dd9..29c2e60b 100644
--- a/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/CanvasInputs/UICanvasControllerInput.cs
+++ b/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/CanvasInputs/UICanvasControllerInput.cs
@@ -27,7 +27,7 @@ public void VirtualSprintInput(bool virtualSprintState)
         {
             starterAssetsInputs.SprintInput(virtualSprintState);
         }
-        
+
     }
 
 }
diff --git a/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/Utilities/MobileDisableAutoSwitchControls.cs b/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/Utilities/MobileDisableAutoSwitchControls.cs
index 8c815ce3..060a96f6 100644
--- a/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/Utilities/MobileDisableAutoSwitchControls.cs
+++ b/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/Utilities/MobileDisableAutoSwitchControls.cs
@@ -14,7 +14,7 @@ The PlayerInput component has an auto-switch control scheme action that allows a
 
 public class MobileDisableAutoSwitchControls : MonoBehaviour
 {
-    
+
 #if ENABLE_INPUT_SYSTEM && (UNITY_IOS || UNITY_ANDROID) && STARTER_ASSETS_PACKAGES_CHECKED
 
     [Header("Target")]
@@ -31,5 +31,5 @@ void DisableAutoSwitchControls()
     }
 
 #endif
-    
+
 }
diff --git a/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/VirtualInputs/UIVirtualButton.cs b/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/VirtualInputs/UIVirtualButton.cs
index 73bbc861..9c0ada6e 100644
--- a/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/VirtualInputs/UIVirtualButton.cs
+++ b/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/VirtualInputs/UIVirtualButton.cs
@@ -22,7 +22,7 @@ public void OnPointerUp(PointerEventData eventData)
     {
         OutputButtonStateValue(false);
     }
-    
+
     public void OnPointerClick(PointerEventData eventData)
     {
         OutputButtonClickEvent();
diff --git a/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/VirtualInputs/UIVirtualJoystick.cs b/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/VirtualInputs/UIVirtualJoystick.cs
index 2b255ceb..39b0c4f0 100644
--- a/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/VirtualInputs/UIVirtualJoystick.cs
+++ b/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/VirtualInputs/UIVirtualJoystick.cs
@@ -6,7 +6,7 @@ public class UIVirtualJoystick : MonoBehaviour, IPointerDownHandler, IDragHandle
 {
     [System.Serializable]
     public class Event : UnityEvent<Vector2> { }
-    
+
     [Header("Rect References")]
     public RectTransform containerRect;
     public RectTransform handleRect;
@@ -27,7 +27,7 @@ void Start()
 
     private void SetupHandle()
     {
-        if(handleRect)
+        if (handleRect)
         {
             UpdateHandleRectPosition(Vector2.zero);
         }
@@ -42,29 +42,29 @@ public void OnDrag(PointerEventData eventData)
     {
 
         RectTransformUtility.ScreenPointToLocalPointInRectangle(containerRect, eventData.position, eventData.pressEventCamera, out Vector2 position);
-        
+
         position = ApplySizeDelta(position);
-        
+
         Vector2 clampedPosition = ClampValuesToMagnitude(position);
 
         Vector2 outputPosition = ApplyInversionFilter(position);
 
         OutputPointerEventValue(outputPosition * magnitudeMultiplier);
 
-        if(handleRect)
+        if (handleRect)
         {
             UpdateHandleRectPosition(clampedPosition * joystickRange);
         }
-        
+
     }
 
     public void OnPointerUp(PointerEventData eventData)
     {
         OutputPointerEventValue(Vector2.zero);
 
-        if(handleRect)
+        if (handleRect)
         {
-             UpdateHandleRectPosition(Vector2.zero);
+            UpdateHandleRectPosition(Vector2.zero);
         }
     }
 
@@ -80,8 +80,8 @@ private void UpdateHandleRectPosition(Vector2 newPosition)
 
     Vector2 ApplySizeDelta(Vector2 position)
     {
-        float x = (position.x/containerRect.sizeDelta.x) * 2.5f;
-        float y = (position.y/containerRect.sizeDelta.y) * 2.5f;
+        float x = (position.x / containerRect.sizeDelta.x) * 2.5f;
+        float y = (position.y / containerRect.sizeDelta.y) * 2.5f;
         return new Vector2(x, y);
     }
 
@@ -92,12 +92,12 @@ Vector2 ClampValuesToMagnitude(Vector2 position)
 
     Vector2 ApplyInversionFilter(Vector2 position)
     {
-        if(invertXOutputValue)
+        if (invertXOutputValue)
         {
             position.x = InvertValue(position.x);
         }
 
-        if(invertYOutputValue)
+        if (invertYOutputValue)
         {
             position.y = InvertValue(position.y);
         }
@@ -109,5 +109,5 @@ float InvertValue(float value)
     {
         return -value;
     }
-    
-}
\ No newline at end of file
+
+}
diff --git a/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/VirtualInputs/UIVirtualTouchZone.cs b/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/VirtualInputs/UIVirtualTouchZone.cs
index 4abb21a9..ffc438d7 100644
--- a/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/VirtualInputs/UIVirtualTouchZone.cs
+++ b/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/VirtualInputs/UIVirtualTouchZone.cs
@@ -31,9 +31,9 @@ void Start()
 
     private void SetupHandle()
     {
-        if(handleRect)
+        if (handleRect)
         {
-            SetObjectActiveState(handleRect.gameObject, false); 
+            SetObjectActiveState(handleRect.gameObject, false);
         }
     }
 
@@ -42,7 +42,7 @@ public void OnPointerDown(PointerEventData eventData)
 
         RectTransformUtility.ScreenPointToLocalPointInRectangle(containerRect, eventData.position, eventData.pressEventCamera, out pointerDownPosition);
 
-        if(handleRect)
+        if (handleRect)
         {
             SetObjectActiveState(handleRect.gameObject, true);
             UpdateHandleRectPosition(pointerDownPosition);
@@ -53,11 +53,11 @@ public void OnDrag(PointerEventData eventData)
     {
 
         RectTransformUtility.ScreenPointToLocalPointInRectangle(containerRect, eventData.position, eventData.pressEventCamera, out currentPointerPosition);
-        
+
         Vector2 positionDelta = GetDeltaBetweenPositions(pointerDownPosition, currentPointerPosition);
 
         Vector2 clampedPosition = ClampValuesToMagnitude(positionDelta);
-        
+
         Vector2 outputPosition = ApplyInversionFilter(clampedPosition);
 
         OutputPointerEventValue(outputPosition * magnitudeMultiplier);
@@ -70,7 +70,7 @@ public void OnPointerUp(PointerEventData eventData)
 
         OutputPointerEventValue(Vector2.zero);
 
-        if(handleRect)
+        if (handleRect)
         {
             SetObjectActiveState(handleRect.gameObject, false);
             UpdateHandleRectPosition(Vector2.zero);
@@ -104,12 +104,12 @@ Vector2 ClampValuesToMagnitude(Vector2 position)
 
     Vector2 ApplyInversionFilter(Vector2 position)
     {
-        if(invertXOutputValue)
+        if (invertXOutputValue)
         {
             position.x = InvertValue(position.x);
         }
 
-        if(invertYOutputValue)
+        if (invertYOutputValue)
         {
             position.y = InvertValue(position.y);
         }
@@ -121,5 +121,5 @@ float InvertValue(float value)
     {
         return -value;
     }
-    
+
 }
diff --git a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Scripts/BasicRigidBodyPush.cs b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Scripts/BasicRigidBodyPush.cs
index 7f1b3b17..9e8e5a81 100644
--- a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Scripts/BasicRigidBodyPush.cs
+++ b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Scripts/BasicRigidBodyPush.cs
@@ -1,35 +1,35 @@
-using UnityEngine;
+using UnityEngine;
 
 public class BasicRigidBodyPush : MonoBehaviour
 {
-	public LayerMask pushLayers;
-	public bool canPush;
-	[Range(0.5f, 5f)] public float strength = 1.1f;
+    public LayerMask pushLayers;
+    public bool canPush;
+    [Range(0.5f, 5f)] public float strength = 1.1f;
 
-	private void OnControllerColliderHit(ControllerColliderHit hit)
-	{
-		if (canPush) PushRigidBodies(hit);
-	}
+    private void OnControllerColliderHit(ControllerColliderHit hit)
+    {
+        if (canPush) PushRigidBodies(hit);
+    }
 
-	private void PushRigidBodies(ControllerColliderHit hit)
-	{
-		// https://docs.unity3d.com/ScriptReference/CharacterController.OnControllerColliderHit.html
+    private void PushRigidBodies(ControllerColliderHit hit)
+    {
+        // https://docs.unity3d.com/ScriptReference/CharacterController.OnControllerColliderHit.html
 
-		// make sure we hit a non kinematic rigidbody
-		Rigidbody body = hit.collider.attachedRigidbody;
-		if (body == null || body.isKinematic) return;
+        // make sure we hit a non kinematic rigidbody
+        Rigidbody body = hit.collider.attachedRigidbody;
+        if (body == null || body.isKinematic) return;
 
-		// make sure we only push desired layer(s)
-		var bodyLayerMask = 1 << body.gameObject.layer;
-		if ((bodyLayerMask & pushLayers.value) == 0) return;
+        // make sure we only push desired layer(s)
+        var bodyLayerMask = 1 << body.gameObject.layer;
+        if ((bodyLayerMask & pushLayers.value) == 0) return;
 
-		// We dont want to push objects below us
-		if (hit.moveDirection.y < -0.3f) return;
+        // We dont want to push objects below us
+        if (hit.moveDirection.y < -0.3f) return;
 
-		// Calculate push direction from move direction, horizontal motion only
-		Vector3 pushDir = new Vector3(hit.moveDirection.x, 0.0f, hit.moveDirection.z);
+        // Calculate push direction from move direction, horizontal motion only
+        Vector3 pushDir = new Vector3(hit.moveDirection.x, 0.0f, hit.moveDirection.z);
 
-		// Apply the push and take strength into account
-		body.AddForce(pushDir * strength, ForceMode.Impulse);
-	}
-}
\ No newline at end of file
+        // Apply the push and take strength into account
+        body.AddForce(pushDir * strength, ForceMode.Impulse);
+    }
+}
diff --git a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Scripts/ThirdPersonController.cs b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Scripts/ThirdPersonController.cs
index 9acb269f..8eaeb112 100644
--- a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Scripts/ThirdPersonController.cs
+++ b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Scripts/ThirdPersonController.cs
@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 #if ENABLE_INPUT_SYSTEM && STARTER_ASSETS_PACKAGES_CHECKED
 using UnityEngine.InputSystem;
 #endif
@@ -135,7 +135,7 @@ private void Awake()
         private void Start()
         {
             _cinemachineTargetYaw = CinemachineCameraTarget.transform.rotation.eulerAngles.y;
-            
+
             _hasAnimator = TryGetComponent(out _animator);
             _controller = GetComponent<CharacterController>();
             _input = GetComponent<StarterAssetsInputs>();
@@ -393,4 +393,4 @@ private void OnLand(AnimationEvent animationEvent)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/00_Preloading/Preloading.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/00_Preloading/Preloading.cs
index bceb33ee..94d53084 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/00_Preloading/Preloading.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/00_Preloading/Preloading.cs
@@ -21,9 +21,9 @@ namespace Game.Preloading
     public sealed class Preloading : MonoBehaviour
     {
         [SerializeField] AssetReferenceGameObject m_DynamicPrefabReference;
-        
+
         [SerializeField] NetworkManager m_NetworkManager;
-        
+
         async void Start()
         {
             await PreloadDynamicPlayerPrefab();
@@ -35,18 +35,18 @@ async void Start()
         async Task PreloadDynamicPlayerPrefab()
         {
             Debug.Log($"Started to load addressable with GUID: {m_DynamicPrefabReference.AssetGUID}");
-            var op =  Addressables.LoadAssetAsync<GameObject>(m_DynamicPrefabReference);
+            var op = Addressables.LoadAssetAsync<GameObject>(m_DynamicPrefabReference);
             var prefab = await op.Task;
             Addressables.Release(op);
-            
+
             //it's important to actually add the player prefab to the list of network prefabs - it doesn't happen
             //automatically
             m_NetworkManager.AddNetworkPrefab(prefab);
             Debug.Log($"Loaded prefab has been assigned to NetworkManager's PlayerPrefab");
-            
+
             // at this point we can easily change the PlayerPrefab
             m_NetworkManager.NetworkConfig.PlayerPrefab = prefab;
-            
+
             // Forcing all game instances to load a set of network prefabs and having each game instance inject network
             // prefabs to NetworkManager's NetworkPrefabs list pre-connection time guarantees that all players will have
             // matching NetworkConfigs. This is why NetworkManager.ForceSamePrefabs is set to true. We let Netcode for
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/01_Connection Approval/ConnectionApproval.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/01_Connection Approval/ConnectionApproval.cs
index 3763cadb..4b5c802e 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/01_Connection Approval/ConnectionApproval.cs	
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/01_Connection Approval/ConnectionApproval.cs	
@@ -20,13 +20,13 @@ public sealed class ConnectionApproval : NetworkBehaviour
 
         [SerializeField]
         AssetReferenceGameObject m_AssetReferenceGameObject;
-        
+
         [SerializeField] InGameUI m_InGameUI;
-        
+
         const int k_MaxConnectedClientCount = 4;
-        
+
         const int k_MaxConnectPayload = 1024;
-        
+
         void Start()
         {
             DynamicPrefabLoadingUtilities.Init(m_NetworkManager);
@@ -34,7 +34,7 @@ void Start()
             // In the use-cases where connection approval is implemented, the server can begin to validate a user's
             // connection payload, and either approve or deny connection to the joining client.
             m_NetworkManager.NetworkConfig.ConnectionApproval = true;
-            
+
             // Here, we keep ForceSamePrefabs disabled. This will allow us to dynamically add network prefabs to Netcode
             // for GameObject after establishing a connection. In this implementation of the connection approval
             // callback, the server validates the client's connection payload based on the hash of their dynamic prefabs
@@ -53,16 +53,16 @@ void Start()
 
         async void LoadAPrefab()
         {
-            var assetGuid = new AddressableGUID() { Value = m_AssetReferenceGameObject.AssetGUID }; 
-            
+            var assetGuid = new AddressableGUID() { Value = m_AssetReferenceGameObject.AssetGUID };
+
             // server is starting to load a prefab, update UI
-            m_InGameUI.ClientLoadedPrefabStatusChanged(NetworkManager.ServerClientId, 
-                assetGuid.GetHashCode(), 
-                "Undefined", 
+            m_InGameUI.ClientLoadedPrefabStatusChanged(NetworkManager.ServerClientId,
+                assetGuid.GetHashCode(),
+                "Undefined",
                 InGameUI.LoadStatus.Loading);
-            
+
             await DynamicPrefabLoadingUtilities.LoadDynamicPrefab(assetGuid, 0);
-            
+
             // server loaded a prefab, update UI with the loaded asset's name
             DynamicPrefabLoadingUtilities.TryGetLoadedGameObjectFromGuid(assetGuid, out var loadedGameObject);
             m_InGameUI.ClientLoadedPrefabStatusChanged(NetworkManager.ServerClientId, assetGuid.GetHashCode(), loadedGameObject.Result.name, InGameUI.LoadStatus.Loaded);
@@ -75,27 +75,27 @@ public override void OnDestroy()
             DynamicPrefabLoadingUtilities.UnloadAndReleaseAllDynamicPrefabs();
             base.OnDestroy();
         }
-    
+
         void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request, NetworkManager.ConnectionApprovalResponse response)
         {
             Debug.Log($"Client {request.ClientNetworkId} is trying to connect ");
             var connectionData = request.Payload;
             var clientId = request.ClientNetworkId;
-            
+
             if (clientId == m_NetworkManager.LocalClientId)
             {
                 //allow the host to connect
                 Approve();
                 return;
             }
-            
+
             // A sample-specific denial on clients after k_MaxConnectedClientCount clients have been connected
             if (m_NetworkManager.ConnectedClientsList.Count >= k_MaxConnectedClientCount)
             {
                 ImmediateDeny();
                 return;
             }
-            
+
             if (connectionData.Length > k_MaxConnectPayload)
             {
                 // If connectionData is too big, deny immediately to avoid wasting time on the server. This is intended as
@@ -103,36 +103,36 @@ void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request
                 ImmediateDeny();
                 return;
             }
-    
+
             if (DynamicPrefabLoadingUtilities.LoadedPrefabCount == 0)
             {
                 //immediately approve the connection if we haven't loaded any prefabs yet
                 Approve();
                 return;
             }
-    
+
             var payload = System.Text.Encoding.UTF8.GetString(connectionData);
             var connectionPayload = JsonUtility.FromJson<ConnectionPayload>(payload); // https://docs.unity3d.com/2020.2/Documentation/Manual/JSONSerialization.html
-    
+
             int clientPrefabHash = connectionPayload.hashOfDynamicPrefabGUIDs;
             int serverPrefabHash = DynamicPrefabLoadingUtilities.HashOfDynamicPrefabGUIDs;
-            
+
             //if the client has the same prefabs as the server - approve the connection
             if (clientPrefabHash == serverPrefabHash)
             {
                 Approve();
 
                 DynamicPrefabLoadingUtilities.RecordThatClientHasLoadedAllPrefabs(clientId);
-                
+
                 return;
             }
-            
+
             // In order for clients to not just get disconnected with no feedback, the server needs to tell the client
             // why it disconnected it. This could happen after an auth check on a service or because of gameplay
             // reasons (server full, wrong build version, etc).
             // The server can do so via the DisconnectReason in the ConnectionApprovalResponse. The guids of the prefabs
             // the client will need to load will be sent, such that the client loads the needed prefabs, and reconnects.
-            
+
             // A note: DisconnectReason will not be written to if the string is too large in size. This should be used
             // only to tell the client "why" it failed -- the client should instead use services like UGS to fetch the
             // relevant data it needs to fetch & download.
@@ -140,21 +140,21 @@ void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request
             DynamicPrefabLoadingUtilities.RefreshLoadedPrefabGuids();
 
             response.Reason = DynamicPrefabLoadingUtilities.GenerateDisconnectionPayload();
-            
+
             ImmediateDeny();
-            
+
             // A note: sending large strings through Netcode is not ideal -- you'd usually want to use REST services to
             // accomplish this instead. UGS services like Lobby can be a useful alternative. Another route may be to
             // set ConnectionApprovalResponse's Pending flag to true, and send a CustomMessage containing the array of 
             // GUIDs to a client, which the client would load and reattempt a reconnection.
-    
+
             void Approve()
             {
                 Debug.Log($"Client {clientId} approved");
                 response.Approved = true;
                 response.CreatePlayerObject = false; //we're not going to spawn a player object for this sample
             }
-            
+
             void ImmediateDeny()
             {
                 Debug.Log($"Client {clientId} denied connection");
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/02_Server Authoritative Load All Async/ServerAuthoritativeLoadAllAsync.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/02_Server Authoritative Load All Async/ServerAuthoritativeLoadAllAsync.cs
index c6673600..d1b7173d 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/02_Server Authoritative Load All Async/ServerAuthoritativeLoadAllAsync.cs	
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/02_Server Authoritative Load All Async/ServerAuthoritativeLoadAllAsync.cs	
@@ -23,20 +23,20 @@ public sealed class ServerAuthoritativeLoadAllAsync : NetworkBehaviour
     {
         [SerializeField]
         NetworkManager m_NetworkManager;
-        
+
         [SerializeField] List<AssetReferenceGameObject> m_DynamicPrefabReferences;
 
         [SerializeField]
         InGameUI m_InGameUI;
-        
+
         const int k_MaxConnectedClientCount = 4;
 
         const int k_MaxConnectPayload = 1024;
-        
+
         void Start()
         {
             DynamicPrefabLoadingUtilities.Init(m_NetworkManager);
-            
+
             // In the use-cases where connection approval is implemented, the server can begin to validate a user's
             // connection payload, and either approve or deny connection to the joining client.
             // Note: we will define a very simplistic connection approval below, which will effectively deny all
@@ -44,16 +44,16 @@ void Start()
             // a connection approval callback, but late-joining clients will have mismatching NetworkConfigs (and  
             // potentially different world versions if the server has spawned a dynamic prefab).
             m_NetworkManager.NetworkConfig.ConnectionApproval = true;
-            
+
             // Here, we keep ForceSamePrefabs disabled. This will allow us to dynamically add network prefabs to Netcode
             // for GameObject after establishing a connection.
             m_NetworkManager.NetworkConfig.ForceSamePrefabs = false;
-            
+
             // This is a simplistic use-case of a connection approval callback. To see how a connection approval should
             // be used to validate a user's connection payload, see the connection approval use-case, or the
             // APIPlayground, where all post-connection techniques are used in harmony.
             m_NetworkManager.ConnectionApprovalCallback += ConnectionApprovalCallback;
-            
+
             // hooking up UI callbacks
             m_InGameUI.LoadAllAsyncButtonPressed += OnClickedPreload;
         }
@@ -68,27 +68,27 @@ public override void OnDestroy()
             DynamicPrefabLoadingUtilities.UnloadAndReleaseAllDynamicPrefabs();
             base.OnDestroy();
         }
-        
+
         void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request, NetworkManager.ConnectionApprovalResponse response)
         {
             Debug.Log("Client is trying to connect " + request.ClientNetworkId);
             var connectionData = request.Payload;
             var clientId = request.ClientNetworkId;
-            
+
             if (clientId == m_NetworkManager.LocalClientId)
             {
                 // allow the host to connect
                 Approve();
                 return;
             }
-            
+
             // A sample-specific denial on clients after k_MaxConnectedClientCount clients have been connected
             if (m_NetworkManager.ConnectedClientsList.Count >= k_MaxConnectedClientCount)
             {
                 ImmediateDeny();
                 return;
             }
-            
+
             if (connectionData.Length > k_MaxConnectPayload)
             {
                 // If connectionData is too big, deny immediately to avoid wasting time on the server. This is intended as
@@ -96,7 +96,7 @@ void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request
                 ImmediateDeny();
                 return;
             }
-            
+
             // simple approval if the server has not loaded any dynamic prefabs yet
             if (DynamicPrefabLoadingUtilities.LoadedPrefabCount == 0)
             {
@@ -106,14 +106,14 @@ void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request
             {
                 ImmediateDeny();
             }
-            
+
             void Approve()
             {
                 Debug.Log($"Client {clientId} approved");
                 response.Approved = true;
                 response.CreatePlayerObject = false; //we're not going to spawn a player object for this sample
             }
-            
+
             void ImmediateDeny()
             {
                 Debug.Log($"Client {clientId} denied connection");
@@ -121,7 +121,7 @@ void ImmediateDeny()
                 response.CreatePlayerObject = false;
             }
         }
-        
+
         // invoked by UI
         public void OnClickedPreload()
         {
@@ -129,7 +129,7 @@ public void OnClickedPreload()
             {
                 return;
             }
-            
+
             PreloadPrefabs();
         }
 
@@ -156,38 +156,38 @@ async Task PreloadDynamicPrefabOnServerAndStartLoadingOnAllClients(string guid)
                 {
                     Value = guid
                 };
-                
+
                 if (DynamicPrefabLoadingUtilities.IsPrefabLoadedOnAllClients(assetGuid))
                 {
                     Debug.Log("Prefab is already loaded by all peers");
                     return;
                 }
-                
+
                 // update UI for each client that is requested to load a certain prefab
                 foreach (var client in m_NetworkManager.ConnectedClients.Keys)
                 {
                     m_InGameUI.ClientLoadedPrefabStatusChanged(client, assetGuid.GetHashCode(), "Undefined", InGameUI.LoadStatus.Loading);
                 }
-                
+
                 Debug.Log("Loading dynamic prefab on the clients...");
                 LoadAddressableClientRpc(assetGuid);
-                
+
                 await DynamicPrefabLoadingUtilities.LoadDynamicPrefab(assetGuid, m_InGameUI.ArtificialDelayMilliseconds);
-                
+
                 // server loaded a prefab, update UI with the loaded asset's name
                 DynamicPrefabLoadingUtilities.TryGetLoadedGameObjectFromGuid(assetGuid, out var loadedGameObject);
-                
+
                 // every client loaded dynamic prefab, their respective ClientUIs in case they loaded first
                 foreach (var client in m_NetworkManager.ConnectedClients.Keys)
                 {
                     m_InGameUI.ClientLoadedPrefabStatusChanged(client,
-                        assetGuid.GetHashCode(), 
-                        loadedGameObject.Result.name, 
+                        assetGuid.GetHashCode(),
+                        loadedGameObject.Result.name,
                         InGameUI.LoadStatus.Loaded);
                 }
             }
         }
-        
+
         [ClientRpc]
         void LoadAddressableClientRpc(AddressableGUID guid, ClientRpcParams rpcParams = default)
         {
@@ -200,24 +200,24 @@ async void Load(AddressableGUID assetGuid)
             {
                 // loading prefab as a client, update UI
                 m_InGameUI.ClientLoadedPrefabStatusChanged(m_NetworkManager.LocalClientId, assetGuid.GetHashCode(), "Undefined", InGameUI.LoadStatus.Loading);
-                
+
                 Debug.Log("Loading dynamic prefab on the client...");
                 await DynamicPrefabLoadingUtilities.LoadDynamicPrefab(assetGuid, m_InGameUI.ArtificialDelayMilliseconds);
                 Debug.Log("Client loaded dynamic prefab");
-                
+
                 DynamicPrefabLoadingUtilities.TryGetLoadedGameObjectFromGuid(assetGuid, out var loadedGameObject);
                 m_InGameUI.ClientLoadedPrefabStatusChanged(m_NetworkManager.LocalClientId, assetGuid.GetHashCode(), loadedGameObject.Result.name, InGameUI.LoadStatus.Loaded);
-                
+
                 AcknowledgeSuccessfulPrefabLoadServerRpc(assetGuid.GetHashCode());
             }
         }
-        
+
         [ServerRpc(RequireOwnership = false)]
         void AcknowledgeSuccessfulPrefabLoadServerRpc(int prefabHash, ServerRpcParams rpcParams = default)
         {
             Debug.Log($"Client acknowledged successful prefab load with hash: {prefabHash}");
             DynamicPrefabLoadingUtilities.RecordThatClientHasLoadedAPrefab(prefabHash, rpcParams.Receive.SenderClientId);
-            
+
             // a quick way to grab a matching prefab reference's name via its prefabHash
             var loadedPrefabName = "Undefined";
             foreach (var prefabReference in m_DynamicPrefabReferences)
@@ -227,7 +227,7 @@ void AcknowledgeSuccessfulPrefabLoadServerRpc(int prefabHash, ServerRpcParams rp
                 {
                     // found the matching prefab reference
                     if (DynamicPrefabLoadingUtilities.LoadedDynamicPrefabResourceHandles.TryGetValue(
-                            prefabReferenceGuid, 
+                            prefabReferenceGuid,
                             out var loadedGameObject))
                     {
                         // if it is loaded on the server, update the name on the ClientUI
@@ -236,7 +236,7 @@ void AcknowledgeSuccessfulPrefabLoadServerRpc(int prefabHash, ServerRpcParams rp
                     break;
                 }
             }
-            
+
             // client has successfully loaded a prefab, update UI
             m_InGameUI.ClientLoadedPrefabStatusChanged(rpcParams.Receive.SenderClientId, prefabHash, loadedPrefabName, InGameUI.LoadStatus.Loaded);
         }
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/03_Server Authoritative Synchronous Spawning/ServerAuthoritativeSynchronousSpawning.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/03_Server Authoritative Synchronous Spawning/ServerAuthoritativeSynchronousSpawning.cs
index 384b6e52..98cb068d 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/03_Server Authoritative Synchronous Spawning/ServerAuthoritativeSynchronousSpawning.cs	
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/03_Server Authoritative Synchronous Spawning/ServerAuthoritativeSynchronousSpawning.cs	
@@ -29,23 +29,23 @@ public sealed class ServerAuthoritativeSynchronousSpawning : NetworkBehaviour
     {
         [SerializeField]
         NetworkManager m_NetworkManager;
-        
+
         [SerializeField] List<AssetReferenceGameObject> m_DynamicPrefabReferences;
 
         [SerializeField] InGameUI m_InGameUI;
-        
+
         const int k_MaxConnectedClientCount = 4;
-        
+
         const int k_MaxConnectPayload = 1024;
-        
+
         float m_SynchronousSpawnTimeoutTimer;
-        
+
         int m_SynchronousSpawnAckCount = 0;
-        
+
         void Start()
         {
             DynamicPrefabLoadingUtilities.Init(m_NetworkManager);
-            
+
             // In the use-cases where connection approval is implemented, the server can begin to validate a user's
             // connection payload, and either approve or deny connection to the joining client.
             // Note: we will define a very simplistic connection approval below, which will effectively deny all
@@ -53,20 +53,20 @@ void Start()
             // a connection approval callback, but late-joining clients will have mismatching NetworkConfigs (and  
             // potentially different world versions if the server has spawned a dynamic prefab).
             m_NetworkManager.NetworkConfig.ConnectionApproval = true;
-            
+
             // Here, we keep ForceSamePrefabs disabled. This will allow us to dynamically add network prefabs to Netcode
             // for GameObject after establishing a connection.
             m_NetworkManager.NetworkConfig.ForceSamePrefabs = false;
-            
+
             // This is a simplistic use-case of a connection approval callback. To see how a connection approval should
             // be used to validate a user's connection payload, see the connection approval use-case, or the
             // APIPlayground, where all post-connection techniques are used in harmony.
             m_NetworkManager.ConnectionApprovalCallback += ConnectionApprovalCallback;
-            
+
             // hooking up UI callbacks
             m_InGameUI.TrySpawnSynchronouslyButtonPressed += OnClickedTrySpawnSynchronously;
         }
-        
+
         public override void OnDestroy()
         {
             m_NetworkManager.ConnectionApprovalCallback -= ConnectionApprovalCallback;
@@ -83,21 +83,21 @@ void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request
             Debug.Log("Client is trying to connect " + request.ClientNetworkId);
             var connectionData = request.Payload;
             var clientId = request.ClientNetworkId;
-            
+
             if (clientId == m_NetworkManager.LocalClientId)
             {
                 // allow the host to connect
                 Approve();
                 return;
             }
-            
+
             // A sample-specific denial on clients after k_MaxConnectedClientCount clients have been connected
             if (m_NetworkManager.ConnectedClientsList.Count >= k_MaxConnectedClientCount)
             {
                 ImmediateDeny();
                 return;
             }
-            
+
             if (connectionData.Length > k_MaxConnectPayload)
             {
                 // If connectionData is too big, deny immediately to avoid wasting time on the server. This is intended as
@@ -105,7 +105,7 @@ void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request
                 ImmediateDeny();
                 return;
             }
-            
+
             // simple approval if the server has not loaded any dynamic prefabs yet
             if (DynamicPrefabLoadingUtilities.LoadedPrefabCount == 0)
             {
@@ -115,14 +115,14 @@ void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request
             {
                 ImmediateDeny();
             }
-            
+
             void Approve()
             {
                 Debug.Log($"Client {clientId} approved");
                 response.Approved = true;
                 response.CreatePlayerObject = false; //we're not going to spawn a player object for this sample
             }
-            
+
             void ImmediateDeny()
             {
                 Debug.Log($"Client {clientId} denied connection");
@@ -138,10 +138,10 @@ void OnClickedTrySpawnSynchronously()
             {
                 return;
             }
-            
+
             TrySpawnSynchronously();
         }
-        
+
         async void TrySpawnSynchronously()
         {
             var randomPrefab = m_DynamicPrefabReferences[Random.Range(0, m_DynamicPrefabReferences.Count)];
@@ -162,33 +162,33 @@ async void TrySpawnSynchronously()
                 {
                     Value = guid
                 };
-                
+
                 if (DynamicPrefabLoadingUtilities.IsPrefabLoadedOnAllClients(assetGuid))
                 {
                     Debug.Log("Prefab is already loaded by all peers, we can spawn it immediately");
                     var obj = Spawn(assetGuid);
                     return (true, obj);
                 }
-                
+
                 m_SynchronousSpawnAckCount = 0;
                 m_SynchronousSpawnTimeoutTimer = 0;
-                
+
                 Debug.Log("Loading dynamic prefab on the clients...");
                 LoadAddressableClientRpc(assetGuid);
-                
+
                 // server is starting to load a prefab, update UI
                 m_InGameUI.ClientLoadedPrefabStatusChanged(NetworkManager.ServerClientId, assetGuid.GetHashCode(), "Undefined", InGameUI.LoadStatus.Loading);
-                
+
                 //load the prefab on the server, so that any late-joiner will need to load that prefab also
                 await DynamicPrefabLoadingUtilities.LoadDynamicPrefab(assetGuid, m_InGameUI.ArtificialDelayMilliseconds);
-                
+
                 // server loaded a prefab, update UI with the loaded asset's name
                 DynamicPrefabLoadingUtilities.TryGetLoadedGameObjectFromGuid(assetGuid, out var loadedGameObject);
                 m_InGameUI.ClientLoadedPrefabStatusChanged(NetworkManager.ServerClientId, assetGuid.GetHashCode(), loadedGameObject.Result.name, InGameUI.LoadStatus.Loaded);
-                
-                var requiredAcknowledgementsCount = IsHost ? m_NetworkManager.ConnectedClients.Count - 1 : 
+
+                var requiredAcknowledgementsCount = IsHost ? m_NetworkManager.ConnectedClients.Count - 1 :
                     m_NetworkManager.ConnectedClients.Count;
-                
+
                 while (m_SynchronousSpawnTimeoutTimer < m_InGameUI.NetworkSpawnTimeoutSeconds)
                 {
                     if (m_SynchronousSpawnAckCount >= requiredAcknowledgementsCount)
@@ -197,11 +197,11 @@ async void TrySpawnSynchronously()
                         var obj = Spawn(assetGuid);
                         return (true, obj);
                     }
-                    
+
                     m_SynchronousSpawnTimeoutTimer += Time.deltaTime;
                     await Task.Yield();
                 }
-                
+
                 // left to the reader: you'll need to be reactive to clients failing to load -- you should either have
                 // the offending client try again or disconnect it after a predetermined amount of failed attempts
                 Debug.LogError("Failed to spawn dynamic prefab - timeout");
@@ -220,20 +220,20 @@ NetworkObject Spawn(AddressableGUID assetGuid)
                 var obj = Instantiate(prefab.Result, position, rotation).GetComponent<NetworkObject>();
                 obj.Spawn();
                 Debug.Log("Spawned dynamic prefab");
-                
+
                 // every client loaded dynamic prefab, their respective ClientUIs in case they loaded first
                 foreach (var client in m_NetworkManager.ConnectedClients.Keys)
                 {
-                    m_InGameUI.ClientLoadedPrefabStatusChanged(client, 
-                        assetGuid.GetHashCode(), 
-                        prefab.Result.name, 
+                    m_InGameUI.ClientLoadedPrefabStatusChanged(client,
+                        assetGuid.GetHashCode(),
+                        prefab.Result.name,
                         InGameUI.LoadStatus.Loaded);
                 }
-                
+
                 return obj;
             }
         }
-        
+
         [ClientRpc]
         void LoadAddressableClientRpc(AddressableGUID guid, ClientRpcParams rpcParams = default)
         {
@@ -246,26 +246,26 @@ async void Load(AddressableGUID assetGuid)
             {
                 // loading prefab as a client, update UI
                 m_InGameUI.ClientLoadedPrefabStatusChanged(m_NetworkManager.LocalClientId, assetGuid.GetHashCode(), "Undefined", InGameUI.LoadStatus.Loading);
-                
+
                 Debug.Log("Loading dynamic prefab on the client...");
                 await DynamicPrefabLoadingUtilities.LoadDynamicPrefab(assetGuid, m_InGameUI.ArtificialDelayMilliseconds);
                 Debug.Log("Client loaded dynamic prefab");
-                
+
                 DynamicPrefabLoadingUtilities.TryGetLoadedGameObjectFromGuid(assetGuid, out var loadedGameObject);
                 m_InGameUI.ClientLoadedPrefabStatusChanged(m_NetworkManager.LocalClientId, assetGuid.GetHashCode(), loadedGameObject.Result.name, InGameUI.LoadStatus.Loaded);
-                
+
                 AcknowledgeSuccessfulPrefabLoadServerRpc(assetGuid.GetHashCode());
             }
         }
-        
+
         [ServerRpc(RequireOwnership = false)]
         void AcknowledgeSuccessfulPrefabLoadServerRpc(int prefabHash, ServerRpcParams rpcParams = default)
         {
             m_SynchronousSpawnAckCount++;
             Debug.Log($"Client acknowledged successful prefab load with hash: {prefabHash}");
-            DynamicPrefabLoadingUtilities.RecordThatClientHasLoadedAPrefab(prefabHash, 
+            DynamicPrefabLoadingUtilities.RecordThatClientHasLoadedAPrefab(prefabHash,
                 rpcParams.Receive.SenderClientId);
-            
+
             // a quick way to grab a matching prefab reference's name via its prefabHash
             var loadedPrefabName = "Undefined";
             foreach (var prefabReference in m_DynamicPrefabReferences)
@@ -275,7 +275,7 @@ void AcknowledgeSuccessfulPrefabLoadServerRpc(int prefabHash, ServerRpcParams rp
                 {
                     // found the matching prefab reference
                     if (DynamicPrefabLoadingUtilities.LoadedDynamicPrefabResourceHandles.TryGetValue(
-                            prefabReferenceGuid, 
+                            prefabReferenceGuid,
                             out var loadedGameObject))
                     {
                         // if it is loaded on the server, update the name on the ClientUI
@@ -284,7 +284,7 @@ void AcknowledgeSuccessfulPrefabLoadServerRpc(int prefabHash, ServerRpcParams rp
                     break;
                 }
             }
-            
+
             // client has successfully loaded a prefab, update UI
             m_InGameUI.ClientLoadedPrefabStatusChanged(rpcParams.Receive.SenderClientId, prefabHash, loadedPrefabName, InGameUI.LoadStatus.Loaded);
         }
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/04_Server Authoritative Network-Visibility Spawning/ServerAuthoritativeNetworkVisibilitySpawning.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/04_Server Authoritative Network-Visibility Spawning/ServerAuthoritativeNetworkVisibilitySpawning.cs
index 4b391df2..51f25072 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/04_Server Authoritative Network-Visibility Spawning/ServerAuthoritativeNetworkVisibilitySpawning.cs	
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/04_Server Authoritative Network-Visibility Spawning/ServerAuthoritativeNetworkVisibilitySpawning.cs	
@@ -30,22 +30,22 @@ public sealed class ServerAuthoritativeNetworkVisibilitySpawning : NetworkBehavi
     {
         [SerializeField]
         NetworkManager m_NetworkManager;
-        
+
         [SerializeField] List<AssetReferenceGameObject> m_DynamicPrefabReferences;
-        
+
         [SerializeField] InGameUI m_InGameUI;
-        
+
         const int k_MaxConnectedClientCount = 4;
-        
+
         const int k_MaxConnectPayload = 1024;
-        
+
         //A storage where we keep association between prefab (hash of it's GUID) and the spawned network objects that use it
         Dictionary<int, HashSet<NetworkObject>> m_PrefabHashToNetworkObjectId = new Dictionary<int, HashSet<NetworkObject>>();
 
         void Start()
         {
             DynamicPrefabLoadingUtilities.Init(m_NetworkManager);
-            
+
             // In the use-cases where connection approval is implemented, the server can begin to validate a user's
             // connection payload, and either approve or deny connection to the joining client.
             // Note: we will define a very simplistic connection approval below, which will effectively deny all
@@ -53,20 +53,20 @@ void Start()
             // a connection approval callback, but late-joining clients will have mismatching NetworkConfigs (and  
             // potentially different world versions if the server has spawned a dynamic prefab).
             m_NetworkManager.NetworkConfig.ConnectionApproval = true;
-            
+
             // Here, we keep ForceSamePrefabs disabled. This will allow us to dynamically add network prefabs to Netcode
             // for GameObject after establishing a connection.
             m_NetworkManager.NetworkConfig.ForceSamePrefabs = false;
-            
+
             // This is a simplistic use-case of a connection approval callback. To see how a connection approval should
             // be used to validate a user's connection payload, see the connection approval use-case, or the
             // APIPlayground, where all post-connection techniques are used in harmony.
             m_NetworkManager.ConnectionApprovalCallback += ConnectionApprovalCallback;
-            
+
             // hooking up UI callbacks
             m_InGameUI.SpawnUsingVisibilityButtonPressed += OnClickedTrySpawnInvisible;
         }
-        
+
         public override void OnDestroy()
         {
             m_NetworkManager.ConnectionApprovalCallback -= ConnectionApprovalCallback;
@@ -77,27 +77,27 @@ public override void OnDestroy()
             DynamicPrefabLoadingUtilities.UnloadAndReleaseAllDynamicPrefabs();
             base.OnDestroy();
         }
-        
+
         void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request, NetworkManager.ConnectionApprovalResponse response)
         {
             Debug.Log("Client is trying to connect " + request.ClientNetworkId);
             var connectionData = request.Payload;
             var clientId = request.ClientNetworkId;
-            
+
             if (clientId == m_NetworkManager.LocalClientId)
             {
                 // allow the host to connect
                 Approve();
                 return;
             }
-            
+
             // A sample-specific denial on clients after k_MaxConnectedClientCount clients have been connected
             if (m_NetworkManager.ConnectedClientsList.Count >= k_MaxConnectedClientCount)
             {
                 ImmediateDeny();
                 return;
             }
-            
+
             if (connectionData.Length > k_MaxConnectPayload)
             {
                 // If connectionData is too big, deny immediately to avoid wasting time on the server. This is intended as
@@ -105,7 +105,7 @@ void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request
                 ImmediateDeny();
                 return;
             }
-            
+
             // simple approval if the server has not loaded any dynamic prefabs yet
             if (DynamicPrefabLoadingUtilities.LoadedPrefabCount == 0)
             {
@@ -115,14 +115,14 @@ void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request
             {
                 ImmediateDeny();
             }
-            
+
             void Approve()
             {
                 Debug.Log($"Client {clientId} approved");
                 response.Approved = true;
                 response.CreatePlayerObject = false; //we're not going to spawn a player object for this sample
             }
-            
+
             void ImmediateDeny()
             {
                 Debug.Log($"Client {clientId} denied connection");
@@ -130,7 +130,7 @@ void ImmediateDeny()
                 response.CreatePlayerObject = false;
             }
         }
-        
+
         // invoked by UI
         void OnClickedTrySpawnInvisible()
         {
@@ -138,7 +138,7 @@ void OnClickedTrySpawnInvisible()
             {
                 return;
             }
-            
+
             TrySpawnInvisible();
         }
 
@@ -147,7 +147,7 @@ async void TrySpawnInvisible()
             var randomPrefab = m_DynamicPrefabReferences[Random.Range(0, m_DynamicPrefabReferences.Count)];
             await SpawnImmediatelyAndHideUntilPrefabIsLoadedOnClient(randomPrefab.AssetGUID, Random.insideUnitCircle * 5, Quaternion.identity);
         }
-        
+
         /// <summary>
         /// This call spawns an addressable prefab by it's guid. It does not ensure that all the clients have loaded the
         /// prefab before spawning it. All spawned objects are network-invisible to clients that don't have the prefab
@@ -164,7 +164,7 @@ async Task<NetworkObject> SpawnImmediatelyAndHideUntilPrefabIsLoadedOnClient(str
                 {
                     Value = guid
                 };
-                
+
                 return await Spawn(assetGuid);
             }
 
@@ -174,56 +174,56 @@ async Task<NetworkObject> Spawn(AddressableGUID assetGuid)
             {
                 // server is starting to load a prefab, update UI
                 m_InGameUI.ClientLoadedPrefabStatusChanged(NetworkManager.ServerClientId, assetGuid.GetHashCode(), "Undefined", InGameUI.LoadStatus.Loading);
-                
-                var prefab = await DynamicPrefabLoadingUtilities.LoadDynamicPrefab(assetGuid, 
+
+                var prefab = await DynamicPrefabLoadingUtilities.LoadDynamicPrefab(assetGuid,
                     m_InGameUI.ArtificialDelayMilliseconds);
-                
+
                 // server loaded a prefab, update UI with the loaded asset's name
                 DynamicPrefabLoadingUtilities.TryGetLoadedGameObjectFromGuid(assetGuid, out var loadedGameObject);
                 m_InGameUI.ClientLoadedPrefabStatusChanged(NetworkManager.ServerClientId, assetGuid.GetHashCode(), loadedGameObject.Result.name, InGameUI.LoadStatus.Loaded);
-                
+
                 var obj = Instantiate(prefab, position, rotation).GetComponent<NetworkObject>();
-                
+
                 if (m_PrefabHashToNetworkObjectId.TryGetValue(assetGuid.GetHashCode(), out var networkObjectIds))
                 {
                     networkObjectIds.Add(obj);
                 }
                 else
                 {
-                    m_PrefabHashToNetworkObjectId.Add(assetGuid.GetHashCode(), new HashSet<NetworkObject>() {obj});
+                    m_PrefabHashToNetworkObjectId.Add(assetGuid.GetHashCode(), new HashSet<NetworkObject>() { obj });
                 }
 
                 // This gets called on spawn and makes sure clients currently syncing and receiving spawns have the
                 // appropriate network visibility settings automatically. This can happen on late join, on spawn, on
                 // scene switch, etc.
-                obj.CheckObjectVisibility = (clientId) => 
+                obj.CheckObjectVisibility = (clientId) =>
                 {
                     if (clientId == NetworkManager.ServerClientId)
                     {
                         // object is loaded on the server, no need to validate for visibility
                         return true;
                     }
-                    
+
                     //if the client has already loaded the prefab - we can make the object network-visible to them
                     if (DynamicPrefabLoadingUtilities.HasClientLoadedPrefab(clientId, assetGuid.GetHashCode()))
                     {
                         return true;
                     }
-                    
+
                     // client is loading a prefab, update UI
                     m_InGameUI.ClientLoadedPrefabStatusChanged(clientId, assetGuid.GetHashCode(), "Undefined", InGameUI.LoadStatus.Loading);
-                    
+
                     //otherwise the clients need to load the prefab, and after they ack - the ShowHiddenObjectsToClient 
-                    LoadAddressableClientRpc(assetGuid, new ClientRpcParams(){Send = new ClientRpcSendParams(){TargetClientIds = new ulong[]{clientId}}});
+                    LoadAddressableClientRpc(assetGuid, new ClientRpcParams() { Send = new ClientRpcSendParams() { TargetClientIds = new ulong[] { clientId } } });
                     return false;
                 };
-                
+
                 obj.Spawn();
 
                 return obj;
             }
         }
-        
+
         void ShowHiddenObjectsToClient(int prefabHash, ulong clientId)
         {
             if (m_PrefabHashToNetworkObjectId.TryGetValue(prefabHash, out var networkObjects))
@@ -237,7 +237,7 @@ void ShowHiddenObjectsToClient(int prefabHash, ulong clientId)
                 }
             }
         }
-        
+
         [ClientRpc]
         void LoadAddressableClientRpc(AddressableGUID guid, ClientRpcParams rpcParams = default)
         {
@@ -250,25 +250,25 @@ async void Load(AddressableGUID assetGuid)
             {
                 // loading prefab as a client, update UI
                 m_InGameUI.ClientLoadedPrefabStatusChanged(m_NetworkManager.LocalClientId, assetGuid.GetHashCode(), "Undefined", InGameUI.LoadStatus.Loading);
-                
+
                 Debug.Log("Loading dynamic prefab on the client...");
                 await DynamicPrefabLoadingUtilities.LoadDynamicPrefab(assetGuid, m_InGameUI.ArtificialDelayMilliseconds);
                 Debug.Log("Client loaded dynamic prefab");
-                
+
                 DynamicPrefabLoadingUtilities.TryGetLoadedGameObjectFromGuid(assetGuid, out var loadedGameObject);
                 m_InGameUI.ClientLoadedPrefabStatusChanged(m_NetworkManager.LocalClientId, assetGuid.GetHashCode(), loadedGameObject.Result.name, InGameUI.LoadStatus.Loaded);
-                
+
                 AcknowledgeSuccessfulPrefabLoadServerRpc(assetGuid.GetHashCode());
             }
         }
-        
+
         [ServerRpc(RequireOwnership = false)]
         void AcknowledgeSuccessfulPrefabLoadServerRpc(int prefabHash, ServerRpcParams rpcParams = default)
         {
             Debug.Log($"Client acknowledged successful prefab load with hash: {prefabHash}");
-            DynamicPrefabLoadingUtilities.RecordThatClientHasLoadedAPrefab(prefabHash, 
+            DynamicPrefabLoadingUtilities.RecordThatClientHasLoadedAPrefab(prefabHash,
                 rpcParams.Receive.SenderClientId);
-           
+
             //the server has all the objects network-visible, no need to do anything
             if (rpcParams.Receive.SenderClientId != m_NetworkManager.LocalClientId)
             {
@@ -278,7 +278,7 @@ void AcknowledgeSuccessfulPrefabLoadServerRpc(int prefabHash, ServerRpcParams rp
                 // and/or visually) to that player, giving them a potential advantage.
                 ShowHiddenObjectsToClient(prefabHash, rpcParams.Receive.SenderClientId);
             }
-            
+
             // a quick way to grab a matching prefab reference's name via its prefabHash
             var loadedPrefabName = "Undefined";
             foreach (var prefabReference in m_DynamicPrefabReferences)
@@ -288,7 +288,7 @@ void AcknowledgeSuccessfulPrefabLoadServerRpc(int prefabHash, ServerRpcParams rp
                 {
                     // found the matching prefab reference
                     if (DynamicPrefabLoadingUtilities.LoadedDynamicPrefabResourceHandles.TryGetValue(
-                            prefabReferenceGuid, 
+                            prefabReferenceGuid,
                             out var loadedGameObject))
                     {
                         // if it is loaded on the server, update the name on the ClientUI
@@ -297,7 +297,7 @@ void AcknowledgeSuccessfulPrefabLoadServerRpc(int prefabHash, ServerRpcParams rp
                     break;
                 }
             }
-            
+
             // client has successfully loaded a prefab, update UI
             m_InGameUI.ClientLoadedPrefabStatusChanged(rpcParams.Receive.SenderClientId, prefabHash, loadedPrefabName, InGameUI.LoadStatus.Loaded);
         }
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/05_API Playground/APIPlayground.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/05_API Playground/APIPlayground.cs
index f1cc3e08..a32d588b 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/05_API Playground/APIPlayground.cs	
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/05_API Playground/APIPlayground.cs	
@@ -25,41 +25,41 @@ public sealed class APIPlayground : NetworkBehaviour
     {
         [SerializeField]
         NetworkManager m_NetworkManager;
-        
+
         [SerializeField] List<AssetReferenceGameObject> m_DynamicPrefabReferences;
-        
+
         [SerializeField] InGameUI m_InGameUI;
-        
+
         const int k_MaxConnectedClientCount = 4;
-        
+
         const int k_MaxConnectPayload = 1024;
-        
+
         //A storage where we keep association between prefab (hash of it's GUID) and the spawned network objects that use it
         Dictionary<int, HashSet<NetworkObject>> m_PrefabHashToNetworkObjectId = new Dictionary<int, HashSet<NetworkObject>>();
-        
+
         float m_SynchronousSpawnTimeoutTimer;
-        
+
         int m_SynchronousSpawnAckCount = 0;
 
         void Start()
         {
             DynamicPrefabLoadingUtilities.Init(m_NetworkManager);
-            
+
             // In the use-cases where connection approval is implemented, the server can begin to validate a user's
             // connection payload, and either approve or deny connection to the joining client.
             m_NetworkManager.NetworkConfig.ConnectionApproval = true;
-            
+
             // Here, we keep ForceSamePrefabs disabled. This will allow us to dynamically add network prefabs to Netcode
             // for GameObject after establishing a connection.
             m_NetworkManager.NetworkConfig.ForceSamePrefabs = false;
             m_NetworkManager.ConnectionApprovalCallback += ConnectionApprovalCallback;
-            
+
             // hooking up UI callbacks
             m_InGameUI.LoadAllAsyncButtonPressed += OnClickedPreload;
             m_InGameUI.TrySpawnSynchronouslyButtonPressed += OnClickedTrySpawnSynchronously;
             m_InGameUI.SpawnUsingVisibilityButtonPressed += OnClickedTrySpawnInvisible;
         }
-        
+
         public override void OnDestroy()
         {
             m_NetworkManager.ConnectionApprovalCallback -= ConnectionApprovalCallback;
@@ -78,21 +78,21 @@ void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request
             Debug.Log("Client is trying to connect " + request.ClientNetworkId);
             var connectionData = request.Payload;
             var clientId = request.ClientNetworkId;
-            
+
             if (clientId == m_NetworkManager.LocalClientId)
             {
                 //allow the host to connect
                 Approve();
                 return;
             }
-            
+
             // A sample-specific denial on clients after k_MaxConnectedClientCount clients have been connected
             if (m_NetworkManager.ConnectedClientsList.Count >= k_MaxConnectedClientCount)
             {
                 ImmediateDeny();
                 return;
             }
-            
+
             if (connectionData.Length > k_MaxConnectPayload)
             {
                 // If connectionData is too big, deny immediately to avoid wasting time on the server. This is intended as
@@ -100,36 +100,36 @@ void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request
                 ImmediateDeny();
                 return;
             }
-    
+
             if (DynamicPrefabLoadingUtilities.LoadedPrefabCount == 0)
             {
                 //immediately approve the connection if we haven't loaded any prefabs yet
                 Approve();
                 return;
             }
-    
+
             var payload = System.Text.Encoding.UTF8.GetString(connectionData);
             var connectionPayload = JsonUtility.FromJson<ConnectionPayload>(payload); // https://docs.unity3d.com/2020.2/Documentation/Manual/JSONSerialization.html
-    
+
             int clientPrefabHash = connectionPayload.hashOfDynamicPrefabGUIDs;
             int serverPrefabHash = DynamicPrefabLoadingUtilities.HashOfDynamicPrefabGUIDs;
-            
+
             //if the client has the same prefabs as the server - approve the connection
             if (clientPrefabHash == serverPrefabHash)
             {
                 Approve();
 
                 DynamicPrefabLoadingUtilities.RecordThatClientHasLoadedAllPrefabs(clientId);
-                
+
                 return;
             }
-            
+
             // In order for clients to not just get disconnected with no feedback, the server needs to tell the client
             // why it disconnected it. This could happen after an auth check on a service or because of gameplay
             // reasons (server full, wrong build version, etc).
             // The server can do so via the DisconnectReason in the ConnectionApprovalResponse. The guids of the prefabs
             // the client will need to load will be sent, such that the client loads the needed prefabs, and reconnects.
-            
+
             // A note: DisconnectReason will not be written to if the string is too large in size. This should be used
             // only to tell the client "why" it failed -- the client should instead use services like UGS to fetch the
             // relevant data it needs to fetch & download.
@@ -137,21 +137,21 @@ void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request
             DynamicPrefabLoadingUtilities.RefreshLoadedPrefabGuids();
 
             response.Reason = DynamicPrefabLoadingUtilities.GenerateDisconnectionPayload();
-            
+
             ImmediateDeny();
-            
+
             // A note: sending large strings through Netcode is not ideal -- you'd usually want to use REST services to
             // accomplish this instead. UGS services like Lobby can be a useful alternative. Another route may be to
             // set ConnectionApprovalResponse's Pending flag to true, and send a CustomMessage containing the array of 
             // GUIDs to a client, which the client would load and reattempt a reconnection.
-    
+
             void Approve()
             {
                 Debug.Log($"Client {clientId} approved");
                 response.Approved = true;
                 response.CreatePlayerObject = false; //we're not going to spawn a player object for this sample
             }
-            
+
             void ImmediateDeny()
             {
                 Debug.Log($"Client {clientId} denied connection");
@@ -167,10 +167,10 @@ void OnClickedPreload()
             {
                 return;
             }
-            
+
             PreloadPrefabs();
         }
-        
+
         // invoked by UI
         void OnClickedTrySpawnSynchronously()
         {
@@ -178,10 +178,10 @@ void OnClickedTrySpawnSynchronously()
             {
                 return;
             }
-            
+
             TrySpawnSynchronously();
         }
-        
+
         // invoked by UI
         void OnClickedTrySpawnInvisible()
         {
@@ -189,7 +189,7 @@ void OnClickedTrySpawnInvisible()
             {
                 return;
             }
-            
+
             TrySpawnInvisible();
         }
 
@@ -216,47 +216,47 @@ async Task PreloadDynamicPrefabOnServerAndStartLoadingOnAllClients(string guid)
                 {
                     Value = guid
                 };
-                
+
                 if (DynamicPrefabLoadingUtilities.IsPrefabLoadedOnAllClients(assetGuid))
                 {
                     Debug.Log("Prefab is already loaded by all peers");
                     return;
                 }
-                
+
                 // update UI for each client that is requested to load a certain prefab
                 foreach (var client in m_NetworkManager.ConnectedClients.Keys)
                 {
-                    m_InGameUI.ClientLoadedPrefabStatusChanged(client, 
-                        assetGuid.GetHashCode(), 
-                        "Undefined", 
+                    m_InGameUI.ClientLoadedPrefabStatusChanged(client,
+                        assetGuid.GetHashCode(),
+                        "Undefined",
                         InGameUI.LoadStatus.Loading);
                 }
-                
+
                 Debug.Log("Loading dynamic prefab on the clients...");
                 LoadAddressableClientRpc(assetGuid);
 
                 await DynamicPrefabLoadingUtilities.LoadDynamicPrefab(assetGuid, m_InGameUI.ArtificialDelayMilliseconds);
-                
+
                 // server loaded a prefab, update UI with the loaded asset's name
                 DynamicPrefabLoadingUtilities.TryGetLoadedGameObjectFromGuid(assetGuid, out var loadedGameObject);
-                
+
                 // every client loaded dynamic prefab, their respective ClientUIs in case they loaded first
                 foreach (var client in m_NetworkManager.ConnectedClients.Keys)
                 {
                     m_InGameUI.ClientLoadedPrefabStatusChanged(client,
-                        assetGuid.GetHashCode(), 
-                        loadedGameObject.Result.name, 
+                        assetGuid.GetHashCode(),
+                        loadedGameObject.Result.name,
                         InGameUI.LoadStatus.Loaded);
                 }
             }
         }
-        
+
         async void TrySpawnSynchronously()
         {
             var randomPrefab = m_DynamicPrefabReferences[Random.Range(0, m_DynamicPrefabReferences.Count)];
             await TrySpawnDynamicPrefabSynchronously(randomPrefab.AssetGUID, Random.insideUnitCircle * 5, Quaternion.identity);
         }
-        
+
         /// <summary>
         /// This call attempts to spawn a prefab by it's addressable guid - it ensures that all the clients have loaded the prefab before spawning it,
         /// and if the clients fail to acknowledge that they've loaded a prefab - the spawn will fail.
@@ -271,33 +271,33 @@ async void TrySpawnSynchronously()
                 {
                     Value = guid
                 };
-                
+
                 if (DynamicPrefabLoadingUtilities.IsPrefabLoadedOnAllClients(assetGuid))
                 {
                     Debug.Log("Prefab is already loaded by all peers, we can spawn it immediately");
                     var obj = Spawn(assetGuid);
                     return (true, obj);
                 }
-                
+
                 m_SynchronousSpawnAckCount = 0;
                 m_SynchronousSpawnTimeoutTimer = 0;
-                
+
                 Debug.Log("Loading dynamic prefab on the clients...");
                 LoadAddressableClientRpc(assetGuid);
-                
+
                 // server is starting to load a prefab, update UI
                 m_InGameUI.ClientLoadedPrefabStatusChanged(NetworkManager.ServerClientId, assetGuid.GetHashCode(), "Undefined", InGameUI.LoadStatus.Loading);
 
                 //load the prefab on the server, so that any late-joiner will need to load that prefab also
                 await DynamicPrefabLoadingUtilities.LoadDynamicPrefab(assetGuid, m_InGameUI.ArtificialDelayMilliseconds);
-                
+
                 // server loaded a prefab, update UI with the loaded asset's name
                 DynamicPrefabLoadingUtilities.TryGetLoadedGameObjectFromGuid(assetGuid, out var loadedGameObject);
                 m_InGameUI.ClientLoadedPrefabStatusChanged(NetworkManager.ServerClientId, assetGuid.GetHashCode(), loadedGameObject.Result.name, InGameUI.LoadStatus.Loaded);
 
-                var requiredAcknowledgementsCount = IsHost ? m_NetworkManager.ConnectedClients.Count - 1 : 
+                var requiredAcknowledgementsCount = IsHost ? m_NetworkManager.ConnectedClients.Count - 1 :
                     m_NetworkManager.ConnectedClients.Count;
-                
+
                 while (m_SynchronousSpawnTimeoutTimer < m_InGameUI.NetworkSpawnTimeoutSeconds)
                 {
                     if (m_SynchronousSpawnAckCount >= requiredAcknowledgementsCount)
@@ -306,11 +306,11 @@ async void TrySpawnSynchronously()
                         var obj = Spawn(assetGuid);
                         return (true, obj);
                     }
-                    
+
                     m_SynchronousSpawnTimeoutTimer += Time.deltaTime;
                     await Task.Yield();
                 }
-                
+
                 // left to the reader: you'll need to be reactive to clients failing to load -- you should either have
                 // the offending client try again or disconnect it after a predetermined amount of failed attempts
                 Debug.LogError("Failed to spawn dynamic prefab - timeout");
@@ -326,20 +326,20 @@ NetworkObject Spawn(AddressableGUID assetGuid)
                     Debug.LogWarning($"GUID {assetGuid} is not a GUID of a previously loaded prefab. Failed to spawn a prefab.");
                     return null;
                 }
-                
+
                 var obj = Instantiate(prefab.Result, position, rotation).GetComponent<NetworkObject>();
                 obj.Spawn();
                 Debug.Log("Spawned dynamic prefab");
-                
+
                 // every client loaded dynamic prefab, their respective ClientUIs in case they loaded first
                 foreach (var client in m_NetworkManager.ConnectedClients.Keys)
                 {
-                    m_InGameUI.ClientLoadedPrefabStatusChanged(client, 
-                        assetGuid.GetHashCode(), 
-                        prefab.Result.name, 
+                    m_InGameUI.ClientLoadedPrefabStatusChanged(client,
+                        assetGuid.GetHashCode(),
+                        prefab.Result.name,
                         InGameUI.LoadStatus.Loaded);
                 }
-                
+
                 return obj;
             }
         }
@@ -349,7 +349,7 @@ async void TrySpawnInvisible()
             var randomPrefab = m_DynamicPrefabReferences[Random.Range(0, m_DynamicPrefabReferences.Count)];
             await SpawnImmediatelyAndHideUntilPrefabIsLoadedOnClient(randomPrefab.AssetGUID, Random.insideUnitCircle * 5, Quaternion.identity);
         }
-        
+
         /// <summary>
         /// This call spawns an addressable prefab by it's guid. It does not ensure that all the clients have loaded the
         /// prefab before spawning it. All spawned objects are network-invisible to clients that don't have the prefab
@@ -366,7 +366,7 @@ async Task<NetworkObject> SpawnImmediatelyAndHideUntilPrefabIsLoadedOnClient(str
                 {
                     Value = guid
                 };
-                
+
                 return await Spawn(assetGuid);
             }
 
@@ -377,52 +377,52 @@ async Task<NetworkObject> Spawn(AddressableGUID assetGuid)
                 // server is starting to load a prefab, update UI
                 m_InGameUI.ClientLoadedPrefabStatusChanged(NetworkManager.ServerClientId, assetGuid.GetHashCode(), "Undefined", InGameUI.LoadStatus.Loading);
 
-                var prefab = await DynamicPrefabLoadingUtilities.LoadDynamicPrefab(assetGuid, 
+                var prefab = await DynamicPrefabLoadingUtilities.LoadDynamicPrefab(assetGuid,
                     m_InGameUI.ArtificialDelayMilliseconds);
-                
+
                 // server loaded a prefab, update UI with the loaded asset's name
                 DynamicPrefabLoadingUtilities.TryGetLoadedGameObjectFromGuid(assetGuid, out var loadedGameObject);
-                m_InGameUI.ClientLoadedPrefabStatusChanged(NetworkManager.ServerClientId, assetGuid.GetHashCode(), loadedGameObject.Result.name, InGameUI.LoadStatus.Loaded);                
-                
+                m_InGameUI.ClientLoadedPrefabStatusChanged(NetworkManager.ServerClientId, assetGuid.GetHashCode(), loadedGameObject.Result.name, InGameUI.LoadStatus.Loaded);
+
                 var obj = Instantiate(prefab, position, rotation).GetComponent<NetworkObject>();
-                
+
                 if (m_PrefabHashToNetworkObjectId.TryGetValue(assetGuid.GetHashCode(), out var networkObjectIds))
                 {
                     networkObjectIds.Add(obj);
                 }
                 else
                 {
-                    m_PrefabHashToNetworkObjectId.Add(assetGuid.GetHashCode(), new HashSet<NetworkObject>() {obj});
+                    m_PrefabHashToNetworkObjectId.Add(assetGuid.GetHashCode(), new HashSet<NetworkObject>() { obj });
                 }
 
-                obj.CheckObjectVisibility = (clientId) => 
+                obj.CheckObjectVisibility = (clientId) =>
                 {
                     if (clientId == NetworkManager.ServerClientId)
                     {
                         // object is loaded on the server, no need to validate for visibility
                         return true;
                     }
-                    
+
                     //if the client has already loaded the prefab - we can make the object network-visible to them
                     if (DynamicPrefabLoadingUtilities.HasClientLoadedPrefab(clientId, assetGuid.GetHashCode()))
                     {
                         return true;
                     }
-                    
+
                     // client is loading a prefab, update UI
                     m_InGameUI.ClientLoadedPrefabStatusChanged(clientId, assetGuid.GetHashCode(), "Undefined", InGameUI.LoadStatus.Loading);
 
                     //otherwise the client need to load the prefab, and after they ack - the ShowHiddenObjectsToClient 
-                    LoadAddressableClientRpc(assetGuid, new ClientRpcParams(){Send = new ClientRpcSendParams(){TargetClientIds = new ulong[]{clientId}}});
+                    LoadAddressableClientRpc(assetGuid, new ClientRpcParams() { Send = new ClientRpcSendParams() { TargetClientIds = new ulong[] { clientId } } });
                     return false;
                 };
-                
+
                 obj.Spawn();
 
                 return obj;
             }
         }
-        
+
         void ShowHiddenObjectsToClient(int prefabHash, ulong clientId)
         {
             if (m_PrefabHashToNetworkObjectId.TryGetValue(prefabHash, out var networkObjects))
@@ -436,7 +436,7 @@ void ShowHiddenObjectsToClient(int prefabHash, ulong clientId)
                 }
             }
         }
-        
+
         [ClientRpc]
         void LoadAddressableClientRpc(AddressableGUID guid, ClientRpcParams rpcParams = default)
         {
@@ -453,22 +453,22 @@ async void Load(AddressableGUID assetGuid)
                 Debug.Log("Loading dynamic prefab on the client...");
                 await DynamicPrefabLoadingUtilities.LoadDynamicPrefab(assetGuid, m_InGameUI.ArtificialDelayMilliseconds);
                 Debug.Log("Client loaded dynamic prefab");
-                
+
                 DynamicPrefabLoadingUtilities.TryGetLoadedGameObjectFromGuid(assetGuid, out var loadedGameObject);
                 m_InGameUI.ClientLoadedPrefabStatusChanged(m_NetworkManager.LocalClientId, assetGuid.GetHashCode(), loadedGameObject.Result.name, InGameUI.LoadStatus.Loaded);
 
                 AcknowledgeSuccessfulPrefabLoadServerRpc(assetGuid.GetHashCode());
             }
         }
-        
+
         [ServerRpc(RequireOwnership = false)]
         void AcknowledgeSuccessfulPrefabLoadServerRpc(int prefabHash, ServerRpcParams rpcParams = default)
         {
             m_SynchronousSpawnAckCount++;
             Debug.Log($"Client acknowledged successful prefab load with hash: {prefabHash}");
-            DynamicPrefabLoadingUtilities.RecordThatClientHasLoadedAPrefab(prefabHash, 
+            DynamicPrefabLoadingUtilities.RecordThatClientHasLoadedAPrefab(prefabHash,
                 rpcParams.Receive.SenderClientId);
-           
+
             //the server has all the objects network-visible, no need to do anything
             if (rpcParams.Receive.SenderClientId != m_NetworkManager.LocalClientId)
             {
@@ -488,7 +488,7 @@ void AcknowledgeSuccessfulPrefabLoadServerRpc(int prefabHash, ServerRpcParams rp
                 {
                     // found the matching prefab reference
                     if (DynamicPrefabLoadingUtilities.LoadedDynamicPrefabResourceHandles.TryGetValue(
-                            prefabReferenceGuid, 
+                            prefabReferenceGuid,
                             out var loadedGameObject))
                     {
                         // if it is loaded on the server, update the name on the ClientUI
@@ -497,7 +497,7 @@ void AcknowledgeSuccessfulPrefabLoadServerRpc(int prefabHash, ServerRpcParams rp
                     break;
                 }
             }
-            
+
             // client has successfully loaded a prefab, update UI
             m_InGameUI.ClientLoadedPrefabStatusChanged(rpcParams.Receive.SenderClientId, prefabHash, loadedPrefabName, InGameUI.LoadStatus.Loaded);
         }
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Readme/Editor/ReadmeEditor.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Readme/Editor/ReadmeEditor.cs
index 0587edb5..6f6b0d96 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Readme/Editor/ReadmeEditor.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Readme/Editor/ReadmeEditor.cs
@@ -78,7 +78,7 @@ static void LoadLayout()
             var assembly = typeof(EditorApplication).Assembly;
             var windowLayoutType = assembly.GetType("UnityEditor.WindowLayout", true);
             var method = windowLayoutType.GetMethod("LoadWindowLayout", BindingFlags.Public | BindingFlags.Static);
-            method?.Invoke(null, new object[] {Path.Combine(Application.dataPath, "TutorialInfo/Layout.wlt"), false});
+            method?.Invoke(null, new object[] { Path.Combine(Application.dataPath, "TutorialInfo/Layout.wlt"), false });
         }
 
         [MenuItem("Sample/Show Sample Instructions")]
@@ -89,9 +89,9 @@ static Readme SelectReadme()
             {
                 var readmeObject = AssetDatabase.LoadMainAssetAtPath(AssetDatabase.GUIDToAssetPath(ids[0]));
 
-                Selection.objects = new UnityEngine.Object[] {readmeObject};
+                Selection.objects = new UnityEngine.Object[] { readmeObject };
 
-                return (Readme) readmeObject;
+                return (Readme)readmeObject;
             }
             else
             {
@@ -102,7 +102,7 @@ static Readme SelectReadme()
 
         protected override void OnHeaderGUI()
         {
-            var readme = (Readme) target;
+            var readme = (Readme)target;
             Init();
 
             var iconWidth = Mathf.Min(EditorGUIUtility.currentViewWidth / 3f - 20f, 128f);
@@ -117,7 +117,7 @@ protected override void OnHeaderGUI()
 
         public override void OnInspectorGUI()
         {
-            var readme = (Readme) target;
+            var readme = (Readme)target;
             Init();
 
             foreach (var section in readme.sections)
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/AddressableGUID.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/AddressableGUID.cs
index f2c916a7..549166d4 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/AddressableGUID.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/AddressableGUID.cs
@@ -29,7 +29,7 @@ public override string ToString()
             return Value.ToString();
         }
     }
-    
+
     /// <summary>
     /// A class that implements IEqualityComparer, for AddressableGUID comparisons that don't allocate memory since it
     /// compares integer values instead of strings.
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/AppController.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/AppController.cs
index 10bacf15..f0037387 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/AppController.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/AppController.cs
@@ -17,10 +17,10 @@ public sealed class AppController : MonoBehaviour
 
         [SerializeField]
         OptionalConnectionManager m_ConnectionManager;
-        
+
         [SerializeField]
         IPMenuUI m_IPMenuUI;
-        
+
         [SerializeField]
         InGameUI m_InGameUI;
 
@@ -33,7 +33,7 @@ void Start()
         {
             m_IPMenuUI.ResetUI();
             m_InGameUI.Hide();
-            
+
             m_NetworkManager.OnClientConnectedCallback += OnClientConnected;
             m_NetworkManager.OnClientDisconnectCallback += OnClientDisconnect;
 
@@ -58,7 +58,7 @@ void OnDestroy()
         void OnClientConnected(ulong clientId)
         {
             m_IPMenuUI.HideIPConnectionMenu();
-            
+
             // for host
             if (m_NetworkManager.IsHost)
             {
@@ -72,7 +72,7 @@ void OnClientConnected(ulong clientId)
                 {
                     // grab all loaded prefabs and represent that on the newly joined client
                     var loadedPrefabs = GetLoadedPrefabsHashesAndNames();
-                    
+
                     m_InGameUI.AddConnectionUIInstance(clientId, loadedPrefabs.Item1, loadedPrefabs.Item2);
                 }
             }
@@ -83,10 +83,10 @@ void OnClientConnected(ulong clientId)
                 {
                     m_IPMenuUI.ClientStarted();
                     m_InGameUI.Show(InGameUI.ButtonVisibility.Client);
-                    
+
                     // grab all locally loaded prefabs and represent that on local client
                     var loadedPrefabs = GetLoadedPrefabsHashesAndNames();
-                    
+
                     m_InGameUI.AddConnectionUIInstance(clientId, loadedPrefabs.Item1, loadedPrefabs.Item2);
                 }
             }
@@ -106,7 +106,7 @@ static Tuple<int[], string[]> GetLoadedPrefabsHashesAndNames()
 
             return Tuple.Create(loadedHashes, loadedNames);
         }
-        
+
         void OnClientDisconnect(ulong clientId)
         {
             // when a connected client disconnects, remove their UI
@@ -123,13 +123,13 @@ void OnClientDisconnect(ulong clientId)
                 m_InGameUI.Hide();
             }
         }
-        
+
         void StartHost()
         {
             Debug.Log(nameof(StartHost));
             m_ConnectionManager.StartHostIp(m_IPMenuUI.IpAddress, m_IPMenuUI.Port);
         }
-        
+
         void StartClient()
         {
             Debug.Log(nameof(StartClient));
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionPayload.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionPayload.cs
index 82cc6d63..91c9d5f1 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionPayload.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionPayload.cs
@@ -13,7 +13,7 @@ public class ConnectionPayload
     {
         public int hashOfDynamicPrefabGUIDs;
     }
-    
+
     /// <summary>
     /// For the purposes of this sample, this class will be serialized inside of Netcode for GameObject's
     /// DisconnectReason string, and sent to clients which failed to connect. It contains the reason enum, and the list
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionState.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionState.cs
index ff58a826..b3c02b21 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionState.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionState.cs
@@ -15,13 +15,13 @@ abstract class ConnectionState
         public abstract void Exit();
 
         public virtual void OnClientConnected(ulong clientId) { }
-        
+
         public virtual void OnClientDisconnect(ulong clientId) { }
 
         public virtual void OnServerStarted() { }
 
         public virtual void StartClientIP(string ipaddress, ushort port) { }
-        
+
         public virtual void StartHostIP(string ipaddress, ushort port) { }
 
         public virtual void OnUserRequestedShutdown() { }
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientConnectedState.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientConnectedState.cs
index c1ee6c6e..5c5472ad 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientConnectedState.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientConnectedState.cs
@@ -12,11 +12,11 @@ public ClientConnectedState(OptionalConnectionManager connectionManager)
         {
             m_ConnectionManager = connectionManager;
         }
-        
+
         public override void Enter() { }
 
         public override void Exit() { }
-        
+
         public override void OnUserRequestedShutdown()
         {
             m_ConnectionManager.m_NetworkManager.Shutdown();
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientConnectingState.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientConnectingState.cs
index 2448ba13..a1263a18 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientConnectingState.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientConnectingState.cs
@@ -14,23 +14,23 @@ public ClientConnectingState(OptionalConnectionManager connectionManager)
         {
             m_ConnectionManager = connectionManager;
         }
-        
+
         public override void Enter()
         {
             StartClient();
         }
 
         public override void Exit() { }
-        
+
         void StartClient()
         {
             var transport = m_ConnectionManager.m_NetworkManager.GetComponent<UnityTransport>();
             transport.SetConnectionData(m_ConnectionManager.m_ConnectAddress, m_ConnectionManager.m_Port);
-            m_ConnectionManager.m_NetworkManager.NetworkConfig.ConnectionData = 
+            m_ConnectionManager.m_NetworkManager.NetworkConfig.ConnectionData =
                 DynamicPrefabLoadingUtilities.GenerateRequestPayload();
             m_ConnectionManager.m_NetworkManager.StartClient();
         }
-        
+
         public override void OnClientConnected(ulong _)
         {
             m_ConnectionManager.ChangeState(m_ConnectionManager.m_ClientConnected);
@@ -55,11 +55,11 @@ public override void OnClientDisconnect(ulong _)
                         m_ConnectionManager.ChangeState(m_ConnectionManager.m_Offline);
                         break;
                     case DisconnectReason.ClientNeedsToPreload:
-                    {
-                        Debug.Log("Client needs to preload");
-                        m_ConnectionManager.m_ClientPreloading.disconnectionPayload = disconnectionPayload;
-                        m_ConnectionManager.ChangeState(m_ConnectionManager.m_ClientPreloading);
-                    }
+                        {
+                            Debug.Log("Client needs to preload");
+                            m_ConnectionManager.m_ClientPreloading.disconnectionPayload = disconnectionPayload;
+                            m_ConnectionManager.ChangeState(m_ConnectionManager.m_ClientPreloading);
+                        }
                         break;
                     default:
                         throw new ArgumentOutOfRangeException();
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientPreloadingState.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientPreloadingState.cs
index 56f5b5c4..6f8ed16e 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientPreloadingState.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientPreloadingState.cs
@@ -23,7 +23,7 @@ public ClientPreloadingState(OptionalConnectionManager connectionManager)
         public override void Enter()
         {
             m_ConnectionManager.m_NetworkManager.Shutdown();
-            HandleDisconnectReason(); 
+            HandleDisconnectReason();
         }
 
         async void HandleDisconnectReason()
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/HostingState.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/HostingState.cs
index 10c6ba4b..32b26c49 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/HostingState.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/HostingState.cs
@@ -12,7 +12,7 @@ public HostingState(OptionalConnectionManager connectionManager)
         {
             m_ConnectionManager = connectionManager;
         }
-        
+
         public override void Enter() { }
 
         public override void Exit() { }
@@ -27,7 +27,7 @@ public override void OnClientConnected(ulong clientId)
         {
             Debug.Log($"Client {clientId} connected");
         }
-        
+
         public override void OnClientDisconnect(ulong clientId)
         {
             if (clientId == m_ConnectionManager.m_NetworkManager.LocalClientId)
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/OfflineState.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/OfflineState.cs
index f43e45c2..91ebd8f9 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/OfflineState.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/OfflineState.cs
@@ -13,7 +13,7 @@ public OfflineState(OptionalConnectionManager connectionManager)
         {
             m_ConnectionManager = connectionManager;
         }
-        
+
         public override void Enter()
         {
             DynamicPrefabLoadingUtilities.UnloadAndReleaseAllDynamicPrefabs();
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/StartingHostState.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/StartingHostState.cs
index 985b6680..0b3fa6d6 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/StartingHostState.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/StartingHostState.cs
@@ -13,21 +13,21 @@ public StartingHostState(OptionalConnectionManager connectionManager)
         {
             m_ConnectionManager = connectionManager;
         }
-    
+
         public override void Enter()
         {
             StartHost();
         }
 
         public override void Exit() { }
-        
+
         void StartHost()
         {
             var transport = m_ConnectionManager.m_NetworkManager.GetComponent<UnityTransport>();
             transport.SetConnectionData(m_ConnectionManager.m_ConnectAddress, m_ConnectionManager.m_Port);
             m_ConnectionManager.m_NetworkManager.StartHost();
         }
-        
+
         public override void OnClientDisconnect(ulong clientId)
         {
             if (clientId == m_ConnectionManager.m_NetworkManager.LocalClientId)
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/DynamicPrefabLoadingUtilities.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/DynamicPrefabLoadingUtilities.cs
index f713ee6b..0b0380c1 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/DynamicPrefabLoadingUtilities.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/DynamicPrefabLoadingUtilities.cs
@@ -22,16 +22,16 @@ public static class DynamicPrefabLoadingUtilities
         public static int HashOfDynamicPrefabGUIDs { get; private set; } = k_EmptyDynamicPrefabHash;
 
         static Dictionary<AddressableGUID, AsyncOperationHandle<GameObject>> s_LoadedDynamicPrefabResourceHandles = new Dictionary<AddressableGUID, AsyncOperationHandle<GameObject>>(new AddressableGUIDEqualityComparer());
-        
+
         static List<AddressableGUID> s_DynamicPrefabGUIDs = new List<AddressableGUID>(); //cached list to avoid GC
 
         //A storage where we keep the association between the dynamic prefab (hash of it's GUID) and the clients that have it loaded
         static Dictionary<int, HashSet<ulong>> s_PrefabHashToClientIds = new Dictionary<int, HashSet<ulong>>();
 
-        public static bool HasClientLoadedPrefab(ulong clientId, int prefabHash) => 
+        public static bool HasClientLoadedPrefab(ulong clientId, int prefabHash) =>
             s_PrefabHashToClientIds.TryGetValue(prefabHash, out var clientIds) && clientIds.Contains(clientId);
 
-        public static bool IsPrefabLoadedOnAllClients(AddressableGUID assetGuid) => 
+        public static bool IsPrefabLoadedOnAllClients(AddressableGUID assetGuid) =>
             s_LoadedDynamicPrefabResourceHandles.ContainsKey(assetGuid);
 
         public static bool TryGetLoadedGameObjectFromGuid(AddressableGUID assetGuid, out AsyncOperationHandle<GameObject> loadedGameObject)
@@ -64,7 +64,7 @@ public static void RecordThatClientHasLoadedAllPrefabs(ulong clientId)
                 RecordThatClientHasLoadedAPrefab(dynamicPrefabGUID.GetHashCode(), clientId);
             }
         }
-        
+
         public static void RecordThatClientHasLoadedAPrefab(int assetGuidHash, ulong clientId)
         {
             if (s_PrefabHashToClientIds.TryGetValue(assetGuidHash, out var clientIds))
@@ -103,17 +103,17 @@ public static string GenerateDisconnectionPayload()
             {
                 dynamicPrefabGuidStrings.Add(dynamicPrefabGuid.ToString());
             }
-            
+
             var rejectionPayload = new DisconnectionPayload()
             {
                 reason = DisconnectReason.ClientNeedsToPreload,
                 guids = dynamicPrefabGuidStrings
             };
-    
+
             return JsonUtility.ToJson(rejectionPayload);
         }
-        
-        public static async Task<GameObject> LoadDynamicPrefab(AddressableGUID guid, int artificialDelayMilliseconds, 
+
+        public static async Task<GameObject> LoadDynamicPrefab(AddressableGUID guid, int artificialDelayMilliseconds,
             bool recomputeHash = true)
         {
             if (s_LoadedDynamicPrefabResourceHandles.ContainsKey(guid))
@@ -121,7 +121,7 @@ public static async Task<GameObject> LoadDynamicPrefab(AddressableGUID guid, int
                 Debug.Log($"Prefab has already been loaded, skipping loading this time | {guid}");
                 return s_LoadedDynamicPrefabResourceHandles[guid].Result;
             }
-            
+
             Debug.Log($"Loading dynamic prefab {guid.Value}");
             var op = Addressables.LoadAssetAsync<GameObject>(guid.ToString());
             var prefab = await op.Task;
@@ -133,7 +133,7 @@ public static async Task<GameObject> LoadDynamicPrefab(AddressableGUID guid, int
 
             s_NetworkManager.AddNetworkPrefab(prefab);
             s_LoadedDynamicPrefabResourceHandles.Add(guid, op);
-            
+
             if (recomputeHash)
             {
                 CalculateDynamicPrefabArrayHash();
@@ -141,7 +141,7 @@ public static async Task<GameObject> LoadDynamicPrefab(AddressableGUID guid, int
 
             return prefab;
         }
-        
+
         public static async Task<IList<GameObject>> LoadDynamicPrefabs(AddressableGUID[] guids,
             int artificialDelaySeconds = 0)
         {
@@ -149,12 +149,12 @@ public static async Task<IList<GameObject>> LoadDynamicPrefabs(AddressableGUID[]
 
             foreach (var guid in guids)
             {
-                tasks.Add( LoadDynamicPrefab(guid, artificialDelaySeconds, recomputeHash:false));
+                tasks.Add(LoadDynamicPrefab(guid, artificialDelaySeconds, recomputeHash: false));
             }
-            
+
             var prefabs = await Task.WhenAll(tasks);
             CalculateDynamicPrefabArrayHash();
-            
+
             return prefabs;
         }
 
@@ -163,7 +163,7 @@ public static void RefreshLoadedPrefabGuids()
             s_DynamicPrefabGUIDs.Clear();
             s_DynamicPrefabGUIDs.AddRange(s_LoadedDynamicPrefabResourceHandles.Keys);
         }
-        
+
         static void CalculateDynamicPrefabArrayHash()
         {
             //we need to sort the array so that the hash is consistent across clients
@@ -171,7 +171,7 @@ static void CalculateDynamicPrefabArrayHash()
             RefreshLoadedPrefabGuids();
             s_DynamicPrefabGUIDs.Sort((a, b) => a.Value.CompareTo(b.Value));
             HashOfDynamicPrefabGUIDs = k_EmptyDynamicPrefabHash;
-            
+
             //a simple hash combination algorithm suggested by Jon Skeet,
             //found here: https://stackoverflow.com/questions/1646807/quick-and-simple-hash-code-combinations
             //we can't use C# HashCode combine because it is unreliable across different processes (by design)
@@ -188,17 +188,17 @@ static void CalculateDynamicPrefabArrayHash()
 
             Debug.Log($"Calculated hash of dynamic prefabs: {HashOfDynamicPrefabGUIDs}");
         }
-        
+
         public static void UnloadAndReleaseAllDynamicPrefabs()
         {
             HashOfDynamicPrefabGUIDs = k_EmptyDynamicPrefabHash;
-            
+
             foreach (var handle in s_LoadedDynamicPrefabResourceHandles.Values)
             {
                 s_NetworkManager.RemoveNetworkPrefab(handle.Result);
                 Addressables.Release(handle);
             }
-            
+
             s_LoadedDynamicPrefabResourceHandles.Clear();
         }
     }
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/OptionalConnectionManager.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/OptionalConnectionManager.cs
index 99d75103..cd5b2ffc 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/OptionalConnectionManager.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/OptionalConnectionManager.cs
@@ -14,23 +14,23 @@ public class OptionalConnectionManager : MonoBehaviour
     {
         [SerializeField]
         internal NetworkManager m_NetworkManager;
-        
+
         ConnectionState m_CurrentState;
-        
+
         internal OfflineState m_Offline;
-        
+
         internal ClientConnectingState m_ClientConnecting;
-        
+
         internal ClientConnectedState m_ClientConnected;
-        
+
         internal ClientPreloadingState m_ClientPreloading;
-        
+
         internal StartingHostState m_StartingHost;
-        
+
         internal HostingState m_Hosting;
-        
+
         internal string m_ConnectAddress;
-        
+
         internal ushort m_Port;
 
         void Awake()
@@ -46,7 +46,7 @@ void Start()
             m_ClientPreloading = new ClientPreloadingState(this);
             m_StartingHost = new StartingHostState(this);
             m_Hosting = new HostingState(this);
-            
+
             m_CurrentState = m_Offline;
 
             m_NetworkManager.OnClientConnectedCallback += OnClientConnectedCallback;
@@ -54,7 +54,7 @@ void Start()
             m_NetworkManager.OnServerStarted += OnServerStarted;
             m_NetworkManager.OnTransportFailure += OnTransportFailure;
         }
-        
+
         void OnDestroy()
         {
             m_NetworkManager.OnClientConnectedCallback -= OnClientConnectedCallback;
@@ -62,22 +62,22 @@ void OnDestroy()
             m_NetworkManager.OnServerStarted -= OnServerStarted;
             m_NetworkManager.OnTransportFailure -= OnTransportFailure;
         }
-        
+
         void OnClientConnectedCallback(ulong clientId)
         {
             m_CurrentState.OnClientConnected(clientId);
         }
-        
+
         void OnClientDisconnectCallback(ulong clientId)
         {
             m_CurrentState.OnClientDisconnect(clientId);
         }
-        
+
         void OnServerStarted()
         {
             m_CurrentState.OnServerStarted();
         }
-        
+
         void OnTransportFailure()
         {
             m_CurrentState.OnTransportFailure();
@@ -114,4 +114,4 @@ public void RequestShutdown()
             m_CurrentState.OnUserRequestedShutdown();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/UI/IPMenuUI.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/UI/IPMenuUI.cs
index 17124cbe..47c0e0bb 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/UI/IPMenuUI.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/UI/IPMenuUI.cs
@@ -27,11 +27,11 @@ public class IPMenuUI : MonoBehaviour
 
         public string IpAddress { get; private set; } = "127.0.0.1";
         public ushort Port { get; private set; } = 9998;
-                
+
         public event Action HostButtonPressed;
-        
+
         public event Action ClientButtonPressed;
-        
+
         public event Action DisconnectButtonPressed;
 
         void Awake()
@@ -62,17 +62,17 @@ void Start()
             m_IPInputField.value = IpAddress;
             m_PortInputField.value = Port.ToString();
         }
-        
+
         void OnHostButtonPressed()
         {
             HostButtonPressed?.Invoke();
         }
-        
+
         void OnClientButtonPressed()
         {
             ClientButtonPressed?.Invoke();
         }
-        
+
         void OnDisconnectButtonPressed()
         {
             DisconnectButtonPressed?.Invoke();
@@ -87,7 +87,7 @@ public void ClientStarted()
         {
             SwitchToInGameUI("Client");
         }
-        
+
         public void HideIPConnectionMenu()
         {
             SetUIElementVisibility(m_IPMenuUIRoot, false);
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/UI/InGameUI.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/UI/InGameUI.cs
index eaee64b7..e2236ba7 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/UI/InGameUI.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/UI/InGameUI.cs
@@ -53,17 +53,17 @@ public class InGameUI : MonoBehaviour
         public float NetworkSpawnTimeoutSeconds { get; private set; } = 3000;
 
         Dictionary<ulong, ClientUI> m_Clients = new Dictionary<ulong, ClientUI>();
-        
+
         public event Action LoadAllAsyncButtonPressed;
-        
+
         public event Action TrySpawnSynchronouslyButtonPressed;
-        
+
         public event Action SpawnUsingVisibilityButtonPressed;
-        
+
         [Flags]
-        public enum ButtonVisibility 
+        public enum ButtonVisibility
         {
-            None   = 0,
+            None = 0,
             Server = 1,
             Client = 2
         }
@@ -165,7 +165,7 @@ void Start()
         public void Show(ButtonVisibility visibility)
         {
             SetUIElementVisibility(m_InGameUIRoot, true);
-            
+
             SetUIElementVisibility(m_ArtificialDelaySliderHolder, m_ShowArtificialDelaySlider.HasFlag(visibility));
             SetUIElementVisibility(m_NetworkSpawnTimeoutSliderHolder, m_ShowNetworkSpawnTimeoutSlider.HasFlag(visibility));
             SetUIElementVisibility(m_ApiControlsHolder, m_ShowApiControls.HasFlag(visibility));
@@ -173,7 +173,7 @@ public void Show(ButtonVisibility visibility)
             SetUIElementVisibility(m_SpawnSynchronouslyButton, m_ShowTrySpawnSynchronouslyButton.HasFlag(visibility));
             SetUIElementVisibility(m_SpawnWithVisibilityButton, m_ShowSpawnUsingVisibilityButton.HasFlag(visibility));
         }
-        
+
         public void Hide()
         {
             SetUIElementVisibility(m_InGameUIRoot, false);
diff --git a/Basic/Invaders/Assets/Scripts/EnemyAgent.cs b/Basic/Invaders/Assets/Scripts/EnemyAgent.cs
index 6f5d7d10..2cb398f5 100644
--- a/Basic/Invaders/Assets/Scripts/EnemyAgent.cs
+++ b/Basic/Invaders/Assets/Scripts/EnemyAgent.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Unity.Netcode;
 using UnityEngine;
 using UnityEngine.Assertions;
@@ -61,7 +61,7 @@ private void Update()
             // Wait for the grace shooting period to pass
             return;
         }
-        
+
         bool bCanShootThisFrame = false;
         if (IsServer && canShoot)
             if (Random.Range(0, 1.0f) > k_ShootingRandomThreshold)
diff --git a/Basic/Invaders/Assets/Scripts/EnemyBullet.cs b/Basic/Invaders/Assets/Scripts/EnemyBullet.cs
index 61059e3e..67269802 100644
--- a/Basic/Invaders/Assets/Scripts/EnemyBullet.cs
+++ b/Basic/Invaders/Assets/Scripts/EnemyBullet.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Unity.Netcode;
 using UnityEngine;
 using UnityEngine.Assertions;
diff --git a/Basic/Invaders/Assets/Scripts/InvadersGame.cs b/Basic/Invaders/Assets/Scripts/InvadersGame.cs
index 1bf2ab23..bd38f2d9 100644
--- a/Basic/Invaders/Assets/Scripts/InvadersGame.cs
+++ b/Basic/Invaders/Assets/Scripts/InvadersGame.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using TMPro;
 using Unity.Netcode;
@@ -100,7 +100,7 @@ private void Awake()
     {
         Assert.IsNull(Singleton, $"Multiple instances of {nameof(InvadersGame)} detected. This should not happen.");
         Singleton = this;
-        
+
         OnSingletonReady?.Invoke();
 
         if (IsServer)
@@ -198,7 +198,7 @@ private void OnClientConnected(ulong clientId)
         if (m_ReplicatedTimeSent)
         {
             // Send the RPC only to the newly connected client
-            SetReplicatedTimeRemainingClientRPC(m_TimeRemaining, new ClientRpcParams {Send = new ClientRpcSendParams{TargetClientIds = new List<ulong>() {clientId}}});
+            SetReplicatedTimeRemainingClientRPC(m_TimeRemaining, new ClientRpcParams { Send = new ClientRpcSendParams { TargetClientIds = new List<ulong>() { clientId } } });
         }
     }
 
@@ -320,13 +320,13 @@ private void UpdateEnemies()
             UpdateEnemiesResultFlags enemiesResultFlags = UpdateEnemiesResultFlags.None;
             UpdateShootingEnemies(ref enemiesResultFlags);
 
-            if((enemiesResultFlags & UpdateEnemiesResultFlags.ReachedBottom) != 0)
+            if ((enemiesResultFlags & UpdateEnemiesResultFlags.ReachedBottom) != 0)
             {
                 // Force game end as at least one of the enemies have reached the bottom!
                 SetGameEnd(GameOverReason.EnemiesReachedBottom);
                 return;
             }
-            
+
             // If we didn't find any enemies, then spawn some
             if ((enemiesResultFlags & UpdateEnemiesResultFlags.FoundEnemy) == 0)
             {
@@ -367,14 +367,14 @@ private void UpdateShootingEnemies(ref UpdateEnemiesResultFlags flags)
             {
                 continue;
             }
-            
+
             // If at least one of the enemies reached bottom, return early.
             if (enemy.transform.position.y <= k_BottomBoundaryOffset)
             {
                 flags |= UpdateEnemiesResultFlags.ReachedBottom;
                 return;
             }
-            
+
             if (enemy.score > 100)
                 continue;
 
@@ -435,17 +435,17 @@ public void SetGameEnd(GameOverReason reason)
             BroadcastGameOverClientRpc(reason); // Notify our clients!
             return;
         }
-        
+
         foreach (NetworkClient networkedClient in NetworkManager.Singleton.ConnectedClientsList)
         {
             var playerObject = networkedClient.PlayerObject;
-            if(playerObject == null) continue;
-            
+            if (playerObject == null) continue;
+
             // We should just early out if any of the player's are still alive
             if (playerObject.GetComponent<PlayerControl>().IsAlive)
                 return;
         }
-        
+
         this.isGameOver.Value = true;
     }
 
@@ -466,24 +466,24 @@ public void RegisterSpawnableObject(InvadersObjectType invadersObjectType, GameO
         switch (invadersObjectType)
         {
             case InvadersObjectType.Enemy:
-            {
-                // Don't register if this is a saucer
-                if (gameObject.TryGetComponent<SuperEnemyMovement>(out var saucer))
-                    return;
-
-                gameObject.TryGetComponent<EnemyAgent>(out var enemyAgent);
-                Assert.IsTrue(enemyAgent != null);
-                if (!m_Enemies.Contains(enemyAgent))
-                    m_Enemies.Add(enemyAgent);
-                break;
-            }
+                {
+                    // Don't register if this is a saucer
+                    if (gameObject.TryGetComponent<SuperEnemyMovement>(out var saucer))
+                        return;
+
+                    gameObject.TryGetComponent<EnemyAgent>(out var enemyAgent);
+                    Assert.IsTrue(enemyAgent != null);
+                    if (!m_Enemies.Contains(enemyAgent))
+                        m_Enemies.Add(enemyAgent);
+                    break;
+                }
             case InvadersObjectType.Shield:
-            {
-                gameObject.TryGetComponent<Shield>(out var shield);
-                Assert.IsTrue(shield != null);
-                m_Shields.Add(shield);
-                break;
-            }
+                {
+                    gameObject.TryGetComponent<Shield>(out var shield);
+                    Assert.IsTrue(shield != null);
+                    m_Shields.Add(shield);
+                    break;
+                }
             default:
                 Assert.IsTrue(false);
                 break;
@@ -497,25 +497,25 @@ public void UnregisterSpawnableObject(InvadersObjectType invadersObjectType, Gam
         switch (invadersObjectType)
         {
             case InvadersObjectType.Enemy:
-            {
-                // Don't unregister if this is a saucer
-                if (gameObject.TryGetComponent<SuperEnemyMovement>(out var saucer))
-                    return;
-
-                gameObject.TryGetComponent<EnemyAgent>(out var enemyAgent);
-                Assert.IsTrue(enemyAgent != null);
-                if (m_Enemies.Contains(enemyAgent))
-                    m_Enemies.Remove(enemyAgent);
-                break;
-            }
+                {
+                    // Don't unregister if this is a saucer
+                    if (gameObject.TryGetComponent<SuperEnemyMovement>(out var saucer))
+                        return;
+
+                    gameObject.TryGetComponent<EnemyAgent>(out var enemyAgent);
+                    Assert.IsTrue(enemyAgent != null);
+                    if (m_Enemies.Contains(enemyAgent))
+                        m_Enemies.Remove(enemyAgent);
+                    break;
+                }
             case InvadersObjectType.Shield:
-            {
-                gameObject.TryGetComponent<Shield>(out var shield);
-                Assert.IsTrue(shield != null);
-                if (m_Shields.Contains(shield))
-                    m_Shields.Remove(shield);
-                break;
-            }
+                {
+                    gameObject.TryGetComponent<Shield>(out var shield);
+                    Assert.IsTrue(shield != null);
+                    if (m_Shields.Contains(shield))
+                        m_Shields.Remove(shield);
+                    break;
+                }
             default:
                 Assert.IsTrue(false);
                 break;
diff --git a/Basic/Invaders/Assets/Scripts/LobbyControl.cs b/Basic/Invaders/Assets/Scripts/LobbyControl.cs
index dd4ad8d8..ebcfae2c 100644
--- a/Basic/Invaders/Assets/Scripts/LobbyControl.cs
+++ b/Basic/Invaders/Assets/Scripts/LobbyControl.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using TMPro;
 using Unity.Netcode;
@@ -9,11 +9,11 @@ public class LobbyControl : NetworkBehaviour
 {
     [SerializeField]
     private string m_InGameSceneName = "InGame";
-    
+
     // Minimum player count required to transition to next level
     [SerializeField]
     private int m_MinimumPlayerCount = 2;
-    
+
     public TMP_Text LobbyText;
     private bool m_AllPlayersInLobby;
 
@@ -23,7 +23,7 @@ public class LobbyControl : NetworkBehaviour
     public override void OnNetworkSpawn()
     {
         m_ClientsInLobby = new Dictionary<ulong, bool>();
-        
+
         //Always add ourselves to the list at first
         m_ClientsInLobby.Add(NetworkManager.LocalClientId, false);
 
diff --git a/Basic/Invaders/Assets/Scripts/MenuControl.cs b/Basic/Invaders/Assets/Scripts/MenuControl.cs
index a6365363..d8fe541e 100644
--- a/Basic/Invaders/Assets/Scripts/MenuControl.cs
+++ b/Basic/Invaders/Assets/Scripts/MenuControl.cs
@@ -42,7 +42,7 @@ public void JoinGame()
             Debug.LogError("Failed to start client.");
         }
     }
-    
+
     static string Sanitize(string dirtyString)
     {
         // sanitize the input for the ip address
diff --git a/Basic/Invaders/Assets/Scripts/PlayerBullet.cs b/Basic/Invaders/Assets/Scripts/PlayerBullet.cs
index 021559c4..511fd833 100644
--- a/Basic/Invaders/Assets/Scripts/PlayerBullet.cs
+++ b/Basic/Invaders/Assets/Scripts/PlayerBullet.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Unity.Netcode;
 using UnityEngine;
 
@@ -49,11 +49,11 @@ private void OnTriggerEnter2D(Collider2D collider)
 
             // Only the server can despawn a NetworkObject
             hitEnemy.NetworkObject.Despawn();
-            
+
             SpawnExplosionVFXClientRPC(transform.position, Quaternion.identity);
-            
+
             NetworkObject.Despawn();
-            
+
             return;
         }
 
diff --git a/Basic/Invaders/Assets/Scripts/PlayerControl.cs b/Basic/Invaders/Assets/Scripts/PlayerControl.cs
index 0ddd1445..459a907c 100644
--- a/Basic/Invaders/Assets/Scripts/PlayerControl.cs
+++ b/Basic/Invaders/Assets/Scripts/PlayerControl.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Unity.Mathematics;
 using Unity.Netcode;
 using UnityEngine;
@@ -51,10 +51,10 @@ private void Update()
         switch (SceneTransitionHandler.sceneTransitionHandler.GetCurrentSceneState())
         {
             case SceneTransitionHandler.SceneStates.Ingame:
-            {
-                InGameUpdate();
-                break;
-            }
+                {
+                    InGameUpdate();
+                    break;
+                }
         }
     }
 
@@ -120,7 +120,7 @@ public override void OnNetworkSpawn()
             InvadersGame.OnSingletonReady += SubscribeToDelegatesAndUpdateValues;
         else
             SubscribeToDelegatesAndUpdateValues();
-        
+
         SceneTransitionHandler.sceneTransitionHandler.OnSceneStateChanged += SceneTransitionHandler_sceneStateChanged;
         UpdateColor();
     }
diff --git a/Basic/Invaders/Assets/Scripts/SceneTransitionHandler.cs b/Basic/Invaders/Assets/Scripts/SceneTransitionHandler.cs
index 79515437..57334a48 100644
--- a/Basic/Invaders/Assets/Scripts/SceneTransitionHandler.cs
+++ b/Basic/Invaders/Assets/Scripts/SceneTransitionHandler.cs
@@ -21,7 +21,7 @@ public class SceneTransitionHandler : NetworkBehaviour
     public event SceneStateChangedDelegateHandler OnSceneStateChanged;
 
     private int m_numberOfClientLoaded;
-    
+
     /// <summary>
     /// Example scene states
     /// </summary>
@@ -42,7 +42,7 @@ public enum SceneStates
     /// </summary>
     private void Awake()
     {
-        if(sceneTransitionHandler != this && sceneTransitionHandler != null)
+        if (sceneTransitionHandler != this && sceneTransitionHandler != null)
         {
             GameObject.Destroy(sceneTransitionHandler.gameObject);
         }
@@ -59,7 +59,7 @@ private void Awake()
     public void SetSceneState(SceneStates sceneState)
     {
         m_SceneState = sceneState;
-        if(OnSceneStateChanged != null)
+        if (OnSceneStateChanged != null)
         {
             OnSceneStateChanged.Invoke(m_SceneState);
         }
@@ -81,7 +81,7 @@ public SceneStates GetCurrentSceneState()
     /// </summary>
     private void Start()
     {
-        if(m_SceneState == SceneStates.Init)
+        if (m_SceneState == SceneStates.Init)
         {
             SceneManager.LoadScene(DefaultMainMenu);
         }
@@ -93,7 +93,7 @@ private void Start()
     public void RegisterCallbacks()
     {
         NetworkManager.Singleton.SceneManager.OnLoadComplete += OnLoadComplete;
-        
+
     }
 
     /// <summary>
@@ -102,7 +102,7 @@ public void RegisterCallbacks()
     /// <param name="scenename"></param>
     public void SwitchScene(string scenename)
     {
-        if(NetworkManager.Singleton.IsListening)
+        if (NetworkManager.Singleton.IsListening)
         {
             m_numberOfClientLoaded = 0;
             NetworkManager.Singleton.SceneManager.LoadScene(scenename, LoadSceneMode.Single);
@@ -134,9 +134,9 @@ public void ExitAndLoadStartMenu()
         {
             NetworkManager.Singleton.SceneManager.OnLoadComplete -= OnLoadComplete;
         }
-        
+
         OnClientLoadedScene = null;
         SetSceneState(SceneStates.Start);
         SceneManager.LoadScene(1);
     }
-}
\ No newline at end of file
+}
diff --git a/Basic/Invaders/Assets/Scripts/Shield.cs b/Basic/Invaders/Assets/Scripts/Shield.cs
index 17b6a02b..7dc32c7b 100644
--- a/Basic/Invaders/Assets/Scripts/Shield.cs
+++ b/Basic/Invaders/Assets/Scripts/Shield.cs
@@ -1,4 +1,4 @@
-using Unity.Mathematics;
+using Unity.Mathematics;
 using Unity.Netcode;
 using UnityEngine;
 
diff --git a/Basic/Invaders/Assets/Scripts/SuperEnemyMovement.cs b/Basic/Invaders/Assets/Scripts/SuperEnemyMovement.cs
index 0bec4674..cc6f9750 100644
--- a/Basic/Invaders/Assets/Scripts/SuperEnemyMovement.cs
+++ b/Basic/Invaders/Assets/Scripts/SuperEnemyMovement.cs
@@ -1,4 +1,4 @@
-using Unity.Netcode;
+using Unity.Netcode;
 using UnityEngine;
 
 public class SuperEnemyMovement : NetworkBehaviour
@@ -14,7 +14,7 @@ public class SuperEnemyMovement : NetworkBehaviour
     private void Update()
     {
         if (!IsServer) return;
-        
+
         if (transform.position.x > k_YBoundary)
         {
             if (IsServer) NetworkObject.Despawn();
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80f98253..afd0049a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [unreleased] yyyy-mm-dd
+
+### Bitesize Samples Repository
+
+#### Cleanup
+- Formatted .cs files inside the Bitesize Samples repository to adhere to coding standards (#156) Internal testing job definition files were added in order for internal processes to execute.
+
 ## [1.5.0] 2023-12-15
 
 ### Bitesize Samples Repository
diff --git a/Experimental/MultiplayerUseCases/Assets/Common/Scripts/MultiplayerUseCasesUtilities.cs b/Experimental/MultiplayerUseCases/Assets/Common/Scripts/MultiplayerUseCasesUtilities.cs
index e2469353..eb00b58f 100644
--- a/Experimental/MultiplayerUseCases/Assets/Common/Scripts/MultiplayerUseCasesUtilities.cs
+++ b/Experimental/MultiplayerUseCases/Assets/Common/Scripts/MultiplayerUseCasesUtilities.cs
@@ -37,4 +37,4 @@ public static string FilterBadWords(string input)
                                                                                                  : match.Groups[1].Value);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Experimental/MultiplayerUseCases/Assets/Common/Scripts/NetworkManagerUI.cs b/Experimental/MultiplayerUseCases/Assets/Common/Scripts/NetworkManagerUI.cs
index 4cccf804..d54786e3 100644
--- a/Experimental/MultiplayerUseCases/Assets/Common/Scripts/NetworkManagerUI.cs
+++ b/Experimental/MultiplayerUseCases/Assets/Common/Scripts/NetworkManagerUI.cs
@@ -102,10 +102,10 @@ void SetButtonStateAndColor(Button button, bool highlight, bool enable)
                                              : m_DisabledButtonColor;
             button.colors = colors;
             button.interactable = enable;
-            
+
             var buttonOutline = button.transform.Find("Outline").GetComponent<Image>();
             buttonOutline.color = enable ? m_ButtonOutlineColor : m_ButtonOutlineDisabledColor;
             buttonOutline.color = highlight ? m_ButtonOutlineHighlightedColor : buttonOutline.color;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Experimental/MultiplayerUseCases/Assets/Common/Scripts/PlayerManager.cs b/Experimental/MultiplayerUseCases/Assets/Common/Scripts/PlayerManager.cs
index 22e9066d..0bcc5bd0 100644
--- a/Experimental/MultiplayerUseCases/Assets/Common/Scripts/PlayerManager.cs
+++ b/Experimental/MultiplayerUseCases/Assets/Common/Scripts/PlayerManager.cs
@@ -68,4 +68,4 @@ void OnLocalPlayerDeSpawned()
 
         void OnNonLocalPlayerDeSpawned() { }
     }
-}
\ No newline at end of file
+}
diff --git a/Experimental/MultiplayerUseCases/Assets/Editor/Tutorials/TutorialCallbacks.cs b/Experimental/MultiplayerUseCases/Assets/Editor/Tutorials/TutorialCallbacks.cs
index 6bfffa23..c23957f1 100644
--- a/Experimental/MultiplayerUseCases/Assets/Editor/Tutorials/TutorialCallbacks.cs
+++ b/Experimental/MultiplayerUseCases/Assets/Editor/Tutorials/TutorialCallbacks.cs
@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using UnityEditor;
 using Unity.Tutorials.Core.Editor;
 using Unity.Netcode;
@@ -87,4 +87,4 @@ public void LoadSelectionScene()
             UnityEditor.SceneManagement.EditorSceneManager.OpenScene(AssetDatabase.GetAssetPath(m_UseCaseSelectionScene));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Experimental/MultiplayerUseCases/Assets/StarterAssets/InputSystem/StarterAssetsInputs.cs b/Experimental/MultiplayerUseCases/Assets/StarterAssets/InputSystem/StarterAssetsInputs.cs
index d1aa1572..57f0c21b 100644
--- a/Experimental/MultiplayerUseCases/Assets/StarterAssets/InputSystem/StarterAssetsInputs.cs
+++ b/Experimental/MultiplayerUseCases/Assets/StarterAssets/InputSystem/StarterAssetsInputs.cs
@@ -5,76 +5,76 @@
 
 namespace StarterAssets
 {
-	public class StarterAssetsInputs : MonoBehaviour
-	{
-		[Header("Character Input Values")]
-		public Vector2 move;
-		public Vector2 look;
-		public bool jump;
-		public bool sprint;
+    public class StarterAssetsInputs : MonoBehaviour
+    {
+        [Header("Character Input Values")]
+        public Vector2 move;
+        public Vector2 look;
+        public bool jump;
+        public bool sprint;
 
-		[Header("Movement Settings")]
-		public bool analogMovement;
+        [Header("Movement Settings")]
+        public bool analogMovement;
 
-		[Header("Mouse Cursor Settings")]
-		public bool cursorLocked = true;
-		public bool cursorInputForLook = true;
+        [Header("Mouse Cursor Settings")]
+        public bool cursorLocked = true;
+        public bool cursorInputForLook = true;
 
 #if ENABLE_INPUT_SYSTEM && STARTER_ASSETS_PACKAGES_CHECKED
-		public void OnMove(InputValue value)
-		{
-			MoveInput(value.Get<Vector2>());
-		}
+        public void OnMove(InputValue value)
+        {
+            MoveInput(value.Get<Vector2>());
+        }
 
-		public void OnLook(InputValue value)
-		{
-			if(cursorInputForLook)
-			{
-				LookInput(value.Get<Vector2>());
-			}
-		}
+        public void OnLook(InputValue value)
+        {
+            if (cursorInputForLook)
+            {
+                LookInput(value.Get<Vector2>());
+            }
+        }
 
-		public void OnJump(InputValue value)
-		{
-			JumpInput(value.isPressed);
-		}
+        public void OnJump(InputValue value)
+        {
+            JumpInput(value.isPressed);
+        }
 
-		public void OnSprint(InputValue value)
-		{
-			SprintInput(value.isPressed);
-		}
+        public void OnSprint(InputValue value)
+        {
+            SprintInput(value.isPressed);
+        }
 #endif
 
 
-		public void MoveInput(Vector2 newMoveDirection)
-		{
-			move = newMoveDirection;
-		} 
+        public void MoveInput(Vector2 newMoveDirection)
+        {
+            move = newMoveDirection;
+        }
 
-		public void LookInput(Vector2 newLookDirection)
-		{
-			look = newLookDirection;
-		}
+        public void LookInput(Vector2 newLookDirection)
+        {
+            look = newLookDirection;
+        }
 
-		public void JumpInput(bool newJumpState)
-		{
-			jump = newJumpState;
-		}
+        public void JumpInput(bool newJumpState)
+        {
+            jump = newJumpState;
+        }
 
-		public void SprintInput(bool newSprintState)
-		{
-			sprint = newSprintState;
-		}
+        public void SprintInput(bool newSprintState)
+        {
+            sprint = newSprintState;
+        }
 
-		private void OnApplicationFocus(bool hasFocus)
-		{
-			SetCursorState(cursorLocked);
-		}
+        private void OnApplicationFocus(bool hasFocus)
+        {
+            SetCursorState(cursorLocked);
+        }
 
-		private void SetCursorState(bool newState)
-		{
-			Cursor.lockState = newState ? CursorLockMode.Locked : CursorLockMode.None;
-		}
-	}
-	
-}
\ No newline at end of file
+        private void SetCursorState(bool newState)
+        {
+            Cursor.lockState = newState ? CursorLockMode.Locked : CursorLockMode.None;
+        }
+    }
+
+}
diff --git a/Experimental/MultiplayerUseCases/Assets/StarterAssets/ThirdPersonController/Scripts/BasicRigidBodyPush.cs b/Experimental/MultiplayerUseCases/Assets/StarterAssets/ThirdPersonController/Scripts/BasicRigidBodyPush.cs
index 7f1b3b17..9e8e5a81 100644
--- a/Experimental/MultiplayerUseCases/Assets/StarterAssets/ThirdPersonController/Scripts/BasicRigidBodyPush.cs
+++ b/Experimental/MultiplayerUseCases/Assets/StarterAssets/ThirdPersonController/Scripts/BasicRigidBodyPush.cs
@@ -1,35 +1,35 @@
-using UnityEngine;
+using UnityEngine;
 
 public class BasicRigidBodyPush : MonoBehaviour
 {
-	public LayerMask pushLayers;
-	public bool canPush;
-	[Range(0.5f, 5f)] public float strength = 1.1f;
+    public LayerMask pushLayers;
+    public bool canPush;
+    [Range(0.5f, 5f)] public float strength = 1.1f;
 
-	private void OnControllerColliderHit(ControllerColliderHit hit)
-	{
-		if (canPush) PushRigidBodies(hit);
-	}
+    private void OnControllerColliderHit(ControllerColliderHit hit)
+    {
+        if (canPush) PushRigidBodies(hit);
+    }
 
-	private void PushRigidBodies(ControllerColliderHit hit)
-	{
-		// https://docs.unity3d.com/ScriptReference/CharacterController.OnControllerColliderHit.html
+    private void PushRigidBodies(ControllerColliderHit hit)
+    {
+        // https://docs.unity3d.com/ScriptReference/CharacterController.OnControllerColliderHit.html
 
-		// make sure we hit a non kinematic rigidbody
-		Rigidbody body = hit.collider.attachedRigidbody;
-		if (body == null || body.isKinematic) return;
+        // make sure we hit a non kinematic rigidbody
+        Rigidbody body = hit.collider.attachedRigidbody;
+        if (body == null || body.isKinematic) return;
 
-		// make sure we only push desired layer(s)
-		var bodyLayerMask = 1 << body.gameObject.layer;
-		if ((bodyLayerMask & pushLayers.value) == 0) return;
+        // make sure we only push desired layer(s)
+        var bodyLayerMask = 1 << body.gameObject.layer;
+        if ((bodyLayerMask & pushLayers.value) == 0) return;
 
-		// We dont want to push objects below us
-		if (hit.moveDirection.y < -0.3f) return;
+        // We dont want to push objects below us
+        if (hit.moveDirection.y < -0.3f) return;
 
-		// Calculate push direction from move direction, horizontal motion only
-		Vector3 pushDir = new Vector3(hit.moveDirection.x, 0.0f, hit.moveDirection.z);
+        // Calculate push direction from move direction, horizontal motion only
+        Vector3 pushDir = new Vector3(hit.moveDirection.x, 0.0f, hit.moveDirection.z);
 
-		// Apply the push and take strength into account
-		body.AddForce(pushDir * strength, ForceMode.Impulse);
-	}
-}
\ No newline at end of file
+        // Apply the push and take strength into account
+        body.AddForce(pushDir * strength, ForceMode.Impulse);
+    }
+}
diff --git a/Experimental/MultiplayerUseCases/Assets/StarterAssets/ThirdPersonController/Scripts/ThirdPersonController.cs b/Experimental/MultiplayerUseCases/Assets/StarterAssets/ThirdPersonController/Scripts/ThirdPersonController.cs
index a340f287..cf54b363 100644
--- a/Experimental/MultiplayerUseCases/Assets/StarterAssets/ThirdPersonController/Scripts/ThirdPersonController.cs
+++ b/Experimental/MultiplayerUseCases/Assets/StarterAssets/ThirdPersonController/Scripts/ThirdPersonController.cs
@@ -1,4 +1,4 @@
-using Unity.Netcode;
+using Unity.Netcode;
 using UnityEngine;
 #if ENABLE_INPUT_SYSTEM && STARTER_ASSETS_PACKAGES_CHECKED
 using UnityEngine.InputSystem;
@@ -391,4 +391,4 @@ private void OnLand(AnimationEvent animationEvent)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Experimental/MultiplayerUseCases/Assets/Tests/Editor/MissingReferencesFinder.cs b/Experimental/MultiplayerUseCases/Assets/Tests/Editor/MissingReferencesFinder.cs
index 59f13e22..ab7823eb 100644
--- a/Experimental/MultiplayerUseCases/Assets/Tests/Editor/MissingReferencesFinder.cs
+++ b/Experimental/MultiplayerUseCases/Assets/Tests/Editor/MissingReferencesFinder.cs
@@ -33,7 +33,7 @@ internal static void FindMissingReferencesInAllBuiltScenes()
                 {
                     continue;
                 }
-                
+
                 EditorSceneManager.OpenScene(scene.path);
                 FindMissingReferencesInCurrentScene();
             }
@@ -145,4 +145,4 @@ static string GetFullPath(GameObject go)
                                                : Path.Combine(GetFullPath(go.transform.parent.gameObject), go.name);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Experimental/MultiplayerUseCases/Assets/Tests/Editor/ProjectTests.cs b/Experimental/MultiplayerUseCases/Assets/Tests/Editor/ProjectTests.cs
index b74decde..9ab9b843 100644
--- a/Experimental/MultiplayerUseCases/Assets/Tests/Editor/ProjectTests.cs
+++ b/Experimental/MultiplayerUseCases/Assets/Tests/Editor/ProjectTests.cs
@@ -16,4 +16,4 @@ public void FindMissingReferencesInAssets_NoMissingReferencesFound()
             MissingReferencesFinder.FindMissingReferencesInAssets();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetvarVsRpc/Scripts/ColorManager.cs b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetvarVsRpc/Scripts/ColorManager.cs
index 0c63e27b..6ecf09ac 100644
--- a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetvarVsRpc/Scripts/ColorManager.cs
+++ b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetvarVsRpc/Scripts/ColorManager.cs
@@ -49,7 +49,7 @@ public override void OnNetworkDespawn()
 
         void Update()
         {
-            if (!IsClient) 
+            if (!IsClient)
             {
                 /* note: in this case there's only client-side logic and therefore the scripts returns early.
                  * In a real production scenario, you would have an UpdateManager script running all Updates from a centralized point.
diff --git a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetworkVariables/Scripts/CharacterManager.cs b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetworkVariables/Scripts/CharacterManager.cs
index b1969c1c..e3c861d5 100644
--- a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetworkVariables/Scripts/CharacterManager.cs
+++ b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetworkVariables/Scripts/CharacterManager.cs
@@ -99,7 +99,7 @@ void OnServerChangeData()
 
         void OnClientHealthChanged(int previousHealth, int newHealth)
         {
-            m_HealthBarImage.rectTransform.localScale = new Vector3((float) newHealth / 100.0f, 1);//(float)newHealth / 100.0f;
+            m_HealthBarImage.rectTransform.localScale = new Vector3((float)newHealth / 100.0f, 1);//(float)newHealth / 100.0f;
             OnClientUpdateHealthBarColor(newHealth);
             //note: you could use the previousHealth to play an healing/damage animation
         }
diff --git a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetworkVariables/Scripts/ColorManager.cs b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetworkVariables/Scripts/ColorManager.cs
index 5a068884..b812510b 100644
--- a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetworkVariables/Scripts/ColorManager.cs
+++ b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetworkVariables/Scripts/ColorManager.cs
@@ -65,7 +65,7 @@ void Update()
             m_ElapsedSecondsSinceLastChange += Time.deltaTime;
 
             if (m_ElapsedSecondsSinceLastChange >= m_SecondsBetweenColorChanges)
-            {  
+            {
                 m_ElapsedSecondsSinceLastChange = 0;
                 OnServerChangeColor();
             }
diff --git a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/SelectionScreen/Scripts/SceneSelectionElement.cs b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/SelectionScreen/Scripts/SceneSelectionElement.cs
index 96be59f9..c6351a59 100644
--- a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/SelectionScreen/Scripts/SceneSelectionElement.cs
+++ b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/SelectionScreen/Scripts/SceneSelectionElement.cs
@@ -57,4 +57,4 @@ void LoadScene(string sceneName)
             SceneManager.LoadScene(sceneName, LoadSceneMode.Single);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/SelectionScreen/Scripts/SceneSelectionUI.cs b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/SelectionScreen/Scripts/SceneSelectionUI.cs
index 8c799133..72f0f64e 100644
--- a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/SelectionScreen/Scripts/SceneSelectionUI.cs
+++ b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/SelectionScreen/Scripts/SceneSelectionUI.cs
@@ -46,4 +46,4 @@ static void DestroyAllChildrenOf(Transform t)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/dotnet-tools/.gitignore b/dotnet-tools/.gitignore
new file mode 100644
index 00000000..8afdcb63
--- /dev/null
+++ b/dotnet-tools/.gitignore
@@ -0,0 +1,454 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+[Ll]ogs/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# Tye
+.tye/
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# CodeRush personal settings
+.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
+
+##
+## Visual studio for Mac
+##
+
+
+# globs
+Makefile.in
+*.userprefs
+*.usertasks
+config.make
+config.status
+aclocal.m4
+install-sh
+autom4te.cache/
+*.tar.gz
+tarballs/
+test-results/
+
+# Mac bundle stuff
+*.dmg
+*.app
+
+# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore
+# Windows thumbnail cache files
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+##
+## Visual Studio Code
+##
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
diff --git a/dotnet-tools/README.md b/dotnet-tools/README.md
new file mode 100644
index 00000000..9fe15843
--- /dev/null
+++ b/dotnet-tools/README.md
@@ -0,0 +1,61 @@
+# .NET Tools for Unity Netcode
+
+## Netcode.Standards
+
+C# coding standards tool for Netcode that relies on `.editorconfig` ruleset and `dotnet format` tool
+
+### How to Install & Uninstall
+
+Build (Pack)
+
+```zsh
+dotnet pack dotnet-tools/netcode.standards
+```
+
+Install
+
+```zsh
+dotnet tool install --global --add-source ./dotnet-tools/netcode.standards netcode.standards
+```
+
+Check
+
+```zsh
+netcode.standards --help
+```
+
+Uninstall
+
+```zsh
+dotnet tool uninstall --global netcode.standards
+```
+
+### How to Use
+
+#### Commands
+
+Check
+
+```zsh
+# check for standards issues without touching files
+netcode.standards --check
+```
+
+Fix
+```zsh
+# try to fix standards issues and save file changes
+netcode.standards --fix
+```
+
+#### Options
+
+Specifying at least one of `--check` or `--fix` is required.
+
+However, you can also specify other options to configure the tool.
+
+|Option|Description|
+|:-|:-|
+|`--project <project>`|Target project folder [default: testproject]|
+|`--pattern <pattern>`|Search pattern string [default: *.sln]|
+|`--verbosity <verbosity>`|Logs verbosity level [default: normal]|
+|`-?`, `-h`, `--help`|Show help and usage information|
diff --git a/dotnet-tools/netcode.standards/Program.cs b/dotnet-tools/netcode.standards/Program.cs
new file mode 100644
index 00000000..2a8ce865
--- /dev/null
+++ b/dotnet-tools/netcode.standards/Program.cs
@@ -0,0 +1,66 @@
+using System;
+using System.IO;
+using System.Diagnostics;
+
+internal static class Program
+{
+    /// <summary>
+    /// C# coding standards tool for Netcode that relies on `.editorconfig` ruleset and `dotnet format` tool
+    /// </summary>
+    /// <param name="check">Check for standards issues (will not change files)</param>
+    /// <param name="fix">Try to fix standards issues (could change files)</param>
+    /// <param name="project">Target project folder</param>
+    /// <param name="pattern">Search pattern string</param>
+    /// <param name="verbosity">Logs verbosity level</param>
+    private static int Main(
+        bool check = false, bool fix = false,
+        string project = "",
+        string pattern = "*.sln",
+        string verbosity = "normal")
+    {
+        if (check && fix)
+        {
+            Console.WriteLine($"FAILED: Please use --{nameof(check)} or --{nameof(fix)} individually, not both at the same time");
+            return 1;
+        }
+
+        if (!check && !fix)
+        {
+            Console.WriteLine($"FAILED: Please use at least one of --{nameof(check)} or --{nameof(fix)} workflows");
+            return 2;
+        }
+
+        foreach (var file in Directory.GetFiles(project, pattern))
+        {
+            var procInfo = new ProcessStartInfo("dotnet");
+
+            procInfo.Arguments = check
+                ? $"format {file} whitespace --no-restore --verify-no-changes --verbosity {verbosity}"
+                : $"format {file} whitespace --no-restore --verbosity {verbosity}";
+            Console.WriteLine($"######## START -> {(check ? "check" : "fix")} whitespace issues");
+            var whitespace = Process.Start(procInfo);
+            whitespace.WaitForExit();
+            if (whitespace.ExitCode != 0)
+            {
+                Console.WriteLine("######## FAILED -> found whitespace issues (see details above)");
+                return whitespace.ExitCode;
+            }
+            Console.WriteLine("######## SUCCEEDED -> no whitespace issues");
+
+            procInfo.Arguments = check
+                ? $"format {file} style --severity error --no-restore --verify-no-changes --verbosity {verbosity}"
+                : $"format {file} style --severity error --no-restore --verbosity {verbosity}";
+            Console.WriteLine($"######## START -> {(check ? "check" : "fix")} style/naming issues");
+            var style = Process.Start(procInfo);
+            style.WaitForExit();
+            if (style.ExitCode != 0)
+            {
+                Console.WriteLine("######## FAILED -> found style/naming issues (see details above)");
+                return style.ExitCode;
+            }
+            Console.WriteLine("######## SUCCEEDED -> no style/naming issues");
+        }
+
+        return 0;
+    }
+}
diff --git a/dotnet-tools/netcode.standards/netcode.standards.csproj b/dotnet-tools/netcode.standards/netcode.standards.csproj
new file mode 100644
index 00000000..74e37a21
--- /dev/null
+++ b/dotnet-tools/netcode.standards/netcode.standards.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net6.0</TargetFramework>
+        <PackAsTool>true</PackAsTool>
+        <ToolCommandName>netcode.standards</ToolCommandName>
+        <PackageOutputPath>./nupkg</PackageOutputPath>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="System.CommandLine.DragonFruit" Version="0.3.0-alpha.21216.1" />
+    </ItemGroup>
+
+</Project>
\ No newline at end of file

From 61085b1ef745e0e202ec2825d23bbd72a80e339a Mon Sep 17 00:00:00 2001
From: Elfi0Kuhndorf <93766359+Elfi0Kuhndorf@users.noreply.github.com>
Date: Tue, 16 Apr 2024 17:07:09 +0200
Subject: [PATCH 03/20] Deleting the duplicated comment and quick comment fixes
 [MTT-7677] (#163)

* deleting the duplicated comment (see MTT-7677)

* small comment fixes in ConnectionApproval.cs and in InvadersGame.cs
---
 Basic/ClientDriven/Assets/Scripts/ServerPlayerMove.cs           | 1 -
 .../Assets/Scripts/01_Connection Approval/ConnectionApproval.cs | 2 +-
 Basic/Invaders/Assets/Scripts/InvadersGame.cs                   | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Basic/ClientDriven/Assets/Scripts/ServerPlayerMove.cs b/Basic/ClientDriven/Assets/Scripts/ServerPlayerMove.cs
index b1f1dab8..7cb70c74 100644
--- a/Basic/ClientDriven/Assets/Scripts/ServerPlayerMove.cs
+++ b/Basic/ClientDriven/Assets/Scripts/ServerPlayerMove.cs
@@ -39,7 +39,6 @@ void OnServerSpawnPlayer()
         transform.position = spawnPosition;
 
         // A note specific to owner authority:
-        // Side Note:  Specific to Owner Authoritative
         // Setting the position works as and can be set in OnNetworkSpawn server-side unless there is a
         // CharacterController that is enabled by default on the authoritative side. With CharacterController, it
         // needs to be disabled by default (i.e. in Awake), the server applies the position (OnNetworkSpawn), and then
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/01_Connection Approval/ConnectionApproval.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/01_Connection Approval/ConnectionApproval.cs
index 4b5c802e..f5b85b36 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/01_Connection Approval/ConnectionApproval.cs	
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/01_Connection Approval/ConnectionApproval.cs	
@@ -36,7 +36,7 @@ void Start()
             m_NetworkManager.NetworkConfig.ConnectionApproval = true;
 
             // Here, we keep ForceSamePrefabs disabled. This will allow us to dynamically add network prefabs to Netcode
-            // for GameObject after establishing a connection. In this implementation of the connection approval
+            // for GameObjects after establishing a connection. In this implementation of the connection approval
             // callback, the server validates the client's connection payload based on the hash of their dynamic prefabs
             // loaded, and either approves or denies connection to the joining client. If a client is denied connection,
             // the server provides a disconnection payload through NetworkManager's DisconnectReason, so that a
diff --git a/Basic/Invaders/Assets/Scripts/InvadersGame.cs b/Basic/Invaders/Assets/Scripts/InvadersGame.cs
index bd38f2d9..1f4113f4 100644
--- a/Basic/Invaders/Assets/Scripts/InvadersGame.cs
+++ b/Basic/Invaders/Assets/Scripts/InvadersGame.cs
@@ -80,7 +80,7 @@ public class InvadersGame : NetworkBehaviour
     private float m_NextTick;
 
     // the timer should only be synced at the beginning
-    // and then let the client to update it in a predictive manner
+    // and then let the client update it in a predictive manner
     private bool m_ReplicatedTimeSent = false;
     private GameObject m_Saucer;
     private List<Shield> m_Shields = new List<Shield>();

From 559f6678ac61202ea828e8ae7745a0bdc685e5c8 Mon Sep 17 00:00:00 2001
From: Elfi0Kuhndorf <93766359+Elfi0Kuhndorf@users.noreply.github.com>
Date: Wed, 17 Apr 2024 18:16:27 +0200
Subject: [PATCH 04/20] Fix: Client Driven Ghost Static Ingredients on Late
 join [MTT-4505] (#157)

* added object spawner game objects for startup instead of in-scene place objects

there to copy behavior in Boss Room and to keep it consistent between different clients including late joiners

* adding NetworkObjectSpawner.cs script

* implemented spawning logic into an OnServerStarted event

* addressed feedback including namepace, OnDestroy method and null check

* added prefab variants and added summary  to NetworkObjectSpawner

* update for CHANGELOG

* adding NetworkManager.Singleton to functions and changing to var

* removed unnecessary lines, adjusted debug.assert and adjusted tags within the scene
---
 .../ClientDriven/Assets/NetworkPrefabs.asset  |  15 +
 .../Assets/Prefabs/Ingredient.prefab          |  42 +-
 .../IngredientServerStartSpawner.prefab       |  48 ++
 .../IngredientServerStartSpawner.prefab.meta  |   7 +
 .../Assets/Prefabs/Ingredient_Blue.prefab     |  67 ++
 .../Prefabs/Ingredient_Blue.prefab.meta       |   7 +
 .../Assets/Prefabs/Ingredient_Purple.prefab   |  67 ++
 .../Prefabs/Ingredient_Purple.prefab.meta     |   7 +
 .../Assets/Prefabs/Ingredient_Red.prefab      |  59 ++
 .../Assets/Prefabs/Ingredient_Red.prefab.meta |   7 +
 .../Assets/Scenes/Bootstrap.unity             | 703 +++++-------------
 .../Assets/Scripts/NetworkObjectSpawner.cs    |  43 ++
 .../Scripts/NetworkObjectSpawner.cs.meta      |  11 +
 CHANGELOG.md                                  |   5 +
 14 files changed, 566 insertions(+), 522 deletions(-)
 create mode 100644 Basic/ClientDriven/Assets/Prefabs/IngredientServerStartSpawner.prefab
 create mode 100644 Basic/ClientDriven/Assets/Prefabs/IngredientServerStartSpawner.prefab.meta
 create mode 100644 Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab
 create mode 100644 Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab.meta
 create mode 100644 Basic/ClientDriven/Assets/Prefabs/Ingredient_Purple.prefab
 create mode 100644 Basic/ClientDriven/Assets/Prefabs/Ingredient_Purple.prefab.meta
 create mode 100644 Basic/ClientDriven/Assets/Prefabs/Ingredient_Red.prefab
 create mode 100644 Basic/ClientDriven/Assets/Prefabs/Ingredient_Red.prefab.meta
 create mode 100644 Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs
 create mode 100644 Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs.meta

diff --git a/Basic/ClientDriven/Assets/NetworkPrefabs.asset b/Basic/ClientDriven/Assets/NetworkPrefabs.asset
index e1d68b4d..77b29c82 100644
--- a/Basic/ClientDriven/Assets/NetworkPrefabs.asset
+++ b/Basic/ClientDriven/Assets/NetworkPrefabs.asset
@@ -19,3 +19,18 @@ MonoBehaviour:
     SourcePrefabToOverride: {fileID: 3439633038736912633, guid: 2a2c42bf260b04db580cf31345132259, type: 3}
     SourceHashToOverride: 0
     OverridingTargetPrefab: {fileID: 2233080138743716588, guid: 6db9810ba5bf046f7af9c7017b746129, type: 3}
+  - Override: 0
+    Prefab: {fileID: 34856496335307672, guid: 93ffadfcde7ae054397f3f63b51d2188, type: 3}
+    SourcePrefabToOverride: {fileID: 3439633038736912633, guid: 2a2c42bf260b04db580cf31345132259, type: 3}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 2233080138743716588, guid: 6db9810ba5bf046f7af9c7017b746129, type: 3}
+  - Override: 0
+    Prefab: {fileID: 4013193825546441291, guid: 404a6c73dd6ffb14490f25c33e93ffff, type: 3}
+    SourcePrefabToOverride: {fileID: 3439633038736912633, guid: 2a2c42bf260b04db580cf31345132259, type: 3}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 2233080138743716588, guid: 6db9810ba5bf046f7af9c7017b746129, type: 3}
+  - Override: 0
+    Prefab: {fileID: 4013193825546441291, guid: d0360ef45c142b744b880b5819cf7f00, type: 3}
+    SourcePrefabToOverride: {fileID: 3439633038736912633, guid: 2a2c42bf260b04db580cf31345132259, type: 3}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 2233080138743716588, guid: 6db9810ba5bf046f7af9c7017b746129, type: 3}
diff --git a/Basic/ClientDriven/Assets/Prefabs/Ingredient.prefab b/Basic/ClientDriven/Assets/Prefabs/Ingredient.prefab
index d36c425b..a48b3cb4 100644
--- a/Basic/ClientDriven/Assets/Prefabs/Ingredient.prefab
+++ b/Basic/ClientDriven/Assets/Prefabs/Ingredient.prefab
@@ -11,9 +11,9 @@ GameObject:
   - component: {fileID: 4621998539424734916}
   - component: {fileID: 4840591773774142929}
   - component: {fileID: 7759258758774188825}
+  - component: {fileID: 5818429371130516787}
   - component: {fileID: 8268979759230423690}
   - component: {fileID: 2014424453305718345}
-  - component: {fileID: 5818429371130516787}
   - component: {fileID: 5607146804455042385}
   - component: {fileID: 2549828380439460752}
   - component: {fileID: -5120166168328346616}
@@ -92,6 +92,26 @@ Rigidbody:
   m_Interpolate: 1
   m_Constraints: 0
   m_CollisionDetection: 3
+--- !u!114 &5818429371130516787
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8321201880322001125}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  GlobalObjectIdHash: 3406890450
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1
 --- !u!114 &8268979759230423690
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -136,26 +156,6 @@ MonoBehaviour:
   InLocalSpace: 0
   Interpolate: 1
   SlerpPosition: 0
---- !u!114 &5818429371130516787
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8321201880322001125}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 951099334
-  AlwaysReplicateAsRoot: 0
-  SynchronizeTransform: 1
-  ActiveSceneSynchronization: 0
-  SceneMigrationSynchronization: 1
-  SpawnWithObservers: 1
-  DontDestroyWithOwner: 0
-  AutoObjectParentSync: 1
 --- !u!114 &5607146804455042385
 MonoBehaviour:
   m_ObjectHideFlags: 0
diff --git a/Basic/ClientDriven/Assets/Prefabs/IngredientServerStartSpawner.prefab b/Basic/ClientDriven/Assets/Prefabs/IngredientServerStartSpawner.prefab
new file mode 100644
index 00000000..fdd66d78
--- /dev/null
+++ b/Basic/ClientDriven/Assets/Prefabs/IngredientServerStartSpawner.prefab
@@ -0,0 +1,48 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &536145635693947214
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 207166779390499285}
+  - component: {fileID: 1695740223341187737}
+  m_Layer: 0
+  m_Name: IngredientServerStartSpawner
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &207166779390499285
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 536145635693947214}
+  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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1695740223341187737
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 536145635693947214}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a358fd16b205c224fae652283f7cedae, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_PrefabReference: {fileID: 0}
+  m_NetworkManager: {fileID: 0}
diff --git a/Basic/ClientDriven/Assets/Prefabs/IngredientServerStartSpawner.prefab.meta b/Basic/ClientDriven/Assets/Prefabs/IngredientServerStartSpawner.prefab.meta
new file mode 100644
index 00000000..88d3d7db
--- /dev/null
+++ b/Basic/ClientDriven/Assets/Prefabs/IngredientServerStartSpawner.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 34c1add8edaf6e44787b5c1a6803a83e
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab
new file mode 100644
index 00000000..db871b30
--- /dev/null
+++ b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab
@@ -0,0 +1,67 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &8286918849967262589
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: GlobalObjectIdHash
+      value: 1010565204
+      objectReference: {fileID: 0}
+    - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: currentIngredientType.m_InternalValue
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8321201880322001125, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_Name
+      value: Ingredient_Blue
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a6b33b41508134c09957e076f4d53415, type: 3}
diff --git a/Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab.meta b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab.meta
new file mode 100644
index 00000000..f4101765
--- /dev/null
+++ b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 93ffadfcde7ae054397f3f63b51d2188
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Basic/ClientDriven/Assets/Prefabs/Ingredient_Purple.prefab b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Purple.prefab
new file mode 100644
index 00000000..71f2f9ae
--- /dev/null
+++ b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Purple.prefab
@@ -0,0 +1,67 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &4957165217442912942
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: GlobalObjectIdHash
+      value: 4112275378
+      objectReference: {fileID: 0}
+    - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: currentIngredientType.m_InternalValue
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 8321201880322001125, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_Name
+      value: Ingredient_Purple
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a6b33b41508134c09957e076f4d53415, type: 3}
diff --git a/Basic/ClientDriven/Assets/Prefabs/Ingredient_Purple.prefab.meta b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Purple.prefab.meta
new file mode 100644
index 00000000..94f14fe0
--- /dev/null
+++ b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Purple.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 404a6c73dd6ffb14490f25c33e93ffff
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Basic/ClientDriven/Assets/Prefabs/Ingredient_Red.prefab b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Red.prefab
new file mode 100644
index 00000000..52a561f7
--- /dev/null
+++ b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Red.prefab
@@ -0,0 +1,59 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &4957165217442912942
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8321201880322001125, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_Name
+      value: Ingredient
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a6b33b41508134c09957e076f4d53415, type: 3}
diff --git a/Basic/ClientDriven/Assets/Prefabs/Ingredient_Red.prefab.meta b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Red.prefab.meta
new file mode 100644
index 00000000..22d14d9f
--- /dev/null
+++ b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Red.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d0360ef45c142b744b880b5819cf7f00
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity b/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity
index 4a1d9259..eabf639d 100644
--- a/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity
+++ b/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity
@@ -123,7 +123,7 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
---- !u!1001 &181529897
+--- !u!1001 &232086523
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -131,75 +131,67 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_RootOrder
-      value: 8
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 7.19
+      value: 3
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 1.42
+      value: 1.5
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 2.05
+      value: 5.24
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: GlobalObjectIdHash
-      value: 588047825
-      objectReference: {fileID: 0}
-    - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: CurrentIngredientType
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: CurrentIngredientType.m_InternalValue
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: currentIngredientType.m_InternalValue
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 8321201880322001125, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_Name
-      value: Ingredient (3)
+      value: IngredientServerStartSpawner (3)
       objectReference: {fileID: 0}
+    - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+      propertyPath: prefabReference
+      value: 
+      objectReference: {fileID: 1473896641872547741, guid: 404a6c73dd6ffb14490f25c33e93ffff, type: 3}
+    - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+      propertyPath: m_NetworkManager
+      value: 
+      objectReference: {fileID: 1114774667}
+    - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+      propertyPath: m_PrefabReference
+      value: 
+      objectReference: {fileID: 1473896641872547741, guid: 404a6c73dd6ffb14490f25c33e93ffff, type: 3}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+  m_SourcePrefab: {fileID: 100100000, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
 --- !u!1 &232705322
 GameObject:
   m_ObjectHideFlags: 0
@@ -231,87 +223,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 1980547847}
   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}
-      propertyPath: m_RootOrder
-      value: 7
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -6.93
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 1.42
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -14.16
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4644362981357575575, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: d1a9058ddc5c2461298f65541af6fcd9, type: 2}
-    - target: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: GlobalObjectIdHash
-      value: 1277636585
-      objectReference: {fileID: 0}
-    - target: {fileID: 6206319821543937579, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: d1a9058ddc5c2461298f65541af6fcd9, type: 2}
-    - target: {fileID: 6691487417621146171, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: d1a9058ddc5c2461298f65541af6fcd9, type: 2}
-    - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: currentIngredientType
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8321201880322001125, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_Name
-      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:
   m_ObjectHideFlags: 0
@@ -532,38 +443,7 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3}
---- !u!1 &796975752
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 796975753}
-  m_Layer: 0
-  m_Name: IngredientSpawnPoint (3)
-  m_TagString: Untagged
-  m_Icon: {fileID: -5397416234189338067, guid: 0000000000000000d000000000000000, type: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &796975753
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &883084307
+--- !u!1001 &666714754
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -571,91 +451,98 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_RootOrder
-      value: 6
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -10.82
+      value: -6
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 1.42
+      value: 1.5
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 13.44
+      value: -1
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4644362981357575575, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: b423dced7a4ac4f40a119b84a23cfc9b, type: 2}
-    - target: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: GlobalObjectIdHash
-      value: 2015703404
+    - target: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+      propertyPath: m_Name
+      value: IngredientServerStartSpawner (1)
       objectReference: {fileID: 0}
-    - target: {fileID: 6206319821543937579, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_Materials.Array.data[0]
+    - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+      propertyPath: prefabReference
       value: 
-      objectReference: {fileID: 2100000, guid: b423dced7a4ac4f40a119b84a23cfc9b, type: 2}
-    - target: {fileID: 6691487417621146171, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_Materials.Array.data[0]
+      objectReference: {fileID: 1473896641872547741, guid: 404a6c73dd6ffb14490f25c33e93ffff, type: 3}
+    - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+      propertyPath: m_NetworkManager
       value: 
-      objectReference: {fileID: 2100000, guid: b423dced7a4ac4f40a119b84a23cfc9b, type: 2}
-    - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: CurrentIngredientType
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: currentIngredientType
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: CurrentIngredientType.m_InternalValue
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: currentIngredientType.m_InternalValue
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8321201880322001125, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_Name
-      value: Ingredient (1)
-      objectReference: {fileID: 0}
+      objectReference: {fileID: 1114774667}
+    - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+      propertyPath: m_PrefabReference
+      value: 
+      objectReference: {fileID: 1473896641872547741, guid: 404a6c73dd6ffb14490f25c33e93ffff, type: 3}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+  m_SourcePrefab: {fileID: 100100000, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+--- !u!1 &796975752
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 796975753}
+  m_Layer: 0
+  m_Name: IngredientSpawnPoint (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: -5397416234189338067, guid: 0000000000000000d000000000000000, type: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &796975753
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &966089317
 GameObject:
   m_ObjectHideFlags: 0
@@ -667,7 +554,7 @@ GameObject:
   - component: {fileID: 966089318}
   m_Layer: 0
   m_Name: -------- Art --------
-  m_TagString: Untagged
+  m_TagString: EditorOnly
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1016,8 +903,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1299635456}
-  - component: {fileID: 1299635455}
   - component: {fileID: 1299635454}
+  - component: {fileID: 1299635455}
   m_Layer: 0
   m_Name: ScoreReplicator
   m_TagString: Untagged
@@ -1222,99 +1109,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 2060465724}
   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}
-      propertyPath: m_RootOrder
-      value: 9
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0.61
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 1.42
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 10.04
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4644362981357575575, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: b423dced7a4ac4f40a119b84a23cfc9b, type: 2}
-    - target: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: GlobalObjectIdHash
-      value: 1167607349
-      objectReference: {fileID: 0}
-    - target: {fileID: 6206319821543937579, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: b423dced7a4ac4f40a119b84a23cfc9b, type: 2}
-    - target: {fileID: 6691487417621146171, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: b423dced7a4ac4f40a119b84a23cfc9b, type: 2}
-    - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: CurrentIngredientType
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: currentIngredientType
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: CurrentIngredientType.m_InternalValue
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: currentIngredientType.m_InternalValue
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8321201880322001125, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_Name
-      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:
   m_ObjectHideFlags: 0
@@ -1394,152 +1188,6 @@ Transform:
   - {fileID: 474653828}
   m_Father: {fileID: 0}
   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}
-      propertyPath: m_RootOrder
-      value: 11
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 12.44
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 1.42
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -10.44
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 43.354
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: -56.524
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 66.302
-      objectReference: {fileID: 0}
-    - target: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: GlobalObjectIdHash
-      value: 2317574502
-      objectReference: {fileID: 0}
-    - target: {fileID: 6206319821543937579, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: d1a9058ddc5c2461298f65541af6fcd9, type: 2}
-    - target: {fileID: 6691487417621146171, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_Enabled
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6691487417621146171, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: d1a9058ddc5c2461298f65541af6fcd9, type: 2}
-    - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: currentIngredientType
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8321201880322001125, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_Name
-      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}
-      propertyPath: m_RootOrder
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 14.26
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 1.42
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -7.03
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4644362981357575575, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: d1a9058ddc5c2461298f65541af6fcd9, type: 2}
-    - target: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: GlobalObjectIdHash
-      value: 1282886573
-      objectReference: {fileID: 0}
-    - target: {fileID: 6206319821543937579, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: d1a9058ddc5c2461298f65541af6fcd9, type: 2}
-    - target: {fileID: 6691487417621146171, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: d1a9058ddc5c2461298f65541af6fcd9, type: 2}
-    - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: currentIngredientType
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8321201880322001125, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_Name
-      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:
   m_CorrespondingSourceObject: {fileID: 2182991878644361159, guid: d793abe7ff9aa094eb534e73a82fdab5, type: 3}
@@ -1728,6 +1376,75 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 3608989045728912046, guid: 2cb44b699415ff447a63b3c87e56fd16, type: 3}
   m_PrefabInstance: {fileID: 1997149792}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &2024285500
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -6
+      objectReference: {fileID: 0}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 5.24
+      objectReference: {fileID: 0}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+      propertyPath: m_Name
+      value: IngredientServerStartSpawner (2)
+      objectReference: {fileID: 0}
+    - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+      propertyPath: prefabReference
+      value: 
+      objectReference: {fileID: 1473896641872547741, guid: d0360ef45c142b744b880b5819cf7f00, type: 3}
+    - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+      propertyPath: m_NetworkManager
+      value: 
+      objectReference: {fileID: 1114774667}
+    - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+      propertyPath: m_PrefabReference
+      value: 
+      objectReference: {fileID: 1473896641872547741, guid: d0360ef45c142b744b880b5819cf7f00, type: 3}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
 --- !u!1 &2051538844
 GameObject:
   m_ObjectHideFlags: 0
@@ -2108,7 +1825,7 @@ PrefabInstance:
       insertIndex: -1
       addedObject: {fileID: 1368949947}
   m_SourcePrefab: {fileID: 100100000, guid: d793abe7ff9aa094eb534e73a82fdab5, type: 3}
---- !u!1001 &5723720766742547469
+--- !u!1001 &2255677428018747830
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -2116,96 +1833,80 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_RootOrder
-      value: 5
-      objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -14.38
+      value: 3
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 1.42
+      value: 1.5
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 11.72
+      value: -1
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: GlobalObjectIdHash
-      value: 2123788497
-      objectReference: {fileID: 0}
-    - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: CurrentIngredientType
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: m_StartingIngredientType
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: CurrentIngredientType.m_InternalValue
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3}
-      propertyPath: currentIngredientType.m_InternalValue
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 8321201880322001125, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
       propertyPath: m_Name
-      value: Ingredient
+      value: IngredientServerStartSpawner
       objectReference: {fileID: 0}
-    m_RemovedComponents:
-    - {fileID: 1702713463106468697, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+    - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+      propertyPath: prefabReference
+      value: 
+      objectReference: {fileID: 2575560247572078158, guid: 93ffadfcde7ae054397f3f63b51d2188, type: 3}
+    - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+      propertyPath: m_NetworkManager
+      value: 
+      objectReference: {fileID: 1114774667}
+    - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+      propertyPath: m_PrefabReference
+      value: 
+      objectReference: {fileID: 2575560247572078158, guid: 93ffadfcde7ae054397f3f63b51d2188, type: 3}
+    m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+  m_SourcePrefab: {fileID: 100100000, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0
   m_Roots:
   - {fileID: 1114774669}
   - {fileID: 1038740739}
+  - {fileID: 2255677428018747830}
+  - {fileID: 666714754}
+  - {fileID: 2024285500}
+  - {fileID: 232086523}
   - {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}
diff --git a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs
new file mode 100644
index 00000000..b7b8a594
--- /dev/null
+++ b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs
@@ -0,0 +1,43 @@
+using Unity.Netcode;
+using UnityEngine;
+
+namespace Unity.Multiplayer.Samples.ClientDriven
+{
+    /// <summary>
+    /// Spawn a NetworkObject at this transform's position when NetworkManager's server is started.
+    /// </summary>
+    /// <remarks>
+    /// A NetworkManager is expected to be part of the scene that this NetworkObject is a part of.
+    /// </remarks>
+    internal class NetworkObjectSpawner : MonoBehaviour
+    {
+        [SerializeField]
+        NetworkObject m_PrefabReference;
+
+        void Start()
+        {
+            Debug.Assert(NetworkManager.Singleton != null, "A NetworkManager is likely not a part of this MonoBehaviour's scene.");
+            if (NetworkManager.Singleton == null)
+            {
+                return;
+            }
+
+            NetworkManager.Singleton.OnServerStarted += SpawnIngredient;
+        }
+
+        void OnDestroy()
+        {
+            if(NetworkManager.Singleton != null)
+            { 
+                NetworkManager.Singleton.OnServerStarted -= SpawnIngredient;
+            }
+        }
+
+        void SpawnIngredient()
+        {
+            NetworkObject instantiatedNetworkObject = Instantiate(m_PrefabReference, transform.position, transform.rotation, null);
+            var ingredient = instantiatedNetworkObject.GetComponent<ServerIngredient>();
+            ingredient.NetworkObject.Spawn();
+        }
+    }
+}
diff --git a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs.meta b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs.meta
new file mode 100644
index 00000000..83de4835
--- /dev/null
+++ b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a358fd16b205c224fae652283f7cedae
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62f3bcfb..255762e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@
 #### Cleanup
 - Formatted .cs files inside the Bitesize Samples repository to adhere to coding standards (#156) Internal testing job definition files were added in order for internal processes to execute.
 
+### Client Driven
+
+#### Fixed
+- Added Spawner with event executed on Server Start to fix inconsistent ghost ingredients issue (#157)
+
 ## [1.5.0] 2023-12-15
 
 ### Bitesize Samples Repository

From 1072e7d471fe6afa5ad018ce19dc14e408b0f531 Mon Sep 17 00:00:00 2001
From: Fernando Cortez <fernando.cortez@unity3d.com>
Date: Thu, 18 Apr 2024 10:50:34 -0400
Subject: [PATCH 05/20] feat: ClientDriven upgrade to Netcode for GameObjects
 v1.8.1, client position place of execution change, Universal Rpc upgrade
 [MTT-7985] (#164)

* upgrade to Netcode for GameObjects v1.8.1, centralizing position changes client-side to one class

* redundant cast to NetworkObject removed, summary fix

* starting position set to origin once past all spawn points

* Rpcs converted to Universal Rpcs

* changelog addition

* more context on pattern change

* renaming of auto-gen method
---
 .../Prefabs/PlayerArmature_Networked.prefab   | 16 ++++---
 .../Scripts/ClientDrivenNetworkTransform.cs   | 44 +++++++++++++++++++
 .../ClientDrivenNetworkTransform.cs.meta      | 11 +++++
 .../Assets/Scripts/ClientPlayerMove.cs        |  8 ++--
 .../Assets/Scripts/ServerPlayerMove.cs        | 38 +++++++++++-----
 Basic/ClientDriven/Packages/manifest.json     |  2 +-
 .../ClientDriven/Packages/packages-lock.json  |  2 +-
 CHANGELOG.md                                  | 12 +++--
 8 files changed, 103 insertions(+), 30 deletions(-)
 create mode 100644 Basic/ClientDriven/Assets/Scripts/ClientDrivenNetworkTransform.cs
 create mode 100644 Basic/ClientDriven/Assets/Scripts/ClientDrivenNetworkTransform.cs.meta

diff --git a/Basic/ClientDriven/Assets/Prefabs/PlayerArmature_Networked.prefab b/Basic/ClientDriven/Assets/Prefabs/PlayerArmature_Networked.prefab
index 9f9c1517..c6cf9a0e 100644
--- a/Basic/ClientDriven/Assets/Prefabs/PlayerArmature_Networked.prefab
+++ b/Basic/ClientDriven/Assets/Prefabs/PlayerArmature_Networked.prefab
@@ -25,13 +25,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7567938585585123398}
+  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: 303777381631976334}
-  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!135 &6758041290174012784
 SphereCollider:
@@ -180,7 +180,7 @@ PrefabInstance:
       addedObject: {fileID: 5801232430748397462}
     - targetCorrespondingSourceObject: {fileID: 4416926081852918481, guid: 64dce48905ffd9b4293e595fa6941544, type: 3}
       insertIndex: -1
-      addedObject: {fileID: 7243582772389402832}
+      addedObject: {fileID: 5997952762632541840}
     - targetCorrespondingSourceObject: {fileID: 8187455079231382173, guid: 64dce48905ffd9b4293e595fa6941544, type: 3}
       insertIndex: -1
       addedObject: {fileID: 3615669438616969171}
@@ -230,11 +230,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 951099334
+  GlobalObjectIdHash: 3868643671
+  InScenePlacedSourceGlobalObjectIdHash: 0
   AlwaysReplicateAsRoot: 0
   SynchronizeTransform: 1
   ActiveSceneSynchronization: 0
   SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
 --- !u!114 &-2755784201116707001
@@ -252,6 +254,8 @@ MonoBehaviour:
   isObjectPickedUp:
     m_InternalValue: 0
   m_LocalHeldPosition: {x: 0, y: 2.85, z: 0}
+  spawnPosition:
+    m_InternalValue: {x: 0, y: 0, z: 0}
 --- !u!114 &5667156634780145037
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -284,7 +288,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   TransitionStateInfoList: []
   m_Animator: {fileID: 5969265393934875124}
---- !u!114 &7243582772389402832
+--- !u!114 &5997952762632541840
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -293,9 +297,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 1116025501350672692}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: df2868252ab5c4d1da357e8f11f1b524, type: 3}
+  m_Script: {fileID: 11500000, guid: 53b28d1b2108d4d199dae3ac8f537c27, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  UseUnreliableDeltas: 0
   SyncPositionX: 1
   SyncPositionY: 1
   SyncPositionZ: 1
@@ -314,6 +319,7 @@ MonoBehaviour:
   InLocalSpace: 0
   Interpolate: 1
   SlerpPosition: 0
+  m_ServerPlayerMove: {fileID: -2755784201116707001}
 --- !u!114 &1116025501350672696 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 4416926081852918493, guid: 64dce48905ffd9b4293e595fa6941544, type: 3}
diff --git a/Basic/ClientDriven/Assets/Scripts/ClientDrivenNetworkTransform.cs b/Basic/ClientDriven/Assets/Scripts/ClientDrivenNetworkTransform.cs
new file mode 100644
index 00000000..71f4fd59
--- /dev/null
+++ b/Basic/ClientDriven/Assets/Scripts/ClientDrivenNetworkTransform.cs
@@ -0,0 +1,44 @@
+using Unity.Multiplayer.Samples.Utilities.ClientAuthority;
+using UnityEngine;
+
+/// <summary>
+/// Component inheriting from <see cref="ClientNetworkTransform"/>, where server-driven player position changes are
+/// applied to the owning client.
+/// </summary>
+/// <remarks>
+/// Handling movement inside this component's OnNetworkSpawn method only ensures the mitigation of race condition issues
+/// arising due to the execution order of other NetworkBehaviours' OnNetworkSpawn methods.
+/// </remarks>
+[RequireComponent(typeof(ServerPlayerMove))]
+[DisallowMultipleComponent]
+public class ClientDrivenNetworkTransform : ClientNetworkTransform
+{
+    [SerializeField]
+    ServerPlayerMove m_ServerPlayerMove;
+
+    public override void OnNetworkSpawn()
+    {
+        base.OnNetworkSpawn();
+
+        if (IsClient && IsOwner)
+        {
+            SetPosition(Vector3.zero, m_ServerPlayerMove.spawnPosition.Value);
+            m_ServerPlayerMove.spawnPosition.OnValueChanged += SetPosition;
+        }
+    }
+
+    public override void OnNetworkDespawn()
+    {
+        base.OnNetworkDespawn();
+
+        if (m_ServerPlayerMove != null)
+        {
+            m_ServerPlayerMove.spawnPosition.OnValueChanged -= SetPosition;
+        }
+    }
+
+    void SetPosition(Vector3 previousValue, Vector3 newValue)
+    {
+        transform.position = newValue;
+    }
+}
diff --git a/Basic/ClientDriven/Assets/Scripts/ClientDrivenNetworkTransform.cs.meta b/Basic/ClientDriven/Assets/Scripts/ClientDrivenNetworkTransform.cs.meta
new file mode 100644
index 00000000..6044f9cb
--- /dev/null
+++ b/Basic/ClientDriven/Assets/Scripts/ClientDrivenNetworkTransform.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 53b28d1b2108d4d199dae3ac8f537c27
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Basic/ClientDriven/Assets/Scripts/ClientPlayerMove.cs b/Basic/ClientDriven/Assets/Scripts/ClientPlayerMove.cs
index 5c5d2399..30c15cde 100644
--- a/Basic/ClientDriven/Assets/Scripts/ClientPlayerMove.cs
+++ b/Basic/ClientDriven/Assets/Scripts/ClientPlayerMove.cs
@@ -38,10 +38,10 @@ void Awake()
         Cursor.visible = false;
 
         // ThirdPersonController & CharacterController are enabled only on owning clients. Ghost player objects have
-        // these two components disabled, and will enable a CapsuleCollider. Per the CharacterController documentation: 
+        // these two components disabled, and will enable a CapsuleCollider. Per the CharacterController documentation:
         // https://docs.unity3d.com/Manual/CharacterControllers.html, a Character controller can push rigidbody
         // objects aside while moving but will not be accelerated by incoming collisions. This means that a primitive
-        // CapsuleCollider must instead be used for ghost clients to simulate collisions between owning players and 
+        // CapsuleCollider must instead be used for ghost clients to simulate collisions between owning players and
         // ghost clients.
         m_ThirdPersonController.enabled = false;
         m_CapsuleCollider.enabled = false;
@@ -77,7 +77,7 @@ void OnPickUp()
     {
         if (m_ServerPlayerMove.isObjectPickedUp.Value)
         {
-            m_ServerPlayerMove.DropObjectServerRpc();
+            m_ServerPlayerMove.ServerDropObjectRpc();
         }
         else
         {
@@ -99,7 +99,7 @@ void OnPickUp()
                     // Netcode is a server driven SDK. Shared objects like ingredients need to be interacted with using ServerRPCs. Therefore, there
                     // will be a delay between the button press and the reparenting.
                     // This delay could be hidden with some animations/sounds/VFX that would be triggered here.
-                    m_ServerPlayerMove.PickupObjectServerRpc(netObj);
+                    m_ServerPlayerMove.ServerPickupObjectRpc(netObj);
                 }
             }
         }
diff --git a/Basic/ClientDriven/Assets/Scripts/ServerPlayerMove.cs b/Basic/ClientDriven/Assets/Scripts/ServerPlayerMove.cs
index 7cb70c74..b01e812b 100644
--- a/Basic/ClientDriven/Assets/Scripts/ServerPlayerMove.cs
+++ b/Basic/ClientDriven/Assets/Scripts/ServerPlayerMove.cs
@@ -1,6 +1,5 @@
 using System;
 using Unity.Netcode;
-using Unity.Netcode.Components;
 using UnityEngine;
 
 /// <summary>
@@ -17,6 +16,8 @@ public class ServerPlayerMove : NetworkBehaviour
     [SerializeField]
     Vector3 m_LocalHeldPosition;
 
+    public NetworkVariable<Vector3> spawnPosition;
+
     // DOC START HERE
     public override void OnNetworkSpawn()
     {
@@ -33,12 +34,21 @@ public override void OnNetworkSpawn()
 
     void OnServerSpawnPlayer()
     {
+        // Note: specific to Netcode for GameObjects v1.8.0 & v1.8.1
+        // Previous versions of this sample utilizing Netcode for GameObjects <v1.8.0 had set the player's position at
+        // this point. However, a regression with these two particular versions forced the new pattern for modifying a
+        // player's initial position, which is:
+        // we store the server-determined spawn position inside of a NetworkVariable, and have that be consumed by the
+        // owning client, inside ClientDrivenNetworkTransform. This approach navigates potential OnNetworkSpawn race
+        // conditions that popped up in these two Netcode versions, and is now a recommended approach for setting spawn
+        // positions on OnNetworkSpawn for owner-authoritative NetworkTransforms.
+
         // this is done server side, so we have a single source of truth for our spawn point list
         var spawnPoint = ServerPlayerSpawnPoints.Instance.ConsumeNextSpawnPoint();
-        var spawnPosition = spawnPoint ? spawnPoint.transform.position : Vector3.zero;
-        transform.position = spawnPosition;
+        spawnPosition.Value = spawnPoint != null ? spawnPoint.transform.position : Vector3.zero;
 
-        // A note specific to owner authority:
+        // A note specific to owner authority (see the note above why this would not work for Netcode for GameObjects
+        // v1.8.0 & 1.8.1):
         // Setting the position works as and can be set in OnNetworkSpawn server-side unless there is a
         // CharacterController that is enabled by default on the authoritative side. With CharacterController, it
         // needs to be disabled by default (i.e. in Awake), the server applies the position (OnNetworkSpawn), and then
@@ -47,15 +57,19 @@ void OnServerSpawnPlayer()
         // transform after synchronization with the initial position, thus overwriting the synchronized position.
     }
 
-    [ServerRpc]
-    public void PickupObjectServerRpc(ulong objToPickupID)
+    [Rpc(SendTo.Server)]
+    public void ServerPickupObjectRpc(ulong objToPickupID)
     {
         NetworkManager.SpawnManager.SpawnedObjects.TryGetValue(objToPickupID, out var objectToPickup);
-        if (objectToPickup == null || objectToPickup.transform.parent != null) return; // object already picked up, server authority says no
+        if (objectToPickup == null || objectToPickup.transform.parent != null)
+        {
+            // object already picked up, server authority says no
+            return;
+        }
 
-        if (objectToPickup.TryGetComponent(out NetworkObject networkObject) && networkObject.TrySetParent(transform))
+        if (objectToPickup.TrySetParent(transform))
         {
-            m_PickedUpObject = networkObject;
+            m_PickedUpObject = objectToPickup;
             objectToPickup.transform.localPosition = m_LocalHeldPosition;
             objectToPickup.GetComponent<ServerIngredient>().ingredientDespawned += IngredientDespawned;
             isObjectPickedUp.Value = true;
@@ -68,14 +82,14 @@ void IngredientDespawned()
         isObjectPickedUp.Value = false;
     }
 
-    [ServerRpc]
-    public void DropObjectServerRpc()
+    [Rpc(SendTo.Server)]
+    public void ServerDropObjectRpc()
     {
         if (m_PickedUpObject != null)
         {
             m_PickedUpObject.GetComponent<ServerIngredient>().ingredientDespawned -= IngredientDespawned;
             // can be null if enter drop zone while carrying
-            m_PickedUpObject.transform.parent = null;
+            m_PickedUpObject.TrySetParent(parent: (Transform)null);
             m_PickedUpObject = null;
         }
 
diff --git a/Basic/ClientDriven/Packages/manifest.json b/Basic/ClientDriven/Packages/manifest.json
index 73440ec1..f3e1689c 100644
--- a/Basic/ClientDriven/Packages/manifest.json
+++ b/Basic/ClientDriven/Packages/manifest.json
@@ -8,7 +8,7 @@
     "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.4.0",
-    "com.unity.netcode.gameobjects": "1.7.1",
+    "com.unity.netcode.gameobjects": "1.8.1",
     "com.unity.render-pipelines.universal": "14.0.9",
     "com.unity.test-framework": "1.1.33",
     "com.unity.textmeshpro": "3.0.6",
diff --git a/Basic/ClientDriven/Packages/packages-lock.json b/Basic/ClientDriven/Packages/packages-lock.json
index 0a2eee70..a66b77cd 100644
--- a/Basic/ClientDriven/Packages/packages-lock.json
+++ b/Basic/ClientDriven/Packages/packages-lock.json
@@ -135,7 +135,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.netcode.gameobjects": {
-      "version": "1.7.1",
+      "version": "1.8.1",
       "depth": 0,
       "source": "registry",
       "dependencies": {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 255762e7..81663c49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,11 @@
 
 ### Client Driven
 
+#### Changed
+- Upgraded to Netcode for GameObjects v1.8.1 (#164)
+  - Upgraded to the newer API for Rpcs, Universal Rpcs
+  - The place of execution for a client's position was moved to ClientNetworkTransform child class, ClientDrivenNetworkTransform. This ensures no race condition issues on a client's first position sync. Server code now modifies a NetworkVariable that client-owned instances of ClientDrivenNetworkTransform use on OnNetworkSpawn to initially move a player
+
 #### Fixed
 - Added Spawner with event executed on Server Start to fix inconsistent ghost ingredients issue (#157)
 
@@ -86,13 +91,6 @@
 - Upgraded to Netcode for GameObjects v1.6.0 (#134)
 - Upgraded sample to 2022.3.9f1 LTS (#134)
 
-## [Unreleased]
-
-### Dedicated Game Server
-todo: the changelog entry for this sample will be updated with subsequent PRs before being merged when ready
-
-- New Dedicated Game Server sample. (#1) This sample's goal is to demonstrate how to use the different tools and packages available to create a game using the dedicated server approach. It requires editor version 2023.3.
-
 ## [1.3.0] - 2023-07-07
 
 ### Dynamic Addressables Network Prefabs

From 2c96d6226e15370d17cba57f3a8747ff4fd1d3d6 Mon Sep 17 00:00:00 2001
From: Elfi0Kuhndorf <93766359+Elfi0Kuhndorf@users.noreply.github.com>
Date: Tue, 23 Apr 2024 09:36:26 +0200
Subject: [PATCH 06/20] Fix/update IDE packages [MTT-8034] (#166)

* updated IDE Rider packages in basic samples

* Update CHANGELOG.md
---
 Basic/2DSpaceShooter/Packages/manifest.json      |  2 +-
 Basic/2DSpaceShooter/Packages/packages-lock.json |  2 +-
 Basic/ClientDriven/Packages/manifest.json        |  2 +-
 Basic/ClientDriven/Packages/packages-lock.json   |  2 +-
 .../Packages/manifest.json                       |  2 +-
 .../Packages/packages-lock.json                  |  2 +-
 Basic/Invaders/Packages/manifest.json            |  2 +-
 Basic/Invaders/Packages/packages-lock.json       |  2 +-
 CHANGELOG.md                                     | 16 ++++++++++++++++
 9 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/Basic/2DSpaceShooter/Packages/manifest.json b/Basic/2DSpaceShooter/Packages/manifest.json
index acb568c2..bde35453 100644
--- a/Basic/2DSpaceShooter/Packages/manifest.json
+++ b/Basic/2DSpaceShooter/Packages/manifest.json
@@ -3,7 +3,7 @@
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.ai.navigation": "1.1.5",
     "com.unity.collab-proxy": "2.2.0",
-    "com.unity.ide.rider": "3.0.26",
+    "com.unity.ide.rider": "3.0.28",
     "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.4.0",
diff --git a/Basic/2DSpaceShooter/Packages/packages-lock.json b/Basic/2DSpaceShooter/Packages/packages-lock.json
index 09caa8fa..d184065e 100644
--- a/Basic/2DSpaceShooter/Packages/packages-lock.json
+++ b/Basic/2DSpaceShooter/Packages/packages-lock.json
@@ -56,7 +56,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.26",
+      "version": "3.0.28",
       "depth": 0,
       "source": "registry",
       "dependencies": {
diff --git a/Basic/ClientDriven/Packages/manifest.json b/Basic/ClientDriven/Packages/manifest.json
index f3e1689c..ac89602e 100644
--- a/Basic/ClientDriven/Packages/manifest.json
+++ b/Basic/ClientDriven/Packages/manifest.json
@@ -3,7 +3,7 @@
     "com.unity.ai.navigation": "1.1.5",
     "com.unity.cinemachine": "2.9.5",
     "com.unity.collab-proxy": "2.2.0",
-    "com.unity.ide.rider": "3.0.26",
+    "com.unity.ide.rider": "3.0.28",
     "com.unity.ide.visualstudio": "2.0.22",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.inputsystem": "1.7.0",
diff --git a/Basic/ClientDriven/Packages/packages-lock.json b/Basic/ClientDriven/Packages/packages-lock.json
index a66b77cd..6b124807 100644
--- a/Basic/ClientDriven/Packages/packages-lock.json
+++ b/Basic/ClientDriven/Packages/packages-lock.json
@@ -59,7 +59,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.26",
+      "version": "3.0.28",
       "depth": 0,
       "source": "registry",
       "dependencies": {
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Packages/manifest.json b/Basic/DynamicAddressablesNetworkPrefabs/Packages/manifest.json
index f7f252a2..1c948211 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Packages/manifest.json
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Packages/manifest.json
@@ -2,7 +2,7 @@
   "dependencies": {
     "com.unity.addressables": "1.21.19",
     "com.unity.ai.navigation": "1.1.5",
-    "com.unity.ide.rider": "3.0.26",
+    "com.unity.ide.rider": "3.0.28",
     "com.unity.ide.visualstudio": "2.0.22",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.multiplayer.tools": "1.1.1",
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Packages/packages-lock.json b/Basic/DynamicAddressablesNetworkPrefabs/Packages/packages-lock.json
index ca625803..d10d8894 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Packages/packages-lock.json
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Packages/packages-lock.json
@@ -50,7 +50,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.26",
+      "version": "3.0.28",
       "depth": 0,
       "source": "registry",
       "dependencies": {
diff --git a/Basic/Invaders/Packages/manifest.json b/Basic/Invaders/Packages/manifest.json
index 94f24ee8..d3a440cc 100644
--- a/Basic/Invaders/Packages/manifest.json
+++ b/Basic/Invaders/Packages/manifest.json
@@ -2,7 +2,7 @@
   "dependencies": {
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.ai.navigation": "1.1.5",
-    "com.unity.ide.rider": "3.0.26",
+    "com.unity.ide.rider": "3.0.28",
     "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.4.0",
diff --git a/Basic/Invaders/Packages/packages-lock.json b/Basic/Invaders/Packages/packages-lock.json
index e73e9fa0..c5bbcf15 100644
--- a/Basic/Invaders/Packages/packages-lock.json
+++ b/Basic/Invaders/Packages/packages-lock.json
@@ -49,7 +49,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.26",
+      "version": "3.0.28",
       "depth": 0,
       "source": "registry",
       "dependencies": {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81663c49..39e11df7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,16 +7,32 @@
 #### Cleanup
 - Formatted .cs files inside the Bitesize Samples repository to adhere to coding standards (#156) Internal testing job definition files were added in order for internal processes to execute.
 
+### 2D Space Shooter
+
+#### Changed
+- Upgraded to IDE Rider v3.0.28 (#166)
+
 ### Client Driven
 
 #### Changed
 - Upgraded to Netcode for GameObjects v1.8.1 (#164)
   - Upgraded to the newer API for Rpcs, Universal Rpcs
   - The place of execution for a client's position was moved to ClientNetworkTransform child class, ClientDrivenNetworkTransform. This ensures no race condition issues on a client's first position sync. Server code now modifies a NetworkVariable that client-owned instances of ClientDrivenNetworkTransform use on OnNetworkSpawn to initially move a player
+- Upgraded to IDE Rider v3.0.28 (#166)
 
 #### Fixed
 - Added Spawner with event executed on Server Start to fix inconsistent ghost ingredients issue (#157)
 
+### Dynamic Addressables Network Prefabs
+
+#### Changed
+- Upgraded to IDE Rider v3.0.28 (#166)
+
+### Invaders
+
+#### Changed
+- Upgraded to IDE Rider v3.0.28 (#166)
+
 ## [1.5.0] 2023-12-15
 
 ### Bitesize Samples Repository

From 91a0a0778dce3b43895fa33fb1e84f188e3840e4 Mon Sep 17 00:00:00 2001
From: Bastien Humeau <bastienh@unity3d.com>
Date: Thu, 25 Apr 2024 14:12:55 -0400
Subject: [PATCH 07/20] Fix: Adding comments on ingredients parenting to make
 it clear what is being done [MTT-8377] (#165)

* Fix: Adding comments on the rigidbody changes when parenting to be clear in what is being done [MTT-8377]
---
 .../Assets/Scripts/ServerIngredientPhysics.cs    | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/Basic/ClientDriven/Assets/Scripts/ServerIngredientPhysics.cs b/Basic/ClientDriven/Assets/Scripts/ServerIngredientPhysics.cs
index ad2d8819..8bfd17ea 100644
--- a/Basic/ClientDriven/Assets/Scripts/ServerIngredientPhysics.cs
+++ b/Basic/ClientDriven/Assets/Scripts/ServerIngredientPhysics.cs
@@ -1,4 +1,3 @@
-using System;
 using Unity.Netcode;
 using Unity.Netcode.Components;
 using UnityEngine;
@@ -14,13 +13,18 @@ public class ServerIngredientPhysics : NetworkBehaviour
 
     public override void OnNetworkObjectParentChanged(NetworkObject parentNetworkObject)
     {
-        SetPhysics(parentNetworkObject == null);
+        // The ingredient's physic needs to be disabled when the ingredient is parented so that it's following the parent instead of moving freely.
+        SetKinematic(parentNetworkObject != null);
     }
 
-    void SetPhysics(bool isEnabled)
+    private void SetKinematic(bool isEnabled)
     {
-        m_Rigidbody.isKinematic = !isEnabled;
-        m_Rigidbody.interpolation = isEnabled ? RigidbodyInterpolation.Interpolate : RigidbodyInterpolation.None;
-        m_NetworkTransform.InLocalSpace = !isEnabled;
+        // Setting isKinematic to true will prevent the object from being affected by the physic forces in the game.
+        m_Rigidbody.isKinematic = isEnabled;
+        // When parented, rigidbody children are only moving because they receive their parent forces along with their own physic.
+        // When kinematic is true, they will ignore their parent forces and stay at the same world place.
+        // Changing the interpolation to None in that case will allow the object to keep the same local position instead of the world position.
+        m_Rigidbody.interpolation = isEnabled ? RigidbodyInterpolation.None : RigidbodyInterpolation.Interpolate;
+        m_NetworkTransform.InLocalSpace = isEnabled;
     }
 }

From faac280b80ebccd2b1bd182ec540d45527df5a41 Mon Sep 17 00:00:00 2001
From: Elfi0Kuhndorf <93766359+Elfi0Kuhndorf@users.noreply.github.com>
Date: Tue, 30 Apr 2024 17:43:27 +0200
Subject: [PATCH 08/20] Fix/resolving todos and suggestions in comments
 2dspaceshooter (#167)

* fixed some more comment typos and resolved todo in shipcontrol.cs plus comments in bullet.cs scripts

* adding a local pool for explosion spawning, adding comment for buff reset

* removing unneeded lines and reformatting

* deleted unneeded library reference

* trying to implement built-in pooling class into new script

* feat: added pooling system for explosion particles of bullet by using built-in pooling component

* fix: cleanup of bullet and exlosionsPool script and creating of pool instances, CHANGELOG addition

* deleted former custom object pool script as it is unused now

* adjusted CHANGELOG
---
 .../Assets/Prefabs/Bullet.prefab              |  71 +++-
 .../Assets/Prefabs/Explosion.prefab           |  92 ++++-
 .../Assets/Prefabs/ExplosionsPool.prefab      |  49 +++
 .../Assets/Prefabs/ExplosionsPool.prefab.meta |   7 +
 .../Assets/Prefabs/NetworkObjectPool.prefab   |  54 +++
 .../Prefabs/NetworkObjectPool.prefab.meta     |   7 +
 .../Assets/Scenes/network.unity               | 374 ++++++++++++++----
 Basic/2DSpaceShooter/Assets/Scripts/Bullet.cs |  20 +-
 .../Assets/Scripts/ExplosionsPool.cs          |  89 +++++
 .../Assets/Scripts/ExplosionsPool.cs.meta     |  11 +
 .../Scripts/ReturnParticleSystemToPool.cs     |  25 ++
 .../ReturnParticleSystemToPool.cs.meta        |  11 +
 .../Assets/Scripts/ShipControl.cs             |  18 +-
 CHANGELOG.md                                  |   6 +
 14 files changed, 730 insertions(+), 104 deletions(-)
 create mode 100644 Basic/2DSpaceShooter/Assets/Prefabs/ExplosionsPool.prefab
 create mode 100644 Basic/2DSpaceShooter/Assets/Prefabs/ExplosionsPool.prefab.meta
 create mode 100644 Basic/2DSpaceShooter/Assets/Prefabs/NetworkObjectPool.prefab
 create mode 100644 Basic/2DSpaceShooter/Assets/Prefabs/NetworkObjectPool.prefab.meta
 create mode 100644 Basic/2DSpaceShooter/Assets/Scripts/ExplosionsPool.cs
 create mode 100644 Basic/2DSpaceShooter/Assets/Scripts/ExplosionsPool.cs.meta
 create mode 100644 Basic/2DSpaceShooter/Assets/Scripts/ReturnParticleSystemToPool.cs
 create mode 100644 Basic/2DSpaceShooter/Assets/Scripts/ReturnParticleSystemToPool.cs.meta

diff --git a/Basic/2DSpaceShooter/Assets/Prefabs/Bullet.prefab b/Basic/2DSpaceShooter/Assets/Prefabs/Bullet.prefab
index 895cabb0..752df1ac 100644
--- a/Basic/2DSpaceShooter/Assets/Prefabs/Bullet.prefab
+++ b/Basic/2DSpaceShooter/Assets/Prefabs/Bullet.prefab
@@ -12,8 +12,8 @@ GameObject:
   - component: {fileID: 21200000}
   - component: {fileID: 5000000}
   - component: {fileID: 5800000}
-  - component: {fileID: 11400004}
   - component: {fileID: -4113703611147433057}
+  - component: {fileID: 11400004}
   m_Layer: 0
   m_Name: Bullet
   m_TagString: Untagged
@@ -28,6 +28,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: 17.05494, y: -1.1583278, z: 0}
   m_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
@@ -37,7 +38,6 @@ Transform:
   - {fileID: 2541587719488337929}
   - {fileID: 437137293806936037}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &21200000
 SpriteRenderer:
@@ -108,6 +108,12 @@ Rigidbody2D:
   m_AngularDrag: 0.05
   m_GravityScale: 0
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
   m_Interpolate: 1
   m_SleepingMode: 1
   m_CollisionDetection: 1
@@ -122,13 +128,32 @@ CircleCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ForceSendLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ForceReceiveLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ContactCaptureLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CallbackLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
   m_Offset: {x: 0, y: 0}
   serializedVersion: 2
   m_Radius: 0.2
---- !u!114 &11400004
+--- !u!114 &-4113703611147433057
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -137,11 +162,18 @@ MonoBehaviour:
   m_GameObject: {fileID: 100000}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3cd7bb63a91d2a644b2775fdf8fa9087, type: 3}
+  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  explosionParticle: {fileID: 100000, guid: 9f490055b474c5b499c694b9f707abb0, type: 3}
---- !u!114 &-4113703611147433057
+  GlobalObjectIdHash: 4230786284
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 0
+--- !u!114 &11400004
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -150,13 +182,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 100000}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
+  m_Script: {fileID: 11500000, guid: 3cd7bb63a91d2a644b2775fdf8fa9087, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 951099334
-  AlwaysReplicateAsRoot: 0
-  DontDestroyWithOwner: 0
-  AutoObjectParentSync: 0
+  particles: {fileID: 19800000, guid: 9f490055b474c5b499c694b9f707abb0, type: 3}
 --- !u!1 &1734169577680067239
 GameObject:
   m_ObjectHideFlags: 0
@@ -181,17 +210,17 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1734169577680067239}
+  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1.6666665, y: 1.6666665, z: 1.6666665}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 400000}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!96 &8001524962857443883
 TrailRenderer:
-  serializedVersion: 2
+  serializedVersion: 3
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -232,6 +261,7 @@ TrailRenderer:
   m_SortingLayer: 7
   m_SortingOrder: 0
   m_Time: 0.1
+  m_PreviewTimeScale: 1
   m_Parameters:
     serializedVersion: 3
     widthMultiplier: 1
@@ -286,17 +316,21 @@ TrailRenderer:
       atime6: 0
       atime7: 0
       m_Mode: 0
+      m_ColorSpace: -1
       m_NumColorKeys: 2
       m_NumAlphaKeys: 2
     numCornerVertices: 0
     numCapVertices: 0
     alignment: 0
     textureMode: 0
+    textureScale: {x: 1, y: 1}
     shadowBias: 0.5
     generateLightingData: 0
   m_MinVertexDistance: 0.2
+  m_MaskInteraction: 0
   m_Autodestruct: 0
   m_Emitting: 1
+  m_ApplyActiveColorSpace: 0
 --- !u!1 &5834909677899066770
 GameObject:
   m_ObjectHideFlags: 0
@@ -321,13 +355,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5834909677899066770}
+  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.6784176, y: 0.6784176, z: 0.6784176}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 400000}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &7281275371523386705
 SpriteRenderer:
@@ -405,17 +439,17 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8201526709602511825}
+  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1.2764332, y: 1.2764332, z: 1.2764332}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 400000}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!96 &6763641590727656120
 TrailRenderer:
-  serializedVersion: 2
+  serializedVersion: 3
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -456,6 +490,7 @@ TrailRenderer:
   m_SortingLayer: 7
   m_SortingOrder: 5
   m_Time: 0.04
+  m_PreviewTimeScale: 1
   m_Parameters:
     serializedVersion: 3
     widthMultiplier: 1
@@ -510,14 +545,18 @@ TrailRenderer:
       atime6: 0
       atime7: 0
       m_Mode: 0
+      m_ColorSpace: -1
       m_NumColorKeys: 2
       m_NumAlphaKeys: 2
     numCornerVertices: 0
     numCapVertices: 0
     alignment: 0
     textureMode: 0
+    textureScale: {x: 1, y: 1}
     shadowBias: 0.5
     generateLightingData: 0
   m_MinVertexDistance: 0.1
+  m_MaskInteraction: 0
   m_Autodestruct: 0
   m_Emitting: 1
+  m_ApplyActiveColorSpace: 0
diff --git a/Basic/2DSpaceShooter/Assets/Prefabs/Explosion.prefab b/Basic/2DSpaceShooter/Assets/Prefabs/Explosion.prefab
index 571bc37f..eb53efbf 100644
--- a/Basic/2DSpaceShooter/Assets/Prefabs/Explosion.prefab
+++ b/Basic/2DSpaceShooter/Assets/Prefabs/Explosion.prefab
@@ -26,6 +26,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: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -35,7 +36,6 @@ Transform:
   - {fileID: 8627892897656053862}
   - {fileID: 5255014377074247034}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!198 &19800000
 ParticleSystem:
@@ -47,7 +47,7 @@ ParticleSystem:
   serializedVersion: 8
   lengthInSec: 1
   simulationSpeed: 1
-  stopAction: 2
+  stopAction: 3
   cullingMode: 1
   ringBufferMode: 0
   ringBufferLoopRange: {x: 0, y: 1}
@@ -255,6 +255,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -284,6 +285,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     startSize:
@@ -605,6 +607,7 @@ ParticleSystem:
         m_PostInfinity: 2
         m_RotationOrder: 4
     randomizeRotationDirection: 0
+    gravitySource: 0
     maxNumParticles: 1000
     customEmitterVelocity: {x: 0, y: 0, z: 0}
     size3D: 0
@@ -1459,6 +1462,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 4
         m_NumAlphaKeys: 4
       minGradient:
@@ -1488,6 +1492,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
   UVModule:
@@ -3717,6 +3722,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -3746,6 +3752,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     range: {x: 0, y: 1}
@@ -4129,6 +4136,7 @@ ParticleSystem:
         m_RotationOrder: 4
     minVertexDistance: 0.2
     textureMode: 0
+    textureScale: {x: 1, y: 1}
     ribbonCount: 1
     shadowBias: 0.5
     worldSpace: 0
@@ -4171,6 +4179,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -4200,6 +4209,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     widthOverTrail:
@@ -4287,6 +4297,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -4316,6 +4327,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
   CustomDataModule:
@@ -4354,6 +4366,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -4383,6 +4396,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     colorLabel0: Color
@@ -4636,6 +4650,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -4665,6 +4680,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     colorLabel1: Color
@@ -4940,13 +4956,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}
@@ -4963,7 +4981,7 @@ AudioSource:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 100000}
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 0}
   m_audioClip: {fileID: 8300000, guid: b3a8517925e98704985f20f3a605b2de, type: 3}
@@ -5077,13 +5095,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2728610517644350409}
+  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: 400000}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!198 &8693427991503904308
 ParticleSystem:
@@ -5303,6 +5321,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -5332,6 +5351,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     startSize:
@@ -5653,6 +5673,7 @@ ParticleSystem:
         m_PostInfinity: 2
         m_RotationOrder: 4
     randomizeRotationDirection: 0
+    gravitySource: 0
     maxNumParticles: 1000
     customEmitterVelocity: {x: 0, y: 0, z: 0}
     size3D: 0
@@ -6458,6 +6479,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 3
         m_NumAlphaKeys: 5
       minGradient:
@@ -6487,6 +6509,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
   UVModule:
@@ -8707,6 +8730,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -8736,6 +8760,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     range: {x: 0, y: 1}
@@ -9119,6 +9144,7 @@ ParticleSystem:
         m_RotationOrder: 4
     minVertexDistance: 0.2
     textureMode: 0
+    textureScale: {x: 1, y: 1}
     ribbonCount: 1
     shadowBias: 0.5
     worldSpace: 0
@@ -9161,6 +9187,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -9190,6 +9217,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     widthOverTrail:
@@ -9277,6 +9305,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -9306,6 +9335,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
   CustomDataModule:
@@ -9344,6 +9374,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -9373,6 +9404,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     colorLabel0: Color
@@ -9626,6 +9658,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -9655,6 +9688,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     colorLabel1: Color
@@ -9930,13 +9964,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}
@@ -9971,13 +10007,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5868758377587957888}
+  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: 400000}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!198 &1297806946781327402
 ParticleSystem:
@@ -10197,6 +10233,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -10226,6 +10263,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     startSize:
@@ -10547,6 +10585,7 @@ ParticleSystem:
         m_PostInfinity: 2
         m_RotationOrder: 4
     randomizeRotationDirection: 0
+    gravitySource: 0
     maxNumParticles: 1000
     customEmitterVelocity: {x: 0, y: 0, z: 0}
     size3D: 0
@@ -11352,6 +11391,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 3
         m_NumAlphaKeys: 5
       minGradient:
@@ -11381,6 +11421,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
   UVModule:
@@ -13601,6 +13642,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -13630,6 +13672,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     range: {x: 0, y: 1}
@@ -14013,6 +14056,7 @@ ParticleSystem:
         m_RotationOrder: 4
     minVertexDistance: 0.2
     textureMode: 0
+    textureScale: {x: 1, y: 1}
     ribbonCount: 1
     shadowBias: 0.5
     worldSpace: 0
@@ -14055,6 +14099,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -14084,6 +14129,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     widthOverTrail:
@@ -14171,6 +14217,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -14200,6 +14247,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
   CustomDataModule:
@@ -14238,6 +14286,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -14267,6 +14316,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     colorLabel0: Color
@@ -14520,6 +14570,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -14549,6 +14600,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     colorLabel1: Color
@@ -14824,13 +14876,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}
@@ -14865,13 +14919,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9156983861408004323}
+  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: 400000}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!198 &7102130296119057202
 ParticleSystem:
@@ -15091,6 +15145,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -15120,6 +15175,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     startSize:
@@ -15441,6 +15497,7 @@ ParticleSystem:
         m_PostInfinity: 2
         m_RotationOrder: 4
     randomizeRotationDirection: 0
+    gravitySource: 0
     maxNumParticles: 1000
     customEmitterVelocity: {x: 0, y: 0, z: 0}
     size3D: 0
@@ -16313,6 +16370,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 3
         m_NumAlphaKeys: 3
       minGradient:
@@ -16342,6 +16400,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
   UVModule:
@@ -18562,6 +18621,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -18591,6 +18651,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     range: {x: 0, y: 1}
@@ -18974,6 +19035,7 @@ ParticleSystem:
         m_RotationOrder: 4
     minVertexDistance: 0.2
     textureMode: 0
+    textureScale: {x: 1, y: 1}
     ribbonCount: 1
     shadowBias: 0.5
     worldSpace: 0
@@ -19016,6 +19078,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -19045,6 +19108,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     widthOverTrail:
@@ -19132,6 +19196,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -19161,6 +19226,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
   CustomDataModule:
@@ -19199,6 +19265,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -19228,6 +19295,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     colorLabel0: Color
@@ -19481,6 +19549,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -19510,6 +19579,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
+        m_ColorSpace: -1
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
     colorLabel1: Color
@@ -19785,13 +19855,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}
diff --git a/Basic/2DSpaceShooter/Assets/Prefabs/ExplosionsPool.prefab b/Basic/2DSpaceShooter/Assets/Prefabs/ExplosionsPool.prefab
new file mode 100644
index 00000000..6bc537da
--- /dev/null
+++ b/Basic/2DSpaceShooter/Assets/Prefabs/ExplosionsPool.prefab
@@ -0,0 +1,49 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4100745325842416285
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 353012723220325942}
+  - component: {fileID: 906457504253834577}
+  m_Layer: 0
+  m_Name: ExplosionsPool
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &353012723220325942
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4100745325842416285}
+  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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &906457504253834577
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4100745325842416285}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d3305ca95ec6e0c48aa691072c25b1c9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  collectionChecks: 1
+  maxPoolSize: 50
+  m_ExplosionPrefab: {fileID: 100000, guid: 9f490055b474c5b499c694b9f707abb0, type: 3}
diff --git a/Basic/2DSpaceShooter/Assets/Prefabs/ExplosionsPool.prefab.meta b/Basic/2DSpaceShooter/Assets/Prefabs/ExplosionsPool.prefab.meta
new file mode 100644
index 00000000..3934cae7
--- /dev/null
+++ b/Basic/2DSpaceShooter/Assets/Prefabs/ExplosionsPool.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6221fcaa4ef51bb4badceb82a86cff8f
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Basic/2DSpaceShooter/Assets/Prefabs/NetworkObjectPool.prefab b/Basic/2DSpaceShooter/Assets/Prefabs/NetworkObjectPool.prefab
new file mode 100644
index 00000000..dc9165b3
--- /dev/null
+++ b/Basic/2DSpaceShooter/Assets/Prefabs/NetworkObjectPool.prefab
@@ -0,0 +1,54 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1086539700089093819
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 411308774211368270}
+  - component: {fileID: 987422801466715749}
+  m_Layer: 0
+  m_Name: NetworkObjectPool
+  m_TagString: ObjectPool
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &411308774211368270
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1086539700089093819}
+  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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &987422801466715749
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1086539700089093819}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d2e48fbd6d33eab48807525003196759, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_NetworkManager: {fileID: 0}
+  PooledPrefabsList:
+  - Prefab: {fileID: 100000, guid: f7120fa7a008f8d4fa6c6bb280d092ad, type: 3}
+    PrewarmCount: 100
+  - Prefab: {fileID: 100000, guid: 7ab4780606df6934f9810adaf781b34a, type: 3}
+    PrewarmCount: 20
+  - Prefab: {fileID: 100000, guid: d23f28732e2924c4180c8fec40c78dfc, type: 3}
+    PrewarmCount: 20
diff --git a/Basic/2DSpaceShooter/Assets/Prefabs/NetworkObjectPool.prefab.meta b/Basic/2DSpaceShooter/Assets/Prefabs/NetworkObjectPool.prefab.meta
new file mode 100644
index 00000000..e3cb797b
--- /dev/null
+++ b/Basic/2DSpaceShooter/Assets/Prefabs/NetworkObjectPool.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ef7853ed8a0f97040914dca7bde9f23b
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Basic/2DSpaceShooter/Assets/Scenes/network.unity b/Basic/2DSpaceShooter/Assets/Scenes/network.unity
index 6310d165..5d743586 100644
--- a/Basic/2DSpaceShooter/Assets/Scenes/network.unity
+++ b/Basic/2DSpaceShooter/Assets/Scenes/network.unity
@@ -105,7 +105,7 @@ NavMeshSettings:
   serializedVersion: 2
   m_ObjectHideFlags: 0
   m_BuildSettings:
-    serializedVersion: 2
+    serializedVersion: 3
     agentTypeID: 0
     agentRadius: 0.5
     agentHeight: 2
@@ -118,7 +118,7 @@ NavMeshSettings:
     cellSize: 0.16666667
     manualTileSize: 0
     tileSize: 256
-    accuratePlacement: 0
+    buildHeightMesh: 0
     maxJobWorkers: 0
     preserveTilesOutsideBounds: 0
     debug:
@@ -147,13 +147,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 91422047}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -10.915647, y: 20.098461, z: 8.925151}
   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 &139820504
 GameObject:
@@ -185,6 +185,25 @@ BoxCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 6200000, guid: 01b2dec7004cd734b9f0430b2ed4fd8e, type: 2}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ForceSendLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ForceReceiveLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ContactCaptureLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CallbackLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
@@ -218,6 +237,12 @@ Rigidbody2D:
   m_AngularDrag: 0.05
   m_GravityScale: 0
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
   m_Interpolate: 0
   m_SleepingMode: 1
   m_CollisionDetection: 0
@@ -279,13 +304,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 139820504}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 50, z: 0}
   m_LocalScale: {x: 100, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1118650249}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &215857575
 GameObject:
@@ -328,66 +353,26 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 215857575}
+  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: 11
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &336748511
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 336748512}
-  - component: {fileID: 336748513}
-  m_Layer: 0
-  m_Name: NetworkObjectPool
-  m_TagString: ObjectPool
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &336748512
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 336748511}
-  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: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &336748513
+--- !u!114 &336748513 stripped
 MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 987422801466715749, guid: ef7853ed8a0f97040914dca7bde9f23b,
+    type: 3}
+  m_PrefabInstance: {fileID: 4881783056451638245}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 336748511}
+  m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: d2e48fbd6d33eab48807525003196759, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_NetworkManager: {fileID: 872897446}
-  PooledPrefabsList:
-  - Prefab: {fileID: 100000, guid: f7120fa7a008f8d4fa6c6bb280d092ad, type: 3}
-    PrewarmCount: 100
-  - Prefab: {fileID: 100000, guid: 7ab4780606df6934f9810adaf781b34a, type: 3}
-    PrewarmCount: 20
-  - Prefab: {fileID: 100000, guid: d23f28732e2924c4180c8fec40c78dfc, type: 3}
-    PrewarmCount: 20
 --- !u!1 &380222158
 GameObject:
   m_ObjectHideFlags: 0
@@ -448,13 +433,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 380222158}
+  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: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &440971078
 GameObject:
@@ -483,13 +468,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 440971078}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: -50, z: 0}
   m_LocalScale: {x: 100, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1118650249}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!61 &440971081
 BoxCollider2D:
@@ -501,6 +486,25 @@ BoxCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 6200000, guid: 01b2dec7004cd734b9f0430b2ed4fd8e, type: 2}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ForceSendLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ForceReceiveLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ContactCaptureLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CallbackLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
@@ -534,6 +538,12 @@ Rigidbody2D:
   m_AngularDrag: 0.05
   m_GravityScale: 0
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
   m_Interpolate: 0
   m_SleepingMode: 1
   m_CollisionDetection: 0
@@ -615,13 +625,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 493657732}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 50, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 100, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1118650249}
-  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!61 &493657735
 BoxCollider2D:
@@ -633,6 +643,25 @@ BoxCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 6200000, guid: 01b2dec7004cd734b9f0430b2ed4fd8e, type: 2}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ForceSendLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ForceReceiveLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ContactCaptureLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CallbackLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
@@ -666,6 +695,12 @@ Rigidbody2D:
   m_AngularDrag: 0.05
   m_GravityScale: 0
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
   m_Interpolate: 0
   m_SleepingMode: 1
   m_CollisionDetection: 0
@@ -761,13 +796,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 768456151}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 13.660404, y: 44.446568, z: -0.17136917}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &872897443
 GameObject:
@@ -815,8 +850,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 593a2fe42fa9d37498c96f9a383b6521, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  RunInBackground: 1
-  LogLevel: 1
   NetworkConfig:
     ProtocolVersion: 0
     NetworkTransport: {fileID: 872897450}
@@ -840,6 +873,8 @@ MonoBehaviour:
     SpawnTimeout: 1
     EnableNetworkLogs: 1
     OldPrefabList: []
+  RunInBackground: 1
+  LogLevel: 1
 --- !u!114 &872897447
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -864,13 +899,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 872897443}
+  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: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &872897450
 MonoBehaviour:
@@ -926,13 +961,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1056217932}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -50, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 100, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1118650249}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!61 &1056217935
 BoxCollider2D:
@@ -944,6 +979,25 @@ BoxCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 6200000, guid: 01b2dec7004cd734b9f0430b2ed4fd8e, type: 2}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ForceSendLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ForceReceiveLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ContactCaptureLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CallbackLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
@@ -977,6 +1031,12 @@ Rigidbody2D:
   m_AngularDrag: 0.05
   m_GravityScale: 0
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
   m_Interpolate: 0
   m_SleepingMode: 1
   m_CollisionDetection: 0
@@ -1054,6 +1114,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1118650248}
+  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}
@@ -1064,7 +1125,6 @@ Transform:
   - {fileID: 139820510}
   - {fileID: 493657733}
   m_Father: {fileID: 0}
-  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1339728175
 GameObject:
@@ -1090,13 +1150,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1339728175}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 50}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1667533374}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!81 &1339728177
 AudioListener:
@@ -1227,13 +1287,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1380148066}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 9.653846, y: 34.922676, z: 21.610683}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1468317138
 GameObject:
@@ -1280,13 +1340,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1468317138}
+  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: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1667533368
 GameObject:
@@ -1337,9 +1397,20 @@ MonoBehaviour:
   m_Dithering: 0
   m_ClearDepth: 1
   m_AllowXRRendering: 1
+  m_AllowHDROutput: 1
+  m_UseScreenCoordOverride: 0
+  m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
   m_RequiresDepthTexture: 0
   m_RequiresColorTexture: 0
   m_Version: 2
+  m_TaaSettings:
+    quality: 3
+    frameInfluence: 0.1
+    jitterScale: 1
+    mipBias: 0
+    varianceClampScale: 0.9
+    contrastAdaptiveSharpening: 0
 --- !u!124 &1667533371
 Behaviour:
   m_ObjectHideFlags: 0
@@ -1362,9 +1433,17 @@ Camera:
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0
+  m_Iso: 200
+  m_ShutterSpeed: 0.005
+  m_Aperture: 16
+  m_FocusDistance: 10
+  m_FocalLength: 50
+  m_BladeCount: 5
+  m_Curvature: {x: 2, y: 11}
+  m_BarrelClipping: 0.25
+  m_Anamorphism: 0
   m_SensorSize: {x: 36, y: 24}
   m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
   m_NormalizedViewPortRect:
     serializedVersion: 2
     x: 0
@@ -1398,6 +1477,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1667533368}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 1, z: -50}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -1405,7 +1485,6 @@ Transform:
   m_Children:
   - {fileID: 1339728176}
   m_Father: {fileID: 0}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1875612116
 GameObject:
@@ -1430,13 +1509,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1875612116}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -10.915647, y: 20.098461, z: 8.925151}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1939453142
 GameObject:
@@ -1479,19 +1558,88 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1939453142}
+  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!1001 &2078876190
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 353012723220325942, guid: 6221fcaa4ef51bb4badceb82a86cff8f,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 353012723220325942, guid: 6221fcaa4ef51bb4badceb82a86cff8f,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 353012723220325942, guid: 6221fcaa4ef51bb4badceb82a86cff8f,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 353012723220325942, guid: 6221fcaa4ef51bb4badceb82a86cff8f,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 353012723220325942, guid: 6221fcaa4ef51bb4badceb82a86cff8f,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 353012723220325942, guid: 6221fcaa4ef51bb4badceb82a86cff8f,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 353012723220325942, guid: 6221fcaa4ef51bb4badceb82a86cff8f,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 353012723220325942, guid: 6221fcaa4ef51bb4badceb82a86cff8f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 353012723220325942, guid: 6221fcaa4ef51bb4badceb82a86cff8f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 353012723220325942, guid: 6221fcaa4ef51bb4badceb82a86cff8f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4100745325842416285, guid: 6221fcaa4ef51bb4badceb82a86cff8f,
+        type: 3}
+      propertyPath: m_Name
+      value: ExplosionsPool
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 6221fcaa4ef51bb4badceb82a86cff8f, type: 3}
 --- !u!1001 &2334341849323676973
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: 4870249468168423719, guid: 5743ca0999e90d246a71c949488e1bdf,
@@ -1555,4 +1703,98 @@ PrefabInstance:
       value: EnvironmentObjects
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 5743ca0999e90d246a71c949488e1bdf, type: 3}
+--- !u!1001 &4881783056451638245
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 411308774211368270, guid: ef7853ed8a0f97040914dca7bde9f23b,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 411308774211368270, guid: ef7853ed8a0f97040914dca7bde9f23b,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 411308774211368270, guid: ef7853ed8a0f97040914dca7bde9f23b,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 411308774211368270, guid: ef7853ed8a0f97040914dca7bde9f23b,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 411308774211368270, guid: ef7853ed8a0f97040914dca7bde9f23b,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 411308774211368270, guid: ef7853ed8a0f97040914dca7bde9f23b,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 411308774211368270, guid: ef7853ed8a0f97040914dca7bde9f23b,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 411308774211368270, guid: ef7853ed8a0f97040914dca7bde9f23b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 411308774211368270, guid: ef7853ed8a0f97040914dca7bde9f23b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 411308774211368270, guid: ef7853ed8a0f97040914dca7bde9f23b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 987422801466715749, guid: ef7853ed8a0f97040914dca7bde9f23b,
+        type: 3}
+      propertyPath: m_NetworkManager
+      value: 
+      objectReference: {fileID: 872897446}
+    - target: {fileID: 1086539700089093819, guid: ef7853ed8a0f97040914dca7bde9f23b,
+        type: 3}
+      propertyPath: m_Name
+      value: NetworkObjectPool
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: ef7853ed8a0f97040914dca7bde9f23b, type: 3}
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots:
+  - {fileID: 91422048}
+  - {fileID: 1667533374}
+  - {fileID: 1380148068}
+  - {fileID: 1118650249}
+  - {fileID: 872897449}
+  - {fileID: 4881783056451638245}
+  - {fileID: 1468317140}
+  - {fileID: 380222161}
+  - {fileID: 1875612117}
+  - {fileID: 768456153}
+  - {fileID: 2334341849323676973}
+  - {fileID: 215857577}
+  - {fileID: 1939453144}
+  - {fileID: 2078876190}
diff --git a/Basic/2DSpaceShooter/Assets/Scripts/Bullet.cs b/Basic/2DSpaceShooter/Assets/Scripts/Bullet.cs
index 6ea5772c..2176f506 100644
--- a/Basic/2DSpaceShooter/Assets/Scripts/Bullet.cs
+++ b/Basic/2DSpaceShooter/Assets/Scripts/Bullet.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using Unity.Netcode;
 using UnityEngine;
 
@@ -8,8 +9,6 @@ public class Bullet : NetworkBehaviour
     int m_Damage = 5;
     ShipControl m_Owner;
 
-    public GameObject explosionParticle;
-
     public void Config(ShipControl owner, int damage, bool bounce, float lifetime)
     {
         m_Owner = owner;
@@ -17,15 +16,24 @@ public void Config(ShipControl owner, int damage, bool bounce, float lifetime)
         m_Bounce = bounce;
         if (IsServer)
         {
-            // This is bad code don't use invoke.
-            Invoke(nameof(DestroyBullet), lifetime);
+            StartCoroutine(BulletDestroyCoroutine(lifetime));
         }
     }
 
+    IEnumerator BulletDestroyCoroutine(float lifetime)
+    {
+        yield return new WaitForSeconds(lifetime);
+        DestroyBullet();
+    }
+
     public override void OnNetworkDespawn()
     {
-        // This is inefficient, the explosion object could be pooled.
-        GameObject ex = Instantiate(explosionParticle, transform.position + new Vector3(0, 0, -2), Quaternion.identity);
+        if (IsClient)
+        {
+            ParticleSystem explosionParticles = ExplosionsPool.s_Singleton.Pool.Get();
+            explosionParticles.transform.position = transform.position;
+            explosionParticles.Play();
+        }
     }
 
     private void DestroyBullet()
diff --git a/Basic/2DSpaceShooter/Assets/Scripts/ExplosionsPool.cs b/Basic/2DSpaceShooter/Assets/Scripts/ExplosionsPool.cs
new file mode 100644
index 00000000..48308f78
--- /dev/null
+++ b/Basic/2DSpaceShooter/Assets/Scripts/ExplosionsPool.cs
@@ -0,0 +1,89 @@
+using System;
+using UnityEngine;
+using UnityEngine.Pool;
+
+public class ExplosionsPool : MonoBehaviour
+{
+    public static ExplosionsPool s_Singleton;
+    /// <summary>
+    /// Collection checks will throw errors if we try to release an item that is already in the pool.
+    /// </summary>
+    [SerializeField]
+    bool m_CollectionChecks = true;
+    [SerializeField]
+    int m_MaxPoolSize = 100;
+    [SerializeField]
+    GameObject m_ExplosionPrefab;
+    ObjectPool<ParticleSystem> m_Pool;
+
+    public ObjectPool<ParticleSystem> Pool
+    {
+        get
+        {
+            if (m_Pool == null)
+            {
+                m_Pool = new ObjectPool<ParticleSystem>(CreatePooledItem, OnTakeFromPool, OnReturnedToPool, OnDestroyPoolObject, m_CollectionChecks, 50, m_MaxPoolSize);
+            }
+            return m_Pool;
+        }
+    }
+
+    void Awake()
+    {
+        if (s_Singleton != null && s_Singleton != this)
+        {
+            Destroy(gameObject);
+            return;
+        }
+        s_Singleton = this;
+    }
+
+    void Start()
+    {
+        // create pool item instances at the start of a game to avoid performance loss throughout the game session
+        for (int i = 0; i < 10; i++)
+        {
+           s_Singleton.Pool.Get();
+        }
+    }
+
+    void OnDestroy()
+    {
+        if (s_Singleton == this)
+        {
+            s_Singleton = null;
+        }
+    }
+
+    ParticleSystem CreatePooledItem()
+    {
+        var explosionParticles = Instantiate(m_ExplosionPrefab, transform.position + new Vector3(0, 0, -2), Quaternion.identity).GetComponent<ParticleSystem>();
+        explosionParticles.Stop(true, ParticleSystemStopBehavior.StopEmittingAndClear);
+
+        //This is used to return ParticleSystems to the pool when they have stopped.
+        var returnToPool = explosionParticles.gameObject.AddComponent<ReturnParticleSystemToPool>();
+        returnToPool.Initialize(explosionParticles, Pool);
+        return explosionParticles;
+    }
+
+    // Called when an item is returned to the pool using Release
+    void OnReturnedToPool(ParticleSystem system)
+    {
+        system.gameObject.SetActive(false);
+        system.gameObject.GetComponent<AudioSource>().enabled = false;
+    }
+
+    // Called when an item is taken from the pool using Get
+    void OnTakeFromPool(ParticleSystem system)
+    {
+        system.gameObject.SetActive(true);
+        system.gameObject.GetComponent<AudioSource>().enabled = true;
+    }
+
+    // If the pool capacity is reached then any items returned will be destroyed.
+    // We can control what the destroy behavior does, here we destroy the GameObject.
+    void OnDestroyPoolObject(ParticleSystem system)
+    {
+        Destroy(system.gameObject);
+    }
+}
diff --git a/Basic/2DSpaceShooter/Assets/Scripts/ExplosionsPool.cs.meta b/Basic/2DSpaceShooter/Assets/Scripts/ExplosionsPool.cs.meta
new file mode 100644
index 00000000..c28e52d0
--- /dev/null
+++ b/Basic/2DSpaceShooter/Assets/Scripts/ExplosionsPool.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d3305ca95ec6e0c48aa691072c25b1c9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Basic/2DSpaceShooter/Assets/Scripts/ReturnParticleSystemToPool.cs b/Basic/2DSpaceShooter/Assets/Scripts/ReturnParticleSystemToPool.cs
new file mode 100644
index 00000000..872b997c
--- /dev/null
+++ b/Basic/2DSpaceShooter/Assets/Scripts/ReturnParticleSystemToPool.cs
@@ -0,0 +1,25 @@
+using UnityEngine;
+using UnityEngine.Pool;
+
+/// <summary>
+/// Returns the particle system to the pool when the OnParticleSystemStopped event is received.
+/// </summary>
+[RequireComponent(typeof(ParticleSystem))]
+public class ReturnParticleSystemToPool : MonoBehaviour
+{
+    ParticleSystem m_System;
+    IObjectPool<ParticleSystem> m_Pool;
+
+    internal void Initialize(ParticleSystem particleSystem, IObjectPool<ParticleSystem> pool)
+    {
+        m_Pool = pool;
+        m_System = particleSystem;
+        ParticleSystem.MainModule main = m_System.main;
+        main.stopAction = ParticleSystemStopAction.Callback;
+    }
+
+    void OnParticleSystemStopped()
+    {
+        m_Pool.Release(m_System);
+    }
+}
diff --git a/Basic/2DSpaceShooter/Assets/Scripts/ReturnParticleSystemToPool.cs.meta b/Basic/2DSpaceShooter/Assets/Scripts/ReturnParticleSystemToPool.cs.meta
new file mode 100644
index 00000000..6882806a
--- /dev/null
+++ b/Basic/2DSpaceShooter/Assets/Scripts/ReturnParticleSystemToPool.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e40744dff26876b4d85cf1f29109b814
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs b/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs
index 7f31af39..a176c9be 100644
--- a/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs
+++ b/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs
@@ -181,10 +181,16 @@ public void TakeDamage(int amount)
         if (Health.Value <= 0)
         {
             Health.Value = 0;
-
-            //todo: reset all buffs
-
+            // reset all values and buffs
             Health.Value = 100;
+            LatestShipColor.Value = m_ShipGlowDefaultColor;
+            SpeedBuffTimer.Value = 0;
+            RotateBuffTimer.Value = 0;
+            TripleShotTimer.Value = 0;
+            DoubleShotTimer.Value = 0;
+            QuadDamageTimer.Value = 0;
+            Energy.Value = 100;
+            // reset ship to start position
             transform.position = NetworkManager.GetComponent<RandomPositionPlayerSpawner>().GetNextSpawnPosition();
             GetComponent<Rigidbody2D>().velocity = Vector3.zero;
             GetComponent<Rigidbody2D>().angularVelocity = 0;
@@ -231,7 +237,7 @@ void LateUpdate()
     {
         if (IsLocalPlayer)
         {
-            // center camera.. only if this is MY player!
+            // center camera... only if this is MY player!
             Vector3 pos = transform.position;
             pos.z = -50;
             m_MainCamera.transform.position = pos;
@@ -259,7 +265,7 @@ void UpdateServer()
             m_EnergyTimer = NetworkManager.ServerTime.TimeAsFloat + 1;
         }
 
-        // update rotation 
+        // update rotation
         float rotate = m_Spin * m_RotateSpeed;
         if (RotateBuffTimer.Value > NetworkManager.ServerTime.TimeAsFloat)
         {
@@ -469,7 +475,7 @@ public void AddBuff(Buff.BuffType buff)
 
         if (buff == Buff.BuffType.Bounce)
         {
-            QuadDamageTimer.Value = NetworkManager.ServerTime.TimeAsFloat + 10;
+            BounceTimer.Value = NetworkManager.ServerTime.TimeAsFloat + 10;
             LatestShipColor.Value = Buff.GetColor(Buff.BuffType.Bounce);
         }
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39e11df7..aa6e7e97 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,9 +9,15 @@
 
 ### 2D Space Shooter
 
+#### Added
+- Added local pooling for explosionParticles to optimize performance and showcase built-in pooling component (#167)
+
 #### Changed
 - Upgraded to IDE Rider v3.0.28 (#166)
 
+#### Fixed
+- Reset values and buffs after respawn of ship (#167)
+
 ### Client Driven
 
 #### Changed

From 35d08d76d19768f2e0920f4674e290ba391db423 Mon Sep 17 00:00:00 2001
From: Bastien Humeau <bastienh@unity3d.com>
Date: Mon, 6 May 2024 13:24:45 -0400
Subject: [PATCH 09/20] Upgrade Invaders Sample to Unity 2022.3.27f1 [MTT-8505]
 (#169)

* Upgraded project to use Unity 2022.3.27f1 - [MTT-8505]

* Adding one automatic package upgrade that was missed when opening with the new LTS for the first time.

* Added upgrade entry to the changelog.
---
 Basic/Invaders/Packages/manifest.json         |  2 +-
 Basic/Invaders/Packages/packages-lock.json    | 33 ++++++++++---------
 .../ProjectSettings/ProjectVersion.txt        |  4 +--
 .../UserSettings/EditorUserSettings.asset     |  7 ++++
 CHANGELOG.md                                  |  1 +
 5 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/Basic/Invaders/Packages/manifest.json b/Basic/Invaders/Packages/manifest.json
index d3a440cc..fdb558c3 100644
--- a/Basic/Invaders/Packages/manifest.json
+++ b/Basic/Invaders/Packages/manifest.json
@@ -8,7 +8,7 @@
     "com.unity.multiplayer.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.4.0",
     "com.unity.multiplayer.tools": "1.1.1",
     "com.unity.netcode.gameobjects": "1.7.1",
-    "com.unity.render-pipelines.universal": "14.0.9",
+    "com.unity.render-pipelines.universal": "14.0.11",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.7.6",
     "com.unity.ugui": "1.0.0",
diff --git a/Basic/Invaders/Packages/packages-lock.json b/Basic/Invaders/Packages/packages-lock.json
index c5bbcf15..21a7e868 100644
--- a/Basic/Invaders/Packages/packages-lock.json
+++ b/Basic/Invaders/Packages/packages-lock.json
@@ -16,11 +16,12 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.burst": {
-      "version": "1.8.10",
+      "version": "1.8.13",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.mathematics": "1.2.1"
+        "com.unity.mathematics": "1.2.1",
+        "com.unity.modules.jsonserialize": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
@@ -147,7 +148,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.render-pipelines.core": {
-      "version": "14.0.9",
+      "version": "14.0.11",
       "depth": 1,
       "source": "builtin",
       "dependencies": {
@@ -158,23 +159,23 @@
       }
     },
     "com.unity.render-pipelines.universal": {
-      "version": "14.0.9",
+      "version": "14.0.11",
       "depth": 0,
       "source": "builtin",
       "dependencies": {
         "com.unity.mathematics": "1.2.1",
         "com.unity.burst": "1.8.9",
-        "com.unity.render-pipelines.core": "14.0.9",
-        "com.unity.shadergraph": "14.0.9",
+        "com.unity.render-pipelines.core": "14.0.11",
+        "com.unity.shadergraph": "14.0.11",
         "com.unity.render-pipelines.universal-config": "14.0.9"
       }
     },
     "com.unity.render-pipelines.universal-config": {
-      "version": "14.0.9",
+      "version": "14.0.10",
       "depth": 1,
       "source": "builtin",
       "dependencies": {
-        "com.unity.render-pipelines.core": "14.0.9"
+        "com.unity.render-pipelines.core": "14.0.10"
       }
     },
     "com.unity.searcher": {
@@ -185,19 +186,19 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.services.authentication": {
-      "version": "2.7.2",
+      "version": "2.7.4",
       "depth": 2,
       "source": "registry",
       "dependencies": {
         "com.unity.nuget.newtonsoft-json": "3.2.1",
-        "com.unity.services.core": "1.10.1",
+        "com.unity.services.core": "1.12.5",
         "com.unity.modules.unitywebrequest": "1.0.0",
         "com.unity.ugui": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.services.core": {
-      "version": "1.12.0",
+      "version": "1.12.5",
       "depth": 2,
       "source": "registry",
       "dependencies": {
@@ -208,11 +209,11 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.services.qos": {
-      "version": "1.2.1",
+      "version": "1.3.0",
       "depth": 2,
       "source": "registry",
       "dependencies": {
-        "com.unity.services.core": "1.4.0",
+        "com.unity.services.core": "1.12.4",
         "com.unity.modules.unitywebrequest": "1.0.0",
         "com.unity.nuget.newtonsoft-json": "3.0.2",
         "com.unity.services.authentication": "2.0.0",
@@ -246,11 +247,11 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.shadergraph": {
-      "version": "14.0.9",
+      "version": "14.0.11",
       "depth": 1,
       "source": "builtin",
       "dependencies": {
-        "com.unity.render-pipelines.core": "14.0.9",
+        "com.unity.render-pipelines.core": "14.0.11",
         "com.unity.searcher": "4.9.2"
       }
     },
@@ -287,7 +288,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.transport": {
-      "version": "1.4.0",
+      "version": "1.4.1",
       "depth": 1,
       "source": "registry",
       "dependencies": {
diff --git a/Basic/Invaders/ProjectSettings/ProjectVersion.txt b/Basic/Invaders/ProjectSettings/ProjectVersion.txt
index da671891..9efb20c7 100644
--- a/Basic/Invaders/ProjectSettings/ProjectVersion.txt
+++ b/Basic/Invaders/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.14f1
-m_EditorVersionWithRevision: 2022.3.14f1 (eff2de9070d8)
+m_EditorVersion: 2022.3.27f1
+m_EditorVersionWithRevision: 2022.3.27f1 (73effa14754f)
diff --git a/Basic/Invaders/UserSettings/EditorUserSettings.asset b/Basic/Invaders/UserSettings/EditorUserSettings.asset
index cbffb981..4585eb93 100644
--- a/Basic/Invaders/UserSettings/EditorUserSettings.asset
+++ b/Basic/Invaders/UserSettings/EditorUserSettings.asset
@@ -5,6 +5,9 @@ EditorUserSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 4
   m_ConfigSettings:
+    RecentlyUsedSceneGuid-0:
+      value: 560702525c045a0d0f0f0a2112255e44434e1d79747d22602c2c1f6ab5e33268
+      flags: 0
     RecentlyUsedScenePath-0:
       value: 22424703114646680e0b0227036c761e3116152f623d28393930
       flags: 0
@@ -37,9 +40,13 @@ EditorUserSettings:
   m_VCDebugCmd: 0
   m_VCDebugOut: 0
   m_SemanticMergeMode: 2
+  m_DesiredImportWorkerCount: 1
+  m_StandbyImportWorkerCount: 1
+  m_IdleImportWorkerShutdownDelay: 60000
   m_VCShowFailedCheckout: 1
   m_VCOverwriteFailedCheckoutAssets: 1
   m_VCProjectOverlayIcons: 1
   m_VCHierarchyOverlayIcons: 1
   m_VCOtherOverlayIcons: 1
   m_VCAllowAsyncUpdate: 1
+  m_ArtifactGarbageCollection: 1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa6e7e97..cb34a925 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@
 
 #### Changed
 - Upgraded to IDE Rider v3.0.28 (#166)
+- Upgraded to Unity 2022.3.27f1 (#169)
 
 ## [1.5.0] 2023-12-15
 

From 210b5b43161015f0b8e6e0882cdcd582c55d9483 Mon Sep 17 00:00:00 2001
From: Elfi0Kuhndorf <93766359+Elfi0Kuhndorf@users.noreply.github.com>
Date: Wed, 8 May 2024 09:29:40 +0200
Subject: [PATCH 10/20] Upgrade 2D Space Shooter to Unity Editor 2022.3.27f1
 [MTT-8500] (#170)

* upgraded editor to 2022.3.27f1

* added editor upgrade and related package upgrades to CHANGELOG
---
 .../Packages/packages-lock.json               | 31 ++++++++++---------
 .../ProjectSettings/ProjectVersion.txt        |  4 +--
 CHANGELOG.md                                  | 10 ++++++
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/Basic/2DSpaceShooter/Packages/packages-lock.json b/Basic/2DSpaceShooter/Packages/packages-lock.json
index d184065e..31933c71 100644
--- a/Basic/2DSpaceShooter/Packages/packages-lock.json
+++ b/Basic/2DSpaceShooter/Packages/packages-lock.json
@@ -16,11 +16,12 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.burst": {
-      "version": "1.8.10",
+      "version": "1.8.13",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.mathematics": "1.2.1"
+        "com.unity.mathematics": "1.2.1",
+        "com.unity.modules.jsonserialize": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
@@ -163,7 +164,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.render-pipelines.core": {
-      "version": "14.0.9",
+      "version": "14.0.11",
       "depth": 1,
       "source": "builtin",
       "dependencies": {
@@ -180,17 +181,17 @@
       "dependencies": {
         "com.unity.mathematics": "1.2.1",
         "com.unity.burst": "1.8.9",
-        "com.unity.render-pipelines.core": "14.0.9",
-        "com.unity.shadergraph": "14.0.9",
+        "com.unity.render-pipelines.core": "14.0.11",
+        "com.unity.shadergraph": "14.0.11",
         "com.unity.render-pipelines.universal-config": "14.0.9"
       }
     },
     "com.unity.render-pipelines.universal-config": {
-      "version": "14.0.9",
+      "version": "14.0.10",
       "depth": 1,
       "source": "builtin",
       "dependencies": {
-        "com.unity.render-pipelines.core": "14.0.9"
+        "com.unity.render-pipelines.core": "14.0.10"
       }
     },
     "com.unity.searcher": {
@@ -201,19 +202,19 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.services.authentication": {
-      "version": "2.7.2",
+      "version": "2.7.4",
       "depth": 2,
       "source": "registry",
       "dependencies": {
         "com.unity.nuget.newtonsoft-json": "3.2.1",
-        "com.unity.services.core": "1.10.1",
+        "com.unity.services.core": "1.12.5",
         "com.unity.modules.unitywebrequest": "1.0.0",
         "com.unity.ugui": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.services.core": {
-      "version": "1.12.0",
+      "version": "1.12.5",
       "depth": 2,
       "source": "registry",
       "dependencies": {
@@ -224,11 +225,11 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.services.qos": {
-      "version": "1.2.1",
+      "version": "1.3.0",
       "depth": 2,
       "source": "registry",
       "dependencies": {
-        "com.unity.services.core": "1.4.0",
+        "com.unity.services.core": "1.12.4",
         "com.unity.modules.unitywebrequest": "1.0.0",
         "com.unity.nuget.newtonsoft-json": "3.0.2",
         "com.unity.services.authentication": "2.0.0",
@@ -262,11 +263,11 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.shadergraph": {
-      "version": "14.0.9",
+      "version": "14.0.11",
       "depth": 1,
       "source": "builtin",
       "dependencies": {
-        "com.unity.render-pipelines.core": "14.0.9",
+        "com.unity.render-pipelines.core": "14.0.11",
         "com.unity.searcher": "4.9.2"
       }
     },
@@ -303,7 +304,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.transport": {
-      "version": "1.4.0",
+      "version": "1.4.1",
       "depth": 1,
       "source": "registry",
       "dependencies": {
diff --git a/Basic/2DSpaceShooter/ProjectSettings/ProjectVersion.txt b/Basic/2DSpaceShooter/ProjectSettings/ProjectVersion.txt
index da671891..9efb20c7 100644
--- a/Basic/2DSpaceShooter/ProjectSettings/ProjectVersion.txt
+++ b/Basic/2DSpaceShooter/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.14f1
-m_EditorVersionWithRevision: 2022.3.14f1 (eff2de9070d8)
+m_EditorVersion: 2022.3.27f1
+m_EditorVersionWithRevision: 2022.3.27f1 (73effa14754f)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb34a925..f4db8557 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,16 @@
 
 #### Changed
 - Upgraded to IDE Rider v3.0.28 (#166)
+- Upgraded to Unity 2022.3.27f1 (#170)
+  - upgraded to com.unity.burst v1.8.13
+  - added com.unity.modules.jsonserialize v1.0.0
+  - upgraded to com.unity.render-pipelines.core v14.0.11
+  - upgraded to com.unity.render-pipelines.universal-config v14.0.10
+  - upgraded to com.unity.shadergraph v14.0.11
+  - upgraded to com.unity.services.authentication v2.7.4
+  - upgraded to com.unity.services.qos v1.3.0
+  - upgraded to com.unity.transport v1.4.1
+  - upgraded to com.unity.services.core v1.12.5
 
 #### Fixed
 - Reset values and buffs after respawn of ship (#167)

From 4a2e6c7f0f53b11c91a1084b2cb5b0d6b96be6b0 Mon Sep 17 00:00:00 2001
From: Elfi0Kuhndorf <93766359+Elfi0Kuhndorf@users.noreply.github.com>
Date: Wed, 8 May 2024 16:16:06 +0200
Subject: [PATCH 11/20] Upgrade Multiplayer Use Cases to Unity Editor
 2022.3.27f1 [MTT-8501] (#171)

* upgrade editor to 2022.3.27f1 and keeping automated packaged updates

apart from NGO update (NGO is not updated in this branch)

* update CHANGELOG.md
---
 .../Packages/manifest.json                    |  4 +-
 .../Packages/packages-lock.json               | 41 ++++++++++---------
 .../ProjectSettings/ProjectVersion.txt        |  4 +-
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/Experimental/MultiplayerUseCases/Packages/manifest.json b/Experimental/MultiplayerUseCases/Packages/manifest.json
index f8705720..1bab0be2 100644
--- a/Experimental/MultiplayerUseCases/Packages/manifest.json
+++ b/Experimental/MultiplayerUseCases/Packages/manifest.json
@@ -2,7 +2,7 @@
   "dependencies": {
     "com.unity.ai.navigation": "1.1.5",
     "com.unity.feature.development": "1.0.1",
-    "com.unity.ide.rider": "3.0.26",
+    "com.unity.ide.rider": "3.0.28",
     "com.unity.ide.visualstudio": "2.0.22",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.inputsystem": "1.7.0",
@@ -11,7 +11,7 @@
     "com.unity.multiplayer.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.4.0",
     "com.unity.multiplayer.tools": "1.1.1",
     "com.unity.netcode.gameobjects": "1.7.1",
-    "com.unity.render-pipelines.universal": "14.0.9",
+    "com.unity.render-pipelines.universal": "14.0.11",
     "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 657cef94..29137a46 100644
--- a/Experimental/MultiplayerUseCases/Packages/packages-lock.json
+++ b/Experimental/MultiplayerUseCases/Packages/packages-lock.json
@@ -10,11 +10,12 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.burst": {
-      "version": "1.8.10",
+      "version": "1.8.13",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.mathematics": "1.2.1"
+        "com.unity.mathematics": "1.2.1",
+        "com.unity.modules.jsonserialize": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
@@ -48,16 +49,16 @@
       "source": "builtin",
       "dependencies": {
         "com.unity.ide.visualstudio": "2.0.22",
-        "com.unity.ide.rider": "3.0.26",
+        "com.unity.ide.rider": "3.0.28",
         "com.unity.ide.vscode": "1.2.5",
         "com.unity.editorcoroutines": "1.0.0",
         "com.unity.performance.profile-analyzer": "1.2.2",
         "com.unity.test-framework": "1.1.33",
-        "com.unity.testtools.codecoverage": "1.2.4"
+        "com.unity.testtools.codecoverage": "1.2.5"
       }
     },
     "com.unity.ide.rider": {
-      "version": "3.0.26",
+      "version": "3.0.28",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -180,7 +181,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.render-pipelines.core": {
-      "version": "14.0.9",
+      "version": "14.0.11",
       "depth": 1,
       "source": "builtin",
       "dependencies": {
@@ -191,23 +192,23 @@
       }
     },
     "com.unity.render-pipelines.universal": {
-      "version": "14.0.9",
+      "version": "14.0.11",
       "depth": 0,
       "source": "builtin",
       "dependencies": {
         "com.unity.mathematics": "1.2.1",
         "com.unity.burst": "1.8.9",
-        "com.unity.render-pipelines.core": "14.0.9",
-        "com.unity.shadergraph": "14.0.9",
+        "com.unity.render-pipelines.core": "14.0.11",
+        "com.unity.shadergraph": "14.0.11",
         "com.unity.render-pipelines.universal-config": "14.0.9"
       }
     },
     "com.unity.render-pipelines.universal-config": {
-      "version": "14.0.9",
+      "version": "14.0.10",
       "depth": 1,
       "source": "builtin",
       "dependencies": {
-        "com.unity.render-pipelines.core": "14.0.9"
+        "com.unity.render-pipelines.core": "14.0.10"
       }
     },
     "com.unity.searcher": {
@@ -218,19 +219,19 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.services.authentication": {
-      "version": "2.7.2",
+      "version": "2.7.4",
       "depth": 2,
       "source": "registry",
       "dependencies": {
         "com.unity.nuget.newtonsoft-json": "3.2.1",
-        "com.unity.services.core": "1.10.1",
+        "com.unity.services.core": "1.12.5",
         "com.unity.modules.unitywebrequest": "1.0.0",
         "com.unity.ugui": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.services.core": {
-      "version": "1.12.0",
+      "version": "1.12.5",
       "depth": 2,
       "source": "registry",
       "dependencies": {
@@ -241,11 +242,11 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.services.qos": {
-      "version": "1.2.1",
+      "version": "1.3.0",
       "depth": 2,
       "source": "registry",
       "dependencies": {
-        "com.unity.services.core": "1.4.0",
+        "com.unity.services.core": "1.12.4",
         "com.unity.modules.unitywebrequest": "1.0.0",
         "com.unity.nuget.newtonsoft-json": "3.0.2",
         "com.unity.services.authentication": "2.0.0",
@@ -279,11 +280,11 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.shadergraph": {
-      "version": "14.0.9",
+      "version": "14.0.11",
       "depth": 1,
       "source": "builtin",
       "dependencies": {
-        "com.unity.render-pipelines.core": "14.0.9",
+        "com.unity.render-pipelines.core": "14.0.11",
         "com.unity.searcher": "4.9.2"
       }
     },
@@ -315,7 +316,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.testtools.codecoverage": {
-      "version": "1.2.4",
+      "version": "1.2.5",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -344,7 +345,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.transport": {
-      "version": "1.4.0",
+      "version": "1.4.1",
       "depth": 1,
       "source": "registry",
       "dependencies": {
diff --git a/Experimental/MultiplayerUseCases/ProjectSettings/ProjectVersion.txt b/Experimental/MultiplayerUseCases/ProjectSettings/ProjectVersion.txt
index da671891..9efb20c7 100644
--- a/Experimental/MultiplayerUseCases/ProjectSettings/ProjectVersion.txt
+++ b/Experimental/MultiplayerUseCases/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.14f1
-m_EditorVersionWithRevision: 2022.3.14f1 (eff2de9070d8)
+m_EditorVersion: 2022.3.27f1
+m_EditorVersionWithRevision: 2022.3.27f1 (73effa14754f)

From 634b8467ba800e3cf37342740be14361f133cf05 Mon Sep 17 00:00:00 2001
From: Fernando Cortez <fernando.cortez@unity3d.com>
Date: Mon, 13 May 2024 10:04:05 -0400
Subject: [PATCH 12/20] feat: Client Driven project upgraded to 2022.3.27f1 LTS
 [MTT-8512] (#175)

* client driven project upgraded to 2022.3.27f1

* changelog addition

* changelog updated
---
 Basic/ClientDriven/Packages/manifest.json     |  4 +--
 .../ClientDriven/Packages/packages-lock.json  | 35 ++++++++++---------
 .../ProjectSettings/ProjectVersion.txt        |  4 +--
 CHANGELOG.md                                  |  6 ++++
 4 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/Basic/ClientDriven/Packages/manifest.json b/Basic/ClientDriven/Packages/manifest.json
index ac89602e..10e99f3e 100644
--- a/Basic/ClientDriven/Packages/manifest.json
+++ b/Basic/ClientDriven/Packages/manifest.json
@@ -1,8 +1,8 @@
 {
   "dependencies": {
     "com.unity.ai.navigation": "1.1.5",
-    "com.unity.cinemachine": "2.9.5",
-    "com.unity.collab-proxy": "2.2.0",
+    "com.unity.cinemachine": "2.10.0",
+    "com.unity.collab-proxy": "2.3.1",
     "com.unity.ide.rider": "3.0.28",
     "com.unity.ide.visualstudio": "2.0.22",
     "com.unity.ide.vscode": "1.2.5",
diff --git a/Basic/ClientDriven/Packages/packages-lock.json b/Basic/ClientDriven/Packages/packages-lock.json
index 6b124807..8059ffbc 100644
--- a/Basic/ClientDriven/Packages/packages-lock.json
+++ b/Basic/ClientDriven/Packages/packages-lock.json
@@ -10,16 +10,17 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.burst": {
-      "version": "1.8.10",
+      "version": "1.8.13",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.mathematics": "1.2.1"
+        "com.unity.mathematics": "1.2.1",
+        "com.unity.modules.jsonserialize": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.cinemachine": {
-      "version": "2.9.5",
+      "version": "2.10.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -28,7 +29,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.collab-proxy": {
-      "version": "2.2.0",
+      "version": "2.3.1",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
@@ -166,7 +167,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.render-pipelines.core": {
-      "version": "14.0.9",
+      "version": "14.0.11",
       "depth": 1,
       "source": "builtin",
       "dependencies": {
@@ -183,17 +184,17 @@
       "dependencies": {
         "com.unity.mathematics": "1.2.1",
         "com.unity.burst": "1.8.9",
-        "com.unity.render-pipelines.core": "14.0.9",
-        "com.unity.shadergraph": "14.0.9",
+        "com.unity.render-pipelines.core": "14.0.11",
+        "com.unity.shadergraph": "14.0.11",
         "com.unity.render-pipelines.universal-config": "14.0.9"
       }
     },
     "com.unity.render-pipelines.universal-config": {
-      "version": "14.0.9",
+      "version": "14.0.10",
       "depth": 1,
       "source": "builtin",
       "dependencies": {
-        "com.unity.render-pipelines.core": "14.0.9"
+        "com.unity.render-pipelines.core": "14.0.10"
       }
     },
     "com.unity.searcher": {
@@ -204,19 +205,19 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.services.authentication": {
-      "version": "2.7.2",
+      "version": "2.7.4",
       "depth": 2,
       "source": "registry",
       "dependencies": {
         "com.unity.nuget.newtonsoft-json": "3.2.1",
-        "com.unity.services.core": "1.10.1",
+        "com.unity.services.core": "1.12.5",
         "com.unity.modules.unitywebrequest": "1.0.0",
         "com.unity.ugui": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.services.core": {
-      "version": "1.12.0",
+      "version": "1.12.5",
       "depth": 2,
       "source": "registry",
       "dependencies": {
@@ -227,11 +228,11 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.services.qos": {
-      "version": "1.2.1",
+      "version": "1.3.0",
       "depth": 2,
       "source": "registry",
       "dependencies": {
-        "com.unity.services.core": "1.4.0",
+        "com.unity.services.core": "1.12.4",
         "com.unity.modules.unitywebrequest": "1.0.0",
         "com.unity.nuget.newtonsoft-json": "3.0.2",
         "com.unity.services.authentication": "2.0.0",
@@ -265,11 +266,11 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.shadergraph": {
-      "version": "14.0.9",
+      "version": "14.0.11",
       "depth": 1,
       "source": "builtin",
       "dependencies": {
-        "com.unity.render-pipelines.core": "14.0.9",
+        "com.unity.render-pipelines.core": "14.0.11",
         "com.unity.searcher": "4.9.2"
       }
     },
@@ -306,7 +307,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.transport": {
-      "version": "1.4.0",
+      "version": "1.4.1",
       "depth": 1,
       "source": "registry",
       "dependencies": {
diff --git a/Basic/ClientDriven/ProjectSettings/ProjectVersion.txt b/Basic/ClientDriven/ProjectSettings/ProjectVersion.txt
index da671891..9efb20c7 100644
--- a/Basic/ClientDriven/ProjectSettings/ProjectVersion.txt
+++ b/Basic/ClientDriven/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.14f1
-m_EditorVersionWithRevision: 2022.3.14f1 (eff2de9070d8)
+m_EditorVersion: 2022.3.27f1
+m_EditorVersionWithRevision: 2022.3.27f1 (73effa14754f)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4db8557..ca344ebc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,12 @@
   - Upgraded to the newer API for Rpcs, Universal Rpcs
   - The place of execution for a client's position was moved to ClientNetworkTransform child class, ClientDrivenNetworkTransform. This ensures no race condition issues on a client's first position sync. Server code now modifies a NetworkVariable that client-owned instances of ClientDrivenNetworkTransform use on OnNetworkSpawn to initially move a player
 - Upgraded to IDE Rider v3.0.28 (#166)
+- Upgraded to Unity 2022.3.27f1 (#175)
+  - com.unity.render-pipelines.core upgraded to v14.0.11
+  - com.unity.services.authentication upgraded to v2.7.4
+  - com.unity.services.core upgraded to v1.12.5
+  - com.unity.services.qos upgraded to v1.3.0
+  - com.unity.transport upgraded to v1.4.1
 
 #### Fixed
 - Added Spawner with event executed on Server Start to fix inconsistent ghost ingredients issue (#157)

From f2e33e9e66096301296ec09c00c6761927d75739 Mon Sep 17 00:00:00 2001
From: Fernando Cortez <fernando.cortez@unity3d.com>
Date: Mon, 13 May 2024 15:07:22 -0400
Subject: [PATCH 13/20] feat: ClientDriven further Netcode for GameObejcts
 v1.8.1 API upgrades [MTT-8543] (#173)

* using NetworkObject.InstantiateAndSpawn() where possible

* further clarifying InstantiateAndSpawn() issue

* changelog addition

* project readme fixed with NGO version bump
---
 Basic/ClientDriven/Assets/Scenes/Bootstrap.unity   |  6 ++++--
 .../Assets/Scripts/NetworkObjectSpawner.cs         | 13 ++++++++-----
 .../Assets/Scripts/ServerIngredientSpawner.cs      | 14 +++++++-------
 Basic/ClientDriven/README.md                       |  2 +-
 CHANGELOG.md                                       |  1 +
 5 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity b/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity
index eabf639d..dd474bd1 100644
--- a/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity
+++ b/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.21890283, g: 0.16790575, b: 0.67034173, a: 1}
+  m_IndirectSpecularColor: {r: 0.21890238, g: 0.16790517, b: 0.6703396, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -925,6 +925,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   GlobalObjectIdHash: 2084257867
+  InScenePlacedSourceGlobalObjectIdHash: 0
   AlwaysReplicateAsRoot: 0
   SynchronizeTransform: 1
   ActiveSceneSynchronization: 0
@@ -1525,6 +1526,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   GlobalObjectIdHash: 1374255023
+  InScenePlacedSourceGlobalObjectIdHash: 0
   AlwaysReplicateAsRoot: 0
   SynchronizeTransform: 1
   ActiveSceneSynchronization: 0
@@ -1550,7 +1552,7 @@ MonoBehaviour:
   - {fileID: 1422708175}
   - {fileID: 796975752}
   m_SpawnRatePerSecond: 10
-  m_IngredientPrefab: {fileID: 8321201880322001125, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+  m_IngredientPrefab: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3}
   m_MaxSpawnWaves: 8
 --- !u!4 &2060465724
 Transform:
diff --git a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs
index b7b8a594..fe8e9672 100644
--- a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs
+++ b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs
@@ -9,7 +9,7 @@ namespace Unity.Multiplayer.Samples.ClientDriven
     /// <remarks>
     /// A NetworkManager is expected to be part of the scene that this NetworkObject is a part of.
     /// </remarks>
-    internal class NetworkObjectSpawner : MonoBehaviour
+    class NetworkObjectSpawner : MonoBehaviour
     {
         [SerializeField]
         NetworkObject m_PrefabReference;
@@ -27,17 +27,20 @@ void Start()
 
         void OnDestroy()
         {
-            if(NetworkManager.Singleton != null)
-            { 
+            if (NetworkManager.Singleton != null)
+            {
                 NetworkManager.Singleton.OnServerStarted -= SpawnIngredient;
             }
         }
 
         void SpawnIngredient()
         {
+            // Note: this will be converted to NetworkObject.InstantiateAndSpawn(), but a current limitation on Netcode
+            // for GameObjects invoking this method on OnServerStarted prevents this API upgrade.
+            // Specifically, if you were to spawn a Rigidbody with Rigidbody Interpolation enabled, you would need to
+            // update the Rigidbody's position immediately after invoking NetworkObject.InstantitateAndSpawn().
             NetworkObject instantiatedNetworkObject = Instantiate(m_PrefabReference, transform.position, transform.rotation, null);
-            var ingredient = instantiatedNetworkObject.GetComponent<ServerIngredient>();
-            ingredient.NetworkObject.Spawn();
+            instantiatedNetworkObject.Spawn();
         }
     }
 }
diff --git a/Basic/ClientDriven/Assets/Scripts/ServerIngredientSpawner.cs b/Basic/ClientDriven/Assets/Scripts/ServerIngredientSpawner.cs
index 631cf83a..444f747e 100644
--- a/Basic/ClientDriven/Assets/Scripts/ServerIngredientSpawner.cs
+++ b/Basic/ClientDriven/Assets/Scripts/ServerIngredientSpawner.cs
@@ -12,7 +12,7 @@ public class ServerIngredientSpawner : NetworkBehaviour
     float m_SpawnRatePerSecond;
 
     [SerializeField]
-    GameObject m_IngredientPrefab;
+    NetworkObject m_IngredientPrefab;
 
     [SerializeField]
     int m_MaxSpawnWaves;
@@ -26,9 +26,9 @@ public class ServerIngredientSpawner : NetworkBehaviour
     public override void OnNetworkSpawn()
     {
         base.OnNetworkSpawn();
+        enabled = IsServer;
         if (!IsServer)
         {
-            enabled = false;
             return;
         }
 
@@ -38,11 +38,12 @@ public override void OnNetworkSpawn()
     public override void OnNetworkDespawn()
     {
         m_SpawnWaves = 0;
+        enabled = false;
     }
 
     void FixedUpdate()
     {
-        if (NetworkManager != null && !IsServer)
+        if (NetworkManager == null || !NetworkManager.IsListening || !IsServer)
         {
             return;
         }
@@ -51,11 +52,10 @@ void FixedUpdate()
         {
             foreach (var spawnPoint in m_SpawnPoints)
             {
-                var newIngredientObject = Instantiate(m_IngredientPrefab, spawnPoint.transform.position, spawnPoint.transform.rotation);
-                newIngredientObject.transform.position = spawnPoint.transform.position +
-                    new Vector3(UnityEngine.Random.Range(-0.25f, 0.25f), 0, UnityEngine.Random.Range(-0.25f, 0.25f));
+                var newIngredientObject = m_IngredientPrefab.InstantiateAndSpawn(NetworkManager,
+                    position: spawnPoint.transform.position + new Vector3(UnityEngine.Random.Range(-0.25f, 0.25f), 0, UnityEngine.Random.Range(-0.25f, 0.25f)),
+                    rotation: spawnPoint.transform.rotation);
                 var ingredient = newIngredientObject.GetComponent<ServerIngredient>();
-                ingredient.NetworkObject.Spawn();
                 ingredient.currentIngredientType.Value = (IngredientType)m_RandomGenerator.Next((int)IngredientType.MAX);
             }
             m_SpawnWaves++;
diff --git a/Basic/ClientDriven/README.md b/Basic/ClientDriven/README.md
index d2319561..7fb5d2e1 100644
--- a/Basic/ClientDriven/README.md
+++ b/Basic/ClientDriven/README.md
@@ -4,7 +4,7 @@
 # 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.7.1-57b9d3.svg?logo=unity&color=2196F3)](https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/releases/tag/ngo%2F1.7.1)
+[![NetcodeVersion](https://img.shields.io/badge/Netcode%20Version:-1.8.1-57b9d3.svg?logo=unity&color=2196F3)](https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/releases/tag/ngo%2F1.8.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)
 <br><br>
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca344ebc..410302ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@
 - Upgraded to Netcode for GameObjects v1.8.1 (#164)
   - Upgraded to the newer API for Rpcs, Universal Rpcs
   - The place of execution for a client's position was moved to ClientNetworkTransform child class, ClientDrivenNetworkTransform. This ensures no race condition issues on a client's first position sync. Server code now modifies a NetworkVariable that client-owned instances of ClientDrivenNetworkTransform use on OnNetworkSpawn to initially move a player
+  - Upgraded to use NetworkObject.InstantiateAndSpawn() API where appropriate (#173)
 - Upgraded to IDE Rider v3.0.28 (#166)
 - Upgraded to Unity 2022.3.27f1 (#175)
   - com.unity.render-pipelines.core upgraded to v14.0.11

From ad2eaa3f3b51367ab9e75baf6c27ab0f781fd76f Mon Sep 17 00:00:00 2001
From: Fernando Cortez <fernando.cortez@unity3d.com>
Date: Tue, 14 May 2024 13:20:37 -0400
Subject: [PATCH 14/20] feat: DynamicAddressablesNetworkPrefabs upgraded to
 2022.3.27f1 [MTT-8513] (#176)

* DynamicAddressablesNetworkPrefabs upgraded to 2022.3.27f1

* changelog addition
---
 .../Packages/packages-lock.json                            | 7 ++++---
 .../ProjectSettings/ProjectVersion.txt                     | 4 ++--
 CHANGELOG.md                                               | 2 ++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Packages/packages-lock.json b/Basic/DynamicAddressablesNetworkPrefabs/Packages/packages-lock.json
index d10d8894..f5480cd4 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Packages/packages-lock.json
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Packages/packages-lock.json
@@ -24,11 +24,12 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.burst": {
-      "version": "1.8.10",
+      "version": "1.8.13",
       "depth": 2,
       "source": "registry",
       "dependencies": {
-        "com.unity.mathematics": "1.2.1"
+        "com.unity.mathematics": "1.2.1",
+        "com.unity.modules.jsonserialize": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
@@ -153,7 +154,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.transport": {
-      "version": "1.4.0",
+      "version": "1.4.1",
       "depth": 1,
       "source": "registry",
       "dependencies": {
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/ProjectVersion.txt b/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/ProjectVersion.txt
index da671891..9efb20c7 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/ProjectVersion.txt
+++ b/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.14f1
-m_EditorVersionWithRevision: 2022.3.14f1 (eff2de9070d8)
+m_EditorVersion: 2022.3.27f1
+m_EditorVersionWithRevision: 2022.3.27f1 (73effa14754f)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 410302ee..b732a47d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,8 @@
 
 #### Changed
 - Upgraded to IDE Rider v3.0.28 (#166)
+- Upgraded to Unity 2022.3.27f1 (#176)
+  - com.unity.transport upgraded to v1.4.1
 
 ### Invaders
 

From eb69754c93e54f7091913e9805f5d9ea97fa3865 Mon Sep 17 00:00:00 2001
From: Elfi0Kuhndorf <93766359+Elfi0Kuhndorf@users.noreply.github.com>
Date: Wed, 15 May 2024 15:42:57 +0200
Subject: [PATCH 15/20] Feature: Upgrading 2D Space Shooter to NGO 1.8.1
 [MTT-8498] (#174)

* upgrading to NGO 1.8.1 and adjusting scripts to include new RPC attribute and OnConnectionEvent

* update CHANGELOG
---
 Basic/2DSpaceShooter/Assets/Scripts/Bullet.cs |  6 ++--
 .../Assets/Scripts/NetworkManagerHud.cs       | 30 +++++++++----------
 .../Assets/Scripts/ShipControl.cs             | 23 +++++++-------
 Basic/2DSpaceShooter/Packages/manifest.json   |  2 +-
 .../Packages/packages-lock.json               |  2 +-
 CHANGELOG.md                                  |  3 ++
 6 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/Basic/2DSpaceShooter/Assets/Scripts/Bullet.cs b/Basic/2DSpaceShooter/Assets/Scripts/Bullet.cs
index 2176f506..53ca86cb 100644
--- a/Basic/2DSpaceShooter/Assets/Scripts/Bullet.cs
+++ b/Basic/2DSpaceShooter/Assets/Scripts/Bullet.cs
@@ -52,12 +52,12 @@ public void SetVelocity(Vector2 velocity)
         {
             var bulletRb = GetComponent<Rigidbody2D>();
             bulletRb.velocity = velocity;
-            SetVelocityClientRpc(velocity);
+            ClientSetVelocityRpc(velocity);
         }
     }
 
-    [ClientRpc]
-    void SetVelocityClientRpc(Vector2 velocity)
+    [Rpc(SendTo.ClientsAndHost)]
+    void ClientSetVelocityRpc(Vector2 velocity)
     {
         if (!IsHost)
         {
diff --git a/Basic/2DSpaceShooter/Assets/Scripts/NetworkManagerHud.cs b/Basic/2DSpaceShooter/Assets/Scripts/NetworkManagerHud.cs
index 9b56af39..8f2c373f 100644
--- a/Basic/2DSpaceShooter/Assets/Scripts/NetworkManagerHud.cs
+++ b/Basic/2DSpaceShooter/Assets/Scripts/NetworkManagerHud.cs
@@ -80,24 +80,25 @@ void Start()
         ShowInGameUI(false);
         ShowStatusText(false);
 
-        NetworkManager.Singleton.OnClientConnectedCallback += OnOnClientConnectedCallback;
-        NetworkManager.Singleton.OnClientDisconnectCallback += OnOnClientDisconnectCallback;
+        NetworkManager.Singleton.OnConnectionEvent += OnConnectionEvent;
     }
 
-    void OnOnClientConnectedCallback(ulong obj)
+    void OnConnectionEvent(NetworkManager networkManager, ConnectionEventData connectionEventData)
     {
-        ShowMainMenuUI(false);
-        ShowInGameUI(true);
-    }
-
-    void OnOnClientDisconnectCallback(ulong clientId)
-    {
-        if ((NetworkManager.Singleton.IsServer && clientId != NetworkManager.ServerClientId))
+        if (connectionEventData.EventType == ConnectionEvent.ClientConnected)
         {
-            return;
+            ShowMainMenuUI(false);
+            ShowInGameUI(true);
+        }
+        else if (connectionEventData.EventType == ConnectionEvent.ClientDisconnected)
+        {
+            if ((NetworkManager.Singleton.IsServer && connectionEventData.ClientId != NetworkManager.ServerClientId))
+            {
+                return;
+            }
+            ShowMainMenuUI(true);
+            ShowInGameUI(false);
         }
-        ShowMainMenuUI(true);
-        ShowInGameUI(false);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -262,7 +263,6 @@ void OnDestroy()
         {
             m_ShutdownButton.clickable.clickedWithEventInfo -= ShutdownButtonClicked;
         }
-        m_NetworkManager.OnClientConnectedCallback -= OnOnClientConnectedCallback;
-        m_NetworkManager.OnClientDisconnectCallback -= OnOnClientDisconnectCallback;
+        m_NetworkManager.OnConnectionEvent -= OnConnectionEvent;
     }
 }
diff --git a/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs b/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs
index a176c9be..c1a22d4f 100644
--- a/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs
+++ b/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs
@@ -141,7 +141,6 @@ public override void OnNetworkSpawn()
         if (IsServer)
         {
             LatestShipColor.Value = m_ShipGlowDefaultColor;
-
             PlayerName.Value = $"Player {OwnerClientId}";
 
             if (!IsHost)
@@ -199,7 +198,7 @@ public void TakeDamage(int amount)
 
     void Fire(Vector3 direction)
     {
-        PlayFireSoundClientRpc();
+        ClientPlayFireSoundRpc();
         var damage = 5;
         if (QuadDamageTimer.Value > NetworkManager.ServerTime.TimeAsFloat)
         {
@@ -366,7 +365,7 @@ void UpdateClient()
 
         if (m_OldMoveForce != moveForce || m_OldSpin != spin)
         {
-            ThrustServerRpc(moveForce, spin);
+            ServerThrustRpc(moveForce, spin);
             m_OldMoveForce = moveForce;
             m_OldSpin = spin;
         }
@@ -388,7 +387,7 @@ void UpdateClient()
         // fire
         if (Input.GetKeyDown(KeyCode.Space))
         {
-            FireServerRpc();
+            ServerFireRpc();
         }
     }
 
@@ -505,22 +504,22 @@ void OnCollisionEnter2D(Collision2D other)
 
     // --- ClientRPCs ---
 
-    [ClientRpc]
-    void PlayFireSoundClientRpc()
+    [Rpc(SendTo.ClientsAndHost)]
+    void ClientPlayFireSoundRpc()
     {
         fireSound.Play();
     }
     // --- ServerRPCs ---
 
-    [ServerRpc]
-    public void ThrustServerRpc(float thrusting, int spin)
+    [Rpc(SendTo.Server)]
+    public void ServerThrustRpc(float thrusting, int spin)
     {
         m_Thrust = thrusting;
         m_Spin = spin;
     }
 
-    [ServerRpc]
-    public void FireServerRpc()
+    [Rpc(SendTo.Server)]
+    public void ServerFireRpc()
     {
         if (Energy.Value >= 10)
         {
@@ -549,8 +548,8 @@ public void FireServerRpc()
         }
     }
 
-    [ServerRpc]
-    public void SetNameServerRpc(string name)
+    [Rpc(SendTo.Server)]
+    public void ServerSetNameRpc(FixedString32Bytes name)
     {
         PlayerName.Value = name;
     }
diff --git a/Basic/2DSpaceShooter/Packages/manifest.json b/Basic/2DSpaceShooter/Packages/manifest.json
index bde35453..931873e6 100644
--- a/Basic/2DSpaceShooter/Packages/manifest.json
+++ b/Basic/2DSpaceShooter/Packages/manifest.json
@@ -7,7 +7,7 @@
     "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.4.0",
-    "com.unity.netcode.gameobjects": "1.7.1",
+    "com.unity.netcode.gameobjects": "1.8.1",
     "com.unity.postprocessing": "3.2.2",
     "com.unity.render-pipelines.universal": "14.0.9",
     "com.unity.test-framework": "1.1.33",
diff --git a/Basic/2DSpaceShooter/Packages/packages-lock.json b/Basic/2DSpaceShooter/Packages/packages-lock.json
index 31933c71..f2680726 100644
--- a/Basic/2DSpaceShooter/Packages/packages-lock.json
+++ b/Basic/2DSpaceShooter/Packages/packages-lock.json
@@ -124,7 +124,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.netcode.gameobjects": {
-      "version": "1.7.1",
+      "version": "1.8.1",
       "depth": 0,
       "source": "registry",
       "dependencies": {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b732a47d..e203ef55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,9 @@
   - upgraded to com.unity.services.qos v1.3.0
   - upgraded to com.unity.transport v1.4.1
   - upgraded to com.unity.services.core v1.12.5
+- Upgraded to Netcode for GameObjects v1.8.1 (#174)
+  - Upgraded to the newer API for Rpcs, Universal Rpcs
+  - Upgraded to newer API for Connection Events, OnConnectionEvent
 
 #### Fixed
 - Reset values and buffs after respawn of ship (#167)

From a081eb3ba0c791dec0ff0dd21cbb4a4cbf40645b Mon Sep 17 00:00:00 2001
From: Fernando Cortez <fernando.cortez@unity3d.com>
Date: Wed, 22 May 2024 13:01:17 -0400
Subject: [PATCH 16/20] fix: releasing Addressables handle on OnDestroy in
 DynamicAddressablesNetworkPrefabs Preloading scene (#179)

* releasing Addressables handle on OnDestroy

* changelog addition
---
 .../Assets/Scripts/00_Preloading/Preloading.cs    | 15 +++++++++++----
 CHANGELOG.md                                      |  3 +++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/00_Preloading/Preloading.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/00_Preloading/Preloading.cs
index 94d53084..892c2e5b 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/00_Preloading/Preloading.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/00_Preloading/Preloading.cs
@@ -3,6 +3,7 @@
 using Unity.Netcode;
 using UnityEngine;
 using UnityEngine.AddressableAssets;
+using UnityEngine.ResourceManagement.AsyncOperations;
 
 namespace Game.Preloading
 {
@@ -24,6 +25,8 @@ public sealed class Preloading : MonoBehaviour
 
         [SerializeField] NetworkManager m_NetworkManager;
 
+        AsyncOperationHandle<GameObject> m_AsyncOperationHandle;
+
         async void Start()
         {
             await PreloadDynamicPlayerPrefab();
@@ -35,9 +38,8 @@ async void Start()
         async Task PreloadDynamicPlayerPrefab()
         {
             Debug.Log($"Started to load addressable with GUID: {m_DynamicPrefabReference.AssetGUID}");
-            var op = Addressables.LoadAssetAsync<GameObject>(m_DynamicPrefabReference);
-            var prefab = await op.Task;
-            Addressables.Release(op);
+            m_AsyncOperationHandle = Addressables.LoadAssetAsync<GameObject>(m_DynamicPrefabReference);
+            var prefab = await m_AsyncOperationHandle.Task;
 
             //it's important to actually add the player prefab to the list of network prefabs - it doesn't happen
             //automatically
@@ -51,8 +53,13 @@ async Task PreloadDynamicPlayerPrefab()
             // prefabs to NetworkManager's NetworkPrefabs list pre-connection time guarantees that all players will have
             // matching NetworkConfigs. This is why NetworkManager.ForceSamePrefabs is set to true. We let Netcode for
             // GameObjects validate the matching NetworkConfigs between clients and the server. If this is set to false
-            // on the server, clients may join with a mismatching NetworkPrefabs list from the server. 
+            // on the server, clients may join with a mismatching NetworkPrefabs list from the server.
             m_NetworkManager.NetworkConfig.ForceSamePrefabs = true;
         }
+
+        void OnDestroy()
+        {
+            Addressables.Release(m_AsyncOperationHandle);
+        }
     }
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e203ef55..e54c2a43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,9 @@
 - Upgraded to Unity 2022.3.27f1 (#176)
   - com.unity.transport upgraded to v1.4.1
 
+#### Fixed
+- Releasing an Addressables handle on OnDestroy inside Preloading scene to prevent releasing loaded dynamic prefab from memory (#179)
+
 ### Invaders
 
 #### Changed

From e8fa6ed2233113b1f87fd29fbae8921b7edfac81 Mon Sep 17 00:00:00 2001
From: Elfi0Kuhndorf <93766359+Elfi0Kuhndorf@users.noreply.github.com>
Date: Tue, 28 May 2024 16:43:45 +0200
Subject: [PATCH 17/20] Upgrade Multiplayer Use cases to NGO 1.8.1 [MTT-8499]
 (#178)

* upgrade ngo to 1.8.1 and related rpc adjustments

* included OnConnectionEvent into GameUI.cs script

* adjusted scripts to address comments

* fixing PascalCase in Rpcs, removing empty Line and naming refactor
change version numbers in readme file

* remove redundant code in ColorManager
---
 .../Assets/Common/Scripts/GameUI.cs           | 31 ++++++++++---------
 .../NetvarVsRpc/Scripts/ColorManager.cs       | 14 ++++-----
 .../NetvarVsRpc/Scripts/ProximityTrigger.cs   |  2 +-
 .../Scripts/CharacterManager.cs               |  6 ++--
 .../ProximityChecks/Scripts/ColorManager.cs   |  6 ++--
 .../RPCs/Scripts/MoodManager.cs               | 12 +++----
 .../Packages/manifest.json                    |  2 +-
 .../Packages/packages-lock.json               |  2 +-
 Experimental/MultiplayerUseCases/README.md    |  4 +--
 9 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/Experimental/MultiplayerUseCases/Assets/Common/Scripts/GameUI.cs b/Experimental/MultiplayerUseCases/Assets/Common/Scripts/GameUI.cs
index 7a5f1861..9017c2ec 100644
--- a/Experimental/MultiplayerUseCases/Assets/Common/Scripts/GameUI.cs
+++ b/Experimental/MultiplayerUseCases/Assets/Common/Scripts/GameUI.cs
@@ -13,42 +13,43 @@ public class GameUI : MonoBehaviour
 
         void Start()
         {
-            Refreshlabels(NetworkManager.Singleton && (NetworkManager.Singleton.IsClient || NetworkManager.Singleton.IsServer));
-            NetworkManager.Singleton.OnClientConnectedCallback += OnClientConnectedCallback;
+            RefreshLabels(NetworkManager.Singleton && (NetworkManager.Singleton.IsClient || NetworkManager.Singleton.IsServer));
+            NetworkManager.Singleton.OnConnectionEvent += OnConnectionEvent;
             NetworkManager.Singleton.OnServerStarted += OnServerStarted;
-            NetworkManager.Singleton.OnClientDisconnectCallback += OnClientDisconnectCallback;
         }
 
         void OnDestroy()
         {
             if (NetworkManager.Singleton)
             {
-                NetworkManager.Singleton.OnClientConnectedCallback -= OnClientConnectedCallback;
+                NetworkManager.Singleton.OnConnectionEvent -= OnConnectionEvent;
                 NetworkManager.Singleton.OnServerStarted -= OnServerStarted;
-                NetworkManager.Singleton.OnClientDisconnectCallback -= OnClientDisconnectCallback;
             }
         }
 
         void OnServerStarted()
         {
-            Refreshlabels(true);
+            RefreshLabels(true);
         }
 
-        void OnClientConnectedCallback(ulong obj)
+        void OnConnectionEvent(NetworkManager networkManager, ConnectionEventData connectionEventData)
         {
-            if (NetworkManager.Singleton && NetworkManager.Singleton.IsServer)
+            if (connectionEventData.EventType == ConnectionEvent.ClientConnected)
             {
-                return; //you don't want to do actions twice when playing as a host
+                if (NetworkManager.Singleton && NetworkManager.Singleton.IsServer)
+                {
+                    return; //you don't want to do actions twice when playing as a host
+                }
+                RefreshLabels(true);
             }
-            Refreshlabels(true);
-        }
 
-        void OnClientDisconnectCallback(ulong obj)
-        {
-            Refreshlabels(false);
+            else if (connectionEventData.EventType == ConnectionEvent.ClientDisconnected)
+            {
+                    RefreshLabels(false);
+            }
         }
 
-        void Refreshlabels(bool isConnected)
+        void RefreshLabels(bool isConnected)
         {
             startupLabel.gameObject.SetActive(!isConnected);
             controlsLabel.gameObject.SetActive(isConnected);
diff --git a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetvarVsRpc/Scripts/ColorManager.cs b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetvarVsRpc/Scripts/ColorManager.cs
index 6ecf09ac..acd1f39f 100644
--- a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetvarVsRpc/Scripts/ColorManager.cs
+++ b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetvarVsRpc/Scripts/ColorManager.cs
@@ -1,7 +1,7 @@
 using Unity.Netcode.Samples.MultiplayerUseCases.Common;
 using UnityEngine;
 
-namespace Unity.Netcode.Samples.MultiplayerUseCases.NetVarVsRPC
+namespace Unity.Netcode.Samples.MultiplayerUseCases.NetVarVsRpc
 {
     /// <summary>
     /// Manages the color of a Networked object
@@ -65,11 +65,11 @@ void Update()
 
         void OnClientRequestColorChange()
         {
-            OnServerChangeColorServerRpc();
+            ServerChangeColorRpc();
         }
 
-        [ServerRpc(RequireOwnership = false)] //note: please refer to RPCs documentation to learn more about the pros and cons of the RequireOwnership parameter
-        void OnServerChangeColorServerRpc()
+        [Rpc(SendTo.Server)]
+        void ServerChangeColorRpc()
         {
             Color32 newColor = MultiplayerUseCasesUtilities.GetRandomColor();
             if (m_UseNetworkVariableForColor)
@@ -77,11 +77,11 @@ void OnServerChangeColorServerRpc()
                 m_NetworkedColor.Value = newColor;
                 return;
             }
-            OnClientNotifyColorChangedClientRpc(newColor);
+            ClientNotifyColorChangedRpc(newColor);
         }
 
-        [ClientRpc]
-        void OnClientNotifyColorChangedClientRpc(Color32 newColor)
+        [Rpc(SendTo.ClientsAndHost)]
+        void ClientNotifyColorChangedRpc(Color32 newColor)
         {
             m_Material.color = newColor;
         }
diff --git a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetvarVsRpc/Scripts/ProximityTrigger.cs b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetvarVsRpc/Scripts/ProximityTrigger.cs
index 76780d2c..a7b9ca04 100644
--- a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetvarVsRpc/Scripts/ProximityTrigger.cs
+++ b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetvarVsRpc/Scripts/ProximityTrigger.cs
@@ -1,7 +1,7 @@
 using Unity.Netcode.Samples.MultiplayerUseCases.Common;
 using UnityEngine;
 
-namespace Unity.Netcode.Samples.MultiplayerUseCases.NetVarVsRPC
+namespace Unity.Netcode.Samples.MultiplayerUseCases.NetVarVsRpc
 {
     /// <summary>
     /// Toggles an object when the local player is close enough
diff --git a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetworkVariables/Scripts/CharacterManager.cs b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetworkVariables/Scripts/CharacterManager.cs
index e3c861d5..10731eef 100644
--- a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetworkVariables/Scripts/CharacterManager.cs
+++ b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetworkVariables/Scripts/CharacterManager.cs
@@ -44,7 +44,7 @@ public override void OnNetworkSpawn()
             if (IsClient)
             {
                 /*
-                 * We call the color change method manually when we connect to ensure that our color is correctly initialized. 
+                 * We call the color change method manually when we connect to ensure that our color is correctly initialized.
                  * This is helpful for when a client joins mid-game and needs to catch up with the current state of the game.
                  */
                 OnClientCustomDataChanged(m_SyncedCustomData.Value, m_SyncedCustomData.Value);
@@ -72,7 +72,7 @@ void Update()
             if (!IsServer)
             {
                 /*
-                 * By default, only the server is allowed to change the value of NetworkVariables. 
+                 * By default, only the server is allowed to change the value of NetworkVariables.
                  * This can be changed through the NetworkVariable's constructor.
                  */
                 return;
@@ -101,7 +101,7 @@ void OnClientHealthChanged(int previousHealth, int newHealth)
         {
             m_HealthBarImage.rectTransform.localScale = new Vector3((float)newHealth / 100.0f, 1);//(float)newHealth / 100.0f;
             OnClientUpdateHealthBarColor(newHealth);
-            //note: you could use the previousHealth to play an healing/damage animation
+            //note: you could use the previousHealth to play a healing/damage animation
         }
 
         void OnClientUpdateHealthBarColor(int newHealth)
diff --git a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/ProximityChecks/Scripts/ColorManager.cs b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/ProximityChecks/Scripts/ColorManager.cs
index dfe09926..f273b0bb 100644
--- a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/ProximityChecks/Scripts/ColorManager.cs
+++ b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/ProximityChecks/Scripts/ColorManager.cs
@@ -59,11 +59,11 @@ void Update()
 
         void OnClientRequestColorChange()
         {
-            OnServerChangeColorServerRpc();
+            ServerChangeColorRpc();
         }
 
-        [ServerRpc(RequireOwnership = false)]
-        void OnServerChangeColorServerRpc()
+        [Rpc(SendTo.Server)]
+        void ServerChangeColorRpc()
         {
             m_NetworkedColor.Value = MultiplayerUseCasesUtilities.GetRandomColor();
         }
diff --git a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/RPCs/Scripts/MoodManager.cs b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/RPCs/Scripts/MoodManager.cs
index 6e4a2592..67bac6f7 100644
--- a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/RPCs/Scripts/MoodManager.cs
+++ b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/RPCs/Scripts/MoodManager.cs
@@ -36,18 +36,18 @@ void Update()
             if (m_ElapsedSecondsSinceLastChange >= m_SecondsBetweenDataChanges)
             {
                 m_ElapsedSecondsSinceLastChange = 0;
-                OnServerMoodMessageReceivedServerRpc(s_ChatMessages[Random.Range(0, s_ChatMessages.Length)]);
+                ServerMoodMessageReceivedRpc(s_ChatMessages[Random.Range(0, s_ChatMessages.Length)]);
             }
         }
 
-        [ServerRpc]
-        void OnServerMoodMessageReceivedServerRpc(string message)
+        [Rpc(SendTo.Server)]
+        void ServerMoodMessageReceivedRpc(string message)
         {
             /* Here's an example of the type of operation you could do on the server to prevent malicious actions
              * from bad actors.
              */
             string redactedMessage = OnServerFilterBadWords(message);
-            OnClientMoodMessageReceivedClientRpc(redactedMessage);
+            ClientMoodMessageReceivedRpc(redactedMessage);
         }
 
         string OnServerFilterBadWords(string message)
@@ -55,8 +55,8 @@ string OnServerFilterBadWords(string message)
             return MultiplayerUseCasesUtilities.FilterBadWords(message);
         }
 
-        [ClientRpc]
-        void OnClientMoodMessageReceivedClientRpc(string message)
+        [Rpc(SendTo.ClientsAndHost)]
+        void ClientMoodMessageReceivedRpc(string message)
         {
             if (!m_SpeechBubble)
             {
diff --git a/Experimental/MultiplayerUseCases/Packages/manifest.json b/Experimental/MultiplayerUseCases/Packages/manifest.json
index 1bab0be2..1897ef11 100644
--- a/Experimental/MultiplayerUseCases/Packages/manifest.json
+++ b/Experimental/MultiplayerUseCases/Packages/manifest.json
@@ -10,7 +10,7 @@
     "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.4.0",
     "com.unity.multiplayer.tools": "1.1.1",
-    "com.unity.netcode.gameobjects": "1.7.1",
+    "com.unity.netcode.gameobjects": "1.8.1",
     "com.unity.render-pipelines.universal": "14.0.11",
     "com.unity.test-framework": "1.1.33",
     "com.unity.textmeshpro": "3.0.6",
diff --git a/Experimental/MultiplayerUseCases/Packages/packages-lock.json b/Experimental/MultiplayerUseCases/Packages/packages-lock.json
index 29137a46..d14c3732 100644
--- a/Experimental/MultiplayerUseCases/Packages/packages-lock.json
+++ b/Experimental/MultiplayerUseCases/Packages/packages-lock.json
@@ -143,7 +143,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.netcode.gameobjects": {
-      "version": "1.7.1",
+      "version": "1.8.1",
       "depth": 0,
       "source": "registry",
       "dependencies": {
diff --git a/Experimental/MultiplayerUseCases/README.md b/Experimental/MultiplayerUseCases/README.md
index 6962b0f0..2749b24d 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.7.1-57b9d3.svg?logo=unity&color=2196F3)](https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/releases/tag/ngo%2F1.7.1)
+[![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.27)
+[![NetcodeVersion](https://img.shields.io/badge/Netcode%20Version:-1.8.1-57b9d3.svg?logo=unity&color=2196F3)](https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/releases/tag/ngo%2F1.8.1)
 <br><br>
 
 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.

From db334abbbe3cb6f9e1bd6df5afd1fff2ce0da3b7 Mon Sep 17 00:00:00 2001
From: Bastien Humeau <bastienh@unity3d.com>
Date: Wed, 29 May 2024 11:41:07 -0400
Subject: [PATCH 18/20] Fix - Optimized NetworkTransform on all networked
 prefabs in the Invaders sample [MTT-7599]  (#168)

* Optimize NetworkTransform so they do not interpolate and do not sync unecessary transform data

The server is not interpolating the ennemies position and given the game doesn't have any animation, not interpolating anything allows for the same movement feeling between clients and host.

* Further refine network transform optimizations.

* Updated changelog

* Reverting two manager prefabs that were changed inadvertently

---------

Co-authored-by: Fernando Cortez <fernando.cortez@unity3d.com>
---
 Basic/Invaders/Assets/Prefabs/bullet.prefab   | 90 +++++++++++++------
 Basic/Invaders/Assets/Prefabs/enemy1.prefab   | 88 ++++++++++++------
 Basic/Invaders/Assets/Prefabs/enemy2.prefab   | 90 +++++++++++++------
 Basic/Invaders/Assets/Prefabs/enemy3.prefab   | 90 +++++++++++++------
 .../Assets/Prefabs/enemyBullet.prefab         | 90 +++++++++++++------
 Basic/Invaders/Assets/Prefabs/player.prefab   | 71 +++++++++++----
 Basic/Invaders/Assets/Prefabs/shield.prefab   | 63 ++++++-------
 .../Invaders/Assets/Prefabs/superEnemy.prefab | 90 +++++++++++++------
 CHANGELOG.md                                  |  3 +
 9 files changed, 461 insertions(+), 214 deletions(-)

diff --git a/Basic/Invaders/Assets/Prefabs/bullet.prefab b/Basic/Invaders/Assets/Prefabs/bullet.prefab
index a15a2ae0..633874ae 100644
--- a/Basic/Invaders/Assets/Prefabs/bullet.prefab
+++ b/Basic/Invaders/Assets/Prefabs/bullet.prefab
@@ -10,10 +10,10 @@ GameObject:
   m_Component:
   - component: {fileID: 400000}
   - component: {fileID: 21200000}
+  - component: {fileID: 2859882261451710602}
   - component: {fileID: 11400000}
   - component: {fileID: 6100000}
   - component: {fileID: 5000000}
-  - component: {fileID: 2859882261451710602}
   - component: {fileID: -3163295562554932181}
   m_Layer: 0
   m_Name: bullet
@@ -29,12 +29,13 @@ 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: -2.9616375, y: 0.72005486, z: 8.037054}
   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!212 &21200000
 SpriteRenderer:
@@ -47,6 +48,7 @@ SpriteRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 0
@@ -87,6 +89,26 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!114 &2859882261451710602
+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: 3008223376
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -113,6 +135,25 @@ BoxCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ForceSendLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ForceReceiveLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ContactCaptureLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CallbackLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
   m_IsTrigger: 1
   m_UsedByEffector: 0
   m_UsedByComposite: 0
@@ -146,26 +187,16 @@ Rigidbody2D:
   m_AngularDrag: 0.05
   m_GravityScale: 0
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
   m_Interpolate: 0
   m_SleepingMode: 1
   m_CollisionDetection: 0
   m_Constraints: 0
---- !u!114 &2859882261451710602
-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
-  DontDestroyWithOwner: 0
-  AutoObjectParentSync: 1
 --- !u!114 &-3163295562554932181
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -178,18 +209,21 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  SyncPositionX: 1
+  SyncPositionX: 0
   SyncPositionY: 1
-  SyncPositionZ: 1
-  SyncRotAngleX: 1
-  SyncRotAngleY: 1
-  SyncRotAngleZ: 1
-  SyncScaleX: 1
-  SyncScaleY: 1
-  SyncScaleZ: 1
+  SyncPositionZ: 0
+  SyncRotAngleX: 0
+  SyncRotAngleY: 0
+  SyncRotAngleZ: 0
+  SyncScaleX: 0
+  SyncScaleY: 0
+  SyncScaleZ: 0
   PositionThreshold: 0.001
   RotAngleThreshold: 0.01
   ScaleThreshold: 0.01
+  UseQuaternionSynchronization: 0
+  UseQuaternionCompression: 0
+  UseHalfFloatPrecision: 0
   InLocalSpace: 0
-  Interpolate: 1
-  CanCommitToTransform: 0
+  Interpolate: 0
+  SlerpPosition: 0
diff --git a/Basic/Invaders/Assets/Prefabs/enemy1.prefab b/Basic/Invaders/Assets/Prefabs/enemy1.prefab
index b4bb95d9..47607024 100644
--- a/Basic/Invaders/Assets/Prefabs/enemy1.prefab
+++ b/Basic/Invaders/Assets/Prefabs/enemy1.prefab
@@ -10,11 +10,11 @@ GameObject:
   m_Component:
   - component: {fileID: 400000}
   - component: {fileID: 21200000}
+  - component: {fileID: 2037077820506562951}
   - component: {fileID: 11400000}
   - component: {fileID: 6100000}
   - component: {fileID: 5000000}
   - component: {fileID: 4223722966607089368}
-  - component: {fileID: 2037077820506562951}
   m_Layer: 0
   m_Name: enemy1
   m_TagString: Untagged
@@ -29,13 +29,13 @@ 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: -2.521718, y: 0.97297525, z: 2.9156828}
   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!212 &21200000
 SpriteRenderer:
@@ -89,6 +89,27 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!114 &2037077820506562951
+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: 416377817
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -114,6 +135,25 @@ BoxCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ForceSendLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ForceReceiveLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ContactCaptureLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CallbackLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
@@ -147,6 +187,12 @@ Rigidbody2D:
   m_AngularDrag: 0.05
   m_GravityScale: 0
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
   m_Interpolate: 0
   m_SleepingMode: 1
   m_CollisionDetection: 0
@@ -163,34 +209,22 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  UseUnreliableDeltas: 0
   SyncPositionX: 1
   SyncPositionY: 1
-  SyncPositionZ: 1
-  SyncRotAngleX: 1
-  SyncRotAngleY: 1
-  SyncRotAngleZ: 1
-  SyncScaleX: 1
-  SyncScaleY: 1
-  SyncScaleZ: 1
+  SyncPositionZ: 0
+  SyncRotAngleX: 0
+  SyncRotAngleY: 0
+  SyncRotAngleZ: 0
+  SyncScaleX: 0
+  SyncScaleY: 0
+  SyncScaleZ: 0
   PositionThreshold: 0
   RotAngleThreshold: 0
   ScaleThreshold: 0
+  UseQuaternionSynchronization: 0
+  UseQuaternionCompression: 0
+  UseHalfFloatPrecision: 0
   InLocalSpace: 0
-  Interpolate: 1
-  CanCommitToTransform: 0
---- !u!114 &2037077820506562951
-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
-  DontDestroyWithOwner: 0
-  AutoObjectParentSync: 1
+  Interpolate: 0
+  SlerpPosition: 0
diff --git a/Basic/Invaders/Assets/Prefabs/enemy2.prefab b/Basic/Invaders/Assets/Prefabs/enemy2.prefab
index e86bcfee..0c405858 100644
--- a/Basic/Invaders/Assets/Prefabs/enemy2.prefab
+++ b/Basic/Invaders/Assets/Prefabs/enemy2.prefab
@@ -10,11 +10,11 @@ GameObject:
   m_Component:
   - component: {fileID: 400000}
   - component: {fileID: 21200000}
+  - component: {fileID: 1361474663871475650}
   - component: {fileID: 11400000}
   - component: {fileID: 6100000}
   - component: {fileID: 5000000}
   - component: {fileID: 8401436849663568366}
-  - component: {fileID: 1361474663871475650}
   m_Layer: 0
   m_Name: enemy2
   m_TagString: Untagged
@@ -29,12 +29,13 @@ 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: -3.3369913, y: 1.6158211, z: 5.338147}
   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!212 &21200000
 SpriteRenderer:
@@ -47,6 +48,7 @@ SpriteRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 0
@@ -87,6 +89,27 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!114 &1361474663871475650
+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: 3854485402
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -112,6 +135,25 @@ BoxCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ForceSendLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ForceReceiveLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ContactCaptureLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CallbackLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
@@ -145,6 +187,12 @@ Rigidbody2D:
   m_AngularDrag: 0.05
   m_GravityScale: 0
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
   m_Interpolate: 0
   m_SleepingMode: 1
   m_CollisionDetection: 0
@@ -161,34 +209,22 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  UseUnreliableDeltas: 0
   SyncPositionX: 1
   SyncPositionY: 1
-  SyncPositionZ: 1
-  SyncRotAngleX: 1
-  SyncRotAngleY: 1
-  SyncRotAngleZ: 1
-  SyncScaleX: 1
-  SyncScaleY: 1
-  SyncScaleZ: 1
+  SyncPositionZ: 0
+  SyncRotAngleX: 0
+  SyncRotAngleY: 0
+  SyncRotAngleZ: 0
+  SyncScaleX: 0
+  SyncScaleY: 0
+  SyncScaleZ: 0
   PositionThreshold: 0
   RotAngleThreshold: 0
   ScaleThreshold: 0
+  UseQuaternionSynchronization: 0
+  UseQuaternionCompression: 0
+  UseHalfFloatPrecision: 0
   InLocalSpace: 0
-  Interpolate: 1
-  CanCommitToTransform: 0
---- !u!114 &1361474663871475650
-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
-  DontDestroyWithOwner: 0
-  AutoObjectParentSync: 1
+  Interpolate: 0
+  SlerpPosition: 0
diff --git a/Basic/Invaders/Assets/Prefabs/enemy3.prefab b/Basic/Invaders/Assets/Prefabs/enemy3.prefab
index f34820bb..d313ec52 100644
--- a/Basic/Invaders/Assets/Prefabs/enemy3.prefab
+++ b/Basic/Invaders/Assets/Prefabs/enemy3.prefab
@@ -10,11 +10,11 @@ GameObject:
   m_Component:
   - component: {fileID: 400000}
   - component: {fileID: 21200000}
+  - component: {fileID: 7651551376209856180}
   - component: {fileID: 11400000}
   - component: {fileID: 6100000}
   - component: {fileID: 5000000}
   - component: {fileID: 8349640660830732066}
-  - component: {fileID: 7651551376209856180}
   m_Layer: 0
   m_Name: enemy3
   m_TagString: Untagged
@@ -29,12 +29,13 @@ 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: -2.877448, y: 1.0368326, z: 3.9234695}
   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!212 &21200000
 SpriteRenderer:
@@ -47,6 +48,7 @@ SpriteRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 0
@@ -87,6 +89,27 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!114 &7651551376209856180
+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: 3432298371
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -112,6 +135,25 @@ BoxCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ForceSendLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ForceReceiveLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ContactCaptureLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CallbackLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
@@ -145,6 +187,12 @@ Rigidbody2D:
   m_AngularDrag: 0.05
   m_GravityScale: 0
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
   m_Interpolate: 0
   m_SleepingMode: 1
   m_CollisionDetection: 0
@@ -161,34 +209,22 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  UseUnreliableDeltas: 0
   SyncPositionX: 1
   SyncPositionY: 1
-  SyncPositionZ: 1
-  SyncRotAngleX: 1
-  SyncRotAngleY: 1
-  SyncRotAngleZ: 1
-  SyncScaleX: 1
-  SyncScaleY: 1
-  SyncScaleZ: 1
+  SyncPositionZ: 0
+  SyncRotAngleX: 0
+  SyncRotAngleY: 0
+  SyncRotAngleZ: 0
+  SyncScaleX: 0
+  SyncScaleY: 0
+  SyncScaleZ: 0
   PositionThreshold: 0.001
   RotAngleThreshold: 0.01
   ScaleThreshold: 0.01
+  UseQuaternionSynchronization: 0
+  UseQuaternionCompression: 0
+  UseHalfFloatPrecision: 0
   InLocalSpace: 0
-  Interpolate: 1
-  CanCommitToTransform: 0
---- !u!114 &7651551376209856180
-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
-  DontDestroyWithOwner: 0
-  AutoObjectParentSync: 1
+  Interpolate: 0
+  SlerpPosition: 0
diff --git a/Basic/Invaders/Assets/Prefabs/enemyBullet.prefab b/Basic/Invaders/Assets/Prefabs/enemyBullet.prefab
index 1940b04f..115f17fe 100644
--- a/Basic/Invaders/Assets/Prefabs/enemyBullet.prefab
+++ b/Basic/Invaders/Assets/Prefabs/enemyBullet.prefab
@@ -11,9 +11,9 @@ GameObject:
   - component: {fileID: 400000}
   - component: {fileID: 21200000}
   - component: {fileID: 6100000}
+  - component: {fileID: 2336033219118315817}
   - component: {fileID: 11400000}
   - component: {fileID: 5000000}
-  - component: {fileID: 2336033219118315817}
   - component: {fileID: 5836440591138289839}
   m_Layer: 0
   m_Name: enemyBullet
@@ -29,12 +29,13 @@ 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: -3.3057652, y: 1.3140826, z: 6.5037885}
   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!212 &21200000
 SpriteRenderer:
@@ -47,6 +48,7 @@ SpriteRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 0
@@ -97,6 +99,25 @@ BoxCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ForceSendLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ForceReceiveLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ContactCaptureLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CallbackLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
   m_IsTrigger: 1
   m_UsedByEffector: 0
   m_UsedByComposite: 0
@@ -113,6 +134,26 @@ BoxCollider2D:
   serializedVersion: 2
   m_Size: {x: 0.64, y: 0.64}
   m_EdgeRadius: 0
+--- !u!114 &2336033219118315817
+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: 3981087544
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -145,26 +186,16 @@ Rigidbody2D:
   m_AngularDrag: 0.05
   m_GravityScale: 0
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
   m_Interpolate: 0
   m_SleepingMode: 1
   m_CollisionDetection: 0
   m_Constraints: 0
---- !u!114 &2336033219118315817
-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
-  DontDestroyWithOwner: 0
-  AutoObjectParentSync: 1
 --- !u!114 &5836440591138289839
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -177,18 +208,21 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  SyncPositionX: 1
+  SyncPositionX: 0
   SyncPositionY: 1
-  SyncPositionZ: 1
-  SyncRotAngleX: 1
-  SyncRotAngleY: 1
-  SyncRotAngleZ: 1
-  SyncScaleX: 1
-  SyncScaleY: 1
-  SyncScaleZ: 1
+  SyncPositionZ: 0
+  SyncRotAngleX: 0
+  SyncRotAngleY: 0
+  SyncRotAngleZ: 0
+  SyncScaleX: 0
+  SyncScaleY: 0
+  SyncScaleZ: 0
   PositionThreshold: 0.001
   RotAngleThreshold: 0.01
   ScaleThreshold: 0.01
+  UseQuaternionSynchronization: 0
+  UseQuaternionCompression: 0
+  UseHalfFloatPrecision: 0
   InLocalSpace: 0
-  Interpolate: 1
-  CanCommitToTransform: 0
+  Interpolate: 0
+  SlerpPosition: 0
diff --git a/Basic/Invaders/Assets/Prefabs/player.prefab b/Basic/Invaders/Assets/Prefabs/player.prefab
index 9aa0d647..7eec7f0c 100644
--- a/Basic/Invaders/Assets/Prefabs/player.prefab
+++ b/Basic/Invaders/Assets/Prefabs/player.prefab
@@ -10,10 +10,10 @@ GameObject:
   m_Component:
   - component: {fileID: 400000}
   - component: {fileID: 21200000}
+  - component: {fileID: 5053919295125167455}
   - component: {fileID: 11400000}
   - component: {fileID: 6100000}
   - component: {fileID: 5000000}
-  - component: {fileID: 5053919295125167455}
   - component: {fileID: 2800302518702725854}
   m_Layer: 0
   m_Name: player
@@ -29,13 +29,13 @@ 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: -3.2296677, y: 1.0967851, z: 6.24889}
   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!212 &21200000
 SpriteRenderer:
@@ -89,6 +89,26 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!114 &5053919295125167455
+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: 915374853
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -121,6 +141,25 @@ BoxCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ForceSendLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ForceReceiveLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ContactCaptureLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CallbackLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
   m_IsTrigger: 1
   m_UsedByEffector: 0
   m_UsedByComposite: 0
@@ -154,26 +193,16 @@ Rigidbody2D:
   m_AngularDrag: 0.05
   m_GravityScale: 0
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
   m_Interpolate: 0
   m_SleepingMode: 1
   m_CollisionDetection: 0
   m_Constraints: 0
---- !u!114 &5053919295125167455
-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
-  DontDestroyWithOwner: 0
-  AutoObjectParentSync: 1
 --- !u!114 &2800302518702725854
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -198,5 +227,9 @@ MonoBehaviour:
   PositionThreshold: 0.001
   RotAngleThreshold: 0.01
   ScaleThreshold: 0.01
+  UseQuaternionSynchronization: 0
+  UseQuaternionCompression: 0
+  UseHalfFloatPrecision: 0
   InLocalSpace: 0
-  Interpolate: 1
+  Interpolate: 0
+  SlerpPosition: 0
diff --git a/Basic/Invaders/Assets/Prefabs/shield.prefab b/Basic/Invaders/Assets/Prefabs/shield.prefab
index 9864a41a..b3936691 100644
--- a/Basic/Invaders/Assets/Prefabs/shield.prefab
+++ b/Basic/Invaders/Assets/Prefabs/shield.prefab
@@ -14,7 +14,6 @@ GameObject:
   - component: {fileID: 6100000}
   - component: {fileID: 11400000}
   - component: {fileID: 6564576217164106930}
-  - component: {fileID: 8844355272195160781}
   m_Layer: 0
   m_Name: shield
   m_TagString: Untagged
@@ -29,12 +28,13 @@ 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: -2.8967056, y: 0.35681152, z: 7.338209}
   m_LocalScale: {x: 0.42991, y: 0.42991, z: 0.42991}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &21200000
 SpriteRenderer:
@@ -47,6 +47,7 @@ SpriteRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 0
@@ -104,6 +105,12 @@ Rigidbody2D:
   m_AngularDrag: 0.05
   m_GravityScale: 0
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
   m_Interpolate: 0
   m_SleepingMode: 1
   m_CollisionDetection: 0
@@ -118,6 +125,25 @@ BoxCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ForceSendLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ForceReceiveLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ContactCaptureLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CallbackLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
   m_IsTrigger: 1
   m_UsedByEffector: 0
   m_UsedByComposite: 0
@@ -158,34 +184,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 951099334
+  GlobalObjectIdHash: 3914002580
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
---- !u!114 &8844355272195160781
-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: e96cb6065543e43c4a752faaa1468eb1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  SyncPositionX: 1
-  SyncPositionY: 1
-  SyncPositionZ: 1
-  SyncRotAngleX: 1
-  SyncRotAngleY: 1
-  SyncRotAngleZ: 1
-  SyncScaleX: 1
-  SyncScaleY: 1
-  SyncScaleZ: 1
-  PositionThreshold: 0.001
-  RotAngleThreshold: 0.01
-  ScaleThreshold: 0.01
-  InLocalSpace: 0
-  Interpolate: 1
-  CanCommitToTransform: 0
diff --git a/Basic/Invaders/Assets/Prefabs/superEnemy.prefab b/Basic/Invaders/Assets/Prefabs/superEnemy.prefab
index 8988a409..ac87fa81 100644
--- a/Basic/Invaders/Assets/Prefabs/superEnemy.prefab
+++ b/Basic/Invaders/Assets/Prefabs/superEnemy.prefab
@@ -11,11 +11,11 @@ GameObject:
   - component: {fileID: 400000}
   - component: {fileID: 21200000}
   - component: {fileID: 5000000}
+  - component: {fileID: 3955316467729786863}
   - component: {fileID: 11400006}
   - component: {fileID: 11400004}
   - component: {fileID: 6100000}
   - component: {fileID: 8984612552865464625}
-  - component: {fileID: 3955316467729786863}
   m_Layer: 0
   m_Name: superEnemy
   m_TagString: Untagged
@@ -30,12 +30,13 @@ 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: 1.2698746, y: 0.8354411, z: -1.6262951}
   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!212 &21200000
 SpriteRenderer:
@@ -48,6 +49,7 @@ SpriteRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 0
@@ -105,10 +107,36 @@ Rigidbody2D:
   m_AngularDrag: 0.05
   m_GravityScale: 0
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
   m_Interpolate: 0
   m_SleepingMode: 1
   m_CollisionDetection: 0
   m_Constraints: 0
+--- !u!114 &3955316467729786863
+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: 1887726101
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1
 --- !u!114 &11400006
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -147,6 +175,25 @@ BoxCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ForceSendLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ForceReceiveLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ContactCaptureLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CallbackLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
@@ -176,33 +223,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   SyncPositionX: 1
-  SyncPositionY: 1
-  SyncPositionZ: 1
-  SyncRotAngleX: 1
-  SyncRotAngleY: 1
-  SyncRotAngleZ: 1
-  SyncScaleX: 1
-  SyncScaleY: 1
-  SyncScaleZ: 1
+  SyncPositionY: 0
+  SyncPositionZ: 0
+  SyncRotAngleX: 0
+  SyncRotAngleY: 0
+  SyncRotAngleZ: 0
+  SyncScaleX: 0
+  SyncScaleY: 0
+  SyncScaleZ: 0
   PositionThreshold: 0.001
   RotAngleThreshold: 0.01
   ScaleThreshold: 0.01
+  UseQuaternionSynchronization: 0
+  UseQuaternionCompression: 0
+  UseHalfFloatPrecision: 0
   InLocalSpace: 0
-  Interpolate: 1
-  CanCommitToTransform: 0
---- !u!114 &3955316467729786863
-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
-  DontDestroyWithOwner: 0
-  AutoObjectParentSync: 1
+  Interpolate: 0
+  SlerpPosition: 0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e54c2a43..2e98f40a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,6 +65,9 @@
 - Upgraded to IDE Rider v3.0.28 (#166)
 - Upgraded to Unity 2022.3.27f1 (#169)
 
+#### Fixed
+- Optimized NetworkTransform on all networked prefabs so the Clients objects movements are closer to the Host ones (#168)
+
 ## [1.5.0] 2023-12-15
 
 ### Bitesize Samples Repository

From 36e240b77ee971e0c94bac8f1a67a3b3d3d5c2ba Mon Sep 17 00:00:00 2001
From: Bastien Humeau <bastienh@unity3d.com>
Date: Wed, 29 May 2024 15:01:36 -0400
Subject: [PATCH 19/20] Upgrade Invaders to use Netcode For Gameobject 1.8.1
 [MTT-8503] (#172)

* Upgraded NGO to 1.8.1 in manifest and readme.

* Changed ClientRpc and ServerRpc attributes to the new RpcAttribute

* Changed OnClientConnectedCallback registration to use the new OnConnectionEvent

* Changing spawn methods to use InstantiateAndSpawn

* Added changelog entry.

* Renamed Rpc methods properly.

* ConnectionEvent renaming to make it clear it is executed only on the server side

---------

Co-authored-by: Fernando Cortez <fernando.cortez@unity3d.com>
---
 .../Prefabs/Invaders Game Manager.prefab      | 56 +++++++++-------
 Basic/Invaders/Assets/Prefabs/enemy1.prefab   | 47 +++++++-------
 Basic/Invaders/Assets/Prefabs/enemy2.prefab   | 45 ++++++-------
 Basic/Invaders/Assets/Prefabs/enemy3.prefab   | 45 ++++++-------
 Basic/Invaders/Assets/Prefabs/player.prefab   | 47 +++++++-------
 .../Invaders/Assets/Prefabs/superEnemy.prefab | 47 +++++++-------
 Basic/Invaders/Assets/Scripts/EnemyAgent.cs   |  8 ++-
 Basic/Invaders/Assets/Scripts/EnemyBullet.cs  |  6 +-
 Basic/Invaders/Assets/Scripts/InvadersGame.cs | 64 ++++++++++---------
 Basic/Invaders/Assets/Scripts/LobbyControl.cs | 40 ++++++------
 Basic/Invaders/Assets/Scripts/PlayerBullet.cs |  8 +--
 .../Invaders/Assets/Scripts/PlayerControl.cs  | 24 ++++---
 Basic/Invaders/Packages/manifest.json         |  2 +-
 Basic/Invaders/Packages/packages-lock.json    |  2 +-
 Basic/Invaders/README.md                      |  2 +-
 CHANGELOG.md                                  |  4 ++
 16 files changed, 238 insertions(+), 209 deletions(-)

diff --git a/Basic/Invaders/Assets/Prefabs/Invaders Game Manager.prefab b/Basic/Invaders/Assets/Prefabs/Invaders Game Manager.prefab
index 3b9b380f..f09cf54f 100644
--- a/Basic/Invaders/Assets/Prefabs/Invaders Game Manager.prefab	
+++ b/Basic/Invaders/Assets/Prefabs/Invaders Game Manager.prefab	
@@ -9,8 +9,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4266113290039088506}
-  - component: {fileID: 4266113290039088507}
   - component: {fileID: 2756959678467573149}
+  - component: {fileID: 4266113290039088507}
   m_Layer: 0
   m_Name: Invaders Game Manager
   m_TagString: Untagged
@@ -25,14 +25,35 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4266113290039088508}
+  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!114 &2756959678467573149
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4266113290039088508}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  GlobalObjectIdHash: 2783302607
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1
 --- !u!114 &4266113290039088507
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -45,11 +66,16 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d643b609c6a71c54984c1ad454faa28b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  enemy1Prefab: {fileID: 100000, guid: 43ae6ad1bdadd0747811bb7a00740c2c, type: 3}
-  enemy2Prefab: {fileID: 100000, guid: 38a8441efb2d6d245adbf08f08705374, type: 3}
-  enemy3Prefab: {fileID: 100000, guid: aa50d36274d0dfc4faff2c69820b3711, type: 3}
-  superEnemyPrefab: {fileID: 100000, guid: e811e4fb062e31444aaf36dbec5de77c, type: 3}
-  shieldPrefab: {fileID: 100000, guid: b990a6e6dcf54b646a7397028fed6045, type: 3}
+  enemy1Prefab: {fileID: 2037077820506562951, guid: 43ae6ad1bdadd0747811bb7a00740c2c,
+    type: 3}
+  enemy2Prefab: {fileID: 1361474663871475650, guid: 38a8441efb2d6d245adbf08f08705374,
+    type: 3}
+  enemy3Prefab: {fileID: 7651551376209856180, guid: aa50d36274d0dfc4faff2c69820b3711,
+    type: 3}
+  superEnemyPrefab: {fileID: 3955316467729786863, guid: e811e4fb062e31444aaf36dbec5de77c,
+    type: 3}
+  shieldPrefab: {fileID: 6564576217164106930, guid: b990a6e6dcf54b646a7397028fed6045,
+    type: 3}
   gameTimerText: {fileID: 0}
   scoreText: {fileID: 0}
   livesText: {fileID: 0}
@@ -61,19 +87,3 @@ MonoBehaviour:
   m_EnemyMovingDirection:
     m_InternalValue: 0.3
   m_RandomThresholdForSaucerCreation: 0.92
---- !u!114 &2756959678467573149
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4266113290039088508}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 951099334
-  AlwaysReplicateAsRoot: 0
-  DontDestroyWithOwner: 0
-  AutoObjectParentSync: 1
diff --git a/Basic/Invaders/Assets/Prefabs/enemy1.prefab b/Basic/Invaders/Assets/Prefabs/enemy1.prefab
index 47607024..ec836fb7 100644
--- a/Basic/Invaders/Assets/Prefabs/enemy1.prefab
+++ b/Basic/Invaders/Assets/Prefabs/enemy1.prefab
@@ -10,11 +10,11 @@ GameObject:
   m_Component:
   - component: {fileID: 400000}
   - component: {fileID: 21200000}
-  - component: {fileID: 2037077820506562951}
   - component: {fileID: 11400000}
   - component: {fileID: 6100000}
   - component: {fileID: 5000000}
   - component: {fileID: 4223722966607089368}
+  - component: {fileID: 2037077820506562951}
   m_Layer: 0
   m_Name: enemy1
   m_TagString: Untagged
@@ -89,27 +89,6 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
---- !u!114 &2037077820506562951
-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: 416377817
-  InScenePlacedSourceGlobalObjectIdHash: 0
-  AlwaysReplicateAsRoot: 0
-  SynchronizeTransform: 1
-  ActiveSceneSynchronization: 0
-  SceneMigrationSynchronization: 1
-  SpawnWithObservers: 1
-  DontDestroyWithOwner: 0
-  AutoObjectParentSync: 1
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -123,7 +102,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   score: 10
-  bulletPrefab: {fileID: 100000, guid: ac6ffb0923d0f7448852a32312a0263c, type: 3}
+  bulletPrefab: {fileID: 2336033219118315817, guid: ac6ffb0923d0f7448852a32312a0263c,
+    type: 3}
   GraceShootingPeriod: 1
 --- !u!61 &6100000
 BoxCollider2D:
@@ -228,3 +208,24 @@ MonoBehaviour:
   InLocalSpace: 0
   Interpolate: 0
   SlerpPosition: 0
+--- !u!114 &2037077820506562951
+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: 416377817
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1
diff --git a/Basic/Invaders/Assets/Prefabs/enemy2.prefab b/Basic/Invaders/Assets/Prefabs/enemy2.prefab
index 0c405858..0116df89 100644
--- a/Basic/Invaders/Assets/Prefabs/enemy2.prefab
+++ b/Basic/Invaders/Assets/Prefabs/enemy2.prefab
@@ -89,27 +89,6 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
---- !u!114 &1361474663871475650
-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: 3854485402
-  InScenePlacedSourceGlobalObjectIdHash: 0
-  AlwaysReplicateAsRoot: 0
-  SynchronizeTransform: 1
-  ActiveSceneSynchronization: 0
-  SceneMigrationSynchronization: 1
-  SpawnWithObservers: 1
-  DontDestroyWithOwner: 0
-  AutoObjectParentSync: 1
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -123,7 +102,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   score: 20
-  bulletPrefab: {fileID: 100000, guid: ac6ffb0923d0f7448852a32312a0263c, type: 3}
+  bulletPrefab: {fileID: 2336033219118315817, guid: ac6ffb0923d0f7448852a32312a0263c,
+    type: 3}
   GraceShootingPeriod: 1
 --- !u!61 &6100000
 BoxCollider2D:
@@ -228,3 +208,24 @@ MonoBehaviour:
   InLocalSpace: 0
   Interpolate: 0
   SlerpPosition: 0
+--- !u!114 &1361474663871475650
+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: 3854485402
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1
diff --git a/Basic/Invaders/Assets/Prefabs/enemy3.prefab b/Basic/Invaders/Assets/Prefabs/enemy3.prefab
index d313ec52..fed2aca6 100644
--- a/Basic/Invaders/Assets/Prefabs/enemy3.prefab
+++ b/Basic/Invaders/Assets/Prefabs/enemy3.prefab
@@ -89,27 +89,6 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
---- !u!114 &7651551376209856180
-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: 3432298371
-  InScenePlacedSourceGlobalObjectIdHash: 0
-  AlwaysReplicateAsRoot: 0
-  SynchronizeTransform: 1
-  ActiveSceneSynchronization: 0
-  SceneMigrationSynchronization: 1
-  SpawnWithObservers: 1
-  DontDestroyWithOwner: 0
-  AutoObjectParentSync: 1
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -123,7 +102,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   score: 30
-  bulletPrefab: {fileID: 100000, guid: ac6ffb0923d0f7448852a32312a0263c, type: 3}
+  bulletPrefab: {fileID: 2336033219118315817, guid: ac6ffb0923d0f7448852a32312a0263c,
+    type: 3}
   GraceShootingPeriod: 1
 --- !u!61 &6100000
 BoxCollider2D:
@@ -228,3 +208,24 @@ MonoBehaviour:
   InLocalSpace: 0
   Interpolate: 0
   SlerpPosition: 0
+--- !u!114 &7651551376209856180
+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: 3432298371
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1
diff --git a/Basic/Invaders/Assets/Prefabs/player.prefab b/Basic/Invaders/Assets/Prefabs/player.prefab
index 7eec7f0c..90456e79 100644
--- a/Basic/Invaders/Assets/Prefabs/player.prefab
+++ b/Basic/Invaders/Assets/Prefabs/player.prefab
@@ -10,10 +10,10 @@ GameObject:
   m_Component:
   - component: {fileID: 400000}
   - component: {fileID: 21200000}
-  - component: {fileID: 5053919295125167455}
   - component: {fileID: 11400000}
   - component: {fileID: 6100000}
   - component: {fileID: 5000000}
+  - component: {fileID: 5053919295125167455}
   - component: {fileID: 2800302518702725854}
   m_Layer: 0
   m_Name: player
@@ -89,26 +89,6 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
---- !u!114 &5053919295125167455
-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: 915374853
-  AlwaysReplicateAsRoot: 0
-  SynchronizeTransform: 1
-  ActiveSceneSynchronization: 0
-  SceneMigrationSynchronization: 1
-  SpawnWithObservers: 1
-  DontDestroyWithOwner: 0
-  AutoObjectParentSync: 1
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -121,7 +101,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 74fc8e136514c41458e083092b30afed, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  bulletPrefab: {fileID: 100000, guid: 6dfb311828493c3409e0f7973872052e, type: 3}
+  bulletPrefab: {fileID: 2859882261451710602, guid: 6dfb311828493c3409e0f7973872052e,
+    type: 3}
   m_MoveSpeed: 4.5
   m_Lives:
     m_InternalValue: 3
@@ -203,6 +184,27 @@ Rigidbody2D:
   m_SleepingMode: 1
   m_CollisionDetection: 0
   m_Constraints: 0
+--- !u!114 &5053919295125167455
+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: 915374853
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1
 --- !u!114 &2800302518702725854
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -215,6 +217,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: df2868252ab5c4d1da357e8f11f1b524, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  UseUnreliableDeltas: 0
   SyncPositionX: 1
   SyncPositionY: 0
   SyncPositionZ: 0
diff --git a/Basic/Invaders/Assets/Prefabs/superEnemy.prefab b/Basic/Invaders/Assets/Prefabs/superEnemy.prefab
index ac87fa81..0e206d8d 100644
--- a/Basic/Invaders/Assets/Prefabs/superEnemy.prefab
+++ b/Basic/Invaders/Assets/Prefabs/superEnemy.prefab
@@ -11,11 +11,11 @@ GameObject:
   - component: {fileID: 400000}
   - component: {fileID: 21200000}
   - component: {fileID: 5000000}
-  - component: {fileID: 3955316467729786863}
   - component: {fileID: 11400006}
   - component: {fileID: 11400004}
   - component: {fileID: 6100000}
   - component: {fileID: 8984612552865464625}
+  - component: {fileID: 3955316467729786863}
   m_Layer: 0
   m_Name: superEnemy
   m_TagString: Untagged
@@ -117,26 +117,6 @@ Rigidbody2D:
   m_SleepingMode: 1
   m_CollisionDetection: 0
   m_Constraints: 0
---- !u!114 &3955316467729786863
-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: 1887726101
-  AlwaysReplicateAsRoot: 0
-  SynchronizeTransform: 1
-  ActiveSceneSynchronization: 0
-  SceneMigrationSynchronization: 1
-  SpawnWithObservers: 1
-  DontDestroyWithOwner: 0
-  AutoObjectParentSync: 1
 --- !u!114 &11400006
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -150,7 +130,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   score: 75
-  bulletPrefab: {fileID: 100000, guid: ac6ffb0923d0f7448852a32312a0263c, type: 3}
+  bulletPrefab: {fileID: 2336033219118315817, guid: ac6ffb0923d0f7448852a32312a0263c,
+    type: 3}
   GraceShootingPeriod: 1
 --- !u!114 &11400004
 MonoBehaviour:
@@ -222,6 +203,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  UseUnreliableDeltas: 0
   SyncPositionX: 1
   SyncPositionY: 0
   SyncPositionZ: 0
@@ -240,3 +222,24 @@ MonoBehaviour:
   InLocalSpace: 0
   Interpolate: 0
   SlerpPosition: 0
+--- !u!114 &3955316467729786863
+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: 1887726101
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1
diff --git a/Basic/Invaders/Assets/Scripts/EnemyAgent.cs b/Basic/Invaders/Assets/Scripts/EnemyAgent.cs
index 2cb398f5..2993ba95 100644
--- a/Basic/Invaders/Assets/Scripts/EnemyAgent.cs
+++ b/Basic/Invaders/Assets/Scripts/EnemyAgent.cs
@@ -1,4 +1,5 @@
 using System;
+using Unity.Mathematics;
 using Unity.Netcode;
 using UnityEngine;
 using UnityEngine.Assertions;
@@ -10,7 +11,7 @@ public class EnemyAgent : NetworkBehaviour
     private const float k_ShootTimer = 1.25f;
     [Header("Enemy Settings")]
     public int score = 50;
-    public GameObject bulletPrefab;
+    public NetworkObject bulletPrefab;
     public float GraceShootingPeriod = 1.0f; // A period of time in which the enemy will not shoot at the start
 
     public bool canShoot { get; set; }
@@ -80,8 +81,9 @@ private void Update()
 
     private void SpawnBullet()
     {
-        var myBullet = Instantiate(bulletPrefab, transform.position - Vector3.up, Quaternion.identity);
-        myBullet.GetComponent<NetworkObject>().Spawn();
+        bulletPrefab.InstantiateAndSpawn(NetworkManager.Singleton,
+            position: transform.position - Vector3.up,
+            rotation: quaternion.identity);
     }
 
     private void OnTriggerEnter2D(Collider2D collider)
diff --git a/Basic/Invaders/Assets/Scripts/EnemyBullet.cs b/Basic/Invaders/Assets/Scripts/EnemyBullet.cs
index 67269802..5bbf2513 100644
--- a/Basic/Invaders/Assets/Scripts/EnemyBullet.cs
+++ b/Basic/Invaders/Assets/Scripts/EnemyBullet.cs
@@ -74,15 +74,15 @@ private void OnTriggerEnter2D(Collider2D collider)
         var hitShield = collider.gameObject.GetComponent<Shield>();
         if (hitShield != null)
         {
-            SpawnExplosionVFXClientRpc(transform.position, Quaternion.identity);
+            ClientSpawnExplosionVFXRpc(transform.position, Quaternion.identity);
 
             Destroy(hitShield.gameObject);
             NetworkObject.Despawn();
         }
     }
 
-    [ClientRpc]
-    void SpawnExplosionVFXClientRpc(Vector3 spawnPosition, Quaternion spawnRotation)
+    [Rpc(SendTo.ClientsAndHost)]
+    void ClientSpawnExplosionVFXRpc(Vector3 spawnPosition, Quaternion spawnRotation)
     {
         Instantiate(m_ShieldExplosionParticle, spawnPosition, spawnRotation);
     }
diff --git a/Basic/Invaders/Assets/Scripts/InvadersGame.cs b/Basic/Invaders/Assets/Scripts/InvadersGame.cs
index 1f4113f4..c94635e5 100644
--- a/Basic/Invaders/Assets/Scripts/InvadersGame.cs
+++ b/Basic/Invaders/Assets/Scripts/InvadersGame.cs
@@ -39,11 +39,11 @@ public class InvadersGame : NetworkBehaviour
     private const float k_BottomBoundaryOffset = 1.25f;
 
     [Header("Prefab settings")]
-    public GameObject enemy1Prefab;
-    public GameObject enemy2Prefab;
-    public GameObject enemy3Prefab;
-    public GameObject superEnemyPrefab;
-    public GameObject shieldPrefab;
+    public NetworkObject enemy1Prefab;
+    public NetworkObject enemy2Prefab;
+    public NetworkObject enemy3Prefab;
+    public NetworkObject superEnemyPrefab;
+    public NetworkObject shieldPrefab;
 
     [Header("UI Settings")]
     public TMP_Text gameTimerText;
@@ -82,7 +82,7 @@ public class InvadersGame : NetworkBehaviour
     // the timer should only be synced at the beginning
     // and then let the client update it in a predictive manner
     private bool m_ReplicatedTimeSent = false;
-    private GameObject m_Saucer;
+    private NetworkObject m_Saucer;
     private List<Shield> m_Shields = new List<Shield>();
     private float m_TimeRemaining;
 
@@ -146,9 +146,9 @@ public override void OnNetworkDespawn()
         {
             m_Enemies.Clear();
             m_Shields.Clear();
-        }
 
-        NetworkManager.Singleton.OnClientConnectedCallback -= OnClientConnected;
+            NetworkManager.Singleton.OnConnectionEvent -= ServerOnConnectionEvent;
+        }
     }
 
     internal static event Action OnSingletonReady;
@@ -187,18 +187,21 @@ public override void OnNetworkSpawn()
 
         if (IsServer)
         {
-            NetworkManager.Singleton.OnClientConnectedCallback += OnClientConnected;
+            NetworkManager.Singleton.OnConnectionEvent += ServerOnConnectionEvent;
         }
 
         base.OnNetworkSpawn();
     }
 
-    private void OnClientConnected(ulong clientId)
+    private void ServerOnConnectionEvent(NetworkManager networkManager, ConnectionEventData connectionEventData)
     {
+        if (connectionEventData.EventType != ConnectionEvent.ClientConnected)
+            return;
+
         if (m_ReplicatedTimeSent)
         {
             // Send the RPC only to the newly connected client
-            SetReplicatedTimeRemainingClientRPC(m_TimeRemaining, new ClientRpcParams { Send = new ClientRpcSendParams { TargetClientIds = new List<ulong>() { clientId } } });
+            ClientSetReplicatedTimeRemainingRpc(m_TimeRemaining, RpcTarget.Single(connectionEventData.ClientId, RpcTargetUse.Temp));
         }
     }
 
@@ -218,7 +221,7 @@ private bool ShouldStartCountDown()
             //While we are counting down, continually set the replicated time remaining value for clients (client should only receive the update once)
             if (m_CountdownStarted.Value && !m_ReplicatedTimeSent)
             {
-                SetReplicatedTimeRemainingClientRPC(m_DelayedStartTime);
+                ClientSetReplicatedTimeRemainingRpc(m_DelayedStartTime, RpcTarget.ClientsAndHost);
                 m_ReplicatedTimeSent = true;
             }
 
@@ -233,9 +236,9 @@ private bool ShouldStartCountDown()
     ///     will deal with updating it. For that, we use a ClientRPC
     /// </summary>
     /// <param name="delayedStartTime"></param>
-    /// <param name="clientRpcParams"></param>
-    [ClientRpc]
-    private void SetReplicatedTimeRemainingClientRPC(float delayedStartTime, ClientRpcParams clientRpcParams = new ClientRpcParams())
+    /// <param name="rpcParams"></param>
+    [Rpc(SendTo.SpecifiedInParams)]
+    private void ClientSetReplicatedTimeRemainingRpc(float delayedStartTime, RpcParams rpcParams)
     {
         // See the ShouldStartCountDown method for when the server updates the value
         if (m_TimeRemaining == 0)
@@ -432,7 +435,7 @@ public void SetGameEnd(GameOverReason reason)
         if (reason != GameOverReason.Death)
         {
             this.isGameOver.Value = true;
-            BroadcastGameOverClientRpc(reason); // Notify our clients!
+            ClientBroadcastGameOverRpc(reason); // Notify our clients!
             return;
         }
 
@@ -449,8 +452,8 @@ public void SetGameEnd(GameOverReason reason)
         this.isGameOver.Value = true;
     }
 
-    [ClientRpc]
-    public void BroadcastGameOverClientRpc(GameOverReason reason)
+    [Rpc(SendTo.ClientsAndHost)]
+    public void ClientBroadcastGameOverRpc(GameOverReason reason)
     {
         var localPlayerObject = NetworkManager.Singleton.LocalClient.PlayerObject;
         Assert.IsNotNull(localPlayerObject);
@@ -528,7 +531,7 @@ public void ExitGame()
         SceneTransitionHandler.sceneTransitionHandler.ExitAndLoadStartMenu();
     }
 
-    private void CreateShield(GameObject prefab, int posX, int posY)
+    private void CreateShield(NetworkObject prefab, int posX, int posY)
     {
         Assert.IsTrue(IsServer, "Create Shield should be called server-side only!");
 
@@ -547,10 +550,10 @@ private void CreateShield(GameObject prefab, int posX, int posY)
                     continue;
                 }
 
-                var shield = Instantiate(prefab, new Vector3(x - 1, y, 0), Quaternion.identity);
-
                 // Spawn the Networked Object, this should notify the clients
-                shield.GetComponent<NetworkObject>().Spawn();
+                prefab.InstantiateAndSpawn(NetworkManager.Singleton,
+                    position: new Vector3(x - 1, y, 0),
+                    rotation: Quaternion.identity);
                 xcount += 1;
             }
 
@@ -570,22 +573,21 @@ private void CreateSuperEnemy()
     {
         Assert.IsTrue(IsServer, "Create Saucer should be called server-side only!");
 
-        m_Saucer = Instantiate(superEnemyPrefab, saucerSpawnPoint.position, Quaternion.identity);
-
         // Spawn the Networked Object, this should notify the clients
-        m_Saucer.GetComponent<NetworkObject>().Spawn();
+        m_Saucer = superEnemyPrefab.InstantiateAndSpawn(NetworkManager.Singleton,
+            position: saucerSpawnPoint.position,
+            rotation: Quaternion.identity);
     }
 
-    private void CreateEnemy(GameObject prefab, float posX, float posY)
+    private void CreateEnemy(NetworkObject prefab, float posX, float posY)
     {
         Assert.IsTrue(IsServer, "Create Enemy should be called server-side only!");
 
-        var enemy = Instantiate(prefab);
-        enemy.transform.position = new Vector3(posX, posY, 0.0f);
-        enemy.GetComponent<EnemyAgent>().Setup(Mathf.RoundToInt(posX), Mathf.RoundToInt(posY));
-
         // Spawn the Networked Object, this should notify the clients
-        enemy.GetComponent<NetworkObject>().Spawn();
+        var enemy = prefab.InstantiateAndSpawn(NetworkManager.Singleton,
+            position: new Vector3(posX, posY, 0.0f),
+            rotation: Quaternion.identity);
+        enemy.GetComponent<EnemyAgent>().Setup(Mathf.RoundToInt(posX), Mathf.RoundToInt(posY));
     }
 
     public void CreateEnemies()
diff --git a/Basic/Invaders/Assets/Scripts/LobbyControl.cs b/Basic/Invaders/Assets/Scripts/LobbyControl.cs
index ebcfae2c..59b20137 100644
--- a/Basic/Invaders/Assets/Scripts/LobbyControl.cs
+++ b/Basic/Invaders/Assets/Scripts/LobbyControl.cs
@@ -34,7 +34,7 @@ public override void OnNetworkSpawn()
             m_AllPlayersInLobby = false;
 
             //Server will be notified when a client connects
-            NetworkManager.OnClientConnectedCallback += OnClientConnectedCallback;
+            NetworkManager.Singleton.OnConnectionEvent += ServerOnConnectionEvent;
             SceneTransitionHandler.sceneTransitionHandler.OnClientLoadedScene += ClientLoadedScene;
         }
 
@@ -77,11 +77,12 @@ private void UpdateAndCheckPlayersInLobby()
 
         foreach (var clientLobbyStatus in m_ClientsInLobby)
         {
-            SendClientReadyStatusUpdatesClientRpc(clientLobbyStatus.Key, clientLobbyStatus.Value);
+            ClientSendReadyStatusUpdatesRpc(clientLobbyStatus.Key, clientLobbyStatus.Value);
             if (!NetworkManager.Singleton.ConnectedClients.ContainsKey(clientLobbyStatus.Key))
-
+            {
                 //If some clients are still loading into the lobby scene then this is false
                 m_AllPlayersInLobby = false;
+            }
         }
 
         CheckForAllPlayersReady();
@@ -111,27 +112,30 @@ private void ClientLoadedScene(ulong clientId)
     ///     Since we are entering a lobby and Netcode's NetworkManager is spawning the player,
     ///     the server can be configured to only listen for connected clients at this stage.
     /// </summary>
-    /// <param name="clientId">client that connected</param>
-    private void OnClientConnectedCallback(ulong clientId)
+    /// <param name="networkManager"></param>
+    /// <param name="connectionEventData">Connection event to check for which player id is connecting.</param>
+    private void ServerOnConnectionEvent(NetworkManager networkManager, ConnectionEventData connectionEventData)
     {
-        if (IsServer)
-        {
-            if (!m_ClientsInLobby.ContainsKey(clientId)) m_ClientsInLobby.Add(clientId, false);
-            GenerateUserStatsForLobby();
+        if (connectionEventData.EventType != ConnectionEvent.ClientConnected)
+            return;
 
-            UpdateAndCheckPlayersInLobby();
-        }
+        var clientId = connectionEventData.ClientId;
+        if (!m_ClientsInLobby.ContainsKey(clientId))
+            m_ClientsInLobby.Add(clientId, false);
+
+        GenerateUserStatsForLobby();
+        UpdateAndCheckPlayersInLobby();
     }
 
     /// <summary>
-    ///     SendClientReadyStatusUpdatesClientRpc
+    ///     ClientSendReadyStatusUpdatesRpc
     ///     Sent from the server to the client when a player's status is updated.
     ///     This also populates the connected clients' (excluding host) player state in the lobby
     /// </summary>
     /// <param name="clientId"></param>
     /// <param name="isReady"></param>
-    [ClientRpc]
-    private void SendClientReadyStatusUpdatesClientRpc(ulong clientId, bool isReady)
+    [Rpc(SendTo.ClientsAndHost)]
+    private void ClientSendReadyStatusUpdatesRpc(ulong clientId, bool isReady)
     {
         if (!IsServer)
         {
@@ -162,7 +166,7 @@ private void CheckForAllPlayersReady()
             if (allPlayersAreReady)
             {
                 //Remove our client connected callback
-                NetworkManager.Singleton.OnClientConnectedCallback -= OnClientConnectedCallback;
+                NetworkManager.Singleton.OnConnectionEvent -= ServerOnConnectionEvent;
 
                 //Remove our scene loaded callback
                 SceneTransitionHandler.sceneTransitionHandler.OnClientLoadedScene -= ClientLoadedScene;
@@ -186,7 +190,7 @@ public void PlayerIsReady()
         }
         else
         {
-            OnClientIsReadyServerRpc(NetworkManager.Singleton.LocalClientId);
+            ServerOnClientIsReadyRpc(NetworkManager.Singleton.LocalClientId);
         }
 
         GenerateUserStatsForLobby();
@@ -197,8 +201,8 @@ public void PlayerIsReady()
     ///     Sent to the server when the player clicks the ready button
     /// </summary>
     /// <param name="clientid">clientId that is ready</param>
-    [ServerRpc(RequireOwnership = false)]
-    private void OnClientIsReadyServerRpc(ulong clientid)
+    [Rpc(SendTo.Server)]
+    private void ServerOnClientIsReadyRpc(ulong clientid)
     {
         if (m_ClientsInLobby.ContainsKey(clientid))
         {
diff --git a/Basic/Invaders/Assets/Scripts/PlayerBullet.cs b/Basic/Invaders/Assets/Scripts/PlayerBullet.cs
index 511fd833..d6a3d4c4 100644
--- a/Basic/Invaders/Assets/Scripts/PlayerBullet.cs
+++ b/Basic/Invaders/Assets/Scripts/PlayerBullet.cs
@@ -50,7 +50,7 @@ private void OnTriggerEnter2D(Collider2D collider)
             // Only the server can despawn a NetworkObject
             hitEnemy.NetworkObject.Despawn();
 
-            SpawnExplosionVFXClientRPC(transform.position, Quaternion.identity);
+            ClientSpawnExplosionVFXRpc(transform.position, Quaternion.identity);
 
             NetworkObject.Despawn();
 
@@ -65,10 +65,10 @@ private void OnTriggerEnter2D(Collider2D collider)
         }
     }
 
-    [ClientRpc]
-    void SpawnExplosionVFXClientRPC(Vector3 spawnPosition, Quaternion spawnRotation)
+    [Rpc(SendTo.ClientsAndHost)]
+    void ClientSpawnExplosionVFXRpc(Vector3 spawnPosition, Quaternion spawnRotation)
     {
-        // this instantiates at the position of the bullet, there is an offset in the Y axis on the 
+        // this instantiates at the position of the bullet, there is an offset in the Y axis on the
         // particle systems in the prefab so it looks like it spawns in the middle of the enemy
         Instantiate(m_EnemyExplosionParticle, spawnPosition, spawnRotation);
     }
diff --git a/Basic/Invaders/Assets/Scripts/PlayerControl.cs b/Basic/Invaders/Assets/Scripts/PlayerControl.cs
index 459a907c..7f60460c 100644
--- a/Basic/Invaders/Assets/Scripts/PlayerControl.cs
+++ b/Basic/Invaders/Assets/Scripts/PlayerControl.cs
@@ -3,12 +3,11 @@
 using Unity.Netcode;
 using UnityEngine;
 using UnityEngine.Assertions;
-using UnityEngine.Rendering.VirtualTexturing;
 
 public class PlayerControl : NetworkBehaviour
 {
     [Header("Weapon Settings")]
-    public GameObject bulletPrefab;
+    public NetworkObject bulletPrefab;
 
     [Header("Movement Settings")]
     [SerializeField]
@@ -32,8 +31,7 @@ public class PlayerControl : NetworkBehaviour
 
     private NetworkVariable<int> m_MoveX = new NetworkVariable<int>(0);
 
-    private GameObject m_MyBullet;
-    private ClientRpcParams m_OwnerRPCParams;
+    private NetworkObject m_MyBullet;
 
     [SerializeField]
     private SpriteRenderer m_PlayerVisual;
@@ -114,7 +112,6 @@ public override void OnNetworkSpawn()
         m_Lives.OnValueChanged += OnLivesChanged;
         m_Score.OnValueChanged += OnScoreChanged;
 
-        if (IsServer) m_OwnerRPCParams = new ClientRpcParams { Send = new ClientRpcSendParams { TargetClientIds = new[] { OwnerClientId } } };
 
         if (!InvadersGame.Singleton)
             InvadersGame.OnSingletonReady += SubscribeToDelegatesAndUpdateValues;
@@ -189,20 +186,21 @@ private void InGameUpdate()
                 transform.position + newMovement, m_MoveSpeed * Time.deltaTime);
         }
 
-        if (Input.GetKeyDown(KeyCode.Space)) ShootServerRPC();
+        if (Input.GetKeyDown(KeyCode.Space)) ServerShootRpc();
     }
 
-    [ServerRpc]
-    private void ShootServerRPC()
+    [Rpc(SendTo.Server)]
+    private void ServerShootRpc()
     {
         if (!m_IsAlive)
             return;
 
         if (m_MyBullet == null)
         {
-            m_MyBullet = Instantiate(bulletPrefab, transform.position + Vector3.up, Quaternion.identity);
+            m_MyBullet = bulletPrefab.InstantiateAndSpawn(NetworkManager.Singleton,
+                position: transform.position + Vector3.up,
+                rotation: Quaternion.identity);
             m_MyBullet.GetComponent<PlayerBullet>().owner = this;
-            m_MyBullet.GetComponent<NetworkObject>().Spawn();
         }
     }
 
@@ -220,7 +218,7 @@ public void HitByBullet()
             m_MoveX.Value = 0;
             m_Lives.Value = 0;
             InvadersGame.Singleton.SetGameEnd(GameOverReason.Death);
-            NotifyGameOverClientRpc(GameOverReason.Death, m_OwnerRPCParams);
+            ClientNotifyGameOverRpc(GameOverReason.Death);
             Instantiate(m_ExplosionParticleSystem, transform.position, quaternion.identity);
 
             // Hide graphics of this player object server-side. Note we don't want to destroy the object as it
@@ -233,8 +231,8 @@ public void HitByBullet()
         }
     }
 
-    [ClientRpc]
-    private void NotifyGameOverClientRpc(GameOverReason reason, ClientRpcParams clientParams)
+    [Rpc(SendTo.Owner)]
+    private void ClientNotifyGameOverRpc(GameOverReason reason)
     {
         NotifyGameOver(reason);
     }
diff --git a/Basic/Invaders/Packages/manifest.json b/Basic/Invaders/Packages/manifest.json
index fdb558c3..4dee139b 100644
--- a/Basic/Invaders/Packages/manifest.json
+++ b/Basic/Invaders/Packages/manifest.json
@@ -7,7 +7,7 @@
     "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.4.0",
     "com.unity.multiplayer.tools": "1.1.1",
-    "com.unity.netcode.gameobjects": "1.7.1",
+    "com.unity.netcode.gameobjects": "1.8.1",
     "com.unity.render-pipelines.universal": "14.0.11",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.7.6",
diff --git a/Basic/Invaders/Packages/packages-lock.json b/Basic/Invaders/Packages/packages-lock.json
index 21a7e868..7485e7b0 100644
--- a/Basic/Invaders/Packages/packages-lock.json
+++ b/Basic/Invaders/Packages/packages-lock.json
@@ -117,7 +117,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.netcode.gameobjects": {
-      "version": "1.7.1",
+      "version": "1.8.1",
       "depth": 0,
       "source": "registry",
       "dependencies": {
diff --git a/Basic/Invaders/README.md b/Basic/Invaders/README.md
index 7d9a8399..479af632 100644
--- a/Basic/Invaders/README.md
+++ b/Basic/Invaders/README.md
@@ -4,7 +4,7 @@
 # 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.7.1-57b9d3.svg?logo=unity&color=2196F3)](https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/releases/tag/ngo%2F1.7.1)
+[![NetcodeVersion](https://img.shields.io/badge/Netcode%20Version:-1.8.1-57b9d3.svg?logo=unity&color=2196F3)](https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/releases/tag/ngo%2F1.8.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)
 <br><br>
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e98f40a..c5667531 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,6 +64,10 @@
 #### Changed
 - Upgraded to IDE Rider v3.0.28 (#166)
 - Upgraded to Unity 2022.3.27f1 (#169)
+- Upgraded to Netcode for GameObjects v1.8.1 (#172)
+  - Upgraded to the newer API for Rpcs, Universal Rpcs
+  - Upgraded to the newer API for NetworkObject spawning to use NetworkObject.InstantiateAndSpawn
+  - Upgraded usage of NetworkManager.OnClientConnectedCallback to the new NetworkManager.OnConnectionEvent 
 
 #### Fixed
 - Optimized NetworkTransform on all networked prefabs so the Clients objects movements are closer to the Host ones (#168)

From 3dfe5f66ffaf863a45c238d5b9507f23da6f20c8 Mon Sep 17 00:00:00 2001
From: Fernando Cortez <fernando.cortez@unity3d.com>
Date: Thu, 30 May 2024 14:23:37 -0400
Subject: [PATCH 20/20] bumping release numbers, changelog updated with release

---
 Basic/2DSpaceShooter/README.md                    | 6 +++---
 Basic/ClientDriven/README.md                      | 2 +-
 Basic/DynamicAddressablesNetworkPrefabs/README.md | 6 ++++--
 Basic/Invaders/README.md                          | 4 ++--
 CHANGELOG.md                                      | 2 +-
 README.md                                         | 6 ++++--
 6 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Basic/2DSpaceShooter/README.md b/Basic/2DSpaceShooter/README.md
index f8deb1ba..5a9a652c 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.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)
+[![NetcodeVersion](https://img.shields.io/badge/Netcode%20Version:-1.8.1-57b9d3.svg?logo=unity&color=2196F3)](https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/releases/tag/ngo%2F1.8.1)
+[![LatestRelease](https://img.shields.io/badge/Latest%20%20Github%20Release:-v1.6.0-57b9d3.svg?logo=github&color=brightgreen)](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.bitesize/releases/tag/v1.6.0)
 <br><br>
 
 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. 
@@ -41,4 +41,4 @@ Check out our main [Bitesize Samples GitHub Readme](https://github.com/Unity-Tec
 
 [![Documentation](https://img.shields.io/badge/Unity-bitesize--docs-57b9d3.svg?logo=unity&color=2196F3)](https://docs-multiplayer.unity3d.com/netcode/current/learn/bitesize/bitesize-introduction)
 [![Forums](https://img.shields.io/badge/Unity-multiplayer--forum-57b9d3.svg?logo=unity&color=2196F3)](https://forum.unity.com/forums/multiplayer.26/)
-[![Discord](https://img.shields.io/discord/449263083769036810.svg?label=discord&logo=discord&color=5865F2)](https://discord.gg/FM8SE9E)
\ No newline at end of file
+[![Discord](https://img.shields.io/discord/449263083769036810.svg?label=discord&logo=discord&color=5865F2)](https://discord.gg/FM8SE9E)
diff --git a/Basic/ClientDriven/README.md b/Basic/ClientDriven/README.md
index 7fb5d2e1..ac0abe41 100644
--- a/Basic/ClientDriven/README.md
+++ b/Basic/ClientDriven/README.md
@@ -5,7 +5,7 @@
 
 [![UnityVersion](https://img.shields.io/badge/Unity%20Version:-2022.3%20LTS-57b9d3.svg?logo=unity&color=2196F3)](https://unity.com/releases/editor/whats-new/2022.3.0)
 [![NetcodeVersion](https://img.shields.io/badge/Netcode%20Version:-1.8.1-57b9d3.svg?logo=unity&color=2196F3)](https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/releases/tag/ngo%2F1.8.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)
+[![LatestRelease](https://img.shields.io/badge/Latest%20%20Github%20Release:-v1.6.0-57b9d3.svg?logo=github&color=brightgreen)](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.bitesize/releases/tag/v1.6.0)
 <br><br>
 
 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 02bccfe4..49ac696b 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/README.md
+++ b/Basic/DynamicAddressablesNetworkPrefabs/README.md
@@ -4,10 +4,12 @@
 # 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.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)
+[![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.6.0-57b9d3.svg?logo=github&color=brightgreen)](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.bitesize/releases/tag/v1.6.0)
 <br><br>
 
+*: Due to a regression in Netcode for GameObjects pertaining to the destruction of NetworkObjects when a client unsuccessfully connects, this sample has remained at v1.7.1. It will be upgraded in the near future with the latest Netcode version including a fix for the regression.
+
 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.
 
 ## Note on Addressables
diff --git a/Basic/Invaders/README.md b/Basic/Invaders/README.md
index 479af632..2aa12363 100644
--- a/Basic/Invaders/README.md
+++ b/Basic/Invaders/README.md
@@ -5,7 +5,7 @@
 
 [![UnityVersion](https://img.shields.io/badge/Unity%20Version:-2022.3%20LTS-57b9d3.svg?logo=unity&color=2196F3)](https://unity.com/releases/editor/whats-new/2022.3.0)
 [![NetcodeVersion](https://img.shields.io/badge/Netcode%20Version:-1.8.1-57b9d3.svg?logo=unity&color=2196F3)](https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/releases/tag/ngo%2F1.8.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)
+[![LatestRelease](https://img.shields.io/badge/Latest%20%20Github%20Release:-v1.6.0-57b9d3.svg?logo=github&color=brightgreen)](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.bitesize/releases/tag/v1.6.0)
 <br><br>
 
 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.
@@ -40,4 +40,4 @@ Check out our main [Bitesize Samples GitHub Readme](https://github.com/Unity-Tec
 
 [![Documentation](https://img.shields.io/badge/Unity-bitesize--docs-57b9d3.svg?logo=unity&color=2196F3)](https://docs-multiplayer.unity3d.com/netcode/current/learn/bitesize/bitesize-introduction)
 [![Forums](https://img.shields.io/badge/Unity-multiplayer--forum-57b9d3.svg?logo=unity&color=2196F3)](https://forum.unity.com/forums/multiplayer.26/)
-[![Discord](https://img.shields.io/discord/449263083769036810.svg?label=discord&logo=discord&color=5865F2)](https://discord.gg/FM8SE9E)
\ No newline at end of file
+[![Discord](https://img.shields.io/discord/449263083769036810.svg?label=discord&logo=discord&color=5865F2)](https://discord.gg/FM8SE9E)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5667531..bd08beb6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## [unreleased] yyyy-mm-dd
+## [1.6.0] 2024-05-30
 
 ### Bitesize Samples Repository
 
diff --git a/README.md b/README.md
index ed9c4ece..7436cc5c 100644
--- a/README.md
+++ b/README.md
@@ -3,10 +3,12 @@
 # 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.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)
+[![NetcodeVersion](https://img.shields.io/badge/Netcode%20Version:-1.8.1-57b9d3.svg?logo=unity&color=2196F3)](https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/releases/tag/ngo%2F1.8.1)*
+[![LatestRelease](https://img.shields.io/badge/Latest%20%20Github%20Release:-v1.6.0-57b9d3.svg?logo=github&color=brightgreen)](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.bitesize/releases/tag/v1.6.0)
 <br><br>
 
+*: Due to a regression in Netcode for GameObjects pertaining to the destruction of NetworkObjects when a client unsuccessfully connects, the Dynamic Addressables Network Prefabs sample has remained at v1.7.1. It will be upgraded in the near future with the latest Netcode version including a fix for the regression.
+
 This repository contains a collection of bitesize sample projects and games that showcase different techniques
 which can help you get started with development of a multiplayer 
 project using [Netcode for GameObjects](https://github.com/Unity-Technologies/com.unity.netcode.gameobjects).