Browse Source

adjust smaller demo scene, change lobby link to demo scene, remove names appearing when lobby scene loads

Josh_Dev_branch
Claire Peta 5 years ago
parent
commit
1798783baf
3 changed files with 1699 additions and 4327 deletions
  1. +1696
    -4321
      Assets/Scenes/ColourCollide_Smaller.unity
  2. +1
    -1
      Assets/Scenes/Server Scenes/Lobby.unity
  3. +2
    -5
      Assets/Scripts/Networking/Server/ServerObject.cs

+ 1696
- 4321
Assets/Scenes/ColourCollide_Smaller.unity
File diff suppressed because it is too large
View File


+ 1
- 1
Assets/Scenes/Server Scenes/Lobby.unity View File

@ -587,7 +587,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
Clients: {fileID: 11400000, guid: ded0b21c3ef1e7049a1128c12e9401fe, type: 2} Clients: {fileID: 11400000, guid: ded0b21c3ef1e7049a1128c12e9401fe, type: 2}
SceneToStart: ServerTestScene
SceneToStart: ColourCollide_Smaller
IPText: {fileID: 910932172} IPText: {fileID: 910932172}
Content: {fileID: 1584683394} Content: {fileID: 1584683394}
ClientTag: {fileID: 263791918} ClientTag: {fileID: 263791918}

+ 2
- 5
Assets/Scripts/Networking/Server/ServerObject.cs View File

@ -29,6 +29,8 @@ namespace Networking.Server {
public void StartServer(int port) public void StartServer(int port)
{ {
LoginHandler.ConnectedClients.Clear();
LoginHandler.DisconnectedClients.Clear();
Debug.Log("Starting Server on " + port); Debug.Log("Starting Server on " + port);
server = new NetworkServerSimple(); server = new NetworkServerSimple();
@ -43,10 +45,5 @@ namespace Networking.Server {
if (server != null) if (server != null)
server.Update(); server.Update();
} }
} }
} }

Loading…
Cancel
Save