Browse Source

Fixed old port issue

Added colours for each animal (Tested with selection black out) - need Joshua's help for server push
Josh_Dev_branch
ClairePeta 5 years ago
parent
commit
096edc62a8
10 changed files with 80 additions and 17 deletions
  1. +2
    -2
      Assets/Scenes/Client Scenes/LoginScreen.unity
  2. +2
    -2
      Assets/Scenes/Menus/Lobby.unity
  3. +0
    -8
      Assets/Scripts/Components.meta
  4. +18
    -0
      Assets/Scripts/NewBlock.cs
  5. +11
    -0
      Assets/Scripts/NewBlock.cs.meta
  6. +2
    -1
      Assets/Scripts/UI/Client/LoginUIManager.cs
  7. +30
    -0
      Assets/Scripts/animalSelection.cs
  8. +11
    -0
      Assets/Scripts/animalSelection.cs.meta
  9. +2
    -2
      ProjectSettings/EditorBuildSettings.asset
  10. +2
    -2
      ProjectSettings/GraphicsSettings.asset

+ 2
- 2
Assets/Scenes/Client Scenes/LoginScreen.unity View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5de61707e401edd13ab604df75448d40495d6d52af2b35f23ebb3330e5ac4078
size 267270
oid sha256:921c3031e05c70f24f9c7d294a58f76e4b8ebb7405d1cc6ab4c2bfd9684d79ea
size 259080

+ 2
- 2
Assets/Scenes/Menus/Lobby.unity View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b7017e38836315555c2c321e869b6671fca2ca870a09f20c7107b1dae3ff465f
size 48286
oid sha256:7eb9044982a7b19dbe900e3d7b96c9873bc4f317bf961a9b2d88badd10d7e630
size 46625

+ 0
- 8
Assets/Scripts/Components.meta View File

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

+ 18
- 0
Assets/Scripts/NewBlock.cs View File

@ -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()
{
}
}

+ 11
- 0
Assets/Scripts/NewBlock.cs.meta View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 291a8b435d20f8d459cb39e8be443e8a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

+ 2
- 1
Assets/Scripts/UI/Client/LoginUIManager.cs View File

@ -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)

+ 30
- 0
Assets/Scripts/animalSelection.cs View File

@ -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<Toggle> 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<Image>().color = Color.black;
Animals[j].enabled = false;
}
}
}
}
}
}

+ 11
- 0
Assets/Scripts/animalSelection.cs.meta View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: b8ca17f8588b17645aa5818f4e3bac3a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

+ 2
- 2
ProjectSettings/EditorBuildSettings.asset View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:02436db350b5f6462ab957cd2cd0a682d98500fe0b1e429eea533924fdb17b94
size 1650
oid sha256:a35213e026941835d1fac3130bacfea6df34bd4e07fcfcb45b34c2dd8f1547d2
size 1775

+ 2
- 2
ProjectSettings/GraphicsSettings.asset View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:06f2c9c42c3e01f1143d4c15cfe4f316cfab490aba17fde694e466c130d4e3a4
size 2359
oid sha256:758221ccdd8ed2b386a3367cc69cc6c5466fe975c0b4a77ac65f68abcdaa7ffd
size 2428

Loading…
Cancel
Save