update

Finalized readme and migrated images to local directory.
Cleaned up some minor issues including renaming of some properties, handling resetting of camera when running in server mode and a client being followed disconnects, and some other minor clean up.

Author: NoelStephensUnity

Examples/OverridingScenesAndPrefabs/Assets/Scenes/BootstrapScene.unity

@@ -229,6 +229,7 @@ MonoBehaviour:
   TargetFrameRate: 100
   EnableVSync: 0
   m_OriginalVSyncCount: 1
+  m_ServicesRegistered: 1
 --- !u!114 &455857873
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -272,8 +273,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5c472ff64b067344893ed2e632d0f9f1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  ClientNetworkPrefab: {fileID: 6472733969592893139, guid: 3e5167b6e6bcb5645abb2dbc0078091e, type: 3}
-  ServerNetworkPrefab: {fileID: 4710599683293591777, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+  NetworkPrefab: {fileID: 4710599683293591777, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+  NetworkPrefabOverride: {fileID: 6472733969592893139, guid: 3e5167b6e6bcb5645abb2dbc0078091e, type: 3}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0

Examples/OverridingScenesAndPrefabs/Assets/Scripts/InstanceTypeLocalBehavior.cs

@@ -9,7 +9,7 @@
 /// </summary>
 public class InstanceTypeLocalBehavior : MonoBehaviour, INetworkUpdateSystem
 {
-    [Tooltip("When enabled, this will run only on a server or host.")]
+    [Tooltip("When enabled, this will run only on a server or host. When disabled, this will only run on the owner of the local client player (including host).")]
     public bool ServerOnly;
 
     [Tooltip("This is the unique message example text displayed when running locally.")]
@@ -25,6 +25,38 @@ private void Awake()
         m_MoverScriptNoRigidbody.NotifySpawnStatusChanged += OnSpawnStatusChanged;
     }
 
+    /// <summary>
+    /// Adjust this logic to fit your needs.
+    /// This example makes the InstanceTypeLocalBehavior only update if:
+    /// - It is a server (including host) and is marked for ServerOnly
+    /// - It is a client (including host), is not marked for ServerOnly, and the local client is the owner of MoverScriptNoRigidbody.
+    /// - It is in distributed authority mode, is not marked for ServerOnly, and the local client has authority of the MoverScriptNoRigidbody.
+    /// </summary>
+    private bool HasAuthority()
+    {
+        if (m_NetworkManager == null)
+        {
+            return false;
+        }
+
+        if (!ServerOnly && m_NetworkManager.DistributedAuthorityMode && m_MoverScriptNoRigidbody.HasAuthority)
+        {
+            return true;
+        }
+        else
+        {
+            if (ServerOnly && m_NetworkManager.IsServer)
+            {
+                return true;
+            }
+            else if (!ServerOnly && m_MoverScriptNoRigidbody.IsOwner)
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /// <summary>
     ///  <see cref="MoverScriptNoRigidbody.NotifySpawnStatusChanged"/>
     ///  Isolate the spawning status to the <see cref="NetworkBehaviour"/> and just
@@ -37,18 +69,24 @@ private void OnSpawnStatusChanged(bool spawned)
         if (spawned)
         {
             m_NetworkManager = m_MoverScriptNoRigidbody.NetworkManager;
-            if (ServerOnly && m_NetworkManager.IsServer)
+            if (HasAuthority())
             {
                 NetworkUpdateLoop.RegisterNetworkUpdate(this, NetworkUpdateStage.Update);
             }
         }
         else
         {
+            // Whether registered or not, it is easier to just unregister always.
             NetworkUpdateLoop.UnregisterAllNetworkUpdates(this);
             m_NetworkManager = null;
         }
     }
 
+    /// <summary>
+    /// Invoked only on the instance(s) that have authority to update.
+    /// <see cref="HasAuthority"/>
+    /// </summary>
+    /// <param name="updateStage"></param>
     public void NetworkUpdate(NetworkUpdateStage updateStage)
     {
         if (updateStage == NetworkUpdateStage.Update)

Examples/OverridingScenesAndPrefabs/Assets/Scripts/MoverScriptNoRigidbody.cs

@@ -113,7 +113,7 @@ public class MoverScriptNoRigidbody : NetworkTransform
     private CharacterController m_CharacterController;
     private PlayerBallMotion m_PlayerBallMotion;
 
-    public Action<bool> NotifySpawnStatusChanged;
+    public event Action<bool> NotifySpawnStatusChanged;
 
     protected override void Awake()
     {
@@ -150,10 +150,7 @@ protected override void OnNetworkPreSpawn(ref NetworkManager networkManager)
     protected override void OnNetworkPostSpawn()
     {
         // Authority of this object sends local notifications to any non-networkbehaviour subscribers
-        if (HasAuthority)
-        {
-            NotifySpawnStatusChanged?.Invoke(true);
-        }
+        NotifySpawnStatusChanged?.Invoke(true);
 
         m_CharacterController.enabled = CanCommitToTransform;
         if (CanCommitToTransform)

Examples/OverridingScenesAndPrefabs/Assets/Scripts/NetworkManagerBootstrapper.cs

@@ -55,17 +55,21 @@ public override void OnInspectorGUI()
 /// </summary>
 public class NetworkManagerBootstrapper : NetworkManager
 {
+    #region Validation
 #if UNITY_EDITOR
     // Inspector view expand/collapse settings for this derived child class
     [HideInInspector]
     public bool NetworkManagerBootstrapperExpanded;
     protected override void OnValidateComponent()
     {
         m_OriginalVSyncCount = QualitySettings.vSyncCount;
+        m_ServicesRegistered = CloudProjectSettings.organizationName != string.Empty && CloudProjectSettings.organizationId != string.Empty;
         base.OnValidateComponent();
     }
 #endif
+    #endregion
 
+    #region Properties
     public static NetworkManagerBootstrapper Instance;
 
     public int TargetFrameRate = 100;
@@ -91,12 +95,17 @@ private enum ConnectionStates
     }
 
     private ConnectionStates m_ConnectionState;
+
+    [SerializeField]
     private bool m_ServicesRegistered;
     private ISession m_CurrentSession;
     private string m_SessionName;
     private string m_ProfileName;
     private Task m_SessionTask;
 
+    #endregion
+
+    #region Initialization and Destroy
     public static string GetRandomString(int length)
     {
         var r = new System.Random();
@@ -115,8 +124,6 @@ private void Awake()
         SetFrameRate(TargetFrameRate, EnableVSync);
         SetSingleton();
         m_SceneBootstrapLoader = GetComponent<SceneBootstrapLoader>();
-
-        m_ServicesRegistered = CloudProjectSettings.organizationName != string.Empty && CloudProjectSettings.organizationId != string.Empty;
     }
 
     private async void Start()
@@ -153,8 +160,9 @@ private void OnDestroy()
         OnClientDisconnectCallback -= OnClientDisconnect;
         OnConnectionEvent -= OnClientConnectionEvent;
     }
+    #endregion
 
-
+    #region Session and Connection Event Handling
     private void OnClientConnectionEvent(NetworkManager networkManager, ConnectionEventData eventData)
     {
         LogMessage($"[{Time.realtimeSinceStartup}] Connection event {eventData.EventType} for Client-{eventData.ClientId}.");
@@ -207,6 +215,29 @@ private void SessionStopped(bool isHost)
         }
     }
 
+    private async Task<ISession> ConnectThroughLiveService()
+    {
+        try
+        {
+            var options = new SessionOptions()
+            {
+                Name = m_SessionName,
+                MaxPlayers = 32
+            }.WithDistributedAuthorityNetwork();
+
+            m_CurrentSession = await MultiplayerService.Instance.CreateOrJoinSessionAsync(m_SessionName, options);
+            return m_CurrentSession;
+        }
+        catch (Exception e)
+        {
+            LogMessage($"{e.Message}");
+            Debug.LogException(e);
+        }
+        return null;
+    }
+    #endregion
+
+    #region GUI Menu
     public void StartOrConnectToDistributedAuthoritySession()
     {
         m_SessionTask = ConnectThroughLiveService();
@@ -333,37 +364,21 @@ private void OnGUI()
         }
         GUILayout.EndArea();
     }
+    #endregion
 
-
-    private async Task<ISession> ConnectThroughLiveService()
-    {
-        try
-        {
-            var options = new SessionOptions()
-            {
-                Name = m_SessionName,
-                MaxPlayers = 32
-            }.WithDistributedAuthorityNetwork();
-
-            m_CurrentSession = await MultiplayerService.Instance.CreateOrJoinSessionAsync(m_SessionName, options);
-            return m_CurrentSession;
-        }
-        catch (Exception e)
-        {
-            LogMessage($"{e.Message}");
-            Debug.LogException(e);
-        }
-        return null;
-    }
-
-
+    #region Server Camera Handling
     private Vector3 m_CameraOriginalPosition;
     private Quaternion m_CameraOriginalRotation;
     private int m_CurrentFollowPlayerIndex = -1;
+    private MoverScriptNoRigidbody m_CurrentPlayerFollowed;
 
     private void ResetMainCamera()
     {
         m_CurrentFollowPlayerIndex = -1;
+        SetCameraDefaults();
+    }
+    private void SetCameraDefaults()
+    {
         if (Camera.main != null && Camera.main.transform.parent != null)
         {
             Camera.main.transform.SetParent(null, false);
@@ -372,14 +387,15 @@ private void ResetMainCamera()
         }
     }
 
-    #region Update Methods and Properties
-
     /// <summary>
-    /// General update for server-side
+    /// Server only (i.e. not host), follow players as they move around
     /// </summary>
-    private void ServerSideUpdate()
+    private void ServerFollowPlayerCheck()
     {
-        if (Input.GetKeyDown(KeyCode.P) && ConnectedClientsIds.Count > 0)
+        bool leftBracket = Input.GetKeyDown(KeyCode.LeftBracket);
+        bool rightBracket = Input.GetKeyDown(KeyCode.RightBracket);
+
+        if ((leftBracket || rightBracket) && ConnectedClientsIds.Count > 0)
         {
             // Capture the main camera's original position and rotation the first time the server-side
             // follows a player.
@@ -388,21 +404,53 @@ private void ServerSideUpdate()
                 m_CameraOriginalPosition = Camera.main.transform.position;
                 m_CameraOriginalRotation = Camera.main.transform.rotation;
             }
-            m_CurrentFollowPlayerIndex++;
+
+            if (leftBracket)
+            {
+                m_CurrentFollowPlayerIndex--;
+                if (m_CurrentFollowPlayerIndex < 0)
+                {
+                    m_CurrentFollowPlayerIndex = ConnectedClientsIds.Count - 1;
+                }
+            }
+            else
+            {
+                m_CurrentFollowPlayerIndex++;
+            }
+
             m_CurrentFollowPlayerIndex %= ConnectedClientsIds.Count;
 
             var playerId = ConnectedClientsIds[m_CurrentFollowPlayerIndex];
-            var playerObject = ConnectedClients[playerId];
-            Camera.main.transform.SetParent(playerObject.PlayerObject.transform, false);
+            var playerNetworkClient = ConnectedClients[playerId];
+            m_CurrentPlayerFollowed = playerNetworkClient.PlayerObject.GetComponent<MoverScriptNoRigidbody>();
+            Camera.main.transform.SetParent(playerNetworkClient.PlayerObject.transform, false);
         }
         else if (Input.GetKeyDown(KeyCode.Backspace))
         {
-            Camera.main.transform.SetParent(null, false);
-            Camera.main.transform.position = m_CameraOriginalPosition;
-            Camera.main.transform.rotation = m_CameraOriginalRotation;
+            ClearFollowPlayer();
+        }
+    }
+    public void ClearFollowPlayer()
+    {
+        if (m_CurrentPlayerFollowed != null)
+        {
+            m_CurrentPlayerFollowed = null;
+            SetCameraDefaults();
         }
     }
+    #endregion
 
+    #region Update Methods and Properties
+    /// <summary>
+    /// General update for server-side
+    /// </summary>
+    private void ServerSideUpdate()
+    {
+        if (!IsHost)
+        {
+            ServerFollowPlayerCheck();
+        }
+    }
 
     /// <summary>
     /// General update for client-side
@@ -441,8 +489,7 @@ private void Update()
     }
     #endregion
 
-
-    #region Message Logging Methods and Properties
+    #region Message Logging
 
     private List<MessageLog> m_MessageLogs = new List<MessageLog>();
 

Examples/OverridingScenesAndPrefabs/Assets/Scripts/NetworkPrefabOverrideHandler.cs

@@ -14,36 +14,35 @@
 [RequireComponent(typeof(NetworkPrefabOverrideHandler))]
 public class NetworkPrefabOverrideHandler : MonoBehaviour, INetworkPrefabInstanceHandler
 {
-    public GameObject ClientNetworkPrefab;
+    public GameObject NetworkPrefab;
+    public GameObject NetworkPrefabOverride;
 
-    public GameObject ServerNetworkPrefab;
-
-    private NetworkManager m_NetworkManager;
+    private NetworkManagerBootstrapper m_NetworkManager;
 
     private void Start()
     {
-        m_NetworkManager = GetComponent<NetworkManager>();
-        m_NetworkManager.PrefabHandler.AddHandler(ServerNetworkPrefab, this);
+        m_NetworkManager = GetComponent<NetworkManagerBootstrapper>();
+        m_NetworkManager.PrefabHandler.AddHandler(NetworkPrefab, this);
         NetworkManager.OnDestroying += NetworkManager_OnDestroying;
     }
 
     private void NetworkManager_OnDestroying(NetworkManager obj)
     {
-        m_NetworkManager.PrefabHandler.RemoveHandler(ServerNetworkPrefab);
+        m_NetworkManager.PrefabHandler.RemoveHandler(NetworkPrefab);
     }
 
     /// <summary>
     /// Invoked on both server and clients when the prefab is spawned.
-    /// Server-side will spawn the server version.
-    /// Client-side will spawn the client version.
+    /// Server-side will spawn the default network prefab.
+    /// Client-side will spawn the network prefab override version.
     /// </summary>
     /// <param name="ownerClientId">the client identifier that will own this network prefab instance</param>
     /// <param name="position">optional to use the position passed in</param>
     /// <param name="rotation">optional to use the rotation passed in</param>
     /// <returns></returns>
     public NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaternion rotation)
     {
-        var gameObject = m_NetworkManager.IsClient ? Instantiate(ClientNetworkPrefab) : Instantiate(ServerNetworkPrefab);
+        var gameObject = m_NetworkManager.IsClient ? Instantiate(NetworkPrefabOverride) : Instantiate(NetworkPrefab);
         // You could integrate spawn locations here and on the server side apply the spawn position at
         // this stage of the spawn process.
         gameObject.transform.position = position;
@@ -53,6 +52,13 @@ public NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaterni
 
     public void Destroy(NetworkObject networkObject)
     {
+        // Another useful thing about handling this instantiation and destruction of a NetworkObject is that you can do house cleaning
+        // prior to the object being destroyed. This handles the scenario where the server is following a player and the player disconnects.
+        // Before destroying the player object, we want to unparent the camera and reset the player being followed.
+        if (m_NetworkManager.IsServer && !m_NetworkManager.IsHost && Camera.main != null && Camera.main.transform.parent == networkObject.transform)
+        {
+            m_NetworkManager.ClearFollowPlayer();
+        }
         Destroy(networkObject.gameObject);
     }
 }