Merge remote-tracking branch 'origin/boss'

# Conflicts:
#	Assets/Prefabs/Rooms/SpecialRoom/Room Boss 1-3.prefab
#	Assets/Scripts/Characters/Enemy/Enemy.cs

Assets/Animation/Enemy/JiJoo.controller

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: JiJoo
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers: []

Assets/Animation/Enemy/JiJoo.controller.meta

+fileFormatVersion: 2
+guid: 53e38f8e03546d24b91ad572f3d6598a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Animation/Enemy/JiJooIdle.controller

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: JiJooIdle
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers: []

Assets/Animation/Enemy/JiJooIdle.controller.meta

+fileFormatVersion: 2
+guid: 92c2c0218402ea74388e49df79609ac5
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Data/dropData_exam.csv

@@ -17,8 +17,8 @@
 고대유적,115,엘리게이터-1,1,4,6,3,1,0,2,0,5,5,3,1,3,1,1,0
 고대유적,116,엘리게이터-2,1,4,6,3,1,0,2,0,5,5,3,1,3,1,1,0
 고대유적,42,테스트거미,7,4,1,0,0,0,0,0,2,0,0,0,2,1,0,0
-고대유적,,,,,,,,,,,,,,,,,,
-,,,,,,,,,,,,,,,,,,
+고대유적,110111,지,,,,,,,,,,,,,,,,
+고대유적,110112,주,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,

Assets/JiJooMove.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class JiJooMove : StateMachineBehaviour {
+    float horizontalSpeed;
+    float verticalSpeed;
+    GameObject player;
+    Transform animatorRoot;
+    JiJoo enemy;
+    Vector2Int dir;
+    Vector2Int destination;
+
+    float time;
+    float timer = 0;
+
+     // 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) {
+        animatorRoot = animator.transform.parent;
+        enemy = animator.GetComponent<JiJoo>();
+        player = GameManager.Instance.player;
+
+        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;
+
+        Vector2 realVector = JiJoo.RealPosition(destination) - JiJoo.RealPosition(enemy.gridPosition);
+        time = realVector.x / horizontalSpeed + realVector.y / verticalSpeed;
+    }
+
+	// 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)
+        {
+            enemy.transform.parent.GetComponent<Rigidbody2D>().velocity = Vector2.zero;
+            enemy.gridPosition = destination;
+            enemy.transform.position = JiJoo.RealPosition(destination);
+            animator.SetTrigger("IdleTrigger");
+        }
+	}
+
+	// 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/JiJooMove.cs.meta

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

Assets/Prefabs/Characters/Enemy/Boss.meta

+fileFormatVersion: 2
+guid: 89e79ffcfc31cc44f86a15a9663761cf
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Characters/Enemy/Boss.prefab

-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1001 &100100000
-Prefab:
-  m_ObjectHideFlags: 1
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications: []
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 1042672725339090}
-  m_IsPrefabAsset: 1
---- !u!1 &1042672725339090
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4309964057773466}
-  - component: {fileID: 114460754105970554}
-  m_Layer: 0
-  m_Name: Boss
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &4309964057773466
-Transform:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1042672725339090}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &114460754105970554
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1042672725339090}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 76f6cbd828d7dac46a1be3ae90907fb3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 

Assets/Prefabs/Characters/Enemy/Boss/Ji.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1721569624731500}
+  m_IsPrefabAsset: 1
+--- !u!1 &1634665288320726
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4437783543141110}
+  - component: {fileID: 212426939173703352}
+  - component: {fileID: 95775676120787544}
+  - component: {fileID: 114044160605046206}
+  m_Layer: 0
+  m_Name: Body
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1721569624731500
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4890241557416818}
+  m_Layer: 0
+  m_Name: Ji
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4437783543141110
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1634665288320726}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4890241557416818}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4890241557416818
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1721569624731500}
+  m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068}
+  m_LocalPosition: {x: 20.5, y: 4, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 4437783543141110}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
+--- !u!95 &95775676120787544
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1634665288320726}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 53e38f8e03546d24b91ad572f3d6598a, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!114 &114044160605046206
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1634665288320726}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 04d5fb659b30a0c4a839ebf5ec951491, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  debuffState: 
+  monsterID: 123456
+  maxHealth: 430
+  weight: 0
+  patrolRange: 0
+  noticeRange: 0
+  patrolSpeed: 0
+  trackSpeed: 0
+  knockbackPercentage: []
+  MovementLock: 0
+  bumped: 0
+  bumpable: 1
+  bossRoom: {fileID: 0}
+  verticalSpeed: 0
+  horizontalSpeed: 0
+--- !u!212 &212426939173703352
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1634665288320726}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 4294967295
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: -2078941185
+  m_SortingLayer: 7
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: f798b5b33ff2cda41805e940a12f7286, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 4, y: 5}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0

Assets/Prefabs/Characters/Enemy/Boss.prefab.meta → Assets/Prefabs/Characters/Enemy/Boss/Ji.prefab.meta

 fileFormatVersion: 2
-guid: 69b20d7f2d49937409f7cf14a9b6db1f
+guid: f19de082ce313084886284e3d0b3ad60
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 100100000

Assets/Prefabs/Characters/Enemy/Boss/Joo.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1090433404938738}
+  m_IsPrefabAsset: 1
+--- !u!1 &1090433404938738
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4348044952827228}
+  m_Layer: 0
+  m_Name: Joo
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1378961221035442
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4568486347382672}
+  - component: {fileID: 212678282389790092}
+  - component: {fileID: 95343843949866544}
+  - component: {fileID: 114690849064819294}
+  m_Layer: 0
+  m_Name: Body
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4348044952827228
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1090433404938738}
+  m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
+  m_LocalPosition: {x: 7, y: 20.5, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 4568486347382672}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
+--- !u!4 &4568486347382672
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1378961221035442}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4348044952827228}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!95 &95343843949866544
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1378961221035442}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 5918def686b3a374e9e2d7164153d8e9, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!114 &114690849064819294
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1378961221035442}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 08e33121b29e7a941b4ea5f390a61ffb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  debuffState: 
+  monsterID: 123457
+  maxHealth: 390
+  weight: 0
+  patrolRange: 0
+  noticeRange: 0
+  patrolSpeed: 0
+  trackSpeed: 0
+  knockbackPercentage: []
+  MovementLock: 0
+  bumped: 0
+  bumpable: 1
+  bossRoom: {fileID: 0}
+  verticalSpeed: 0
+  horizontalSpeed: 0
+--- !u!212 &212678282389790092
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1378961221035442}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 4294967295
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: -2078941185
+  m_SortingLayer: 7
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: 632f464b03e1b1b48a71897ec47dbb00, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 2.56, y: 3.2}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0

Assets/Prefabs/Characters/Enemy/Boss/Joo.prefab.meta

+fileFormatVersion: 2
+guid: 1fc3f53adf138524fbf57fc1f1d814c0
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Characters/Player.prefab

@@ -384,16 +384,20 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   spikeTileu:
   - {fileID: 11400000, guid: 7f2c5cb43ad7207499b22fb5e0acd41a, type: 2}
-  - {fileID: 11400000, guid: f9cdf78c8a087c94a9279cc07fc03a25, type: 2}
+  - {fileID: 11400000, guid: 034d5fb04a013124cb432284fdc8c423, type: 2}
+  - {fileID: 11400000, guid: b04f069b23d388c479316677877ada01, type: 2}
   spikeTiled:
   - {fileID: 11400000, guid: f411e29431b787c4ab84b5ff59ca5e6e, type: 2}
-  - {fileID: 11400000, guid: 034d5fb04a013124cb432284fdc8c423, type: 2}
+  - {fileID: 11400000, guid: f9cdf78c8a087c94a9279cc07fc03a25, type: 2}
+  - {fileID: 11400000, guid: 0fcafe8b08fc8f145a66200e7900e90c, type: 2}
   spikeTilel:
   - {fileID: 11400000, guid: 85440e0dd81e48840947ce485614bab6, type: 2}
   - {fileID: 11400000, guid: f6a8681f94ddcf24eac96d8e4a5c82f6, type: 2}
+  - {fileID: 11400000, guid: 8cf5b74a1e8e7fa48a0097c7074d1e54, type: 2}
   spikeTiler:
   - {fileID: 11400000, guid: 7dbb7c55a3417f54fbd38fafb369478e, type: 2}
   - {fileID: 11400000, guid: 69359808565f98f4297a6efb8da5c4da, type: 2}
+  - {fileID: 11400000, guid: fb1826948ae16104784f105d8b716810, type: 2}
   rb: {fileID: 0}
   SpikeLayer: 10
   spikeDamage: 5
@@ -474,7 +478,7 @@ SpriteRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: -2078941185
-  m_SortingLayer: 7
+  m_SortingLayer: 8
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: 92d166e0c2a85a14facee45f5a5a8444, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}

Assets/Prefabs/MapManager.prefab

@@ -105,16 +105,12 @@ MonoBehaviour:
   - {fileID: 114475536472279828, guid: 12fa736e7364cfc4993adcabbd273c10, type: 2}
   - {fileID: 114633610401043244, guid: 07a14b0ab56e0d441ace33941b2165e8, type: 2}
   specialRoomList1:
