feat: PlayerSpawner component (#123)

BREAKING CHANGE: NetworkManager no longer spawns the player. You need to add PlayerSpawner component if you want that behavior
MirageNet · Mar 26, 2020 · e8b933d · e8b933d
1 parent e51482e
commit e8b933d
Show file tree

Hide file tree

Showing 23 changed files with 496 additions and 536 deletions.
diff --git a/Assets/Mirror/Examples/AdditiveScenes/Scenes/MainScene.unity b/Assets/Mirror/Examples/AdditiveScenes/Scenes/MainScene.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.4366757, g: 0.48427194, b: 0.5645252, a: 1}
+  m_IndirectSpecularColor: {r: 0.43667555, g: 0.48427176, b: 0.5645241, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -504,7 +504,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 178547538}
-  - component: {fileID: 178547539}
   m_Layer: 0
   m_Name: StartPos
   m_TagString: Untagged
@@ -526,19 +525,6 @@ Transform:
   m_Father: {fileID: 1172568542}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
---- !u!114 &178547539
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 178547537}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 41f84591ce72545258ea98cb7518d8b9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  manager: {fileID: 0}
 --- !u!1 &534669902
 GameObject:
   m_ObjectHideFlags: 0
@@ -804,7 +790,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 652875645}
-  - component: {fileID: 652875646}
   m_Layer: 0
   m_Name: StartPos
   m_TagString: Untagged
@@ -826,19 +811,6 @@ Transform:
   m_Father: {fileID: 1172568542}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 270, z: 0}
---- !u!114 &652875646
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 652875644}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 41f84591ce72545258ea98cb7518d8b9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  manager: {fileID: 0}
 --- !u!1 &691846569
 GameObject:
   m_ObjectHideFlags: 0
@@ -848,7 +820,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 691846570}
-  - component: {fileID: 691846571}
   m_Layer: 0
   m_Name: StartPos
   m_TagString: Untagged
@@ -870,19 +841,6 @@ Transform:
   m_Father: {fileID: 1172568542}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &691846571
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 691846569}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 41f84591ce72545258ea98cb7518d8b9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  manager: {fileID: 0}
 --- !u!1001 &748207074
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1894,6 +1852,7 @@ GameObject:
   - component: {fileID: 1661834284}
   - component: {fileID: 1661834283}
   - component: {fileID: 1661834282}
+  - component: {fileID: 1661834280}
   m_Layer: 0
   m_Name: Network
   m_TagString: Untagged
@@ -1917,16 +1876,10 @@ MonoBehaviour:
   startOnHeadless: 1
   showDebugMessages: 0
   serverTickRate: 30
-  offlineScene: 
-  onlineScene: 
   server: {fileID: 1661834283}
   client: {fileID: 1661834282}
   transport: {fileID: 1661834284}
-  autoCreatePlayer: 1
-  playerSpawnMethod: 1
   networkSceneName: 
-  startPositionIndex: 0
-  startPositions: []
   subScenes:
   - SubScene
 --- !u!4 &1661834279
@@ -1943,6 +1896,29 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1661834280
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1661834277}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a7aaac73a16c040fd871cb977b5c557b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  client: {fileID: 1661834282}
+  server: {fileID: 1661834283}
+  playerPrefab: {fileID: 8537344390966522168, guid: a5bdca0a2315d43499be7dcef473fbc7,
+    type: 3}
+  startPositionIndex: 0
+  startPositions:
+  - {fileID: 178547538}
+  - {fileID: 1816951100}
+  - {fileID: 652875645}
+  - {fileID: 691846570}
+  playerSpawnMethod: 1
 --- !u!114 &1661834281
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1978,13 +1954,18 @@ MonoBehaviour:
   Authenticated:
     m_PersistentCalls:
       m_Calls: []
