From b7ddc7cfceb8148914ac16399526080ad292e075 Mon Sep 17 00:00:00 2001
From: Malik Rafsanjani <pro.malikakbar2357@gmail.com>
Date: Sat, 15 Apr 2023 13:18:27 +0700
Subject: [PATCH] fix: resolve bug on angler pet and healthslider
---
Assets/Scripts/Pet/AnglerAttack.cs | 5 ++++-
Assets/Scripts/Pet/PetMovement.cs | 7 +++++++
Assets/Scripts/Player/PlayerHealth.cs | 2 ++
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/Assets/Scripts/Pet/AnglerAttack.cs b/Assets/Scripts/Pet/AnglerAttack.cs
index 7d6d060..dbc5a79 100644
--- a/Assets/Scripts/Pet/AnglerAttack.cs
+++ b/Assets/Scripts/Pet/AnglerAttack.cs
@@ -47,7 +47,10 @@ public class AnglerAttack : MonoBehaviour
shootRay.direction = transform.forward;
if (timer >= timeBetweenBullets && !GameControl.control.cantShoot && Physics.Raycast(shootRay, out shootHit, range, shootableMask))
{
- Shoot();
+ if (!shootHit.collider.CompareTag("Player"))
+ {
+ Shoot();
+ }
}
if (timer >= timeBetweenBullets * effectsDisplayTime)
diff --git a/Assets/Scripts/Pet/PetMovement.cs b/Assets/Scripts/Pet/PetMovement.cs
index 1cdb399..7791e1e 100644
--- a/Assets/Scripts/Pet/PetMovement.cs
+++ b/Assets/Scripts/Pet/PetMovement.cs
@@ -51,6 +51,13 @@ public class PetMovement : MonoBehaviour
if (enemyHealth.currentHealth > 0)
{
nav.SetDestination (enemyPosition.position);
+ var damping = 2;
+ var target = enemy.transform;
+
+ var lookPos = target.position - transform.position;
+ lookPos.y = 0;
+ var rotation = Quaternion.LookRotation(lookPos);
+ transform.rotation = Quaternion.Slerp(transform.rotation, rotation, Time.deltaTime * damping);
}
}
else
diff --git a/Assets/Scripts/Player/PlayerHealth.cs b/Assets/Scripts/Player/PlayerHealth.cs
index f943ad0..0bbb2a7 100644
--- a/Assets/Scripts/Player/PlayerHealth.cs
+++ b/Assets/Scripts/Player/PlayerHealth.cs
@@ -69,6 +69,8 @@ public class PlayerHealth : MonoBehaviour
damaged = false;
frozen = false;
+
+ healthSlider.value = currentHealth;
}
public void TakeDamage(int amount)
--
GitLab