From 434820f84d041f88fe68ea2811ea25e54f31cd8f Mon Sep 17 00:00:00 2001
From: rheael <rpandumpi@gmail.com>
Date: Thu, 7 Apr 2022 18:18:08 +0700
Subject: [PATCH] destroy orb after taken/timer
---
Assets/Prefabs/HealthOrb.prefab | 2 +-
Assets/Prefabs/PowerOrb.prefab | 2 +-
Assets/Prefabs/SpeedOrb.prefab | 4 ++--
Assets/Scripts/Orbs/HealthOrb.cs | 17 ++++++-------
Assets/Scripts/Orbs/PowerOrb.cs | 22 +++++++++--------
Assets/Scripts/Orbs/SpeedOrb.cs | 24 ++++++++++---------
Assets/Scripts/Player/PlayerSpeed.cs | 2 +-
.../_Complete-Game/Prefabs/HealthOrb.prefab | 2 +-
Assets/_Complete-Game/Prefabs/PowerOrb.prefab | 2 +-
Assets/_Complete-Game/Prefabs/SpeedOrb.prefab | 2 +-
10 files changed, 42 insertions(+), 37 deletions(-)
diff --git a/Assets/Prefabs/HealthOrb.prefab b/Assets/Prefabs/HealthOrb.prefab
index e8b9498..c7944f1 100644
--- a/Assets/Prefabs/HealthOrb.prefab
+++ b/Assets/Prefabs/HealthOrb.prefab
@@ -114,7 +114,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 764e68913424eeb419dd38af7e60ff61, type: 3}
m_Name:
m_EditorClassIdentifier:
- healthOrbTime: 0.5
+ healthOrbTime: 30
powerUpValue: 10
--- !u!195 &705583067959343806
NavMeshAgent:
diff --git a/Assets/Prefabs/PowerOrb.prefab b/Assets/Prefabs/PowerOrb.prefab
index dc85bb1..cbbdd39 100644
--- a/Assets/Prefabs/PowerOrb.prefab
+++ b/Assets/Prefabs/PowerOrb.prefab
@@ -114,7 +114,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 25d572023fc8dca439d7bd171c970c34, type: 3}
m_Name:
m_EditorClassIdentifier:
- powerOrbTime: 0.5
+ powerOrbTime: 30
powerUpValue: 10
--- !u!195 &8369794267398069332
NavMeshAgent:
diff --git a/Assets/Prefabs/SpeedOrb.prefab b/Assets/Prefabs/SpeedOrb.prefab
index db2e68e..8d4c358 100644
--- a/Assets/Prefabs/SpeedOrb.prefab
+++ b/Assets/Prefabs/SpeedOrb.prefab
@@ -114,8 +114,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d104f8fb432c7ba41998f84129eedf56, type: 3}
m_Name:
m_EditorClassIdentifier:
- speedOrbTime: 0.5
- powerUpValue: 10
+ speedOrbTime: 30
+ powerUpValue: 5
--- !u!195 &-888242424389404344
NavMeshAgent:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Orbs/HealthOrb.cs b/Assets/Scripts/Orbs/HealthOrb.cs
index 312fb46..0cb9bf9 100644
--- a/Assets/Scripts/Orbs/HealthOrb.cs
+++ b/Assets/Scripts/Orbs/HealthOrb.cs
@@ -4,7 +4,7 @@ using UnityEngine;
public class HealthOrb : MonoBehaviour
{
- public float healthOrbTime = 0.5f;
+ public float healthOrbTime = 30f;
public int powerUpValue = 10;
Animator anim;
GameObject player;
@@ -22,17 +22,18 @@ public class HealthOrb : MonoBehaviour
// Update is called once per frame
void Update()
{
- // if (timer >= healthOrbTime)
- //{
- // // hilang
- // }
- // else {
+ timer += Time.deltaTime;
+ if (timer >= healthOrbTime)
+ {
+ Destroy(gameObject);
+ }
+ else {
if (playerInRange)
{
Taken();
- Destroy(this);
+ Destroy(gameObject);
}
- //}
+ }
}
void OnCollisionEnter(Collision other)
diff --git a/Assets/Scripts/Orbs/PowerOrb.cs b/Assets/Scripts/Orbs/PowerOrb.cs
index ff7e106..002957f 100644
--- a/Assets/Scripts/Orbs/PowerOrb.cs
+++ b/Assets/Scripts/Orbs/PowerOrb.cs
@@ -4,7 +4,7 @@ using UnityEngine;
public class PowerOrb : MonoBehaviour
{
- public float powerOrbTime = 0.5f;
+ public float powerOrbTime = 30f;
public int powerUpValue = 10;
Animator anim;
GameObject player;
@@ -22,17 +22,19 @@ public class PowerOrb : MonoBehaviour
// Update is called once per frame
void Update()
{
- // if (timer >= healthOrbTime)
- //{
- // // hilang
- // }
- // else {
- if (playerInRange)
+ timer += Time.deltaTime;
+ if (timer >= powerOrbTime)
{
- Taken();
- Destroy(this);
+ Destroy(gameObject);
+ }
+ else
+ {
+ if (playerInRange)
+ {
+ Taken();
+ Destroy(gameObject);
+ }
}
- //}
}
void OnCollisionEnter(Collision other)
diff --git a/Assets/Scripts/Orbs/SpeedOrb.cs b/Assets/Scripts/Orbs/SpeedOrb.cs
index e4c4037..fa10f3a 100644
--- a/Assets/Scripts/Orbs/SpeedOrb.cs
+++ b/Assets/Scripts/Orbs/SpeedOrb.cs
@@ -4,8 +4,8 @@ using UnityEngine;
public class SpeedOrb : MonoBehaviour
{
- public float speedOrbTime = 0.5f;
- public int powerUpValue = 10;
+ public float speedOrbTime = 30f;
+ public int powerUpValue = 5;
Animator anim;
GameObject player;
PlayerSpeed playerSpeed;
@@ -22,17 +22,19 @@ public class SpeedOrb : MonoBehaviour
// Update is called once per frame
void Update()
{
- // if (timer >= healthOrbTime)
- //{
- // // hilang
- // }
- // else {
- if (playerInRange)
+ timer += Time.deltaTime;
+ if (timer >= speedOrbTime)
{
- Taken();
- Destroy(this);
+ Destroy(gameObject);
+ }
+ else
+ {
+ if (playerInRange)
+ {
+ Taken();
+ Destroy(gameObject);
+ }
}
- //}
}
void OnCollisionEnter(Collision other)
diff --git a/Assets/Scripts/Player/PlayerSpeed.cs b/Assets/Scripts/Player/PlayerSpeed.cs
index fceb65a..eca50b7 100644
--- a/Assets/Scripts/Player/PlayerSpeed.cs
+++ b/Assets/Scripts/Player/PlayerSpeed.cs
@@ -9,7 +9,7 @@ public class PlayerSpeed : MonoBehaviour
public float currentSpeed;
Animator anim;
public Slider speedSlider;
- float maxSpeed = 30f;
+ float maxSpeed = 20f;
// Start is called before the first frame update
void Awake()
diff --git a/Assets/_Complete-Game/Prefabs/HealthOrb.prefab b/Assets/_Complete-Game/Prefabs/HealthOrb.prefab
index 17e06df..b7d59a6 100644
--- a/Assets/_Complete-Game/Prefabs/HealthOrb.prefab
+++ b/Assets/_Complete-Game/Prefabs/HealthOrb.prefab
@@ -113,7 +113,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 764e68913424eeb419dd38af7e60ff61, type: 3}
m_Name:
m_EditorClassIdentifier:
- healthOrbTime: 0.5
+ healthOrbTime: 30
powerUpValue: 10
--- !u!195 &705583067959343806
NavMeshAgent:
diff --git a/Assets/_Complete-Game/Prefabs/PowerOrb.prefab b/Assets/_Complete-Game/Prefabs/PowerOrb.prefab
index 46308ba..1d362e9 100644
--- a/Assets/_Complete-Game/Prefabs/PowerOrb.prefab
+++ b/Assets/_Complete-Game/Prefabs/PowerOrb.prefab
@@ -113,7 +113,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 25d572023fc8dca439d7bd171c970c34, type: 3}
m_Name:
m_EditorClassIdentifier:
- powerOrbTime: 0.5
+ powerOrbTime: 30
powerUpValue: 10
--- !u!195 &8369794267398069332
NavMeshAgent:
diff --git a/Assets/_Complete-Game/Prefabs/SpeedOrb.prefab b/Assets/_Complete-Game/Prefabs/SpeedOrb.prefab
index 89b8eba..4cda098 100644
--- a/Assets/_Complete-Game/Prefabs/SpeedOrb.prefab
+++ b/Assets/_Complete-Game/Prefabs/SpeedOrb.prefab
@@ -113,7 +113,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d104f8fb432c7ba41998f84129eedf56, type: 3}
m_Name:
m_EditorClassIdentifier:
- speedOrbTime: 0.5
+ speedOrbTime: 30
powerUpValue: 10
--- !u!195 &-888242424389404344
NavMeshAgent:
--
GitLab