Merge branch 'master' of https://bitbucket.org/JoshuaReason/ggj-2019

Assets/Scipts/HomeScreenManager.cs

@@ -30,7 +30,7 @@ public class HomeScreenManager : MonoBehaviour {
         bool Succeeded = int.TryParse(Port.text, out intVal);
         if (Succeeded)
         {
-            Destroy(ServerManager.Instance.gameObject);
+            //Destroy(ServerManager.Instance.gameObject);
             ClientManager.Instance.StartClient(IP.text, intVal);
         }
         PlayerPrefs.SetString("IP", IP.text);
@@ -43,6 +43,7 @@ public class HomeScreenManager : MonoBehaviour {
     {
         Server.SetActive(true);
         int intVal = 0;
+
         bool Succeeded = int.TryParse(Port.text, out intVal);
         if (Succeeded)
         {
@@ -52,8 +53,14 @@ public class HomeScreenManager : MonoBehaviour {
         {
             Server.SetActive(false);
         }
+
+        IP.text = IPGrabber.GetIP(ADDRESSFAM.IPv4);
+
         PlayerPrefs.SetString("PORT", Port.text);
         PlayerPrefs.SetString("NAME", Name.text);
+        PlayerPrefs.SetString("IP", IP.text);
+
+        //Connect();
     }
 
     public void ChangeName()

Assets/Scipts/Multiplayer/Client/ClientLoginManager.cs

@@ -24,6 +24,7 @@ namespace Multiplayer
             ClientManager.Client.RegisterHandler(LoginMsgID.QueryName, OnRecieveID);
             ClientManager.Client.RegisterHandler(LoginMsgID.EnterLobby, StartLobby);
             ClientManager.Client.RegisterHandler(PlayerMsgID.GameStart, StartGame);
+            ClientManager.Client.RegisterHandler(LoginMsgID.Seed, SetSeed);
         }
 
         private void OnConnected(NetworkMessage msg)
@@ -65,6 +66,15 @@ namespace Multiplayer
         {
             UnityEngine.SceneManagement.SceneManager.LoadScene(ClientManager.GameScene);
         }
+
+        private void SetSeed(NetworkMessage msg)
+        {
+            longMsg longMsg;
+            if (!Utility.ReadMessage<longMsg>(msg, out longMsg))
+                return;
+
+            Random.InitState((int)longMsg.Long);
+        }
     }
 
 }

Assets/Scipts/Multiplayer/Server/LoginManager.cs

@@ -73,7 +73,7 @@ namespace Multiplayer
         {
             foreach (Player player in ServerManager.AllPlayers.Values)
             {
-                //player.Connection.Send(LoginMsgID.Seed, new longMsg(player.ID, ServerManager.Seed));
+                player.Connection.Send(LoginMsgID.Seed, new longMsg(player.ID, ServerManager.Seed));
                 player.Connection.Send(PlayerMsgID.GameStart, new PlayerMsg(player.ID));
             }
         }

Assets/Shaders.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f87a054963b01dc4c8aa2e3ffedcca21
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: