2 Commits

Author SHA1 Message Date
HelarJ
9a104a8bd3 Merge branch 'loottable'
# Conflicts:
#	Assets/Project Files/Scripts/Arlo/SlimeAI.cs
2022-05-02 17:32:39 +03:00
5a83699fd1 fixes to slime death, attack function has proper timings 2022-04-25 18:05:53 +03:00
3 changed files with 7 additions and 7 deletions

View File

@@ -120,7 +120,7 @@ public class SlimeAI : MonoBehaviour
{ {
HP -= dmg; HP -= dmg;
} }
void Attack() void Attack()
{ {
if (!isAttacking) if (!isAttacking)

View File

@@ -2,7 +2,7 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
public class death : StateMachineBehaviour public class SlimeDeath : StateMachineBehaviour
{ {
// OnStateEnter is called when a transition starts and the state machine starts to evaluate this state // OnStateEnter is called when a transition starts and the state machine starts to evaluate this state
//override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) //override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
@@ -17,10 +17,10 @@ public class death : StateMachineBehaviour
//} //}
// OnStateExit is called when a transition ends and the state machine finishes evaluating this state // OnStateExit is called when a transition ends and the state machine finishes evaluating this state
//override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
//{ {
// Destroy(animator.gameObject);
//} }
// OnStateMove is called right after Animator.OnAnimatorMove() // OnStateMove is called right after Animator.OnAnimatorMove()
//override public void OnStateMove(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) //override public void OnStateMove(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 6c7f89faf36f41b418e5105a12c34cdb guid: aa7306c35f4c27d4daefb1259633b9d0
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2