Merge remote-tracking branch 'origin/boss'

# Conflicts:
#	Assets/Scenes/PlayScene.unity
#	Assets/Scripts/Characters/Enemy/Scarecrow.cs
#	Assets/Scripts/TetrisMap/Rooms/BossRoom/JiJooRoom.cs

Assets/JiJooDead.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class JiJooDead : StateMachineBehaviour {
+
+	 // 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) {
+	//
+	//}
+
+	// OnStateUpdate is called on each Update frame between OnStateEnter and OnStateExit callbacks
+	override public void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
+	    if (true)
+        {
+            animator.SetBool("PhaseEnd", true);
+            return;
+        }
+	}
+
+	// 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) {
+	//
+	//}
+
+	// OnStateMove is called right after Animator.OnAnimatorMove(). Code that processes and affects root motion should be implemented here
+	//override public void OnStateMove(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
+	//
+	//}
+
+	// OnStateIK is called right after Animator.OnAnimatorIK(). Code that sets up animation IK (inverse kinematics) should be implemented here.
+	//override public void OnStateIK(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
+	//
+	//}
+}

Assets/JiJooDead.cs.meta

+fileFormatVersion: 2
+guid: e3cdf16beaf8ced48a82f46a6fe4b13a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/MapManager.prefab

@@ -206,7 +206,7 @@ MonoBehaviour:
   - {fileID: 114384035641513528, guid: a2dadbc92c7cc7e449233fae6430dee7, type: 2}
   - {fileID: 114704192105535744, guid: a121f45347e4c3d4faf83b4e681c84f0, type: 2}
   - {fileID: 114453972306455548, guid: f6834170b7152ee4db0dc7e165dcca70, type: 2}
-  - {fileID: 114902494803447852, guid: 8e573eb3b8b071c47a4ee92adf1a9644, type: 2}
+  - {fileID: 114367142578803744, guid: 8e573eb3b8b071c47a4ee92adf1a9644, type: 2}
   roomSurfaceSprite1:
   - {fileID: 21300000, guid: 5e6d29c00a95b8140a33c81d93aac0b2, type: 3}
   - {fileID: 21300000, guid: 45c68bb908319e942b8dcdaba688c080, type: 3}

Assets/Prefabs/Rooms/SpecialRoom/Room Boss 1-3 - 복사본.prefab.meta

+fileFormatVersion: 2
+guid: 43e46c6c92fe0584995bf0e5987bf559
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/JiJooMove.cs → Assets/Scripts/Characters/Enemy/Animator State/JiJooMove.cs

@@ -7,9 +7,11 @@ public class JiJooMove : StateMachineBehaviour {
     float verticalSpeed;
     GameObject player;
     Transform animatorRoot;
+    Rigidbody2D rb2D;
     JiJoo enemy;
     Vector2Int dir;
     Vector2Int destination;
+    Vector2 velocity;
 
     float time;
     float timer = 0;
@@ -19,29 +21,45 @@ public class JiJooMove : StateMachineBehaviour {
         animatorRoot = animator.transform.parent;
         enemy = animator.GetComponent<JiJoo>();
         player = GameManager.Instance.player;
+        rb2D = enemy.transform.parent.GetComponent<Rigidbody2D>();
 
         horizontalSpeed = enemy.horizontalSpeed;
         verticalSpeed = enemy.verticalSpeed;
 
         dir = enemy.MoveDirection();
-        enemy.transform.eulerAngles = new Vector3(0, 0, JiJoo.Vector2ToZAngle(dir));
-        enemy.transform.parent.GetComponent<Rigidbody2D>().velocity = dir * new Vector2(horizontalSpeed, verticalSpeed);
-
         destination = enemy.gridPosition + dir;
+        if (destination.x < 0 || destination.x >= 6 || destination.y < 0 || destination.y >= 6)
+        {
+            animator.SetTrigger("IdleTrigger");
+            return;
+        }
 
+        enemy.transform.eulerAngles = new Vector3(0, 0, JiJoo.Vector2ToZAngle(dir));
+        velocity = dir * new Vector2(horizontalSpeed, verticalSpeed);
+        Debug.Log(destination);
         Vector2 realVector = JiJoo.RealPosition(destination) - JiJoo.RealPosition(enemy.gridPosition);
-        time = realVector.x / horizontalSpeed + realVector.y / verticalSpeed;
+        time = Mathf.Abs(realVector.x) / horizontalSpeed + Mathf.Abs(realVector.y) / verticalSpeed;
+        timer = 0;
+        rb2D.MovePosition(rb2D.position + velocity * Time.deltaTime);
     }
 
 	// OnStateUpdate is called on each Update frame between OnStateEnter and OnStateExit callbacks
 	override public void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
-	    if (timer > time)
+        if (destination.x < 0 || destination.x >= 6 || destination.y < 0 || destination.y >= 6)
+        {
+            animator.SetTrigger("IdleTrigger");
+            return;
+        }
+
+        rb2D.MovePosition(rb2D.position + velocity * Time.deltaTime);
+        if (timer > time)
         {
-            enemy.transform.parent.GetComponent<Rigidbody2D>().velocity = Vector2.zero;
+            Debug.Log("end");
             enemy.gridPosition = destination;
-            enemy.transform.position = JiJoo.RealPosition(destination);
+            enemy.transform.parent.transform.localPosition = JiJoo.RealPosition(destination);
             animator.SetTrigger("IdleTrigger");
         }
+        timer += Time.deltaTime;
 	}
 
 	// OnStateExit is called when a transition ends and the state machine finishes evaluating this state

