From 49d950df581227b0a7e1eac0ba94eeabe5dbccdc Mon Sep 17 00:00:00 2001 From: Joshua Reason Date: Sun, 31 Jan 2021 17:59:26 +1100 Subject: [PATCH] Did things --- Assets/Data/GameTime.asset | 3 +++ Assets/Data/GameTime.asset.meta | 8 ++++++ Assets/Player/Leggies Controller.controller | 6 ++--- Assets/Scenes/CreditScreen.unity | 4 +-- Assets/Scenes/MainGameplayScene.unity | 4 +-- Assets/Scripts/Behaviours/YeetController.cs | 8 ++++++ Assets/Scripts/Managers/GameManager.cs | 25 +++++++++++++++++++ .../Player Scripts/PlayerInputController.cs | 16 ++++++------ Assets/World Assets/Prefabs/Player.prefab | 1 + 9 files changed, 59 insertions(+), 16 deletions(-) create mode 100644 Assets/Data/GameTime.asset create mode 100644 Assets/Data/GameTime.asset.meta diff --git a/Assets/Data/GameTime.asset b/Assets/Data/GameTime.asset new file mode 100644 index 0000000..9221f56 --- /dev/null +++ b/Assets/Data/GameTime.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ae8dcc76a79f584224f1b3af0c9187bc82e160073096e2edabae2bd72468f28 +size 462 diff --git a/Assets/Data/GameTime.asset.meta b/Assets/Data/GameTime.asset.meta new file mode 100644 index 0000000..ac4b2b5 --- /dev/null +++ b/Assets/Data/GameTime.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 62f467f95cb26b748ab8b7b78ce2a931 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Player/Leggies Controller.controller b/Assets/Player/Leggies Controller.controller index 3c7eadf..8f13520 100644 --- a/Assets/Player/Leggies Controller.controller +++ b/Assets/Player/Leggies Controller.controller @@ -10,7 +10,7 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 3 m_ConditionEvent: Movement - m_EventTreshold: 0.1 + m_EventTreshold: 0.2 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 3556678140949118445} m_Solo: 0 @@ -91,7 +91,7 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -142,7 +142,7 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 4 m_ConditionEvent: Movement - m_EventTreshold: 0.1 + m_EventTreshold: 0.2 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -4814522835881346177} m_Solo: 0 diff --git a/Assets/Scenes/CreditScreen.unity b/Assets/Scenes/CreditScreen.unity index 9547f94..b4e3acd 100644 --- a/Assets/Scenes/CreditScreen.unity +++ b/Assets/Scenes/CreditScreen.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45cbb35f73bef260e35c7801bca1014fc73152ebf848d768c861f34392e8c4ae -size 43062 +oid sha256:1e26dc08f3aa4112b840f41591cc9b9ef1f9bbf9576b8be6eece37b2efa91fdd +size 43060 diff --git a/Assets/Scenes/MainGameplayScene.unity b/Assets/Scenes/MainGameplayScene.unity index 4c599fe..3082652 100644 --- a/Assets/Scenes/MainGameplayScene.unity +++ b/Assets/Scenes/MainGameplayScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:708cbd87a4974182228caa13000e3f07016a9f0c7d6aba855f750510ccac0df2 -size 723429 +oid sha256:c6069490cacd12580489009ce45afb97c078cae059a29b451704bb7b3bfe590a +size 723701 diff --git a/Assets/Scripts/Behaviours/YeetController.cs b/Assets/Scripts/Behaviours/YeetController.cs index b042413..76d35f8 100644 --- a/Assets/Scripts/Behaviours/YeetController.cs +++ b/Assets/Scripts/Behaviours/YeetController.cs @@ -38,6 +38,9 @@ public class YeetController : InputBehaviour private Vector3 preyeetPosition; + public PlayerInputController playerController; + + private void Awake() { m_body = this.gameObject; @@ -61,6 +64,9 @@ public class YeetController : InputBehaviour m_YeetAnimator.SetBool("Yeet", true); m_audioSource.Play(); + + + playerController.m_playerSpeed /= 3; } public void Preyeet() @@ -91,6 +97,8 @@ public class YeetController : InputBehaviour Destroy(m_lineRenderer); m_audioSource.Play(); + + playerController.m_playerSpeed *= 3; } void Start() diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs index bb7af02..2c9d62d 100644 --- a/Assets/Scripts/Managers/GameManager.cs +++ b/Assets/Scripts/Managers/GameManager.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using Variables; public class GameManager : MonoBehaviour { @@ -11,7 +12,16 @@ public class GameManager : MonoBehaviour [SerializeField] private GameObject m_playerPrefab; + [SerializeField] + private Reference m_TimeLeft; + + [SerializeField] + private Reference m_TotalTime; + [SerializeField,NaughtyAttributes.Scene] + private string m_creditScene; + + private bool m_gameEndCalled; private Camera m_camera; private void OnEnable() @@ -29,6 +39,16 @@ public class GameManager : MonoBehaviour { SetUpPlayers(); m_camera = Camera.main; + m_TimeLeft.Value = m_TotalTime; + } + + private void Update() + { + m_TimeLeft.Value -= Time.deltaTime; + + if (m_TimeLeft < 0 && !m_gameEndCalled) + OnGameEnd(); + } private void SetUpPlayers() @@ -39,6 +59,11 @@ public class GameManager : MonoBehaviour } } + private void OnGameEnd() + { + m_gameEndCalled = true; + UnityEngine.SceneManagement.SceneManager.LoadScene(m_creditScene); + } private void SpawnPlayer(PlayerData data) { diff --git a/Assets/Scripts/Player Scripts/PlayerInputController.cs b/Assets/Scripts/Player Scripts/PlayerInputController.cs index 14eba79..52ef6e0 100644 --- a/Assets/Scripts/Player Scripts/PlayerInputController.cs +++ b/Assets/Scripts/Player Scripts/PlayerInputController.cs @@ -9,7 +9,7 @@ public class PlayerInputController : InputBehaviour [SerializeField] - private float m_playerSpeed = 1; + public float m_playerSpeed = 1; [SerializeField] private float m_rotationSpeed = 1; @@ -29,10 +29,13 @@ public class PlayerInputController : InputBehaviour private Vector3 m_desiredDirection; private bool m_recievedInput => m_desiredDirection.magnitude != 0; + public Vector3 m_CameraForwards; + private void Awake() { m_controller = GetComponent(); + //m_CameraForwards = Vector3.ProjectOnPlane(Camera.main.transform.forward,Vector3.up).normalized; } @@ -53,16 +56,11 @@ public class PlayerInputController : InputBehaviour private void ApplyRotation() { - transform.forward = Vector3.Slerp(transform.forward, m_desiredDirection.normalized, m_rotationSpeed * Time.deltaTime); + transform.forward = Vector3.Slerp(transform.forward, m_desiredDirection, m_rotationSpeed * Time.deltaTime); } private void ApplyMovement() - { - - - - - + { float forwardRatio = (Vector3.Dot(transform.forward, m_desiredDirection.normalized) + 1) / 2; float speed = m_turnRadius.Evaluate(forwardRatio) * m_playerSpeed; m_legAnimator.SetFloat("Movement", speed); @@ -70,7 +68,7 @@ public class PlayerInputController : InputBehaviour if (!m_recievedInput) return; - m_controller.Move(transform.forward * speed * Time.deltaTime); + m_controller.Move(transform.forward.normalized * speed * Time.deltaTime); } private void LockAxis(Vector3 axis) diff --git a/Assets/World Assets/Prefabs/Player.prefab b/Assets/World Assets/Prefabs/Player.prefab index fa352e4..fbb0fb3 100644 --- a/Assets/World Assets/Prefabs/Player.prefab +++ b/Assets/World Assets/Prefabs/Player.prefab @@ -153,6 +153,7 @@ MonoBehaviour: windupSpeed: 0.1 m_YeetAnimator: {fileID: 7280267804803618209} trajectoryLineMaterial: {fileID: 2100000, guid: e4dd9001cbdeb53449bec6dddcf07c3d, type: 2} + playerController: {fileID: 2725293205319018847} --- !u!1 &6496616781582263990 GameObject: m_ObjectHideFlags: 0