-  - {fileID: 114330503780891850, guid: 7da800d1a4355fd4aa02e3518cd9e1fb, type: 2}
-  - {fileID: 114788631920660382, guid: 2514de8c1d17b734592b5fe2cdc74560, type: 2}
-  - {fileID: 114276487283992380, guid: 8e573eb3b8b071c47a4ee92adf1a9644, type: 2}
-  - {fileID: 114356134236679564, guid: ea5defee5777b0044b3d684971c1dc40, type: 2}
-  - {fileID: 114533677780758920, guid: fe17cba28f910e54faf7b866f86bfd3e, type: 2}
-  - {fileID: 114453972306455548, guid: f6834170b7152ee4db0dc7e165dcca70, type: 2}
-  - {fileID: 114384035641513528, guid: a2dadbc92c7cc7e449233fae6430dee7, type: 2}
-  - {fileID: 114704192105535744, guid: a121f45347e4c3d4faf83b4e681c84f0, type: 2}
   - {fileID: 114792926073732986, guid: 7b5317162788b8d4daa13ea5c6dd368b, type: 2}
   - {fileID: 114844722971494232, guid: 4643eac2d148bd146be89238dcdfa419, type: 2}
+  - {fileID: 114384035641513528, guid: a2dadbc92c7cc7e449233fae6430dee7, type: 2}
+  - {fileID: 114704192105535744, guid: a121f45347e4c3d4faf83b4e681c84f0, type: 2}
+  - {fileID: 114453972306455548, guid: f6834170b7152ee4db0dc7e165dcca70, type: 2}
+  - {fileID: 114902494803447852, guid: 8e573eb3b8b071c47a4ee92adf1a9644, type: 2}
   roomSurfaceSprite1:
   - {fileID: 21300000, guid: 5e6d29c00a95b8140a33c81d93aac0b2, type: 3}
   - {fileID: 21300000, guid: 45c68bb908319e942b8dcdaba688c080, type: 3}

Assets/Prefabs/Rooms/NormalRoom/Room 1.prefab

@@ -397,7 +397,7 @@ Rigidbody2D:
   m_LinearDrag: 0
   m_AngularDrag: 0.05
   m_GravityScale: 1
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 6200000, guid: 90e689a435f304c469db49daef28ed89, type: 2}
   m_Interpolate: 0
   m_SleepingMode: 1
   m_CollisionDetection: 0

Assets/Prefabs/Rooms/SpecialRoom/Room Start 1-1.prefab

@@ -2748,7 +2748,7 @@ Tilemap:
   - m_RefCount: 0
     m_Data: {r: 1.6829938e+12, g: 1.6829938e+12, b: 1.6829938e+12, a: 1.6829938e+12}
   - m_RefCount: 0
-    m_Data: {r: 1.4e-44, g: 1.4e-44, b: 1.4e-44, a: 1.4e-44}
+    m_Data: {r: 1.8e-44, g: 1.8e-44, b: 1.8e-44, a: 1.8e-44}
   m_AnimationFrameRate: 1
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_Origin: {x: 0, y: 0, z: 0}

Assets/Prefabs/Rooms/SpecialRoom/Room Start 1-2.prefab

@@ -1483,11 +1483,11 @@ Tilemap:
   - m_RefCount: 0
     m_Data:
       e00: 0
-      e01: 5.0854955
+      e01: 13.929637
       e02: NaN
       e03: 0
       e10: 0
-      e11: 0.28263664
+      e11: 12.893201
       e12: NaN
       e13: 0
       e20: 0
@@ -1500,7 +1500,7 @@ Tilemap:
       e33: NaN
   m_TileColorArray:
   - m_RefCount: 0
-    m_Data: {r: 7e-45, g: 7e-45, b: 7e-45, a: 7e-45}
+    m_Data: {r: 1.8e-44, g: 1.8e-44, b: 1.8e-44, a: 1.8e-44}
   m_AnimationFrameRate: 1
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_Origin: {x: 0, y: 0, z: 0}

Assets/Prefabs/TetrisMap/Tetrimino/Room Tutorial.prefab

@@ -468,114 +468,9 @@ CompositeCollider2D:
   m_EdgeRadius: 0
   m_ColliderPaths:
   - m_Collider: {fileID: 2113883505577540150}
-    m_ColliderPaths:
-    - - X: 108200000
-        Y: 47000000
-      - X: 107800000
-        Y: 47199996
-      - X: 102299992
-        Y: 47199996
-      - X: 102000000
-        Y: 47100000
-      - X: 101800000
-        Y: 46600000
-      - X: 101800000
-        Y: 43800000
-      - X: 101899992
-        Y: 43700000
-      - X: 108200000
-        Y: 43700000
-    - - X: 96300000
-        Y: 31900000
-      - X: 96300000
-        Y: 38200000
-      - X: 93400000
-        Y: 38200000
-      - X: 92800000
-        Y: 37900000
-      - X: 92800000
-        Y: 33400000
-      - X: 93100008
-        Y: 33100000
-      - X: 92800000
-        Y: 32800000
-      - X: 92800000
-        Y: 31900000
-      - X: 93300000
-        Y: 31800000
-      - X: 96200000
-        Y: 31800000
-    - - X: 117200000
-        Y: 32200000
-      - X: 117200000
-        Y: 37700000
-      - X: 117100000
-        Y: 38000000
-      - X: 116600000
-        Y: 38200000
-      - X: 113800000
-        Y: 38200000
-      - X: 113700000
-        Y: 38100000
-      - X: 113700000
-        Y: 31800000
-      - X: 117000000
-        Y: 31800000
-    - - X: 108000000
-        Y: 22900000
-      - X: 108200000
-        Y: 23400002
-      - X: 108200000
-        Y: 26199998
-      - X: 108100008
-        Y: 26300002
-      - X: 101800000
-        Y: 26300002
-      - X: 101800000
-        Y: 23500000
-      - X: 101899992
-        Y: 23200002
-      - X: 102100000
-        Y: 22800000
-      - X: 107700008
-        Y: 22800000
+    m_ColliderPaths: []
   m_CompositePaths:
-    m_Paths:
-    - - {x: 10.82, y: 4.7000003}
-      - {x: 10.78, y: 4.72}
-      - {x: 10.23, y: 4.72}
-      - {x: 10.2, y: 4.71}
-      - {x: 10.18, y: 4.66}
-      - {x: 10.18, y: 4.38}
-      - {x: 10.19, y: 4.37}
-      - {x: 10.82, y: 4.37}
-    - - {x: 9.63, y: 3.19}
-      - {x: 9.63, y: 3.82}
-      - {x: 9.34, y: 3.82}
-      - {x: 9.28, y: 3.79}
-      - {x: 9.28, y: 3.3400002}
-      - {x: 9.310001, y: 3.31}
-      - {x: 9.28, y: 3.28}
-      - {x: 9.28, y: 3.19}
-      - {x: 9.33, y: 3.18}
-      - {x: 9.62, y: 3.18}
-    - - {x: 11.72, y: 3.22}
-      - {x: 11.72, y: 3.77}
-      - {x: 11.71, y: 3.8}
-      - {x: 11.66, y: 3.82}
-      - {x: 11.38, y: 3.82}
-      - {x: 11.37, y: 3.81}
-      - {x: 11.37, y: 3.18}
-      - {x: 11.7, y: 3.18}
-    - - {x: 10.8, y: 2.29}
-      - {x: 10.82, y: 2.3400002}
-      - {x: 10.82, y: 2.62}
-      - {x: 10.810001, y: 2.63}
-      - {x: 10.18, y: 2.63}
-      - {x: 10.18, y: 2.3500001}
-      - {x: 10.19, y: 2.3200002}
-      - {x: 10.21, y: 2.28}
-      - {x: 10.77, y: 2.28}
+    m_Paths: []
   m_VertexDistance: 0.0005
 --- !u!66 &66568114228734348
 CompositeCollider2D:
@@ -667,8 +562,6 @@ MonoBehaviour:
   rightDoorLocation: 0
   doorLocations: 010000000900000011000000
   fog: {fileID: 0}
-  leftTetrisDoor: {fileID: 0}
-  rightTetrisDoor: {fileID: 0}
   inGameDoorUp: {fileID: 0}
   inGameDoorDown: {fileID: 0}
   inGameDoorLeft: {fileID: 0}
@@ -1155,11 +1048,11 @@ Tilemap:
   - m_RefCount: 0
     m_Data:
       e00: 0
-      e01: 9.322635
+      e01: 11.014395
       e02: NaN
       e03: 0
       e10: 0
-      e11: 1.4719009
+      e11: 3.2310944
       e12: NaN
       e13: 0
       e20: 0
@@ -1172,7 +1065,7 @@ Tilemap:
       e33: NaN
   m_TileColorArray:
   - m_RefCount: 0
-    m_Data: {r: 1.3e-44, g: 1.3e-44, b: 1.3e-44, a: 1.3e-44}
+    m_Data: {r: 1.5e-44, g: 1.5e-44, b: 1.5e-44, a: 1.5e-44}
   m_AnimationFrameRate: 1
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_Origin: {x: 0, y: 0, z: 0}
@@ -1236,25 +1129,25 @@ Tilemap:
   m_TileMatrixArray:
   - m_RefCount: 0
     m_Data:
-      e00: 0
-      e01: 10.999873
+      e00: 9.813031e+16
+      e01: 9e-44
       e02: NaN
-      e03: 0
+      e03: 4.5e-44
       e10: 0
-      e11: 4.6198006
+      e11: 0
       e12: NaN
       e13: 0
-      e20: 0
-      e21: 0
-      e22: 0.99975586
-      e23: 0
+      e20: 1.44e-42
+      e21: 4.6771786e-29
+      e22: 5.5e-44
+      e23: 4.674001e-29
       e30: 0
       e31: 0
-      e32: Infinity
-      e33: NaN
+      e32: 0
+      e33: 1e-45
   m_TileColorArray:
   - m_RefCount: 0
-    m_Data: {r: 1.4e-44, g: 1.4e-44, b: 1.4e-44, a: 1.4e-44}
+    m_Data: {r: 2.5e-44, g: 2.5e-44, b: 2.5e-44, a: 2.5e-44}
   m_AnimationFrameRate: 1
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_Origin: {x: 0, y: 0, z: 0}

Assets/Scripts/Characters/Enemy/Animator State/ArcherTrack.cs

@@ -28,7 +28,7 @@ public class ArcherTrack : StateMachineBehaviour
 
         animatorRoot = animator.transform.parent;
         enemy = animator.GetComponent<EnemyGround>();
-        player = EnemyManager.Instance.Player;
+        player = GameManager.Instance.player;
 
 
         trackSpeed = enemy.trackSpeed;

Assets/Scripts/Characters/Enemy/Animator State/EnemyAirTrack.cs

