game: trying to fix score/day/customercount system
This commit is contained in:
parent
66ccb98f61
commit
049109cb80
4 changed files with 38 additions and 24 deletions
|
@ -819,8 +819,28 @@ PrefabInstance:
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
m_RemovedGameObjects: []
|
||||||
m_AddedGameObjects: []
|
m_AddedGameObjects: []
|
||||||
m_AddedComponents: []
|
m_AddedComponents:
|
||||||
|
- targetCorrespondingSourceObject: {fileID: 1717954561962503725, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
|
||||||
|
insertIndex: -1
|
||||||
|
addedObject: {fileID: 456355250}
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
|
||||||
|
--- !u!1 &456355243 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 1717954561962503725, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 441087506}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!114 &456355250
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 456355243}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 453d520beb5656b4b8f3e696d9a97205, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
--- !u!1 &520849214
|
--- !u!1 &520849214
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -832,7 +852,6 @@ GameObject:
|
||||||
- component: {fileID: 520849215}
|
- component: {fileID: 520849215}
|
||||||
- component: {fileID: 520849216}
|
- component: {fileID: 520849216}
|
||||||
- component: {fileID: 520849217}
|
- component: {fileID: 520849217}
|
||||||
- component: {fileID: 520849218}
|
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: Game Manager
|
m_Name: Game Manager
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
@ -881,18 +900,6 @@ MonoBehaviour:
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
npcObject: {fileID: 624452548}
|
npcObject: {fileID: 624452548}
|
||||||
--- !u!114 &520849218
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 520849214}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 453d520beb5656b4b8f3e696d9a97205, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
--- !u!1 &624452548
|
--- !u!1 &624452548
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -13,6 +13,7 @@ public class DeskButtons : MonoBehaviour
|
||||||
{
|
{
|
||||||
NPCMovement npcMoveScript;
|
NPCMovement npcMoveScript;
|
||||||
NPCBehaviour npcBehaviourScript;
|
NPCBehaviour npcBehaviourScript;
|
||||||
|
private Player playerScript;
|
||||||
|
|
||||||
[SerializeField] private GameObject npcObject;
|
[SerializeField] private GameObject npcObject;
|
||||||
|
|
||||||
|
@ -23,6 +24,7 @@ public class DeskButtons : MonoBehaviour
|
||||||
{
|
{
|
||||||
npcMoveScript = npcObject.GetComponent<NPCMovement>();
|
npcMoveScript = npcObject.GetComponent<NPCMovement>();
|
||||||
npcBehaviourScript = npcObject.GetComponent<NPCBehaviour>();
|
npcBehaviourScript = npcObject.GetComponent<NPCBehaviour>();
|
||||||
|
playerScript = GameObject.FindGameObjectWithTag("Player").GetComponent<Player>();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void DirectToLeft()
|
public void DirectToLeft()
|
||||||
|
@ -57,6 +59,7 @@ public class DeskButtons : MonoBehaviour
|
||||||
}
|
}
|
||||||
|
|
||||||
CheckCorrectDirection();
|
CheckCorrectDirection();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void CheckCorrectDirection()
|
void CheckCorrectDirection()
|
||||||
|
@ -64,14 +67,20 @@ public class DeskButtons : MonoBehaviour
|
||||||
if (correctDirection == directionSent)
|
if (correctDirection == directionSent)
|
||||||
{
|
{
|
||||||
Player.score += 1;
|
Player.score += 1;
|
||||||
|
Player.customersServed += 1;
|
||||||
Debug.Log("correct");
|
Debug.Log("correct");
|
||||||
Debug.Log(Player.score);
|
Debug.Log(Player.score);
|
||||||
|
Debug.Log(Player.customersServed);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Player.score -= 1;
|
Player.score -= 1;
|
||||||
|
Player.customersServed += 1;
|
||||||
Debug.Log("incorrect");
|
Debug.Log("incorrect");
|
||||||
Debug.Log(Player.score);
|
Debug.Log(Player.score);
|
||||||
|
Debug.Log(Player.customersServed);
|
||||||
|
|
||||||
|
playerScript.CheckDayEnd();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,19 +12,18 @@ using UnityEngine;
|
||||||
|
|
||||||
public class Despawn : MonoBehaviour
|
public class Despawn : MonoBehaviour
|
||||||
{
|
{
|
||||||
|
private Player playerScript;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Destroy NPC object on trigger enter
|
/// Destroy NPC object on trigger enter
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="other"></param>
|
/// <param name="other"></param>
|
||||||
public void OnTriggerEnter(Collider other)
|
public void OnTriggerEnter(Collider other)
|
||||||
{
|
{
|
||||||
/*Debug.Log(other.name);*/
|
|
||||||
|
|
||||||
if (other.CompareTag("NPC"))
|
if (other.CompareTag("NPC"))
|
||||||
{
|
{
|
||||||
other.gameObject.SetActive(false);
|
other.gameObject.SetActive(false);
|
||||||
Destroy(other.gameObject);
|
Destroy(other.gameObject);
|
||||||
/*Debug.Log("NPC left");*/
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -12,6 +12,8 @@ using UnityEngine;
|
||||||
public class Player : MonoBehaviour
|
public class Player : MonoBehaviour
|
||||||
{
|
{
|
||||||
public static int score = 0;
|
public static int score = 0;
|
||||||
|
public static int customersServed = 0;
|
||||||
|
public static int daysPlayed = 0;
|
||||||
|
|
||||||
private GameManager gm;
|
private GameManager gm;
|
||||||
|
|
||||||
|
@ -19,18 +21,15 @@ public class Player : MonoBehaviour
|
||||||
{
|
{
|
||||||
gm = GameObject.Find("Game Manager").GetComponent<GameManager>();
|
gm = GameObject.Find("Game Manager").GetComponent<GameManager>();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Update()
|
|
||||||
{
|
|
||||||
CheckDayEnd();
|
|
||||||
}
|
|
||||||
|
|
||||||
void CheckDayEnd()
|
public void CheckDayEnd()
|
||||||
{
|
{
|
||||||
if (score < 0)
|
if (score < 0)
|
||||||
{
|
{
|
||||||
Debug.Log("Game Over, Day has ended");
|
|
||||||
gm.dayEnded = true;
|
gm.dayEnded = true;
|
||||||
|
daysPlayed += 1;
|
||||||
|
Debug.Log("Game Over, Day has ended");
|
||||||
|
Debug.Log(daysPlayed);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue