Merge remote-tracking branch 'origin/enemy'

# Conflicts:
#	Assets/Prefabs/Characters/Enemy/Goblin.prefab
#	Assets/Scripts/GameManager.cs

Assets/Prefabs/Characters/Enemy/Goblin.prefab

@@ -291,7 +291,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   debuffState: 
   monsterID: 101
-  maxHealth: 15
+  maxHealth: 2
   weight: 15
   patrolRange: 3
   noticeRange: 2
@@ -303,6 +303,8 @@ MonoBehaviour:
   bumped: 0
   bumpable: 1
   attackRange: 1.2
+  WallTest: 
+  CliffTest: 
 --- !u!114 &114173716467154830
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Prefabs/Characters/Enemy/StatueTest.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: 1401848893116652}
+  m_IsPrefabAsset: 1
+--- !u!1 &1162659259063058
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4005902780579934}
+  - component: {fileID: 114561536863273304}
+  m_Layer: 0
+  m_Name: HPBar
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1298248310005788
+GameObject:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4202602386941338}
+  - component: {fileID: 61229995936087696}
+  - component: {fileID: 114160321880148730}
+  m_Layer: 17
+  m_Name: Anti Overlap
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!1 &1401848893116652
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4836495397386794}
+  - component: {fileID: 50141707274670556}
+  - component: {fileID: 61258820314383134}
+  m_Layer: 16
+  m_Name: StatueTest
+  m_TagString: Enemy
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1917537518207390
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4995664760293086}
+  - component: {fileID: 212389034539557544}
+  - component: {fileID: 95431596785065678}
+  - component: {fileID: 114639627468642258}
+  m_Layer: 0
+  m_Name: Body
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4005902780579934
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1162659259063058}
+  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: 4836495397386794}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4202602386941338
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1298248310005788}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.133, y: 0.009, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4995664760293086}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4836495397386794
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1401848893116652}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 11.29, y: -17.94, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 4995664760293086}
+  - {fileID: 4005902780579934}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4995664760293086
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1917537518207390}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.142, y: 0.626, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 4202602386941338}
+  m_Father: {fileID: 4836495397386794}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!50 &50141707274670556
+Rigidbody2D:
+  serializedVersion: 4
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1401848893116652}
+  m_BodyType: 0
+  m_Simulated: 1
+  m_UseFullKinematicContacts: 0
+  m_UseAutoMass: 0
+  m_Mass: 1
+  m_LinearDrag: 0
+  m_AngularDrag: 0.05
+  m_GravityScale: 1
+  m_Material: {fileID: 0}
+  m_Interpolate: 0
+  m_SleepingMode: 1
+  m_CollisionDetection: 0
+  m_Constraints: 4
+--- !u!61 &61229995936087696
+BoxCollider2D:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1298248310005788}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: -0.079675555}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 0.19960898, y: 1.1095564}
+  m_EdgeRadius: 0
+--- !u!61 &61258820314383134
+BoxCollider2D:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1401848893116652}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 6200000, guid: 90e689a435f304c469db49daef28ed89, type: 2}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0.5554246}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 0.7505637, y: 1.109323}
+  m_EdgeRadius: 0
+--- !u!95 &95431596785065678
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1917537518207390}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: dd945695310e7314f8e3ae009064f45b, 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 &114160321880148730
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1298248310005788}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31d57aad92e0a1940b2258c8b7537027, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  pushForce: 0
+--- !u!114 &114561536863273304
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1162659259063058}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 493db5529c03fce44a56a2211507667e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  width: 0.4
+  height: 0.1
+  yOffset: 1.3
+  barPrefab: {fileID: 1489501648010076, guid: bd708b07601179842bbd803b54afda40, type: 2}
+  bor: {fileID: 21300000, guid: f978754916ff69444aa0bd613b44f2c5, type: 3}
+  red: {fileID: 21300000, guid: 014c5204ddcb6e54e86aadaa34227552, type: 3}
+--- !u!114 &114639627468642258
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1917537518207390}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bf69b9b0b3af3664e89e16eab14c1b0c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  debuffState: 
+  monsterID: 251
+  maxHealth: 3
+  weight: 1
+  patrolRange: 0
+  noticeRange: 0
+  patrolSpeed: 0
+  trackSpeed: 0
+  knockbackPercentage: []
+  movementLock: 0
+  scarecrow_or_statue: 0
+--- !u!212 &212389034539557544
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1917537518207390}
+  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: 8
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: 71335108d30aa0e4a90179a09895440e, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 0.8, y: 0.8}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 1

Assets/Prefabs/Characters/Enemy/StatueTest.prefab.meta

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

Assets/Scenes/PlayScene.unity

@@ -213,12 +213,12 @@ Prefab:
     - target: {fileID: 114513527214926720, guid: 408297f86a787fb499fef71b2a40e626,
         type: 2}
       propertyPath: cam
-      value:
+      value: 
       objectReference: {fileID: 743604584}
     - target: {fileID: 114513527214926720, guid: 408297f86a787fb499fef71b2a40e626,
         type: 2}
       propertyPath: can
-      value:
+      value: 
       objectReference: {fileID: 2088383384}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 408297f86a787fb499fef71b2a40e626, type: 2}
@@ -580,6 +580,80 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 1623439448163086, guid: 3d077a5f727dd1e4780e9265ed26e036,
     type: 2}
   m_PrefabInternal: {fileID: 650104063}
+--- !u!1001 &549384201
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4639192263818050, guid: a164c147037e89448820f7387c724c42, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 11.29
+      objectReference: {fileID: 0}
+    - target: {fileID: 4639192263818050, guid: a164c147037e89448820f7387c724c42, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: -17.94
+      objectReference: {fileID: 0}
+    - target: {fileID: 4639192263818050, guid: a164c147037e89448820f7387c724c42, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4639192263818050, guid: a164c147037e89448820f7387c724c42, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4639192263818050, guid: a164c147037e89448820f7387c724c42, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4639192263818050, guid: a164c147037e89448820f7387c724c42, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4639192263818050, guid: a164c147037e89448820f7387c724c42, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4639192263818050, guid: a164c147037e89448820f7387c724c42, type: 2}
+      propertyPath: m_RootOrder
+      value: 14
+      objectReference: {fileID: 0}
+    - target: {fileID: 114118738857420128, guid: a164c147037e89448820f7387c724c42,
+        type: 2}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a164c147037e89448820f7387c724c42, type: 2}
+  m_IsPrefabAsset: 0
+--- !u!1 &549384202 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1225288737757304, guid: a164c147037e89448820f7387c724c42,
+    type: 2}
+  m_PrefabInternal: {fileID: 549384201}
+--- !u!114 &549384203
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 549384202}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bf69b9b0b3af3664e89e16eab14c1b0c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  debuffState: 
+  monsterID: 251
+  maxHealth: 3
+  weight: 1
+  patrolRange: 0
+  noticeRange: 0
+  patrolSpeed: 0
+  trackSpeed: 0
+  knockbackPercentage: []
+  movementLock: 0
+  scarecrow_or_statue: 0
 --- !u!1001 &579652633
 Prefab:
   m_ObjectHideFlags: 0
@@ -622,63 +696,21 @@ Prefab:
     - target: {fileID: 114772635349595938, guid: 7fec52078de87f74abe791494596a804,
         type: 2}
       propertyPath: frameSuper
-      value:
+      value: 
       objectReference: {fileID: 705690561}
     - target: {fileID: 114772635349595938, guid: 7fec52078de87f74abe791494596a804,
         type: 2}
       propertyPath: stoneSuper
-      value:
+      value: 
       objectReference: {fileID: 871841152}
     - target: {fileID: 114772635349595938, guid: 7fec52078de87f74abe791494596a804,
         type: 2}
       propertyPath: lifeStoneUI
-      value:
+      value: 
       objectReference: {fileID: 1206751492}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 7fec52078de87f74abe791494596a804, type: 2}
   m_IsPrefabAsset: 0
---- !u!1001 &604778652
-Prefab:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 4639192263818050, guid: a164c147037e89448820f7387c724c42, type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 11.29
-      objectReference: {fileID: 0}
-    - target: {fileID: 4639192263818050, guid: a164c147037e89448820f7387c724c42, type: 2}
-      propertyPath: m_LocalPosition.y
-      value: -17.94
-      objectReference: {fileID: 0}
-    - target: {fileID: 4639192263818050, guid: a164c147037e89448820f7387c724c42, type: 2}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4639192263818050, guid: a164c147037e89448820f7387c724c42, type: 2}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4639192263818050, guid: a164c147037e89448820f7387c724c42, type: 2}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4639192263818050, guid: a164c147037e89448820f7387c724c42, type: 2}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4639192263818050, guid: a164c147037e89448820f7387c724c42, type: 2}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4639192263818050, guid: a164c147037e89448820f7387c724c42, type: 2}
-      propertyPath: m_RootOrder
-      value: 15
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: a164c147037e89448820f7387c724c42, type: 2}
-  m_IsPrefabAsset: 0
 --- !u!1001 &650104063
 Prefab:
   m_ObjectHideFlags: 0
@@ -721,7 +753,7 @@ Prefab:
     - target: {fileID: 114880704145925944, guid: 3d077a5f727dd1e4780e9265ed26e036,
         type: 2}
       propertyPath: comboUI
-      value:
+      value: 
       objectReference: {fileID: 1504194384}
     - target: {fileID: 114402380471012178, guid: 3d077a5f727dd1e4780e9265ed26e036,
         type: 2}
@@ -824,8 +856,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name:
-  m_EditorClassIdentifier:
+  m_Name: 
+  m_EditorClassIdentifier: 
   m_HorizontalAxis: Horizontal
   m_VerticalAxis: Vertical
   m_SubmitButton: Submit
@@ -842,8 +874,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name:
-  m_EditorClassIdentifier:
+  m_Name: 
+  m_EditorClassIdentifier: 
   m_FirstSelected: {fileID: 0}
   m_sendNavigationEvents: 1
   m_DragThreshold: 10
@@ -907,7 +939,7 @@ Prefab:
     - target: {fileID: 114287389059791124, guid: e6794ab8e2e4c6340a23b382e9497cbb,
         type: 2}
       propertyPath: ui
-      value:
+      value: 
       objectReference: {fileID: 1206751492}
     - target: {fileID: 1083421967201116, guid: e6794ab8e2e4c6340a23b382e9497cbb, type: 2}
       propertyPath: m_IsActive
@@ -1306,7 +1338,7 @@ Prefab:
     - target: {fileID: 114939219159237616, guid: 62a83d11a7addc342ad436145784e698,
         type: 2}
       propertyPath: coolUI
-      value:
+      value: 
       objectReference: {fileID: 1864071040}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 62a83d11a7addc342ad436145784e698, type: 2}
@@ -1610,7 +1642,7 @@ Prefab:
     - target: {fileID: 114102296575005222, guid: b67c2e6425443f14c85899a92710bf3f,
         type: 2}
       propertyPath: player
-      value:
+      value: 
       objectReference: {fileID: 489222433}
     - target: {fileID: 4354682656029732, guid: b67c2e6425443f14c85899a92710bf3f, type: 2}
       propertyPath: m_LocalPosition.x
@@ -1671,8 +1703,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name:
-  m_EditorClassIdentifier:
+  m_Name: 
+  m_EditorClassIdentifier: 
   m_IgnoreReversedGraphics: 1
   m_BlockingObjects: 0
   m_BlockingMask:
@@ -1687,8 +1719,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name:
-  m_EditorClassIdentifier:
+  m_Name: 
+  m_EditorClassIdentifier: 
   m_UiScaleMode: 0
   m_ReferencePixelsPerUnit: 100
   m_ScaleFactor: 1

Assets/Scripts/Characters/Enemy/Enemy.cs

@@ -6,7 +6,6 @@ using Random = UnityEngine.Random;
 public class Enemy : MonoBehaviour {
 
     // data
-
     // debuff
     readonly float[] immunity_time = new float[(int)EnemyDebuffCase.END_POINTER] { 0.0f, 3.0f, 6.0f, 6.0f, 6.0f };
     [SerializeField]
@@ -252,7 +251,13 @@ public class Enemy : MonoBehaviour {
     // Animation Event
 
     // - When dead
-    public void DeadEvent()
+    public virtual void DeadEvent()
+    {
+        ResetForPool();
+        DropItem();
+    }
+
+    public void ResetForPool()
     {
         if (transform.parent.GetComponentInChildren<HPBar>())
             transform.parent.GetComponentInChildren<HPBar>().Inactivate();
@@ -260,10 +265,12 @@ public class Enemy : MonoBehaviour {
         transform.parent.SetParent(null);
         StopAllCoroutines();
         enemyManager.EnemyDeadCount++;
-
         CurrHealth = maxHealth;
         Invisible = false;
-        // Drop 아이템 결정. 인덱스 별 아이템은 맨 밑에 서술
+    }
+
+    private void DropItem()
+    {
         if (dropTable == null) { return; }
 
         float denominator = dropTable[dropTable.Length - 1];
@@ -302,11 +309,6 @@ public class Enemy : MonoBehaviour {
             inventoryManager.AddonInstantiate((ItemQuality)(indexOfItem - 12), transform.parent.position, EnemyManager.dropObjStrength);
         }
     }
-
-    public void aaa()
-    {
-        Debug.Log("aaa");
-    }
 }
 
 /* Item Drop Index

Assets/Scripts/Characters/Enemy/Scarecrow.cs

@@ -3,17 +3,16 @@ using System.Collections.Generic;
 using UnityEngine;
 
 public class Scarecrow : Enemy {
-    public bool neverDie;
+    public bool scarecrow_or_statue; // true: scarecrow
 
     public override void GetHit(PlayerAttackInfo attack)
     {
         if (Invisible) { return; }
-        float prevHealth = CurrHealth;
         CurrHealth -= attack.damage;
 
         if (CurrHealth <= 0)
         {
-            if (neverDie)
+            if (scarecrow_or_statue)
             {
                 CurrHealth = maxHealth;
             }
@@ -27,4 +26,20 @@ public class Scarecrow : Enemy {
 
         animator.SetTrigger("DamagedTrigger");
     }
+
+    public override void DeadEvent()
+    {
+        if (scarecrow_or_statue)
+        {
+            base.DeadEvent();
+        }
+        else
+        {
+            if (transform.parent.GetComponentInChildren<HPBar>()) {
+                transform.parent.GetComponentInChildren<HPBar>().Inactivate();
+            }
+            MapManager.Instance.UpgradeRoom(RoomType.Gold);
+            Destroy(transform.parent.gameObject);
+        }
+    }
 }

Assets/Scripts/EnemyManager.cs

@@ -12,7 +12,6 @@ public class EnemyManager : Singleton<EnemyManager>
     public static readonly float goldPer = 0.5f;
     public static readonly int ameNum = 0;
     public static readonly float dropObjStrength = 1f;
-
     // hold player for animation
     public GameObject player { get; private set; }
 

Assets/Scripts/GameManager.cs

@@ -12,7 +12,7 @@ public class GameManager : Singleton<GameManager> {
     public static GameState gameState;
 
     public bool isTutorial = false;
-
+    private bool statueEvent = false;
     /// <summary>
     /// Position where portal would spawn player.
     /// </summary>
@@ -21,6 +21,7 @@ public class GameManager : Singleton<GameManager> {
     public GameObject player;
     public GameObject minimap;
     public GameObject tetrisAlert;
+    public GameObject statue;
     public Canvas gameOverCanvas;
     public Canvas inventoryCanvas;
     public Canvas textCanvas;
@@ -178,5 +179,22 @@ public class GameManager : Singleton<GameManager> {
             }
         }
         CountLeftRoom();
+
+        if(!statueEvent && MapManager.Instance.clearedRoomCount == 9)
+        {
+            foreach(Transform obj in MapManager.currentRoom.transform)
+            {
+                if (obj.CompareTag("Enemy")) {
+                    GameObject body = obj.GetChild(0).gameObject;
+                    if (body.GetComponent<EnemyGround>() != null && body.GetComponent<SpriteRenderer>().isVisible)
+                    {
+                        Vector3 pos = obj.position;
+                        body.gameObject.GetComponent<EnemyGround>().ResetForPool();
+                        GameObject tempStatue = Instantiate(statue, pos, Quaternion.identity);
+                        statueEvent = true;
+                    }
+                }
+            }
+        }
     }
 }