Merge branch 'loottable'
# Conflicts: # Assets/Project Files/Scripts/Arlo/SlimeAI.cs
This commit is contained in:
@@ -30,7 +30,7 @@ public class SlimeAI : MonoBehaviour
|
||||
animator = GetComponent<Animator>();
|
||||
player = GameObject.FindWithTag("Player");
|
||||
HP = 0;
|
||||
|
||||
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
@@ -75,7 +75,7 @@ public class SlimeAI : MonoBehaviour
|
||||
animator.SetBool("EnemyInAggroRange", false);
|
||||
animator.SetBool("EnemyInVisionRange", false);
|
||||
}
|
||||
|
||||
|
||||
if (!isWandering)
|
||||
{
|
||||
//Idle
|
||||
@@ -99,8 +99,8 @@ public class SlimeAI : MonoBehaviour
|
||||
animator.SetBool("Wandering", true);
|
||||
transform.position += transform.forward * moveSpeed * Time.deltaTime;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
void Rotate()
|
||||
@@ -174,4 +174,4 @@ public class SlimeAI : MonoBehaviour
|
||||
isWandering = false;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user