From 6664480198a11c651121528bfe2253e1cff47040 Mon Sep 17 00:00:00 2001
From: Enderageous <13520012@std.stei.itb.ac.id>
Date: Sat, 15 Apr 2023 13:44:54 +0700
Subject: [PATCH] fix: heal not updating
---
Assets/Prefabs/PetBuff.prefab | 2 +-
Assets/Prefabs/PetHeal.prefab | 4 ++--
Assets/Scripts/Pets/PetHeal.cs | 10 +++++++++-
Assets/Scripts/Pets/PetMovePassive.cs | 1 +
Assets/Scripts/Player/PlayerHealth.cs | 2 ++
5 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/Assets/Prefabs/PetBuff.prefab b/Assets/Prefabs/PetBuff.prefab
index 7c67d49..3f558c2 100644
--- a/Assets/Prefabs/PetBuff.prefab
+++ b/Assets/Prefabs/PetBuff.prefab
@@ -10021,7 +10021,7 @@ SphereCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
- m_Radius: 0.8
+ m_Radius: 4
m_Center: {x: 0, y: 0.8, z: 0}
--- !u!195 &19500000
NavMeshAgent:
diff --git a/Assets/Prefabs/PetHeal.prefab b/Assets/Prefabs/PetHeal.prefab
index a22085b..2c163fe 100644
--- a/Assets/Prefabs/PetHeal.prefab
+++ b/Assets/Prefabs/PetHeal.prefab
@@ -271,7 +271,7 @@ SphereCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
- m_Radius: 0.8
+ m_Radius: 4
m_Center: {x: 0, y: 0.8, z: 0}
--- !u!136 &2965714918109986527
CapsuleCollider:
@@ -417,7 +417,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7fb3e5635aabe2142a1880051c265747, type: 3}
m_Name:
m_EditorClassIdentifier:
- timeBetweenHeals: 20
+ timeBetweenHeals: 10
healing: 30
--- !u!114 &9025456973597242216
MonoBehaviour:
diff --git a/Assets/Scripts/Pets/PetHeal.cs b/Assets/Scripts/Pets/PetHeal.cs
index 27c2a91..3af1ede 100644
--- a/Assets/Scripts/Pets/PetHeal.cs
+++ b/Assets/Scripts/Pets/PetHeal.cs
@@ -4,7 +4,7 @@ using UnityEngine;
public class PetHeal : MonoBehaviour
{
- public float timeBetweenHeals = 20.0f;
+ public float timeBetweenHeals = 10.0f;
public int healing = 30;
@@ -31,6 +31,14 @@ public class PetHeal : MonoBehaviour
}
}
+ void OnTriggerStay (Collider other)
+ {
+ if(other.gameObject == player)
+ {
+ playerInRange = true;
+ }
+ }
+
void OnTriggerExit (Collider other)
{
if(other.gameObject == player)
diff --git a/Assets/Scripts/Pets/PetMovePassive.cs b/Assets/Scripts/Pets/PetMovePassive.cs
index c041cc0..0f8a465 100644
--- a/Assets/Scripts/Pets/PetMovePassive.cs
+++ b/Assets/Scripts/Pets/PetMovePassive.cs
@@ -12,6 +12,7 @@ public class PetMovePassive : MonoBehaviour
{
player = GameObject.FindGameObjectWithTag ("Player").transform;
nav = GetComponent <UnityEngine.AI.NavMeshAgent> ();
+ nav.enabled = true;
}
void OnTriggerEnter (Collider other)
diff --git a/Assets/Scripts/Player/PlayerHealth.cs b/Assets/Scripts/Player/PlayerHealth.cs
index 7a1bb18..9e0e3b4 100644
--- a/Assets/Scripts/Player/PlayerHealth.cs
+++ b/Assets/Scripts/Player/PlayerHealth.cs
@@ -75,6 +75,8 @@ public class PlayerHealth : MonoBehaviour
{
currentHealth = currentHealth + amount;
}
+
+ healthSlider.value = currentHealth;
}
--
GitLab