Merge branch 'feature/info-ui'
This commit is contained in:
commit
4860caa9ff
3 changed files with 4351 additions and 0 deletions
4339
Project Undercover/Assets/Scenes/scene - Randall.unity
Normal file
4339
Project Undercover/Assets/Scenes/scene - Randall.unity
Normal file
File diff suppressed because it is too large
Load diff
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f474888f3d3b7ce40a640249c4e031a1
|
||||||
|
timeCreated: 1506623019
|
||||||
|
licenseType: Free
|
||||||
|
DefaultImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -15,6 +15,8 @@ public class GameManager : Photon.PunBehaviour {
|
||||||
public bool onMissionCooldown = false;
|
public bool onMissionCooldown = false;
|
||||||
public Text missionsCompleteText;
|
public Text missionsCompleteText;
|
||||||
public GameObject winPanel;
|
public GameObject winPanel;
|
||||||
|
public GameObject guardPanel;
|
||||||
|
public GameObject spyPanel;
|
||||||
public Text winText;
|
public Text winText;
|
||||||
private int numOfMissions = 3;
|
private int numOfMissions = 3;
|
||||||
|
|
||||||
|
@ -46,6 +48,7 @@ public class GameManager : Photon.PunBehaviour {
|
||||||
if (PersistantPlayerSettings.character == PersistantPlayerSettings.Character.Guard)
|
if (PersistantPlayerSettings.character == PersistantPlayerSettings.Character.Guard)
|
||||||
{
|
{
|
||||||
guardCamera.SetCameraEnabled(guardCamera, true);
|
guardCamera.SetCameraEnabled(guardCamera, true);
|
||||||
|
guardPanel.SetActive(true);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -54,6 +57,7 @@ public class GameManager : Photon.PunBehaviour {
|
||||||
var spy = PhotonNetwork.Instantiate(spyPrefab.name, randPos, Quaternion.identity, 0);
|
var spy = PhotonNetwork.Instantiate(spyPrefab.name, randPos, Quaternion.identity, 0);
|
||||||
spy.GetComponent<PlayerController>().enabled = true;
|
spy.GetComponent<PlayerController>().enabled = true;
|
||||||
spy.GetComponent<Spy>().SetColor();
|
spy.GetComponent<Spy>().SetColor();
|
||||||
|
spyPanel.SetActive(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (PhotonNetwork.isMasterClient)
|
if (PhotonNetwork.isMasterClient)
|
||||||
|
|
Reference in a new issue