move SessionStateToken into SessionConfig

Author: DSchroer

com.unity.netcode.gameobjects/Runtime/Configuration/SessionConfig.cs

@@ -8,9 +8,10 @@ internal class SessionConfig
         public const uint NoFeatureCompatibility = 0;
         public const uint BypassFeatureCompatible = 1;
         public const uint ServerDistributionCompatible = 2;
+        public const uint SessionStateToken = 3;
 
         // The most current session version (!!!!set this when you increment!!!!!)
-        public static uint PackageSessionVersion => ServerDistributionCompatible;
+        public static uint PackageSessionVersion => SessionStateToken;
 
         internal uint SessionVersion;
 

com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ConnectionApprovedMessage.cs

@@ -9,6 +9,7 @@ internal struct ServiceConfig : INetworkSerializable
         public bool IsRestoredSession;
         public ulong CurrentSessionOwner;
         public bool ServerRedistribution;
+        public ulong SessionStateToken;
 
         public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReaderWriter
         {
@@ -22,6 +23,11 @@ public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReade
                 {
                     serializer.SerializeValue(ref ServerRedistribution);
                 }
+
+                if (SessionVersion >= SessionConfig.SessionStateToken)
+                {
+                    serializer.SerializeValue(ref SessionStateToken);
+                }
             }
             else
             {
@@ -37,19 +43,26 @@ public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReade
                 {
                     ServerRedistribution = false;
                 }
+
+                if (SessionVersion >= SessionConfig.SessionStateToken)
+                {
+                    serializer.SerializeValue(ref SessionStateToken);
+                }
+                else
+                {
+                    SessionStateToken = 0;
+                }
             }
         }
     }
 
     internal struct ConnectionApprovedMessage : INetworkMessage
     {
-        private const int k_AddSessionStateToken = 3;
         private const int k_AddCMBServiceConfig = 2;
         private const int k_VersionAddClientIds = 1;
-        public int Version => k_AddSessionStateToken;
+        public int Version => k_AddCMBServiceConfig;
 
         public ulong OwnerClientId;
-        public ulong SessionStateToken;
         public int NetworkTick;
         // The cloud state service should set this if we are restoring a session
         public ServiceConfig ServiceConfig;
@@ -110,10 +123,6 @@ public void Serialize(FastBufferWriter writer, int targetVersion)
             // ============================================================
 
             BytePacker.WriteValueBitPacked(writer, OwnerClientId);
-            if (targetVersion >= k_AddSessionStateToken)
-            {
-                writer.WriteValueSafe(SessionStateToken);
-            }
             BytePacker.WriteValueBitPacked(writer, NetworkTick);
             if (IsDistributedAuthority)
             {
@@ -205,10 +214,6 @@ public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int
             // ============================================================
             m_ReceiveMessageVersion = receivedMessageVersion;
             ByteUnpacker.ReadValueBitPacked(reader, out OwnerClientId);
-            if (receivedMessageVersion >= k_AddSessionStateToken)
-            {
-                reader.ReadValueSafe(out SessionStateToken);
-            }
             ByteUnpacker.ReadValueBitPacked(reader, out NetworkTick);
             if (networkManager.DistributedAuthorityMode)
             {

testproject/ProjectSettings/MultiplayerManager.asset

@@ -0,0 +1,7 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!655991488 &1
+MultiplayerManager:
+  m_ObjectHideFlags: 0
+  m_EnableMultiplayerRoles: 0
+  m_StrippingTypes: {}