Compare commits

..

No commits in common. "bdd216a46d8e40cfa40d9cb6d298cb42462f9ecb" and "5b5e16d4db511d8422730e83d905bc78c628e98b" have entirely different histories.

6 changed files with 29 additions and 51 deletions

View file

@ -4634,6 +4634,7 @@ MonoBehaviour:
dayEnded: 0
shiftStarted: 0
currentNPC: {fileID: 0}
currentStampDoc: {fileID: 0}
frontWalkPoints:
- {fileID: 1521924626}
- {fileID: 2036976913}
@ -13747,7 +13748,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!114 &1627151198
MonoBehaviour:
m_ObjectHideFlags: 0
@ -16945,7 +16946,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!114 &2043314902
MonoBehaviour:
m_ObjectHideFlags: 0

View file

@ -23,6 +23,7 @@ public class GameManager : MonoBehaviour
public bool shiftStarted;
public GameObject currentNPC;
public GameObject currentStampDoc;
[Header("Walk Points (FOR DEBUGGING")]
public Transform[] frontWalkPoints;

View file

@ -25,4 +25,7 @@ public class NpcData
public int points;
public bool hasPaper;
public string correctDepartment;
}

View file

@ -12,26 +12,21 @@ using UnityEngine.XR.Interaction.Toolkit;
using UnityEngine.XR.Interaction.Toolkit.Interactors;
public class PenInteractor : MonoBehaviour
{
[SerializeField] private GameObject stampDoc;
private StampDocument stampDocScript;
void Awake()
{
stampDocScript = stampDoc.GetComponent<StampDocument>();
}
private void OnCollisionEnter(Collision collision)
{
if (PenSocketInteractor.isPickedUp && collision.gameObject.CompareTag("Paper"))
{
if (collision.collider.gameObject.name == "Stamp-Sign Area")
{
stampDocScript = collision.gameObject.GetComponent<StampDocument>();
if(stampDocScript != null)
{
if(!stampDocScript.isSigned)
{
stampDocScript.SignDocument();
} }
else
{
Debug.LogError("Paper doesn't have StampDocScript");
}
stampDocScript.SignDocument();
}
}
}

View file

@ -10,10 +10,6 @@ public class StampDocument : MonoBehaviour
[SerializeField] private GameObject disabilitiesStamp;
[SerializeField] private GameObject signature;
public bool isStamped;
public bool isSigned;
public string assignedService;
void Start()
{
financialStamp.SetActive(false);
@ -21,42 +17,30 @@ public class StampDocument : MonoBehaviour
dvStamp.SetActive(false);
disabilitiesStamp.SetActive(false);
signature.SetActive(false);
isSigned = false;
isStamped = false;
}
public void StampFinancial()
{
financialStamp.SetActive(true);
isStamped = true;
assignedService = "Financial";
}
public void StampResidential()
{
residentialStamp.SetActive(true);
isStamped = true;
assignedService = "Residential";
}
public void StampDV()
{
dvStamp.SetActive(true);
isStamped = true;
assignedService = "Domestic Violence";
}
public void StampDisabilities()
{
disabilitiesStamp.SetActive(true);
isStamped = true;
assignedService = "Disabilities";
}
public void SignDocument()
{
signature.SetActive(true);
isSigned = true;
}
}

View file

@ -7,11 +7,14 @@ public class StampInteractor : MonoBehaviour
{
public string stampName;
[SerializeField] private GameObject stampDoc;
private StampDocument stampDocScript;
void Awake()
{
stampName = gameObject.name;
stampDocScript = stampDoc.GetComponent<StampDocument>();
}
private void OnCollisionEnter(Collision collision)
@ -20,30 +23,21 @@ public class StampInteractor : MonoBehaviour
{
if (collision.collider.gameObject.name == "Stamp-Sign Area")
{
stampDocScript = collision.gameObject.GetComponent<StampDocument>();
if(stampDocScript != null)
if (stampName == "Stamp_Financial")
{
if (stampName == "Stamp_Financial" && !stampDocScript.isStamped)
{
stampDocScript.StampFinancial();
}
else if (stampName == "Stamp_Residential" && !stampDocScript.isStamped)
{
stampDocScript.StampResidential();
}
else if (stampName == "Stamp_DV" && !stampDocScript.isStamped)
{
stampDocScript.StampDV();
}
else if (stampName == "Stamp_Disabilities" && !stampDocScript.isStamped)
{
stampDocScript.StampDisabilities();
}
stampDocScript.StampFinancial();
}
else
else if (stampName == "Stamp_Residential")
{
Debug.LogError("Paper doesn't have StampDocScript");
stampDocScript.StampResidential();
}
else if (stampName == "Stamp_DV")
{
stampDocScript.StampDV();
}
else if (stampName == "Stamp_Disabilities")
{
stampDocScript.StampDisabilities();
}
}
}