diff --git a/Assets/Prefabs/PetBuff.prefab b/Assets/Prefabs/PetBuff.prefab index 7c67d49fc059d055fd9edc74b3ba491d971be418..3f558c27be946d60f1d485c6217b17a8246b852f 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 a22085b699a093a85f93ab33c71e3cfe231ab7d6..2c163fe3ea2b5bdb01bcc546b930800fc6348426 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 27c2a9171852272cbc7bba8601291cf14abf3466..3af1ede1a0b1d77540ae4d095c9fb1cf85a10612 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 c041cc073e846b60d452861de04c3afb067605a4..0f8a46559f2f35adf7e1f713e84c9ed957ca3670 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 7a1bb18abeddc73c1180f9f328abd8068983bbef..9e0e3b49689671218b5a25e897ece4a6ecc9a446 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; }