+  Disconnected:
+    m_PersistentCalls:
+      m_Calls: []
   spawnPrefabs:
   - {fileID: 1076878374699499732, guid: e1971f4a8c7661546bc509b44bd91b80, type: 3}
   - {fileID: 5623359707189648430, guid: 4ff300cf6bb3c6342a9552c4f18788c8, type: 3}
   - {fileID: 6852530814182375312, guid: 12a4c14e672c00b4b840f937d824b890, type: 3}
   - {fileID: 8872462076811691049, guid: a5bdca0a2315d43499be7dcef473fbc7, type: 3}
   - {fileID: 855244094988030905, guid: f6d08eb9a8e35d84fa30a7e3ae64181a, type: 3}
   - {fileID: 160176457, guid: ab222ed73ada1ac4ba2f61e843d7627c, type: 3}
+  - {fileID: 8872462076811691049, guid: a5bdca0a2315d43499be7dcef473fbc7, type: 3}
+  - {fileID: 8872462076811691049, guid: a5bdca0a2315d43499be7dcef473fbc7, type: 3}
 --- !u!114 &1661834283
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2004,10 +1985,14 @@ MonoBehaviour:
   Authenticated:
     m_PersistentCalls:
       m_Calls: []
+  Disconnected:
+    m_PersistentCalls:
+      m_Calls: []
+  Stopped:
+    m_PersistentCalls:
+      m_Calls: []
   authenticator: {fileID: 0}
   Listening: 1
-  playerPrefab: {fileID: 8872462076811691049, guid: a5bdca0a2315d43499be7dcef473fbc7,
-    type: 3}
 --- !u!114 &1661834284
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2131,7 +2116,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1816951100}
-  - component: {fileID: 1816951101}
   m_Layer: 0
   m_Name: StartPos
   m_TagString: Untagged
@@ -2153,19 +2137,6 @@ Transform:
   m_Father: {fileID: 1172568542}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
---- !u!114 &1816951101
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1816951099}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 41f84591ce72545258ea98cb7518d8b9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  manager: {fileID: 0}
 --- !u!1001 &1076878375580925077
 PrefabInstance:
   m_ObjectHideFlags: 0

diff --git a/Assets/Mirror/Examples/Basic/Scenes/Example.unity b/Assets/Mirror/Examples/Basic/Scenes/Example.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.574817, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -135,6 +135,7 @@ GameObject:
   - component: {fileID: 249891960}
   - component: {fileID: 249891959}
   - component: {fileID: 249891958}
+  - component: {fileID: 249891955}
   m_Layer: 0
   m_Name: NetworkManager
   m_TagString: Untagged
@@ -158,6 +159,25 @@ MonoBehaviour:
   offsetX: 0
   offsetY: 0
   serverIp: localhost
+--- !u!114 &249891955
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 249891953}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a7aaac73a16c040fd871cb977b5c557b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  client: {fileID: 249891958}
+  server: {fileID: 249891959}
+  playerPrefab: {fileID: 1088833923132447018, guid: 22f1fa3a0aff72b46a371f667bb4fb30,
+    type: 3}
+  startPositionIndex: 0
+  startPositions: []
+  playerSpawnMethod: 1
 --- !u!114 &249891956
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -174,16 +194,14 @@ MonoBehaviour:
   startOnHeadless: 0
   showDebugMessages: 0
   serverTickRate: 30
-  offlineScene: 
-  onlineScene: 
   server: {fileID: 249891959}
   client: {fileID: 249891958}
   transport: {fileID: 249891960}
-  autoCreatePlayer: 1
   playerSpawnMethod: 1
   networkSceneName: 
   startPositionIndex: 0
   startPositions: []
+  autoCreatePlayer: 1
 --- !u!4 &249891957
 Transform:
   m_ObjectHideFlags: 0
@@ -217,8 +235,16 @@ MonoBehaviour:
   Authenticated:
     m_PersistentCalls:
       m_Calls: []
+  Disconnected:
+    m_PersistentCalls:
+      m_Calls: []
   spawnPrefabs:
   - {fileID: 1088833923132447022, guid: 22f1fa3a0aff72b46a371f667bb4fb30, type: 3}
