lionfish/SimUL
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor: added GameManager

Browse Source
This commit is contained in:
Vova
2023-12-11 11:53:00 +02:00
parent 05bf8484f5
commit ea59babf93
23 changed files with 162 additions and 643 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/InteractableObjects/Bed.cs
+3 -3
View File
@@ -25,14 +25,14 @@ public class Bed : BaseInteractableObject
private void OnConfirm(TimeSpan time)
{
_player.SetPlayerActing(PlayerStates.Sleeping);
TimeManager.Instance.FastForward(time);
TimeManager.Instance.OnFastForwardEnd += OnFastForwardEnd;
GameManager.Instance.Time.FastForward(time);
GameManager.Instance.Time.OnFastForwardEnd += OnFastForwardEnd;
}
private void OnFastForwardEnd()
{
_player.SetPlayerActing(PlayerStates.Awake);
_player.SetPlayerAnimation(AnimationStates.Standing);
TimeManager.Instance.OnFastForwardEnd -= OnFastForwardEnd;
GameManager.Instance.Time.OnFastForwardEnd -= OnFastForwardEnd;
}
}
Assets/Scripts/InteractableObjects/CashierDesk.cs
+3 -3
View File
@@ -93,15 +93,15 @@ public class CashierDesk : BaseInteractableObject
{
_totalSalary = (float)(time.TotalHours * _playerJob.Salary);
_player.SetPlayerActing(PlayerStates.Working);
TimeManager.Instance.FastForward(time);
TimeManager.Instance.OnFastForwardEnd += OnFastForwardEnd;
GameManager.Instance.Time.FastForward(time);
GameManager.Instance.Time.OnFastForwardEnd += OnFastForwardEnd;
}
private void OnFastForwardEnd()
{
_player.AddMoney(_totalSalary);
_player.SetPlayerActing(PlayerStates.Awake);
TimeManager.Instance.OnFastForwardEnd -= OnFastForwardEnd;
GameManager.Instance.Time.OnFastForwardEnd -= OnFastForwardEnd;
}
}
Assets/Scripts/InteractableObjects/Door.cs
+2 -1
View File
@@ -24,7 +24,8 @@ public class Door : BaseInteractableObject
{
PlayerPrefs.SetString("lastExitName", _exitName.ToLower());
}
SceneManager.Instance.ChangeScene(_scene);
GameManager.Instance.Scene.Change(_scene);
}
}