fix(LogSettings): removing log settings component from samples

LogSetting component without a settings reference does nothing, so should not exist on the NetworkManagers
MirageNet · Oct 21, 2021 · a72d777 · a72d777
1 parent 5c83dc6
commit a72d777
Show file tree

Hide file tree

Showing 13 changed files with 10,291 additions and 11,314 deletions.
diff --git a/Assets/Mirage/Samples~/AdditiveScenes/Scenes/MainScene.unity b/Assets/Mirage/Samples~/AdditiveScenes/Scenes/MainScene.unity
@@ -1879,7 +1879,6 @@ GameObject:
   - component: {fileID: 1661834284}
   - component: {fileID: 1661834281}
   - component: {fileID: 1661834286}
-  - component: {fileID: 1661834287}
   - component: {fileID: 1661834285}
   m_Layer: 0
   m_Name: Network
@@ -1980,8 +1979,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   EnablePeerMetrics: 0
+  MetricsSize: 10
   SocketFactory: {fileID: 1661834285}
+  DisconnectOnException: 1
   authenticator: {fileID: 0}
+  _started:
+    _event:
+      m_PersistentCalls:
+        m_Calls: []
   _connected:
     _event:
       m_PersistentCalls:
@@ -2007,7 +2012,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   EnablePeerMetrics: 0
+  MetricsSize: 10
   MaxConnections: 4
+  DisconnectOnException: 1
   Listening: 1
   SocketFactory: {fileID: 1661834285}
   authenticator: {fileID: 0}
@@ -2051,16 +2058,19 @@ MonoBehaviour:
   Client: {fileID: 1661834282}
   Server: {fileID: 1661834283}
   DontDestroy: 1
-  _clientChangeScene:
+  _onClientStartedSceneChange:
     m_PersistentCalls:
       m_Calls: []
-  _clientSceneChanged:
+  _onClientFinishedSceneChange:
     m_PersistentCalls:
       m_Calls: []
-  _serverChangeScene:
+  _onServerStartedSceneChange:
     m_PersistentCalls:
       m_Calls: []
-  _serverSceneChanged:
+  _onServerFinishedSceneChange:
+    m_PersistentCalls:
+      m_Calls: []
+  _onPlayerSceneReady:
     m_PersistentCalls:
       m_Calls: []
 --- !u!114 &1661834285
@@ -2075,8 +2085,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d9f46b2d67d7a054d8c13075473bd4a2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  address: localhost
-  port: 7777
+  Address: localhost
+  Port: 7777
+  SocketLib: 0
+  BufferSize: 262144
 --- !u!114 &1661834286
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2091,129 +2103,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   Server: {fileID: 1661834283}
   NetworkSceneManager: {fileID: 1661834284}
---- !u!114 &1661834287
-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: ac6e8eccf4b6f4dc7b24c276ef47fde8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  Levels:
-  - Name: ServerObjectManager
-    level: 2
-  - Name: NetworkServer
-    level: 2
-  - Name: NetworkTime
-    level: 2
-  - Name: CharacterSpawner
-    level: 2
-  - Name: NetworkBehaviour
-    level: 2
-  - Name: NetworkClient
-    level: 2
-  - Name: NetworkSceneManager
-    level: 2
-  - Name: ClientObjectManager
-    level: 2
-  - Name: NetworkIdentity
-    level: 2
-  - Name: RemoteCallHelper
-    level: 2
-  - Name: HeadlessFrameLimiter
-    level: 2
-  - Name: NetworkBehaviourInspector
-    level: 2
-  - Name: EchoChannelAndSettingsButton
-    level: 2
-  - Name: LoginManager
-    level: 2
-  - Name: NetworkAnimator
-    level: 2
-  - Name: NetworkPositionBehaviour
-    level: 0
-  - Name: UIManager
-    level: 2
-  - Name: PlayerVoiceBehaviour
-    level: 2
-  - Name: CapyCafeNetworkManager
-    level: 2
-  - Name: UIPanel_Chat
-    level: 2
-  - Name: FirebaseLoginManager
-    level: 2
-  - Name: PlayerSpawner
-    level: 2
-  - Name: SyncPositionBehaviour
-    level: 0
-  - Name: SnapshotBuffer
-    level: 0
-  - Name: NetworkProximityChecker
-    level: 2
-  - Name: ZoneHandler
-    level: 2
-  - Name: AdditiveNetworkManager
-    level: 2
-  - Name: NetworkScenePostProcess
-    level: 2
-  - Name: NetworkWriterPool
-    level: 2
-  - Name: NetworkConnection
-    level: 2
-  - Name: NetworkReaderExtensions
-    level: 2
-  - Name: NetworkReaderPool
-    level: 2
-  - Name: BasicAuthenticator
-    level: 2
-  - Name: NetworkRigidbody
-    level: 2
-  - Name: EnterPlayModeSettingsCheck
-    level: 2
-  - Name: SceneDrawer
-    level: 2
-  - Name: InterpolationTime
-    level: 0
-  - Name: NetworkSceneChecker
-    level: 2
-  - Name: Reward
-    level: 2
-  - Name: LogFactoryTests
-    level: 2
-  - Name: NetworkManager
-    level: 2
-  - Name: WeaverTests
-    level: 4
-  - Name: ChatWindow
-    level: 2
-  - Name: NetworkDiscovery
-    level: 2
-  - Name: NetworkDiscoveryBase`2
-    level: 2
-  - Name: KcpConnection
-    level: 2
-  - Name: Tests
-    level: 4
-  - Name: WelcomeWindow
-    level: 2
-  - Name: MessageBroker
-    level: 2
-  - Name: NetworkPlayer
-    level: 3
-  - Name: SyncVarReceiver
-    level: 2
-  - Name: NetworkWorld
-    level: 2
-  - Name: RosterUI
-    level: 2
-  - Name: Peer
-    level: 2
-  - Name: PipePeerConnection
-    level: 2
 --- !u!1 &1727677796
 GameObject:
   m_ObjectHideFlags: 0
@@ -3946,6 +3835,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   NetworkManager: {fileID: 1661834278}
   NetworkAddress: localhost
+  DontDestroy: 1
   NetworkAddressInput: {fileID: 476531300335670375}
   OfflineGO: {fileID: 476531300067055612}
   OnlineGO: {fileID: 476531299931289191}