+  - {fileID: 8872462076811691049, guid: a5bdca0a2315d43499be7dcef473fbc7, type: 3}
+  - {fileID: 8872462076811691049, guid: a5bdca0a2315d43499be7dcef473fbc7, type: 3}
+  - {fileID: 8872462076811691049, guid: a5bdca0a2315d43499be7dcef473fbc7, type: 3}
+  - {fileID: 1088833923132447022, guid: 22f1fa3a0aff72b46a371f667bb4fb30, type: 3}
+  - {fileID: 1088833923132447022, guid: 22f1fa3a0aff72b46a371f667bb4fb30, type: 3}
 --- !u!114 &249891959
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -238,10 +264,14 @@ MonoBehaviour:
   Authenticated:
     m_PersistentCalls:
       m_Calls: []
+  Disconnected:
+    m_PersistentCalls:
+      m_Calls: []
+  Stopped:
+    m_PersistentCalls:
+      m_Calls: []
   authenticator: {fileID: 0}
   Listening: 1
-  playerPrefab: {fileID: 1088833923132447022, guid: 22f1fa3a0aff72b46a371f667bb4fb30,
-    type: 3}
 --- !u!114 &249891960
 MonoBehaviour:
   m_ObjectHideFlags: 0

diff --git a/Assets/Mirror/Examples/Chat/Scenes/Main.unity b/Assets/Mirror/Examples/Chat/Scenes/Main.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.4465934, g: 0.49642956, b: 0.57482487, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.574817, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -3056,17 +3056,17 @@ MonoBehaviour:
   startOnHeadless: 1
   showDebugMessages: 0
   serverTickRate: 30
-  offlineScene: 
-  onlineScene: 
   server: {fileID: 1783103028}
   client: {fileID: 1783103027}
   transport: {fileID: 1783103023}
-  autoCreatePlayer: 0
   playerSpawnMethod: 0
   networkSceneName: 
   startPositionIndex: 0
   startPositions: []
+  autoCreatePlayer: 0
   chatWindow: {fileID: 75861000}
+  playerPrefab: {fileID: 718303009120396421, guid: e5905ffa27de84009b346b49d518ba03,
+    type: 3}
 --- !u!4 &1783103026
 Transform:
   m_ObjectHideFlags: 0
@@ -3100,6 +3100,9 @@ MonoBehaviour:
   Authenticated:
     m_PersistentCalls:
       m_Calls: []
+  Disconnected:
+    m_PersistentCalls:
+      m_Calls: []
   spawnPrefabs:
   - {fileID: 5075528875289742095, guid: e5905ffa27de84009b346b49d518ba03, type: 3}
 --- !u!114 &1783103028
@@ -3121,10 +3124,14 @@ MonoBehaviour:
   Authenticated:
     m_PersistentCalls:
       m_Calls: []
+  Disconnected:
+    m_PersistentCalls:
+      m_Calls: []
+  Stopped:
+    m_PersistentCalls:
+      m_Calls: []
   authenticator: {fileID: 0}
   Listening: 1
-  playerPrefab: {fileID: 5075528875289742095, guid: e5905ffa27de84009b346b49d518ba03,
-    type: 3}
 --- !u!1 &1863915624
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/Mirror/Examples/Chat/Scripts/ChatNetworkManager.cs b/Assets/Mirror/Examples/Chat/Scripts/ChatNetworkManager.cs
@@ -9,6 +9,8 @@ public class ChatNetworkManager : NetworkManager
 
         public ChatWindow chatWindow;
 
+        public Player playerPrefab;
+
         void Awake()
         {
             client.Authenticated.AddListener(OnAuthenticated);
@@ -33,7 +35,7 @@ public void OnAuthenticated(NetworkConnection conn)
         private void OnCreatePlayer(NetworkConnection connection, CreatePlayerMessage createPlayerMessage)
         {
             // create a gameobject using the name supplied by client
-            GameObject playergo = Instantiate(server.playerPrefab);
+            GameObject playergo = Instantiate(playerPrefab).gameObject;
             playergo.GetComponent<Player>().playerName = createPlayerMessage.name;
 
             // set it as the player