Browse Source

Checked with single player for the collision with traps.

Corrected the connectedclients list
Still need to set up the environment turn to trigger the animations
Josh_Dev_branch
ClairePeta 5 years ago
parent
commit
92b845258f
6 changed files with 17 additions and 16 deletions
  1. +1
    -1
      Assets/Prefabs/Traps/Conveyor Belt.prefab
  2. +2
    -2
      Assets/Prefabs/Traps/FloatingOnWater.prefab
  3. +1
    -1
      Assets/Scenes/SinglePlayer Levels/TuteLevelOne.unity
  4. +6
    -5
      Assets/Scripts/Traps/ConveyorBelt.cs
  5. +6
    -6
      Assets/Scripts/Traps/FloatingOnWater.cs
  6. +1
    -1
      Assets/Scripts/UI/Client/LoginUIManager.cs

+ 1
- 1
Assets/Prefabs/Traps/Conveyor Belt.prefab View File

@ -44,7 +44,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6692f0c965cb4fa41b616ba0991653a3, type: 3}
m_Name:
m_EditorClassIdentifier:
clientData: {fileID: 11400000, guid: 78d89605739516c4f9c66fb270137102, type: 2}
clientData: {fileID: 11400000, guid: ded0b21c3ef1e7049a1128c12e9401fe, type: 2}
left: 0
forward: 0
triggeranimate: 0

+ 2
- 2
Assets/Prefabs/Traps/FloatingOnWater.prefab View File

@ -80,7 +80,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 13e596b7661bb0b43b4ef2f0432f5966, type: 3}
m_Name:
m_EditorClassIdentifier:
clientData: {fileID: 11400000, guid: 78d89605739516c4f9c66fb270137102, type: 2}
clientData: {fileID: 11400000, guid: ded0b21c3ef1e7049a1128c12e9401fe, type: 2}
lilypad: {fileID: 3043143187275025574}
triggeranimate: 0
triggeranimate1: 0
@ -111,7 +111,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
VisualOffset: {x: 0, y: 0, z: 0}
is_Walkable: 1
isWater: 0
isWater: 1
isPit: 0
isSpawnable: 0
SpawnDirection: 2

+ 1
- 1
Assets/Scenes/SinglePlayer Levels/TuteLevelOne.unity View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5cb0faa75a290c6cd189bfe71f72e626ecfe805efb476c81fe5907d4fc24962c
oid sha256:c8e8d2f57e329f92cb93b55207f5503202561f255ea42a94928d442f2242f556
size 214523

+ 6
- 5
Assets/Scripts/Traps/ConveyorBelt.cs View File

@ -2,14 +2,15 @@
using System.Collections.Generic;
using UnityEngine;
using Networking.Client;
using Networking.Server;
public class ConveyorBelt : MonoBehaviour
{
public ConnectedClients clientData;
public ClientList clientData;
bool characterOnBelt = false;
GameObject player;
string charname = "Character";
private List<string> Names;
string charname;
public List<string> Names = new List<string>();
public bool left;
public bool forward;
public bool triggeranimate;
@ -26,9 +27,9 @@ public class ConveyorBelt : MonoBehaviour
private void Start()
{
for (int i = 0; i < clientData.AllClients.Count; i++)
for (int i = 0; i < clientData.ConnectedClients.Count; i++)
{
Names.Add(clientData.AllClients[i].characterAnimal + "(Clone)");
Names.Add(clientData.ConnectedClients[i].characterAnimal + "(Clone)");
}
}
void OnTriggerEnter(Collider other)

+ 6
- 6
Assets/Scripts/Traps/FloatingOnWater.cs View File

@ -1,16 +1,16 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Networking.Client;
using Networking.Server;
public class FloatingOnWater : MonoBehaviour
{
bool characterInWater = true;
public ConnectedClients clientData;
private List<string> Names;
public ClientList clientData;
public List<string> Names = new List<string>();
public GameObject lilypad;
GameObject player;
string charName = "Character";
string charName;
public bool triggeranimate;
public bool triggeranimate1;
@ -31,9 +31,9 @@ public class FloatingOnWater : MonoBehaviour
private void Start()
{
for(int i = 0; i < clientData.AllClients.Count; i++)
for(int i = 0; i < clientData.ConnectedClients.Count; i++)
{
Names.Add(clientData.AllClients[i].characterAnimal + "(Clone)");
Names.Add(clientData.ConnectedClients[i].characterAnimal + "(Clone)");
}
}
void OnTriggerEnter(Collider other)

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

@ -179,7 +179,7 @@ public class LoginUIManager : MonoBehaviour
hex = "#FF7B00";
break;
case "Goat":
//lightblue
//cyan
hex = "#00FFFF";
break;
case "Horse":

Loading…
Cancel
Save