minor bug fixes, settings menu fixed, tutorial fixes
This commit is contained in:
@ -8,8 +8,8 @@ using UnityEngine;
|
||||
public class CameraController : MonoBehaviour
|
||||
{
|
||||
|
||||
private float mouseX = 0;
|
||||
private float mouseY;
|
||||
//private float mouseX = 0;
|
||||
//private float mouseY;
|
||||
[SerializeField]
|
||||
private Camera cam;
|
||||
|
||||
@ -24,10 +24,10 @@ public class CameraController : MonoBehaviour
|
||||
public Vector3 Forward { get { return this.forward; } }
|
||||
public Vector3 Right { get { return this.right; } }
|
||||
|
||||
private float originalDist = 0;
|
||||
private float newDist = 0;
|
||||
[SerializeField]
|
||||
private bool isChild = false;
|
||||
//private float originalDist = 0;
|
||||
//private float newDist = 0;
|
||||
//[SerializeField]
|
||||
// private bool isChild = false;
|
||||
|
||||
|
||||
|
||||
|
@ -15,7 +15,9 @@ public class CameraShift : MonoBehaviour
|
||||
private float cameraSpeed = 5f;
|
||||
[SerializeField]
|
||||
private CinemachineFreeLook freelook;
|
||||
[SerializeField]
|
||||
private float initRadius = 3f;
|
||||
[SerializeField]
|
||||
private float aimingRadius = 2f;
|
||||
//[SerializeField]
|
||||
//private PlayerMovementController movementController;
|
||||
|
@ -17,13 +17,13 @@ public class PlayerAnimationController : MonoBehaviour
|
||||
private float sideStepSpeed;
|
||||
|
||||
private bool isRunning;
|
||||
private bool movementInterrupt = false;
|
||||
//private bool movementInterrupt = false;
|
||||
[SerializeField]
|
||||
private PlayerInteractionHandler interactionHandler;
|
||||
[SerializeField]
|
||||
private PlayerMovementController movement;
|
||||
|
||||
private float verticalAiming = 0;
|
||||
//private float verticalAiming = 0;
|
||||
[SerializeField]
|
||||
private Camera hiddenCam;
|
||||
|
||||
|
@ -10,7 +10,7 @@ public class PlayerMovementController : MonoBehaviour
|
||||
|
||||
private float x = 0;
|
||||
private float y = 0;
|
||||
private float mouseX = 0;
|
||||
//private float mouseX = 0;
|
||||
|
||||
private bool isRunning = false;
|
||||
private bool isSneaking = false;
|
||||
@ -71,7 +71,7 @@ public class PlayerMovementController : MonoBehaviour
|
||||
public void SetSensitivity(float sensitivity)
|
||||
{
|
||||
this.freelook.m_XAxis.m_MaxSpeed = initXSensitivity * sensitivity;
|
||||
this.freelook.m_YAxis.m_MaxValue= initYSensitivity * sensitivity;
|
||||
this.freelook.m_YAxis.m_MaxSpeed= initYSensitivity * sensitivity;
|
||||
}
|
||||
private void MovePlayer()
|
||||
{
|
||||
@ -110,7 +110,7 @@ public class PlayerMovementController : MonoBehaviour
|
||||
void Update()
|
||||
{
|
||||
if(isDead) return;
|
||||
AllowRotation = Input.GetMouseButton(1) || Input.GetAxis("Aim")>0.5f;
|
||||
AllowRotation = Input.GetMouseButton(1) || Input.GetAxis("Aim")>0.5f||IsRunning;
|
||||
GetMovementOld();
|
||||
MovePlayer();
|
||||
|
||||
|
Reference in New Issue
Block a user