This commit is contained in:
j.mei7
2022-03-13 14:56:10 +01:00
parent 25ce88501d
commit eb71cdbc9d
41 changed files with 1830 additions and 205 deletions

View File

@@ -34,48 +34,51 @@ public class Person : MonoBehaviour
void Awake()
{
city.AddCitizen(this);
}
void Start()
void Start ()
{
foreach (Workplace w in city.GetWorkplaces())
{
if(workplace == null)
{
if (w.AddWorker(this))
{
workplace = w;
Debug.Log("Workplace added to " + GetFullName());
}
}
}
city.AddCitizen(this);
house.AddPerson(this);
workplace.AddWorker(this);
/* foreach (Workplace w in city.GetWorkplaces())
{
if(workplace == null)
{
if (w.AddWorker(this))
{
workplace = w;
Debug.Log("Workplace added to " + GetFullName());
}
}
}
foreach (House h in city.GetHouses())
{
if(house == null)
{
if (h.AddPerson(this))
{
house = h;
Debug.Log("House added to " + GetFullName());
}
}
}*/
foreach (House h in city.GetHouses())
{
if(house == null)
{
if (h.AddPerson(this))
{
house = h;
Debug.Log("House added to " + GetFullName());
}
}
}
movement = GetComponent<PersonMovement>();
indicators = GetComponent<PersonIndicators>();
/* TimeManager.OnMinuteUpdate += OnMinuteUpdate;
TimeManager.OnMinuteUpdate += OnMinuteUpdate;
TimeManager.OnDayUpdate += OnDayUpdate;
SetBehaivorDateTimes();
Sleep();*/
Sleep();
}
/*
void OnDayUpdate()
{
SetBehaivorDateTimes();
@@ -115,25 +118,26 @@ public class Person : MonoBehaviour
{
status = PersonStatus.STORE;
Debug.Log(city.GetStores().Count - 1);
movement.SetTarget(city.GetStores()[Random.Range(0, city.GetStores().Count-1)].transform);
movement.SetTarget(city.GetStores()[Random.Range(0, city.GetStores().Count-1)].transform.position);
}
else if(status != PersonStatus.PARK)
{
status = PersonStatus.PARK;// Check if any Object exsits
movement.SetTarget(city.GetFreeTimeObjects()[Random.Range(0, city.GetFreeTimeObjects().Count)].transform);
movement.SetTarget(city.GetFreeTimeObjects()[Random.Range(0, city.GetFreeTimeObjects().Count)].transform.position);
}
}
void Work()
{
status = PersonStatus.WORK;
movement.SetTarget(workplace.transform);
movement.SetTarget(workplace.transform.position);
}
void Sleep()
{
status = PersonStatus.SLEEP;
movement.SetTarget(house.transform);
Debug.Log(house.transform.position);
movement.SetTarget(house.transform.position);
}
void SetBehaivorDateTimes()
@@ -146,5 +150,5 @@ public class Person : MonoBehaviour
Random.Range(0, 59),
currentDateTime.Second);
}*/
}
}

View File

@@ -8,14 +8,19 @@ public class PersonMovement : MonoBehaviour
private int currentPathIndex;
[SerializeField] private List<Vector3> pathVectorList = new List<Vector3>();
private const float speed = 40f;
Rigidbody2D rigidbody;
private void Awake()
{
rigidbody = GetComponent<Rigidbody2D>();
}
private void Update()
void Update()
{
HandleMovementList();
/*
//Debug
if (Input.GetMouseButtonDown(0))
{
Pathfinding pathfinding = PathfindingSystem.instance.pathfinding;
@@ -35,16 +40,22 @@ public class PersonMovement : MonoBehaviour
}
SetTarget(mouseWorldPosition);
}
}*/
}
void HandleMovementList()
{
if(pathVectorList.Count > 0)
{
if(GetPosition() == pathVectorList[0])
{
if(pathVectorList != null && pathVectorList.Count > 0)
{
// Move our position a step closer to the target.
float step = speed * Time.deltaTime; // calculate distance to move
transform.position = Vector3.MoveTowards(transform.position, pathVectorList[0], step);
// Check if the position of the cube and sphere are approximately equal.
if (Vector3.Distance(transform.position, pathVectorList[0]) < 0.001f)
{
pathVectorList.RemoveAt(0);
}
}
}
@@ -55,7 +66,6 @@ public class PersonMovement : MonoBehaviour
}
public void SetTarget(Vector3 targetTransform)
{
pathVectorList = Pathfinding.Instance.FindPath(GetPosition(), targetTransform);
Debug.Log(pathVectorList);
pathVectorList = Pathfinding.Instance.FindPath(GetPosition(), targetTransform);
}
}