GabrielTofvesson/MLAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved Scene switching to the main lib channel

Browse Source
This commit is contained in:
Albin Corén 2018-03-05 13:00:04 +01:00
parent 914c7a2a81
commit 27ae0bc01f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MLAPI/MonoBehaviours/Core/NetworkingManager.cs
View File

@ -93,7 +93,6 @@ namespace MLAPI
//MLAPI channels and messageTypes //MLAPI channels and messageTypes
NetworkConfig.Channels.Add("MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", QosType.ReliableFragmentedSequenced); NetworkConfig.Channels.Add("MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", QosType.ReliableFragmentedSequenced);
NetworkConfig.Channels.Add("MLAPI_POSITION_UPDATE", QosType.StateUpdate); NetworkConfig.Channels.Add("MLAPI_POSITION_UPDATE", QosType.StateUpdate);
NetworkConfig.Channels.Add("MLAPI_SCENE_SWTICH", QosType.AllCostDelivery);
MessageManager.messageTypes.Add("MLAPI_CONNECTION_REQUEST", 0); MessageManager.messageTypes.Add("MLAPI_CONNECTION_REQUEST", 0);
MessageManager.messageTypes.Add("MLAPI_CONNECTION_APPROVED", 1); MessageManager.messageTypes.Add("MLAPI_CONNECTION_APPROVED", 1);
MessageManager.messageTypes.Add("MLAPI_ADD_OBJECT", 2); MessageManager.messageTypes.Add("MLAPI_ADD_OBJECT", 2);

4
MLAPI/NetworkingManagerComponents/NetworkSceneManager.cs
View File

@ -51,7 +51,7 @@ namespace MLAPI.NetworkingManagerComponents
{ {
writer.Write(sceneNameToIndex[sceneName]); writer.Write(sceneNameToIndex[sceneName]);
} }
NetworkingManager.singleton.Send("MLAPI_SWITCH_SCENE", "MLAPI_SCENE_SWTICH", stream.GetBuffer()); NetworkingManager.singleton.Send("MLAPI_SWITCH_SCENE", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.GetBuffer());
} }
} }
@ -62,7 +62,7 @@ namespace MLAPI.NetworkingManagerComponents
Debug.LogWarning("MLAPI: Scene switching is not enabled but was requested by the server"); Debug.LogWarning("MLAPI: Scene switching is not enabled but was requested by the server");
return; return;
} }
else if (!sceneIndexToString.ContainsKey(sceneIndex) ||registeredSceneNames.Contains(sceneIndexToString[sceneIndex])) else if (!sceneIndexToString.ContainsKey(sceneIndex) || registeredSceneNames.Contains(sceneIndexToString[sceneIndex]))
{ {
Debug.LogWarning("MLAPI: Server requested a scene switch to a non registered scene"); Debug.LogWarning("MLAPI: Server requested a scene switch to a non registered scene");
return; return;