Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e6db8a979c | ||
|
|
d4fafd63d3 | ||
|
|
081d93f2c2 |
@@ -180,7 +180,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 194035203}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 80, y: 6.5, z: 12}
|
||||
m_LocalPosition: {x: 155, y: 6.5, z: 12}
|
||||
m_LocalScale: {x: 75, y: 20, z: 0.25}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1013482115}
|
||||
@@ -273,7 +273,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 195913138}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 21, y: 2.5, z: -30}
|
||||
m_LocalPosition: {x: 42, y: 2.5, z: -49.5}
|
||||
m_LocalScale: {x: 10, y: 5, z: 10}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 746704017}
|
||||
@@ -366,8 +366,8 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 203887784}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 120, y: -0.5, z: 6}
|
||||
m_LocalScale: {x: 20, y: 0.5, z: 12}
|
||||
m_LocalPosition: {x: 200, y: -0.5, z: 6}
|
||||
m_LocalScale: {x: 50, y: 0.5, z: 50}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 833538478}
|
||||
m_RootOrder: 2
|
||||
@@ -459,7 +459,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 241158957}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -25, y: 2, z: 22}
|
||||
m_LocalPosition: {x: -50, y: 2, z: 45}
|
||||
m_LocalScale: {x: 1, y: 1, z: 5}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1488444358}
|
||||
@@ -552,7 +552,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 432077771}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -35, y: 5, z: -20}
|
||||
m_LocalPosition: {x: -63, y: 5, z: -37}
|
||||
m_LocalScale: {x: 10, y: 1, z: 10}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 942294095}
|
||||
@@ -645,7 +645,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 478907417}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956}
|
||||
m_LocalPosition: {x: 15, y: 7, z: 40}
|
||||
m_LocalPosition: {x: 45, y: 7, z: 60}
|
||||
m_LocalScale: {x: 25, y: 5, z: 7}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1833724898}
|
||||
@@ -832,7 +832,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 654784537}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -25, y: 2, z: -10}
|
||||
m_LocalPosition: {x: -53, y: 2, z: -27}
|
||||
m_LocalScale: {x: 10, y: 1, z: 10}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 942294095}
|
||||
@@ -1017,7 +1017,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 717001268}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -25.5, y: 2, z: 36}
|
||||
m_LocalPosition: {x: -49, y: 2, z: 58}
|
||||
m_LocalScale: {x: 14, y: 1, z: 7}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1488444358}
|
||||
@@ -1111,7 +1111,7 @@ Transform:
|
||||
m_GameObject: {fileID: 736244541}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 100, y: 0.5, z: 100}
|
||||
m_LocalScale: {x: 250, y: 0.5, z: 250}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 833538478}
|
||||
m_RootOrder: 0
|
||||
@@ -1284,9 +1284,8 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 83127dd120c01de45954b99cc4d669a5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
speed: 10
|
||||
maxSpeed: 25
|
||||
acceleration: 3
|
||||
acceleration: 0.5
|
||||
friction: 0.1
|
||||
jumpHeight: 20
|
||||
gravity: 5
|
||||
@@ -1404,7 +1403,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 858957125}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 80, y: 6.5, z: 0}
|
||||
m_LocalPosition: {x: 155, y: 6.5, z: 0}
|
||||
m_LocalScale: {x: 75, y: 20, z: 0.25}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1013482115}
|
||||
@@ -1667,7 +1666,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1194166061}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -36, y: 2, z: 25.5}
|
||||
m_LocalPosition: {x: -59.5, y: 2, z: 47.5}
|
||||
m_LocalScale: {x: 7, y: 1, z: 14}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1488444358}
|
||||
@@ -1824,7 +1823,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1509260413}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 28, y: 5, z: -23}
|
||||
m_LocalPosition: {x: 49, y: 5, z: -42.5}
|
||||
m_LocalScale: {x: 10, y: 10, z: 10}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 746704017}
|
||||
@@ -1917,7 +1916,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1810553729}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -22, y: 2, z: 25}
|
||||
m_LocalPosition: {x: -47, y: 2, z: 48}
|
||||
m_LocalScale: {x: 5, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1488444358}
|
||||
@@ -2045,7 +2044,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1853948297}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 80, y: -3.5, z: 6}
|
||||
m_LocalPosition: {x: 155, y: -3.5, z: 6}
|
||||
m_LocalScale: {x: 75, y: 0.25, z: 12}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 833538478}
|
||||
@@ -2138,7 +2137,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1943602250}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 19, y: 1, z: -21}
|
||||
m_LocalPosition: {x: 40, y: 1, z: -40.5}
|
||||
m_LocalScale: {x: 10, y: 2, z: 10}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 746704017}
|
||||
@@ -2231,7 +2230,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2057687440}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -20, y: 10, z: -30}
|
||||
m_LocalPosition: {x: -48, y: 10, z: -47}
|
||||
m_LocalScale: {x: 10, y: 1, z: 10}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 942294095}
|
||||
|
||||
@@ -22,8 +22,11 @@ public class PlayerController : MonoBehaviour
|
||||
public GameObject playerModel;
|
||||
|
||||
private bool wallRunning = false;
|
||||
private bool diving = false;
|
||||
private bool sliding = false;
|
||||
private int jump = 0;
|
||||
private int wall = 0;
|
||||
private int dive = 0;
|
||||
private float maxSpeedStore;
|
||||
private float maxSpeedCap = 100;
|
||||
private float accelerationStore;
|
||||
@@ -34,9 +37,13 @@ public class PlayerController : MonoBehaviour
|
||||
private float zVelocity = 0.0f;
|
||||
private Vector3 moveDirection;
|
||||
private Vector3 velocity;
|
||||
private Vector3 gravityVelocity;
|
||||
|
||||
float startTime = 0.0f;
|
||||
float slideTime = 0.0f;
|
||||
float wallRunTime = 0.0f;
|
||||
float oneSec = 1.0f;
|
||||
float halfSec = 0.5f;
|
||||
float quarterSec = 0.25f;
|
||||
|
||||
void Start()
|
||||
{
|
||||
@@ -67,19 +74,20 @@ public class PlayerController : MonoBehaviour
|
||||
moveDirection = new Vector3(Input.GetAxis("Horizontal"), moveDirection.y, Input.GetAxis("Vertical"));
|
||||
moveDirection = transform.TransformDirection(moveDirection);
|
||||
moveDirection = Vector3.ClampMagnitude(moveDirection, 1.0f);
|
||||
moveDirection.y = yStore;
|
||||
|
||||
if (jump >= 2)
|
||||
{
|
||||
if(maxSpeed > maxSpeedStore/1.75f)
|
||||
if(maxSpeed > maxSpeedStore/1.5f)
|
||||
{
|
||||
maxSpeed -= acceleration;
|
||||
}
|
||||
}
|
||||
|
||||
moveDirection.y = yStore;
|
||||
|
||||
if (characterController.isGrounded)
|
||||
{
|
||||
diving = false;
|
||||
dive = 0;
|
||||
jump = 0;
|
||||
moveDirection.y = 0.0f;
|
||||
|
||||
@@ -108,19 +116,29 @@ public class PlayerController : MonoBehaviour
|
||||
capsule.height /= 2;
|
||||
transform.localScale = new Vector3(transform.localScale.x, transformHeight/2, transform.localScale.z);
|
||||
|
||||
if(Input.GetKeyDown(KeyCode.LeftControl) && characterController.velocity != new Vector3(0, 0, 0)
|
||||
&& (Input.GetAxis("Horizontal") != 0 || Input.GetAxis("Vertical") != 0))
|
||||
if(Input.GetKeyDown(KeyCode.LeftControl))
|
||||
{
|
||||
startTime = Time.time;
|
||||
if((Input.GetAxis("Horizontal") == 0 && Input.GetAxis("Vertical") == 0))
|
||||
{
|
||||
sliding = false;
|
||||
} else {
|
||||
sliding = true;
|
||||
slideTime = Time.time;
|
||||
}
|
||||
}
|
||||
|
||||
if(startTime + oneSec >= Time.time)
|
||||
if(slideTime + halfSec >= Time.time && sliding == true)
|
||||
{
|
||||
|
||||
if(maxSpeed < maxSpeedStore*2)
|
||||
{
|
||||
maxSpeed += acceleration*2;
|
||||
}
|
||||
|
||||
if(Input.GetButton("Jump") && slideTime + quarterSec >= Time.time)
|
||||
{
|
||||
maxSpeed += 5;
|
||||
}
|
||||
|
||||
} else {
|
||||
|
||||
@@ -139,6 +157,35 @@ public class PlayerController : MonoBehaviour
|
||||
|
||||
}
|
||||
|
||||
} else {
|
||||
slideTime = Time.time;
|
||||
|
||||
if(Input.GetKey(KeyCode.LeftControl))
|
||||
{
|
||||
|
||||
characterController.height /= 2;
|
||||
capsule.height /= 2;
|
||||
transform.localScale = new Vector3(transform.localScale.x, transformHeight/2, transform.localScale.z);
|
||||
diving = true;
|
||||
|
||||
} else {
|
||||
|
||||
characterController.height = controllerHeight;
|
||||
capsule.height = capsuleHeight;
|
||||
transform.localScale = new Vector3(transform.localScale.x, transformHeight, transform.localScale.z);
|
||||
|
||||
}
|
||||
|
||||
//Might want to change move direction value to make triggering this speed up effect easier/harder
|
||||
if(diving && moveDirection.y > 0.75 && Input.GetKeyDown(KeyCode.LeftControl))
|
||||
{
|
||||
dive++;
|
||||
if(dive == 1){
|
||||
maxSpeed += 10;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (Input.GetButtonDown("Jump") && jump <= 1)
|
||||
@@ -167,10 +214,10 @@ public class PlayerController : MonoBehaviour
|
||||
|
||||
if(wall == 1)
|
||||
{
|
||||
startTime = Time.time;
|
||||
wallRunTime = Time.time;
|
||||
}
|
||||
|
||||
if(startTime + oneSec < Time.time)
|
||||
if(wallRunTime + oneSec < Time.time)
|
||||
{
|
||||
|
||||
moveDirection.y += Physics.gravity.y * (gravity/8) * Time.deltaTime;
|
||||
@@ -189,7 +236,7 @@ public class PlayerController : MonoBehaviour
|
||||
velocity.x = Mathf.SmoothDamp(velocity.x, 0.0f, ref xVelocity, friction);
|
||||
velocity.z = Mathf.SmoothDamp(velocity.z, 0.0f, ref zVelocity, friction);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
if(maxSpeed > maxSpeedCap)
|
||||
{
|
||||
@@ -205,6 +252,14 @@ public class PlayerController : MonoBehaviour
|
||||
|
||||
velocity.y = moveDirection.y;
|
||||
|
||||
Debug.Log(moveDirection.y+"\n");
|
||||
|
||||
if(moveDirection.y <= -5 && Mathf.Abs(velocity.x) <= 1.5f && Mathf.Abs(velocity.z) <= 1.5f)
|
||||
{
|
||||
velocity.x = velocity.x * Mathf.Abs(moveDirection.y);
|
||||
velocity.z = velocity.z * Mathf.Abs(moveDirection.y);
|
||||
}
|
||||
|
||||
// Move the controller
|
||||
characterController.Move(velocity * Time.deltaTime);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user