From b784c9a3ebb22269831890f9f099934e83ab3bc6 Mon Sep 17 00:00:00 2001 From: ProtoSharkk Date: Mon, 21 Oct 2024 15:56:30 -0700 Subject: [PATCH] Attack cooldown works fr this time --- Assets/Player.prefab | 1 + Assets/Scenes/SampleScene.unity | 89 ++++++++++++++++++++++++ Assets/Teo.cs | 5 +- Assets/UI overlay/AttackCooldown.cs | 17 +++++ Assets/UI overlay/AttackCooldown.cs.meta | 2 + 5 files changed, 111 insertions(+), 3 deletions(-) create mode 100644 Assets/UI overlay/AttackCooldown.cs create mode 100644 Assets/UI overlay/AttackCooldown.cs.meta diff --git a/Assets/Player.prefab b/Assets/Player.prefab index 7c81f36..19fd7c5 100644 --- a/Assets/Player.prefab +++ b/Assets/Player.prefab @@ -112,6 +112,7 @@ MonoBehaviour: attackCooldownSeconds: 2 dashDistance: 5 dashCooldownSeconds: 5 + lastAttackTime: 0 --- !u!50 &-4152331571693237436 Rigidbody2D: serializedVersion: 5 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index aff3797..657a7c8 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -215,6 +215,7 @@ RectTransform: m_Children: - {fileID: 1394869899} - {fileID: 782734291} + - {fileID: 1698359317} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -858,6 +859,94 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d13803709cc4d9259a92b5dc9f49fe05, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1698359316 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1698359317} + - component: {fileID: 1698359319} + - component: {fileID: 1698359318} + - component: {fileID: 1698359320} + m_Layer: 5 + m_Name: AttackCooldown + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1698359317 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1698359316} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 109163895} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -75} + m_SizeDelta: {x: 100, y: 10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1698359318 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1698359316} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1698359319 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1698359316} + m_CullTransparentMesh: 1 +--- !u!114 &1698359320 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1698359316} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44c4f0b9443ce51e7bb9fbb5e2ee3e47, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1873397570 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Teo.cs b/Assets/Teo.cs index 2528510..3552a9e 100644 --- a/Assets/Teo.cs +++ b/Assets/Teo.cs @@ -11,9 +11,9 @@ public class Teo : MonoBehaviour public float attackCooldownSeconds = 10; public float dashDistance = 5; public float dashCooldownSeconds = 5; + public float lastAttackTime = 0; Rigidbody2D controller; GameState gameState; - float lastAttackTime = 0; // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() { controller = GetComponent(); @@ -27,7 +27,6 @@ public class Teo : MonoBehaviour Input.GetAxis("Horizontal"), Input.GetAxis("Vertical") ).normalized * moveSpeed; - // Attack on click if not on cooldown if (Input.GetMouseButtonDown(0)) { Attack(); @@ -35,7 +34,7 @@ public class Teo : MonoBehaviour } } void Attack() { - if (Time.fixedTime-attackCooldownSeconds > lastAttackTime) { + if (Time.fixedTime-lastAttackTime < attackCooldownSeconds) { return; } // Get all objects in range in the direction of cursor diff --git a/Assets/UI overlay/AttackCooldown.cs b/Assets/UI overlay/AttackCooldown.cs new file mode 100644 index 0000000..878b98e --- /dev/null +++ b/Assets/UI overlay/AttackCooldown.cs @@ -0,0 +1,17 @@ +using UnityEngine; + +public class AttackCooldown : MonoBehaviour +{ + Teo player; + TMPro.TMP_Sprite bar; + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + player = GameObject.FindGameObjectWithTag("Player").GetComponent(); + } + + // Update is called once per frame + void Update() + { + } +} diff --git a/Assets/UI overlay/AttackCooldown.cs.meta b/Assets/UI overlay/AttackCooldown.cs.meta new file mode 100644 index 0000000..843793a --- /dev/null +++ b/Assets/UI overlay/AttackCooldown.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 44c4f0b9443ce51e7bb9fbb5e2ee3e47 \ No newline at end of file