diff --git a/Assets/Scenes/Client Scenes/LoginScreen.unity b/Assets/Scenes/Client Scenes/LoginScreen.unity index 7f40140..ecf8ab2 100644 --- a/Assets/Scenes/Client Scenes/LoginScreen.unity +++ b/Assets/Scenes/Client Scenes/LoginScreen.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5de61707e401edd13ab604df75448d40495d6d52af2b35f23ebb3330e5ac4078 -size 267270 +oid sha256:921c3031e05c70f24f9c7d294a58f76e4b8ebb7405d1cc6ab4c2bfd9684d79ea +size 259080 diff --git a/Assets/Scenes/Menus/Lobby.unity b/Assets/Scenes/Menus/Lobby.unity index e6e8286..65e6143 100644 --- a/Assets/Scenes/Menus/Lobby.unity +++ b/Assets/Scenes/Menus/Lobby.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7017e38836315555c2c321e869b6671fca2ca870a09f20c7107b1dae3ff465f -size 48286 +oid sha256:7eb9044982a7b19dbe900e3d7b96c9873bc4f317bf961a9b2d88badd10d7e630 +size 46625 diff --git a/Assets/Scripts/Components.meta b/Assets/Scripts/Components.meta deleted file mode 100644 index 5a95b09..0000000 --- a/Assets/Scripts/Components.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8d7394d70ec233849a60a26da5f23b75 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/NewBlock.cs b/Assets/Scripts/NewBlock.cs new file mode 100644 index 0000000..c4221ff --- /dev/null +++ b/Assets/Scripts/NewBlock.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class NewBlock : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/NewBlock.cs.meta b/Assets/Scripts/NewBlock.cs.meta new file mode 100644 index 0000000..ae98e03 --- /dev/null +++ b/Assets/Scripts/NewBlock.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 291a8b435d20f8d459cb39e8be443e8a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Client/LoginUIManager.cs b/Assets/Scripts/UI/Client/LoginUIManager.cs index 20731e0..e8e61ee 100644 --- a/Assets/Scripts/UI/Client/LoginUIManager.cs +++ b/Assets/Scripts/UI/Client/LoginUIManager.cs @@ -150,7 +150,8 @@ public class LoginUIManager : MonoBehaviour { this.playerAnimal = playerAnimal; animalSelected = true; - clientManager.SendPlayerADetails(playerAnimal); + getPlayerColour(playerAnimal); + clientManager.SendPlayerADetails(playerAnimal); } public void OnChange_Name(string playerName) diff --git a/Assets/Scripts/animalSelection.cs b/Assets/Scripts/animalSelection.cs new file mode 100644 index 0000000..e558b6a --- /dev/null +++ b/Assets/Scripts/animalSelection.cs @@ -0,0 +1,30 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Networking.Server; +using UnityEngine.UI; + +public class animalSelection : MonoBehaviour +{ + public ClientList Clients; + public List Animals; + + void Update() + //change function to react on push from the server + { + if (Clients.ConnectedClients.Count > 0) + { + for (int i = 0; i < Clients.ConnectedClients.Count; i++) + { + for (int j = 0; j < Animals.Count; j++) + { + if (Clients.ConnectedClients[i].characterAnimal == Animals[j].name) + { + Animals[j].GetComponent().color = Color.black; + Animals[j].enabled = false; + } + } + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/animalSelection.cs.meta b/Assets/Scripts/animalSelection.cs.meta new file mode 100644 index 0000000..843fe9d --- /dev/null +++ b/Assets/Scripts/animalSelection.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b8ca17f8588b17645aa5818f4e3bac3a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 7429538..550bec2 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:02436db350b5f6462ab957cd2cd0a682d98500fe0b1e429eea533924fdb17b94 -size 1650 +oid sha256:a35213e026941835d1fac3130bacfea6df34bd4e07fcfcb45b34c2dd8f1547d2 +size 1775 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index b70056e..dddc503 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06f2c9c42c3e01f1143d4c15cfe4f316cfab490aba17fde694e466c130d4e3a4 -size 2359 +oid sha256:758221ccdd8ed2b386a3367cc69cc6c5466fe975c0b4a77ac65f68abcdaa7ffd +size 2428