Merge remote-tracking branch 'upstream/master'

Assets/_PROJECT/Multiplayer/CustomNetworkManager.cs

@@ -0,0 +1,38 @@
+using FishNet.Component.Spawning;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class CustomNetworkManager : MonoBehaviour
+{
+
+    public static CustomNetworkManager instance = null;
+
+    public PlayerSpawner playerSpawner;
+
+    void Awake()
+    {
+        if (!instance) { instance = this; }
+        else if (instance != this) { Destroy(gameObject); }
+
+        DontDestroyOnLoad(gameObject);
+    }
+
+    private void Start()
+    {
+        if (playerSpawner.Spawns.Length == 0) {
+            Debug.LogWarning("Player spawns undefined. Assign a player spawn to PlayerSpawner!");
+        } else {
+            bool hasSpawn = false;
+            foreach (Transform spawn in playerSpawner.Spawns)
+            {
+                hasSpawn |= spawn != null;
+            }
+            if (!hasSpawn)
+            {
+                Debug.LogWarning("Player spawns undefined. Assign a player spawn to PlayerSpawner!");
+            }
+        }
+    }
+
+}

Assets/_PROJECT/Multiplayer/CustomNetworkManager.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 067fc70e6bd1a024ba644f52017165fd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_PROJECT/Multiplayer/Networking.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 67f163b4eb8c8df43b48aab810b8a0a8
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: