Fix TestPack

This commit is contained in:
2023-03-26 16:41:13 +03:00
parent fe0ee319e1
commit 9bf19a4c3c
11 changed files with 471 additions and 152623 deletions
+12 -18
View File
@@ -4,27 +4,21 @@ using UnityEngine;
public class CameraSystem : MonoBehaviour
{
[SerializeField]
private CinemachineVirtualCamera _camera;
private CinemachineVirtualCamera _playerCamera;
[SerializeField]
private CinemachineVirtualCamera _cityMapCamera;
private void Start()
{
//transform.position = Player.Instance.transform.position;
_camera.LookAt = Player.Instance.transform;
_camera.Follow = Player.Instance.transform;
_playerCamera.LookAt = Player.Instance.transform;
_playerCamera.Follow = Player.Instance.transform;
}
//private void Update()
//{
// Vector3 inputDir = Vector3.zero;
// if (Input.GetKey(KeyCode.W)) inputDir.z = +1f;
// if (Input.GetKey(KeyCode.S)) inputDir.z = -1f;
// if (Input.GetKey(KeyCode.A)) inputDir.x = -1f;
// if (Input.GetKey(KeyCode.D)) inputDir.x = +1f;
// Vector3 moveDir = transform.forward * inputDir.z + transform.right * inputDir.x;
// //if (moveDir == Vector3.zero && Player.Instance.stat) transform.position = Player.Instance.transform.position;
// transform.position += moveDir * _moveSpeed * Time.deltaTime;
//}
private void Update()
{
if (Input.GetKey(KeyCode.M))
{
//change camera
}
}
}
+2 -1
View File
@@ -41,6 +41,7 @@ public class Player : MonoBehaviour
}
PlayerPrefs.SetString("lastExitName", string.Empty);
Instance = this;
Stats = PlayerStats.CreateInitialStats();
DontDestroyOnLoad(gameObject);
}
@@ -49,7 +50,7 @@ public class Player : MonoBehaviour
TimeManager.Instance.OnMinuteChanged += UpdateStatsByClock;
_animator.applyRootMotion = true;
_navAgent.updatePosition = false;
Stats = PlayerStats.CreateInitialStats();
_currentActing = PlayerStates.Awake;
}