Assets/Scripts/Characters/Enemy/Boss/JiJoo.cs

@@ -11,6 +11,8 @@ public abstract class JiJoo : Boss {
     public float horizontalSpeed;
     public float verticalSpeed;
 
+    public GameObject egg;
+
     public abstract bool IsAttackable();
 
     protected override void Awake()
@@ -25,7 +27,7 @@ public abstract class JiJoo : Boss {
         playerDirection = GameManager.Instance.player.transform.position - transform.position;
 
         bossRoom.transitionUpdate[0] += Phase1Transition;
-        //transitionUpdate[1] += Phase2Transition;
+        bossRoom.transitionUpdate[1] += Phase2Transition;
         bossRoom.phaseUpdate[0] += Phase1;
         //phaseUpdate[1] += Phase2;
     }
@@ -44,8 +46,8 @@ public abstract class JiJoo : Boss {
 
     protected void Phase1Transition()
     {
-        Debug.Log("aaa");
         animator.runtimeAnimatorController = animators[bossRoom.CurPhase];
+        bossRoom.isTransitionFinished = true;
     }
     protected void Phase2Transition()
     {
@@ -60,6 +62,37 @@ public abstract class JiJoo : Boss {
         
     }
 
+    public override void GetHit(PlayerAttackInfo attack)
+    {
+        TakeDamage(attack.damage);
+        DebuffApply(attack.debuffTime);
+    }
+    public override void TakeDamage(float damage)
+    {
+        if (Invisible) { return; }
+        float prevHealth = CurrHealth;
+        CurrHealth -= damage;
+        if (CurrHealth <= 0)
+        {
+            MakeDead();
+            return;
+        }
+        /*
+        float currHealthPercentage = CurrHealth / maxHealth;
+        float prevHealthPercentage = prevHealth / maxHealth;
+
+        foreach (float percentage in knockbackPercentage)
+        {
+            if (currHealthPercentage > percentage) { break; }
+            if (prevHealthPercentage > percentage)
+            {
+                animator.SetTrigger("DamagedTrigger");
+                break;
+            }
+        }
+        */
+    }
+
     public abstract Vector2Int MoveDirection();
 
     public IEnumerator Heal(float hp, float time)
@@ -70,6 +103,7 @@ public abstract class JiJoo : Boss {
             yield return null;
             CurrHealth += (delta * t / time);
         }
+        CurrHealth = hp;
     }
 
     public static float Vector2ToZAngle(Vector2Int dir)

Assets/Scripts/Characters/Enemy/Enemy.cs

@@ -34,7 +34,7 @@ public class Enemy : MonoBehaviour {
     protected EnemyManager enemyManager;
 
     // for movement
-    protected Animator animator;
+    public Animator animator;
     protected float stunnedAnimLength;
     public EnemyMovementLock movementLock;
     public bool Invisible { get; protected set; }
@@ -103,7 +103,7 @@ public class Enemy : MonoBehaviour {
         animator.SetTrigger("TrackTrigger");
     }
 
-    public void TakeDamage(float damage)
+    public virtual void TakeDamage(float damage)
     {
         if (Invisible) { return; }
         float prevHealth = CurrHealth;
@@ -134,7 +134,6 @@ public class Enemy : MonoBehaviour {
         animator.SetTrigger("DeadTrigger");
         StopCoroutine("OnFire");
         GetComponent<SpriteRenderer>().color = Color.white;
-        return;
     }
 
     // - Apply debuff

Assets/Scripts/TetrisMap/Rooms/BossRoomInGame.cs

@@ -75,7 +75,7 @@ public class BossRoomInGame : RoomInGame {
     IEnumerator Phase(int phase)
     {
         isTransitionFinished = false;
-        Debug.Log(transitionUpdate[phase].GetInvocationList().GetLength(0));
+        Debug.Log(transitionUpdate[phase].GetInvocationList().Length);
         while (!isTransitionFinished)
         {
             if (transitionUpdate[phase] != null)

Assets/Sprites/Enemy/Boss/Ji/idle/ji.anim.meta

+fileFormatVersion: 2
+guid: 7505ba8e49e353a49acf0622218f39a9
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: