diff --git a/Assets/_CompletedAssets/Prefabs/Pet/Healer/Ghost.prefab b/Assets/_CompletedAssets/Prefabs/Pet/Healer/Ghost.prefab index 7d497b47a927bc9922f7aa4752956fbfa9566dd1..74c27f060b83b8c93ddbd131fbf1049084f164dc 100644 --- a/Assets/_CompletedAssets/Prefabs/Pet/Healer/Ghost.prefab +++ b/Assets/_CompletedAssets/Prefabs/Pet/Healer/Ghost.prefab @@ -304,6 +304,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 137a031435f14704792bd74bc525b77c, type: 3} m_Name: m_EditorClassIdentifier: + canMove: 0 moveSpeed: 4 --- !u!114 &-7991905058926754014 MonoBehaviour: @@ -346,7 +347,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 74b1e4ce1448eaf489c503bc9b2e792e, type: 3} - m_PlayOnAwake: 1 + m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 Loop: 0 diff --git a/Assets/_CompletedAssets/Prefabs/Pet/Healer/MushroomSmilePBR.prefab b/Assets/_CompletedAssets/Prefabs/Pet/Healer/MushroomSmilePBR.prefab index 93b46678f1eb54a326ff0a7683bed52d17e91204..8c744a3115e2341ccbb17c5a94838db5d5dc8696 100644 --- a/Assets/_CompletedAssets/Prefabs/Pet/Healer/MushroomSmilePBR.prefab +++ b/Assets/_CompletedAssets/Prefabs/Pet/Healer/MushroomSmilePBR.prefab @@ -268,6 +268,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 137a031435f14704792bd74bc525b77c, type: 3} m_Name: m_EditorClassIdentifier: + canMove: 0 moveSpeed: 3 --- !u!114 &-4403744560476453840 MonoBehaviour: @@ -295,7 +296,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 74b1e4ce1448eaf489c503bc9b2e792e, type: 3} - m_PlayOnAwake: 1 + m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 Loop: 0 diff --git a/Assets/_CompletedAssets/Prefabs/Pet/Healer/Rabbit_Red.prefab b/Assets/_CompletedAssets/Prefabs/Pet/Healer/Rabbit_Red.prefab index ab4fe8b55bdfa513d333c7ea051b82a76cbf3edb..382b4bb6659248c6abdfb17e877377df12fb8a4a 100644 --- a/Assets/_CompletedAssets/Prefabs/Pet/Healer/Rabbit_Red.prefab +++ b/Assets/_CompletedAssets/Prefabs/Pet/Healer/Rabbit_Red.prefab @@ -841,6 +841,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 137a031435f14704792bd74bc525b77c, type: 3} m_Name: m_EditorClassIdentifier: + canMove: 0 moveSpeed: 3.5 --- !u!114 &5040952831542473853 MonoBehaviour: @@ -868,7 +869,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 74b1e4ce1448eaf489c503bc9b2e792e, type: 3} - m_PlayOnAwake: 1 + m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 Loop: 0 diff --git a/Assets/_CompletedAssets/Scripts/Pet/Heal.cs b/Assets/_CompletedAssets/Scripts/Pet/Heal.cs index 03e7c320d62ac7742df2720f3884fef57cb59b68..6ec7719db0858faef84d2e13ffa41eca01ecb89f 100644 --- a/Assets/_CompletedAssets/Scripts/Pet/Heal.cs +++ b/Assets/_CompletedAssets/Scripts/Pet/Heal.cs @@ -29,7 +29,7 @@ namespace CompleteProject yield return new WaitForSeconds(4f); while (petHealth.currentHealth > 0 && playerHealth.currentHealth > 0) { - if (Vector3.Distance(player.position, transform.position) <= healRange) + if (Vector3.Distance(player.position, transform.position) <= healRange && transform.gameObject.GetComponent<HealerMovement>().canMove) { healAudio.PlayOneShot(healClip); playerHealth.Heal(healAmount); diff --git a/Assets/_CompletedAssets/Scripts/Pet/HealerMovement.cs b/Assets/_CompletedAssets/Scripts/Pet/HealerMovement.cs index c66cd207d4107056484ba0ffd1f5c149ae0e8cb1..a3c47032ec3c242948fb91e15f1ddde06ba0b273 100644 --- a/Assets/_CompletedAssets/Scripts/Pet/HealerMovement.cs +++ b/Assets/_CompletedAssets/Scripts/Pet/HealerMovement.cs @@ -15,7 +15,7 @@ namespace CompleteProject PetHealth petHealth; // Reference to this enemy's health. UnityEngine.AI.NavMeshAgent nav; // Reference to the nav mesh agent. private Animator animator; - bool canMove = false; + public bool canMove = false; public float moveSpeed; void Awake() {