Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
645395a43c | ||
|
|
ba63ebf72b | ||
|
|
9c10ca695d | ||
|
|
c13613ca25 | ||
|
|
2ade04fcba |
@@ -96,6 +96,7 @@ LightmapSettings:
|
||||
m_PVRFilteringAtrousPositionSigmaAO: 1
|
||||
m_ExportTrainingData: 0
|
||||
m_TrainingDataDestination: TrainingData
|
||||
m_LightProbeSampleCountMultiplier: 4
|
||||
m_LightingDataAsset: {fileID: 0}
|
||||
m_UseShadowmask: 1
|
||||
--- !u!196 &4
|
||||
@@ -199,6 +200,7 @@ MeshRenderer:
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
@@ -270,8 +272,9 @@ Light:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 705507993}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 9
|
||||
serializedVersion: 10
|
||||
m_Type: 1
|
||||
m_Shape: 0
|
||||
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
|
||||
m_Intensity: 1
|
||||
m_Range: 10
|
||||
@@ -396,6 +399,7 @@ MeshRenderer:
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
@@ -477,6 +481,7 @@ MeshRenderer:
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
@@ -537,7 +542,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
speed: 20
|
||||
jumpSpeed: 20
|
||||
jumpHeight: 15
|
||||
gravity: 5
|
||||
rotationSpeed: 20
|
||||
pivot: {fileID: 1402695046}
|
||||
@@ -620,6 +625,7 @@ MeshRenderer:
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
|
||||
@@ -10,20 +10,31 @@ using System.Collections;
|
||||
public class PlayerController : MonoBehaviour
|
||||
{
|
||||
CharacterController characterController;
|
||||
CapsuleCollider capsule;
|
||||
|
||||
public float speed;
|
||||
public float jumpSpeed;
|
||||
public float jumpHeight;
|
||||
public float gravity;
|
||||
public float rotationSpeed;
|
||||
public Transform pivot;
|
||||
public GameObject playerModel;
|
||||
|
||||
private bool extraJump = true;
|
||||
private int jump = 0;
|
||||
private float capsuleHeight;
|
||||
private float controllerHeight;
|
||||
private float transformHeight;
|
||||
private Vector3 moveDirection;
|
||||
|
||||
float startTime = 0.0f;
|
||||
float oneSec = 1.0f;
|
||||
|
||||
void Start()
|
||||
{
|
||||
characterController = GetComponent<CharacterController>();
|
||||
capsule = GetComponent<CapsuleCollider>();
|
||||
transformHeight = transform.localScale.y;
|
||||
controllerHeight = characterController.height;
|
||||
capsuleHeight = capsule.height;
|
||||
}
|
||||
|
||||
void Update()
|
||||
@@ -33,11 +44,10 @@ public class PlayerController : MonoBehaviour
|
||||
//Need to switch to 'raw' when using keyboard
|
||||
moveDirection = (transform.forward * Input.GetAxis("Vertical")) + (transform.right * Input.GetAxis("Horizontal"));
|
||||
|
||||
if (extraJump == true)
|
||||
if (jump <= 1)
|
||||
{
|
||||
moveDirection = moveDirection.normalized * speed; //Remove this line to make running diagonal the fastest standard run
|
||||
} else
|
||||
{
|
||||
} else {
|
||||
moveDirection = (moveDirection.normalized * speed)/4; //Remove this line to make running diagonal the fastest standard run
|
||||
}
|
||||
|
||||
@@ -45,7 +55,7 @@ public class PlayerController : MonoBehaviour
|
||||
|
||||
if (characterController.isGrounded)
|
||||
{
|
||||
extraJump = true;
|
||||
jump = 0;
|
||||
moveDirection.y = 0.0f;
|
||||
|
||||
if(Input.GetKey(KeyCode.LeftShift))
|
||||
@@ -55,21 +65,45 @@ public class PlayerController : MonoBehaviour
|
||||
moveDirection = moveDirection.normalized * speed;
|
||||
}
|
||||
|
||||
if (Input.GetButtonDown("Jump"))
|
||||
if(Input.GetKey(KeyCode.LeftControl))
|
||||
{
|
||||
moveDirection.y = jumpSpeed;
|
||||
|
||||
characterController.height /= 2;
|
||||
capsule.height /= 2;
|
||||
transform.localScale = new Vector3(transform.localScale.x, transformHeight/2, transform.localScale.z);
|
||||
|
||||
if(Input.GetKeyDown(KeyCode.LeftControl))
|
||||
{
|
||||
startTime = Time.time;
|
||||
}
|
||||
|
||||
if(characterController.velocity != new Vector3(0, 0, 0) && startTime + oneSec >= Time.time)
|
||||
{
|
||||
|
||||
moveDirection = (moveDirection.normalized * speed * 2);
|
||||
|
||||
} else {
|
||||
|
||||
moveDirection = (moveDirection.normalized * speed/4);
|
||||
|
||||
}
|
||||
|
||||
} else {
|
||||
if (Input.GetButtonDown("Jump") && extraJump == true)
|
||||
moveDirection = moveDirection.normalized * speed;
|
||||
characterController.height = controllerHeight;
|
||||
capsule.height = capsuleHeight;
|
||||
transform.localScale = new Vector3(transform.localScale.x, transformHeight, transform.localScale.z);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (Input.GetButtonDown("Jump") && jump <= 1)
|
||||
{
|
||||
moveDirection.y = jumpSpeed;
|
||||
extraJump = false;
|
||||
moveDirection.y = jumpHeight;
|
||||
jump++;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
moveDirection.y = moveDirection.y + (Physics.gravity.y * gravity * Time.deltaTime);
|
||||
moveDirection.y += Physics.gravity.y * gravity * Time.deltaTime;
|
||||
|
||||
// Move the controller
|
||||
characterController.Move(moveDirection * Time.deltaTime);
|
||||
|
||||
Reference in New Issue
Block a user