@@ -17,7 +17,7 @@ public class EnemyAirTrack : StateMachineBehaviour {
     override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
         animatorRoot = animator.transform.parent;
         enemy = animator.GetComponent<EnemyAir>();
-        player = EnemyManager.Instance.Player;
+        player = GameManager.Instance.player;
         trackSpeed = enemy.trackSpeed;
         frameCount = 0;
 

Assets/Scripts/Characters/Enemy/Animator State/EnemyMeleeTrack.cs

@@ -16,7 +16,7 @@ public class EnemyMeleeTrack : StateMachineBehaviour {
     override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
         animatorRoot = animator.transform.parent;
         enemy = animator.GetComponent<EnemyGround>();
-        player = EnemyManager.Instance.Player;
+        player = GameManager.Instance.player;
 
         trackSpeed = enemy.trackSpeed;
         attackRange = enemy.attackRange;

Assets/Scripts/Characters/Enemy/Animator State/Jollarcher2Track.cs

@@ -28,7 +28,7 @@ public class Jollarcher2Track : StateMachineBehaviour
 
         animatorRoot = animator.transform.parent;
         enemy = animator.GetComponent<EnemyGround>();
-        player = EnemyManager.Instance.Player;
+        player = GameManager.Instance.player;
 
 
         trackSpeed = enemy.trackSpeed;

Assets/Scripts/Characters/Enemy/Boss.cs

@@ -2,21 +2,29 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class Boss : MonoBehaviour {
+public class Boss : Enemy {
     public BossRoomInGame bossRoom;
+    public RuntimeAnimatorController[] animators;
 
-    protected virtual void Awake()
+    protected override IEnumerator OnIce(float duration) { yield return null; }
+    protected override IEnumerator OnStun(float duration) { yield return null; }
+    protected override IEnumerator Knockback(float knockbackDist, float knockbackTime) { yield return null; }
+
+    protected override void Awake()
     {
-        ;
+        base.Awake();
+        debuffState[(int)EnemyDebuffCase.Ice] = DebuffState.Immune;
+        debuffState[(int)EnemyDebuffCase.Stun] = DebuffState.Immune;
     }
 
     // Use this for initialization
-	void Start () {
-		
+    protected override void Start()
+    {
+        base.Start();
     }
 
-	// Update is called once per frame
-	void Update () {
-		
+    protected override void FixedUpdate()
+    {
+        base.FixedUpdate();
     }
 }

Assets/Scripts/Characters/Enemy/Boss.meta

+fileFormatVersion: 2
+guid: 4c4bf7e2f72d3664bbe31de39b9cf256
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Ji : JiJoo {
+    public float attackRange;
+
+    protected override void Awake()
+    {
+        base.Awake();
+    }
+
+    // Use this for initialization
+    protected override void Start()
+    {
+        base.Start();
+    }
+
+    protected override void FixedUpdate()
+    {
+        base.FixedUpdate();
+    }
+
+    public override bool IsAttackable()
+    {
+        return PlayerDistance < attackRange;
+    }
+
+    public override Vector2Int MoveDirection()
+    {
+        Vector2Int dir;
+        if (Mathf.Abs(playerDirection.x) > Mathf.Abs(playerDirection.y))
+            dir = (playerDirection.x > 0) ? Vector2Int.right : Vector2Int.left;
+        else
+            dir = (playerDirection.y > 0) ? Vector2Int.up : Vector2Int.down;
+        return dir;
+    }
+}

Assets/Scripts/Characters/Enemy/Boss/Ji.cs.meta

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

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

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public abstract class JiJoo : Boss {
+    public static int[] webGrid = { 4, 7, 10, 14, 17, 20 };
+    public Vector2Int gridPosition;
+
+    public Vector2 playerDirection;
+
+    public float horizontalSpeed;
+    public float verticalSpeed;
+
+    public abstract bool IsAttackable();
+
+    protected override void Awake()
+    {
+        base.Awake();
+    }
+
+    // Use this for initialization
+    protected override void Start()
+    {
+        base.Start();
+        playerDirection = GameManager.Instance.player.transform.position - transform.position;
+
+        bossRoom.transitionUpdate[0] += Phase1Transition;
+        //transitionUpdate[1] += Phase2Transition;
+        bossRoom.phaseUpdate[0] += Phase1;
+        //phaseUpdate[1] += Phase2;
+    }
+
+    protected virtual void Update()
+    {
+        if(bossRoom.CurPhase == 0)
+            animator.SetBool("Attackable", IsAttackable());
+    }
+
+    protected override void FixedUpdate()
+    {
+        base.FixedUpdate();
+        playerDirection = GameManager.Instance.player.transform.position - transform.position;
+    }
+
+    protected void Phase1Transition()
+    {
+        Debug.Log("aaa");
+        animator.runtimeAnimatorController = animators[bossRoom.CurPhase];
+    }
+    protected void Phase2Transition()
+    {
+        StartCoroutine(Heal(maxHealth, 2));
+    }
+    protected void Phase1()
+    {
+        
+    }
+    protected void Phase2()
+    {
+        
+    }
+
+    public abstract Vector2Int MoveDirection();
+
+    public IEnumerator Heal(float hp, float time)
+    {
+        float delta = hp - currHealth;
+        for (float t = 0; t <= time; t += Time.deltaTime)
+        {
+            yield return null;
+            currHealth += (delta * t / time);
+        }
+    }
+
+    public static float Vector2ToZAngle(Vector2Int dir)
+    {
+        if (dir == Vector2Int.up)
+            return 0;
+        else if (dir == Vector2Int.left)
+            return 90;
+        else if (dir == Vector2Int.down)
+            return 180;
+        else if (dir == Vector2Int.right)
+            return 270;
+
+        return 0;
+    }
+    public static Vector2 RealPosition(Vector2Int gridPosition)
+    {
+        return new Vector2(webGrid[gridPosition.x], webGrid[gridPosition.y]);
+    }
+}

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

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

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

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Joo : JiJoo {
+    [SerializeField]
+    private LayerMask phase1Raycast;
+
+    protected override void Awake()
+    {
+        base.Awake();
+    }
+
+    // Use this for initialization
+    protected override void Start()
+    {
+        base.Start();
+    }
+
+    protected override void Update()
+    {
+        base.Update();
+    }
+
+    protected override void FixedUpdate()
+    {
+        base.FixedUpdate();
+    }
+
+    public override bool IsAttackable()
+    {
+        RaycastHit2D hit = Physics2D.Raycast(transform.position, playerDirection, 50, phase1Raycast);
+        return hit.collider != null && hit.collider.gameObject.layer != LayerMask.NameToLayer("Wall");
+    }
+
+    public override Vector2Int MoveDirection()
+    {
+        Vector2Int dir;
+        if (Mathf.Abs(playerDirection.x) > Mathf.Abs(playerDirection.y))
+            dir = (playerDirection.x > 0) ? Vector2Int.right : Vector2Int.left;
+        else
+            dir = (playerDirection.y > 0) ? Vector2Int.up : Vector2Int.down;
+        return dir;
+    }
+}

Assets/Scripts/Characters/Enemy/Boss/Joo.cs.meta

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

Assets/Scripts/Characters/Enemy/Enemy.cs

@@ -10,7 +10,7 @@ public class Enemy : MonoBehaviour {
     // debuff
     readonly float[] immunity_time = new float[(int)EnemyDebuffCase.END_POINTER] { 0.0f, 3.0f, 6.0f, 6.0f, 6.0f };
     [SerializeField]
-    DebuffState[] debuffState;
+    protected DebuffState[] debuffState;
     float fireDuration = 0.0f;
     protected virtual IEnumerator OnIce(float duration) { yield return 0; }
     protected virtual IEnumerator OnStun(float duration) { yield return 0; }
@@ -74,12 +74,12 @@ public class Enemy : MonoBehaviour {
         currHealth = maxHealth;
         Invisible = MovementLock = KnockbackLock = false;
         if (enemyManager.DropTableByID.ContainsKey(monsterID)) { dropTable = enemyManager.DropTableByID[monsterID]; }
-        PlayerDistance = Vector2.Distance(enemyManager.Player.transform.position, transform.parent.position);
+        PlayerDistance = Vector2.Distance(GameManager.Instance.player.transform.position, transform.parent.position);
     }
 
     protected virtual void FixedUpdate()
     {
-        PlayerDistance = Vector2.Distance(enemyManager.Player.transform.position, transform.parent.position);
+        PlayerDistance = Vector2.Distance(GameManager.Instance.player.transform.position, transform.parent.position);
     }
 
     // When damaged

Assets/Scripts/Characters/Enemy/EnemyAir.cs

@@ -83,7 +83,7 @@ public class EnemyAir : Enemy {
     {
         MovementLock = true;
         bool[] lockArray = new bool[] { false, KnockbackLock };
-        Vector2 knockbackDir = (transform.parent.position - enemyManager.Player.transform.position).normalized;
+        Vector2 knockbackDir = (transform.parent.position - GameManager.Instance.player.transform.position).normalized;
         Vector2 knockbackVelocity = (knockbackDist / knockbackTime) * knockbackDir;
         ChangeAngleZ(Mathf.Atan2(knockbackDir.y, knockbackDir.x) * -1, new bool[] { MovementLock, KnockbackLock });
         ChangeVelocityXY(knockbackVelocity, lockArray);

Assets/Scripts/Characters/Enemy/EnemyGround.cs

@@ -102,7 +102,7 @@ public class EnemyGround : Enemy {
     {
         MovementLock = true;
         bool[] lockArray = new bool[] { false, KnockbackLock };
-        int knockbackDir = (enemyManager.Player.transform.position.x - transform.parent.position.x >= 0) ? -1 : 1;
+        int knockbackDir = (GameManager.Instance.player.transform.position.x - transform.parent.position.x >= 0) ? -1 : 1;
         float knockbackVelocity = knockbackDir * knockbackDist / knockbackTime;
         ChangeDir(knockbackDir * -1, new bool[] { MovementLock, KnockbackLock });
         ChangeVelocityX(knockbackVelocity, lockArray);

Assets/Scripts/EnemyManager.cs

@@ -14,7 +14,7 @@ public class EnemyManager : Singleton<EnemyManager>
     public static readonly float dropObjStrength = 1f;
 
     // hold player for animation
-    public GameObject Player { get; private set; }
+    //public GameObject Player { get; private set; }    // Use GameManager.Instance.player instead
 
     // data of drop item
     [SerializeField]
@@ -46,7 +46,7 @@ public class EnemyManager : Singleton<EnemyManager>
     }
     private void Start()
     {
-        Player = GameManager.Instance.player;
+        
     }
 
     // Spawn Enemy to Map

Assets/Scripts/TetrisMap/Rooms/BossRoom/JiJooRoom.cs

@@ -4,6 +4,7 @@ using UnityEngine;
 
 public class JiJooRoom : BossRoomInGame {
     
+
     protected override void Awake()
     {
         base.Awake();
@@ -13,8 +14,10 @@ public class JiJooRoom : BossRoomInGame {
     protected override void Start ()
     {
         base.Start();
-        transitionAction[0] += Phase0Transition;
-        transitionAction[1] += Phase1Transition;
+        transitionUpdate[0] += Phase1Transition;
+        //transitionUpdate[1] += Phase2Transition;
+        phaseUpdate[0] += Phase1;
+        //phaseUpdate[1] += Phase2;
     }
 	
 	// Update is called once per frame
@@ -23,20 +26,26 @@ public class JiJooRoom : BossRoomInGame {
         base.Update();
     }
 
-    protected void Phase0Transition()
+    protected void Phase1Transition()
     {
-        
+        Debug.Log("come");
     }
-    protected void Phase1Transition()
+    protected void Phase2Transition()
     {
         
     }
     protected void Phase1()
     {
-
+        if (bosses[0].currHealth <= 0 && bosses[1].currHealth <= 0)
+        {
+            CurPhase++;
+        }
     }
     protected void Phase2()
     {
-
+        if (bosses[0].currHealth <= 0 && bosses[1].currHealth <= 0)
+        {
+            CurPhase++;
+        }
     }
 }

Assets/Scripts/TetrisMap/Rooms/BossRoomInGame.cs

@@ -30,19 +30,20 @@ public class BossRoomInGame : RoomInGame {
         }
     }
     public bool isTransitionFinished;
-    // phaseAction 전(isTransitionFinished == false 일때) 매 프레임 호출됨; Update 대응
-    public Action[] transitionAction;
+    // phaseUpdate 전 매 프레임 호출됨; Update 대용
+    public Action[] transitionUpdate;
     // 진행중인 phase coroutine에서 매 프레임 호출됨; Update 대용
-    public Action[] phaseAction;
+    public Action[] phaseUpdate;
     // 현재 진행중인 phase coroutine
     private IEnumerator phaseCoroutine;
 
-    protected bool attackStart;
+    protected bool attackStart = false;
+    protected bool attackTrigger = false;
 
     protected virtual void Awake()
     {
-        transitionAction = new Action[totalPhase];
-        phaseAction = new Action[totalPhase];
+        transitionUpdate = new Action[totalPhase];
+        phaseUpdate = new Action[totalPhase];
     }
 
     // Use this for initialization
@@ -54,10 +55,11 @@ public class BossRoomInGame : RoomInGame {
     // Update is called once per frame
     protected virtual void Update()
     {
-        if (attackStart)
+        Debug.Log(CurPhase);
+        if (!attackStart && attackTrigger)
         {
             StartCoroutine(BeforeBossFight());
-            attackStart = false;
+            attackStart = true;
         }
     }
 
@@ -73,14 +75,17 @@ public class BossRoomInGame : RoomInGame {
     IEnumerator Phase(int phase)
     {
         isTransitionFinished = false;
+        Debug.Log(transitionUpdate[phase].GetInvocationList().GetLength(0));
         while (!isTransitionFinished)
         {
-            transitionAction[phase]();
+            if (transitionUpdate[phase] != null)
+                transitionUpdate[phase]();
             yield return null;
         }
         while (CurPhase == phase)
         {
-            phaseAction[phase]();
+            if (phaseUpdate[phase] != null)
+                phaseUpdate[phase]();
             yield return null;
         }
     }
@@ -88,7 +93,8 @@ public class BossRoomInGame : RoomInGame {
     public override void RoomEnter()
     {
         base.RoomEnter();
-
+        //EnemyManager.Instance.SpawnEnemyToMap();
+        attackTrigger = true;
         //보스 만들어지면 구현할 것
     }
 

Assets/Sprites/Enemy/Boss.meta

+fileFormatVersion: 2
+guid: a857bd890f6cebd48b9bf6d1051eb984
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Enemy/Boss/Ji.meta

+fileFormatVersion: 2
+guid: ea1006761c723624ebf97ba7e5006901
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

+fileFormatVersion: 2
+guid: baa88d859cbf81f43b7062ebc62f5087
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Enemy/Boss/Ji/idle/zi_idle1.png.meta

+fileFormatVersion: 2
+guid: f798b5b33ff2cda41805e940a12f7286
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 6
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 0
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 64
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 55840a691a2a3ac47933f719114d75e6
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Enemy/Boss/Ji/idle/zi_idle2.png.meta

+fileFormatVersion: 2
+guid: 37f0ec855ae85ed4bbb929cfff6cc8fe
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 6
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 0
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 64
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: fcea12ea4a6254b4da504342badaecbd
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Enemy/Boss/Ji/move.meta

+fileFormatVersion: 2
+guid: 0d8f76e456a9b2b478d1d8242506e35f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Enemy/Boss/Ji/move/zi_move1.png.meta

+fileFormatVersion: 2
+guid: 34161d3f74c21454392cc3ebfb46ccca
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 6
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 0
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 64
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 7bca903340fce8349bc5bd83366b34d4
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Enemy/Boss/Joo.meta

+fileFormatVersion: 2
+guid: d405a9425b6c7b747b4abf4756ad2ce1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Enemy/Boss/Joo/idle.meta

+fileFormatVersion: 2
+guid: 4dc107c5fe41fb94da47f516c32b1e3f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Enemy/Boss/Joo/move.meta

+fileFormatVersion: 2
+guid: 876295da08af1394e9c4eed964e0b73b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: