Merge branch 'tetris'

# Conflicts:
#	Assets/Data/dropData_exam.csv
#	Assets/Prefabs/Characters/Enemy/Goblin.prefab
#	Assets/Prefabs/Characters/Player.prefab
#	Assets/Scripts/Characters/Enemy/Enemy.cs
#	Assets/Scripts/Characters/Enemy/EnemyAir.cs
#	Assets/Scripts/Characters/Enemy/EnemyGround.cs
#	Assets/Scripts/EnemyManager.cs

Assets/Sprites/Rooms/Stage2.meta → Assets/Animation/Portal.meta

 fileFormatVersion: 2
-guid: f8d8d4c7c5fee1345bbf6147371ee66e
+guid: 82792ad70bba5f242b357cc2e8d221ab
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Animation/Portal/Portal.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: Portal
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 1107086799274916306}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1101 &1101341456112995664
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1102826353461419760}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.54545456
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1102 &1102777388683995048
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: open
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 1101341456112995664}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: e29ec5edbf375e243aa8eba3a6a1d80c, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &1102826353461419760
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: idle
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 99a6459aad2ca314a8e06edbcbfb71f2, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1107 &1107086799274916306
+AnimatorStateMachine:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 1102777388683995048}
+    m_Position: {x: 276, y: 36, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1102826353461419760}
+    m_Position: {x: 420, y: 132, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 1102777388683995048}

Assets/Animation/Portal/Portal.controller.meta

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

Assets/Animation/Portal/idle.anim

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: idle
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: 21300000, guid: 12d01a1f37ac24d418b69a938074ba81, type: 3}
+    - time: 0.1
+      value: {fileID: 21300000, guid: 064e0175a87220940afdc56deb6b554a, type: 3}
+    - time: 0.2
+      value: {fileID: 21300000, guid: bbd9737be8c725b478e568846f4e440d, type: 3}
+    - time: 0.3
+      value: {fileID: 21300000, guid: 536f832aedbcefd49af3d50b834228e8, type: 3}
+    - time: 0.4
+      value: {fileID: 21300000, guid: 7a1c95306f9e09243b8d4a711841fe28, type: 3}
+    - time: 0.5
+      value: {fileID: 21300000, guid: d37ec791fdfccb34fb3f8a4ae1b3d839, type: 3}
+    - time: 0.6
+      value: {fileID: 21300000, guid: 8c13043271b5a5241b4d68a6a94d6184, type: 3}
+    - time: 0.7
+      value: {fileID: 21300000, guid: 8874a856f08705a438a46582e2661a1a, type: 3}
+    - time: 0.8
+      value: {fileID: 21300000, guid: 8e63cd68a8f2dcb4e92c9d7f25ab2408, type: 3}
+    - time: 0.9
+      value: {fileID: 21300000, guid: 806eeb55cc4b7ce4eaa981f8d90dc330, type: 3}
+    - time: 1
+      value: {fileID: 21300000, guid: 1d2a5e1079264274a9f8914f53c2f5e7, type: 3}
+    - time: 1.1
+      value: {fileID: 21300000, guid: c1775b16128daad47874d3881c6c4235, type: 3}
+    - time: 1.2
+      value: {fileID: 21300000, guid: 85beb0ebdf440b54687343d0c1b2927b, type: 3}
+    - time: 1.3
+      value: {fileID: 21300000, guid: 6de504b697553d1428ae7164a9e893c1, type: 3}
+    - time: 1.4
+      value: {fileID: 21300000, guid: 65bcc2c8be49e5444b062c165375c94f, type: 3}
+    - time: 1.5
+      value: {fileID: 21300000, guid: ea62b280f63df144093745f2db7f8911, type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: 21300000, guid: 12d01a1f37ac24d418b69a938074ba81, type: 3}
+    - {fileID: 21300000, guid: 064e0175a87220940afdc56deb6b554a, type: 3}
+    - {fileID: 21300000, guid: bbd9737be8c725b478e568846f4e440d, type: 3}
+    - {fileID: 21300000, guid: 536f832aedbcefd49af3d50b834228e8, type: 3}
+    - {fileID: 21300000, guid: 7a1c95306f9e09243b8d4a711841fe28, type: 3}
+    - {fileID: 21300000, guid: d37ec791fdfccb34fb3f8a4ae1b3d839, type: 3}
+    - {fileID: 21300000, guid: 8c13043271b5a5241b4d68a6a94d6184, type: 3}
+    - {fileID: 21300000, guid: 8874a856f08705a438a46582e2661a1a, type: 3}
+    - {fileID: 21300000, guid: 8e63cd68a8f2dcb4e92c9d7f25ab2408, type: 3}
+    - {fileID: 21300000, guid: 806eeb55cc4b7ce4eaa981f8d90dc330, type: 3}
+    - {fileID: 21300000, guid: 1d2a5e1079264274a9f8914f53c2f5e7, type: 3}
+    - {fileID: 21300000, guid: c1775b16128daad47874d3881c6c4235, type: 3}
+    - {fileID: 21300000, guid: 85beb0ebdf440b54687343d0c1b2927b, type: 3}
+    - {fileID: 21300000, guid: 6de504b697553d1428ae7164a9e893c1, type: 3}
+    - {fileID: 21300000, guid: 65bcc2c8be49e5444b062c165375c94f, type: 3}
+    - {fileID: 21300000, guid: ea62b280f63df144093745f2db7f8911, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1.5166667
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_GenerateMotionCurves: 0
+  m_Events: []

Assets/Animation/Portal/idle.anim.meta

+fileFormatVersion: 2
+guid: 99a6459aad2ca314a8e06edbcbfb71f2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Animation/Portal/open.anim

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: open
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.5
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Enabled
+    path: 
+    classID: 58
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.5
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Enabled
+    path: PortalBorder
+    classID: 212
+    script: {fileID: 0}
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: 21300000, guid: 9ff29d05c9a04504eb208e0fd94216b6, type: 3}
+    - time: 0.13333334
+      value: {fileID: 21300000, guid: fce7d3f65980d7d44bf5bec8b10fee2d, type: 3}
+    - time: 0.26666668
+      value: {fileID: 21300000, guid: 184c60b352174d94290466d72e7c30a9, type: 3}
+    - time: 0.4
+      value: {fileID: 21300000, guid: c1763990d25dc164f898fb8258530ac2, type: 3}
+    - time: 0.5
+      value: {fileID: 21300000, guid: 1f230b2227ab513439ab11c5f407ad1b, type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 3305885265
+      script: {fileID: 0}
+      typeID: 58
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 4206719159
+      attribute: 3305885265
+      script: {fileID: 0}
+      typeID: 212
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: 21300000, guid: 9ff29d05c9a04504eb208e0fd94216b6, type: 3}
+    - {fileID: 21300000, guid: fce7d3f65980d7d44bf5bec8b10fee2d, type: 3}
+    - {fileID: 21300000, guid: 184c60b352174d94290466d72e7c30a9, type: 3}
+    - {fileID: 21300000, guid: c1763990d25dc164f898fb8258530ac2, type: 3}
+    - {fileID: 21300000, guid: 1f230b2227ab513439ab11c5f407ad1b, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.51666665
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.5
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Enabled
+    path: 
+    classID: 58
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.5
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Enabled
+    path: PortalBorder
+    classID: 212
+    script: {fileID: 0}
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_GenerateMotionCurves: 0
+  m_Events: []

Assets/Animation/Portal/open.anim.meta

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

Assets/Animation/TetrisAlert.meta

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

Assets/Animation/TetrisAlert/Alert.anim

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Alert
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.r
+    path: 
+    classID: 114
+    script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.g
+    path: 
+    classID: 114
+    script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.b
+    path: 
+    classID: 114
+    script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.5
+        value: 0.3529412
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.a
+    path: 
+    classID: 114
+    script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 304273561
+      script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+      typeID: 114
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 2526845255
+      script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+      typeID: 114
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 4215373228
+      script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+      typeID: 114
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 2334886179
+      script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+      typeID: 114
+      customType: 0
+      isPPtrCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.r
+    path: 
+    classID: 114
+    script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.g
+    path: 
+    classID: 114
+    script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.b
+    path: 
+    classID: 114
+    script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.5
+        value: 0.3529412
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.a
+    path: 
+    classID: 114
+    script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_GenerateMotionCurves: 0
+  m_Events: []

Assets/Animation/TetrisAlert/Alert.anim.meta

+fileFormatVersion: 2
+guid: 5d6372127cd1ae04180cfe82089477cd
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Animation/TetrisAlert/Image.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: Image
+  serializedVersion: 5
+  m_AnimatorParameters:
+  - m_Name: isAlertOn
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 1107462637553657192}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1101 &1101557815655201298
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 2
+    m_ConditionEvent: isAlertOn
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1102811415322281702}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &1101664423246746640
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: isAlertOn
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1102260191540497050}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1102 &1102260191540497050
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Idle
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 1101557815655201298}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 5d6372127cd1ae04180cfe82089477cd, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &1102811415322281702
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Normal
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 1101664423246746640}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 66c208655e170aa489e5a19967a2db84, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1107 &1107462637553657192
+AnimatorStateMachine:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 1102811415322281702}
+    m_Position: {x: 300, y: 12, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1102260191540497050}
+    m_Position: {x: 384, y: 120, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 48, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 1102811415322281702}

Assets/Animation/TetrisAlert/Image.controller.meta

+fileFormatVersion: 2
+guid: 1181c36e3e208c242a28e608d6c27138
+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,주,,,,,,,,,,,,,,,,
+고대유적,1094828,더미,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,

Assets/Prefabs/Camera.prefab

@@ -35,7 +35,6 @@ GameObject:
   m_Component:
   - component: {fileID: 4993091469246972}
   - component: {fileID: 20230104465344434}
-  - component: {fileID: 81459159555736246}
   m_Layer: 0
   m_Name: MiniMap Camera
   m_TagString: Untagged
@@ -96,7 +95,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1771541226646862}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 108, y: 240, z: -3}
+  m_LocalPosition: {x: 120, y: 250, z: -3}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4133681489306484}
@@ -110,8 +109,8 @@ Camera:
   m_GameObject: {fileID: 1771541226646862}
   m_Enabled: 1
   serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_ClearFlags: 3
+  m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0}
   m_projectionMatrixMode: 1
   m_SensorSize: {x: 36, y: 24}
   m_LensShift: {x: 0, y: 0}
@@ -121,12 +120,12 @@ Camera:
     x: 0
     y: 0
     width: 1
-    height: 1
+    height: 0.97
   near clip plane: 0.3
   far clip plane: 1000
   field of view: 60
   orthographic: 1
-  orthographic size: 300
+  orthographic size: 256
   m_Depth: 0
   m_CullingMask:
     serializedVersion: 2
@@ -151,7 +150,7 @@ Camera:
   m_Enabled: 1
   serializedVersion: 2
   m_ClearFlags: 2
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_BackGroundColor: {r: 0.10196079, g: 0.09411766, b: 0.09411766, a: 1}
   m_projectionMatrixMode: 1
   m_SensorSize: {x: 36, y: 24}
   m_LensShift: {x: 0, y: 0}
@@ -182,13 +181,6 @@ Camera:
   m_OcclusionCulling: 0
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
---- !u!81 &81459159555736246
-AudioListener:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1771541226646862}
-  m_Enabled: 0
 --- !u!81 &81874366432473632
 AudioListener:
   m_ObjectHideFlags: 1

Assets/Prefabs/Characters/Enemy/DyingScarecrow.prefab

@@ -239,8 +239,8 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: -2078941185
-  m_SortingLayer: 7
+  m_SortingLayerID: -612658245
+  m_SortingLayer: 8
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: 8c9cb4fc97c794b4ebdf31c29c9804fd, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}

Assets/Prefabs/Characters/Enemy/Goblin.prefab

@@ -61,7 +61,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1734061800721222
 GameObject:
   m_ObjectHideFlags: 1
@@ -157,7 +157,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1636491341446076}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 11.29, y: -17.94, z: 0}
+  m_LocalPosition: {x: -6.88, y: 1.405, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4015301101001556}
@@ -299,11 +299,10 @@ MonoBehaviour:
   trackSpeed: 2.5
   knockbackPercentage:
   - 0.5
-  movementLock: 0
+  MovementLock: 0
+  bumped: 0
+  bumpable: 1
   attackRange: 1.2
-  rotatable: 1
-  WallTest: 
-  CliffTest: 
 --- !u!114 &114173716467154830
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -378,7 +377,7 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: -2078941185
+  m_SortingLayerID: -612658245
   m_SortingLayer: 8
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: 71335108d30aa0e4a90179a09895440e, type: 3}

Assets/Prefabs/Characters/Enemy/GoblinArcher.prefab

@@ -124,7 +124,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1038441420714538}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 3.115, y: 1.126, z: -0.107421875}
+  m_LocalPosition: {x: 3.115, y: 1.126, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4187502796395836}
@@ -151,7 +151,7 @@ Rigidbody2D:
   m_Interpolate: 0
   m_SleepingMode: 1
   m_CollisionDetection: 0
-  m_Constraints: 0
+  m_Constraints: 4
 --- !u!61 &61559445092742440
 BoxCollider2D:
   m_ObjectHideFlags: 1
@@ -268,8 +268,8 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: -2078941185
-  m_SortingLayer: 7
+  m_SortingLayerID: -612658245
+  m_SortingLayer: 8
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: b06f02155bf405c4f8ccf24fbcaf8f51, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}

Assets/Prefabs/Characters/Enemy/Jollarcher2.prefab

@@ -268,8 +268,8 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: -2078941185
-  m_SortingLayer: 7
+  m_SortingLayerID: -612658245
+  m_SortingLayer: 8
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: 8f11281138b005447960640deacdb4b0, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}

Assets/Prefabs/Characters/Enemy/NotDyingScarecrow.prefab

@@ -178,7 +178,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   debuffState: 
-  monsterID: 1
+  monsterID: 1094828
   maxHealth: 30
   weight: 10
   patrolRange: 0
@@ -239,8 +239,8 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: -2078941185
-  m_SortingLayer: 7
+  m_SortingLayerID: -612658245
+  m_SortingLayer: 8
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: 8c9cb4fc97c794b4ebdf31c29c9804fd, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}

Assets/Prefabs/Characters/Enemy/Scarecrow.prefab

@@ -239,8 +239,8 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: -2078941185
-  m_SortingLayer: 7
+  m_SortingLayerID: -612658245
+  m_SortingLayer: 8
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: 8c9cb4fc97c794b4ebdf31c29c9804fd, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}

Assets/Prefabs/Characters/Enemy/Spider.prefab

@@ -308,7 +308,7 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: -2078941185
+  m_SortingLayerID: -612658245
   m_SortingLayer: 8
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: a17674c6b58e63042bbb6b4d46c32467, type: 3}

Assets/Prefabs/Characters/Player.prefab

@@ -393,11 +393,11 @@ MonoBehaviour:
   spikeTilel:
   - {fileID: 11400000, guid: 85440e0dd81e48840947ce485614bab6, type: 2}
   - {fileID: 11400000, guid: f6a8681f94ddcf24eac96d8e4a5c82f6, type: 2}
-  - {fileID: 11400000, guid: 8cf5b74a1e8e7fa48a0097c7074d1e54, type: 2}
+  - {fileID: 11400000, guid: f6a8681f94ddcf24eac96d8e4a5c82f6, type: 2}
   spikeTiler:
   - {fileID: 11400000, guid: 7dbb7c55a3417f54fbd38fafb369478e, type: 2}
   - {fileID: 11400000, guid: 69359808565f98f4297a6efb8da5c4da, type: 2}
-  - {fileID: 11400000, guid: fb1826948ae16104784f105d8b716810, type: 2}
+  - {fileID: 11400000, guid: 69359808565f98f4297a6efb8da5c4da, type: 2}
   rb: {fileID: 0}
   SpikeLayer: 10
   spikeDamage: 5
@@ -441,8 +441,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   ttx: 8
   tty: 0
-  displayText: {fileID: 114495744039531298, guid: 457100d9937aef244b98ef4f67a0f218,
-    type: 2}
   particlePrefab: {fileID: 1120403562358508, guid: e4d08affb61a63840a9cb9412fbe7b38,
     type: 2}
 --- !u!212 &212187280661781960
@@ -478,7 +476,7 @@ SpriteRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: -2078941185
-  m_SortingLayer: 8
+  m_SortingLayer: 9
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: 92d166e0c2a85a14facee45f5a5a8444, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}

Assets/Prefabs/GameManager.prefab

@@ -63,3 +63,6 @@ MonoBehaviour:
   clock: {fileID: 0}
   leftRoomCount: {fileID: 114265606795912022, guid: 7a2325fd567a39f4695487b1c08e4ee9,
     type: 2}
+  displayText: {fileID: 114495744039531298, guid: 457100d9937aef244b98ef4f67a0f218,
+    type: 2}
+  tetrisAlert: {fileID: 0}

Assets/Prefabs/MapManager.prefab

@@ -58,11 +58,11 @@ MonoBehaviour:
   gravity: 0.98
   collapseTime: 10
   clearedRoomCount: 0
-  stageClearCondition: 0a0000000a0000000a0000000a0000000a000000
+  stageClearCondition: 1200000012000000120000001200000012000000
   tetriminoCost: 1
   fog: {fileID: 1100171732424598, guid: b8ab69a93ba618c47b27cc04eb431b3f, type: 2}
   clearedFog: {fileID: 1767033925555920, guid: df8687fe46befb34eaf9d4d63938d946, type: 2}
-  portal: {fileID: 1285471223282336, guid: 93ba58b5e24488741a018d983b59c580, type: 2}
+  portal: {fileID: 1852332565035038, guid: 8028aef678f07ae4885587ec60c08d2a, type: 2}
   press: {fileID: 114990664041074520, guid: 8e750fd197a05d84c9fb8557eb95c666, type: 2}
   inGameDoorUp: {fileID: 1011110161276626, guid: 30d1850ce96755d4ea7675c706899cfb,
     type: 2}
@@ -119,13 +119,13 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 0345323fb9396ed4b9d66aa389016f36, type: 3}
   - {fileID: 21300000, guid: a205697d9c330cd47afc7bfafe83d718, type: 3}
   - {fileID: 21300000, guid: d1893a5ae6c5cdb478ac942867927405, type: 3}
-  - {fileID: 21300000, guid: 5d3d3bb16e5051045be1e72cca68b596, type: 3}
+  - {fileID: 21300000, guid: ec0a3b93e9f049047bf7b9ce674e2369, type: 3}
   - {fileID: 21300000, guid: cad317806c8dd9b42b5b05234dee1997, type: 3}
   roomBackgroundSprite1:
   - {fileID: 21300000, guid: c2e87589a128b824c8f621c5a34bfe5e, type: 3}
   - {fileID: 21300000, guid: 7d94542039acd6a4b932cf9219b71799, type: 3}
-  - {fileID: 21300000, guid: c2e87589a128b824c8f621c5a34bfe5e, type: 3}
-  - {fileID: 21300000, guid: 7d94542039acd6a4b932cf9219b71799, type: 3}
+  - {fileID: 21300000, guid: 6a2ebda2105ccbf4baa07c0b9012d861, type: 3}
+  - {fileID: 21300000, guid: 2636fc5abc7f58240a5eceda6398c6a3, type: 3}
   itemRoomItemSpawnData: {fileID: 4900000, guid: 50da557f52db710419c3374a903b3d22,
     type: 3}
   goldRoomItemSpawnData: {fileID: 4900000, guid: a89c82f77571a09438810f11ef1978e0,

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

@@ -868,7 +868,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   roomSize: {x: 24, y: 24}
   leftDoorInfo: 010001
-  rightDoorInfo: 010101
+  rightDoorInfo: 010100
   concept: 00010001
 --- !u!212 &212707924519819326
 SpriteRenderer:

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

@@ -991,8 +991,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   roomSize: {x: 24, y: 24}
-  leftDoorInfo: 010101
-  rightDoorInfo: 010101
+  leftDoorInfo: 010100
+  rightDoorInfo: 010100
   concept: 01000100
 --- !u!212 &212719427866913766
 SpriteRenderer:

Assets/Prefabs/TetrisMap/Portal.prefab

@@ -9,19 +9,20 @@ Prefab:
     m_Modifications: []
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 1285471223282336}
+  m_RootGameObject: {fileID: 1852332565035038}
   m_IsPrefabAsset: 1
---- !u!1 &1285471223282336
+--- !u!1 &1852332565035038
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 4963485174072056}
-  - component: {fileID: 212036764786901468}
-  - component: {fileID: 61850414438817898}
-  - component: {fileID: 114406776515389056}
+  - component: {fileID: 4418932421453820}
+  - component: {fileID: 212710512498015520}
+  - component: {fileID: 58667113876351250}
+  - component: {fileID: 114171566725347670}
+  - component: {fileID: 95683387813402998}
   m_Layer: 12
   m_Name: Portal
   m_TagString: Untagged
@@ -29,61 +30,146 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &4963485174072056
+--- !u!1 &1895304254806562
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4212199006102432}
+  - component: {fileID: 212716428510371236}
+  m_Layer: 12
+  m_Name: PortalBorder
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &4212199006102432
 Transform:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1285471223282336}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 17, y: 17, z: 0}
+  m_GameObject: {fileID: 1895304254806562}
+  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: 4418932421453820}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4418932421453820
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1852332565035038}
+  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:
+  - {fileID: 4212199006102432}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &61850414438817898
-BoxCollider2D:
+--- !u!58 &58667113876351250
+CircleCollider2D:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1285471223282336}
+  m_GameObject: {fileID: 1852332565035038}
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
   m_IsTrigger: 1
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: 2.0131435, y: 1.311335}
-  m_SpriteTilingProperty:
-    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0, y: 0}
-    oldSize: {x: 4, y: 4}
-    newSize: {x: 4, y: 4}
-    adaptiveTilingThreshold: 0.5
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
+  m_Offset: {x: 2, y: 2}
   serializedVersion: 2
-  m_Size: {x: 3.1036186, y: 2.22733}
-  m_EdgeRadius: 0
---- !u!114 &114406776515389056
+  m_Radius: 1.7
+--- !u!95 &95683387813402998
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1852332565035038}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: b4d9a9616e7bd294cbe8ed2f4e33cd09, 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 &114171566725347670
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1285471223282336}
+  m_GameObject: {fileID: 1852332565035038}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: b5ed2c384310eb6408bb42c91b195e15, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!212 &212036764786901468
+  highlight: {fileID: 1895304254806562}
+--- !u!212 &212710512498015520
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1852332565035038}
+  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: -1315358985
+  m_SortingLayer: 7
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: 12d01a1f37ac24d418b69a938074ba81, 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: 4}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!212 &212716428510371236
 SpriteRenderer:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1285471223282336}
+  m_GameObject: {fileID: 1895304254806562}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 0
@@ -111,9 +197,9 @@ SpriteRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: -1315358985
-  m_SortingLayer: 6
+  m_SortingLayer: 7
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 6147483bafc37034d91c2afaff57cad1, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 039a1b49303cf644b8bf444be5b3864e, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0

Assets/Prefabs/TetrisMap/Portal.prefab.meta

 fileFormatVersion: 2
-guid: 93ba58b5e24488741a018d983b59c580
+guid: 8028aef678f07ae4885587ec60c08d2a
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 100100000

Assets/Prefabs/TetrisMap/PortalSurface.prefab

@@ -73,9 +73,9 @@ SpriteRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: -562706067
-  m_SortingLayer: 15
+  m_SortingLayer: 16
   m_SortingOrder: 2
-  m_Sprite: {fileID: 21300000, guid: 8a3b6e9f552454c45bef6e3f45129bd0, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 94f659dd1a248544e8da15abd588df0b, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0

Assets/Prefabs/TetrisMap/Press.prefab

@@ -11,6 +11,22 @@ Prefab:
   m_SourcePrefab: {fileID: 0}
   m_RootGameObject: {fileID: 1842283105111692}
   m_IsPrefabAsset: 1
+--- !u!1 &1688798517148598
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4333134129199732}
+  - component: {fileID: 212569859179426474}
+  m_Layer: 14
+  m_Name: presshead
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1842283105111692
 GameObject:
   m_ObjectHideFlags: 0
@@ -29,6 +45,19 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!4 &4333134129199732
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1688798517148598}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 6, y: 0, z: 0}
+  m_LocalScale: {x: -1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4390237108358754}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4390237108358754
 Transform:
   m_ObjectHideFlags: 1
@@ -38,7 +67,8 @@ Transform:
   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_Children:
+  - {fileID: 4333134129199732}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -83,6 +113,7 @@ MonoBehaviour:
   bottomRow: 0
   createdOrder: 0
   simultaneouslyCreatedPressNumber: 0
+  pressHead: {fileID: 1688798517148598}
 --- !u!212 &212490318858521944
 SpriteRenderer:
   m_ObjectHideFlags: 1
@@ -116,9 +147,9 @@ SpriteRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: -1129468395
-  m_SortingLayer: 15
+  m_SortingLayer: 14
   m_SortingOrder: 1
-  m_Sprite: {fileID: 21300000, guid: c6beb369e5ae4e54c9be6a3318849ca0, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 47c6b6d48ed178c4aa7ae9f90d750ea9, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -129,3 +160,49 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!212 &212569859179426474
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1688798517148598}
+  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: -1129468395
+  m_SortingLayer: 14
+  m_SortingOrder: 2
+  m_Sprite: {fileID: 21300000, guid: 29676541817e7694cad248f2f49fb4ec, 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: 15.36}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0

Assets/Prefabs/TetrisMap/TetrisMap.prefab

@@ -72,8 +72,8 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: -1977419633
+  m_SortingLayer: 2
   m_SortingOrder: -2
   m_Sprite: {fileID: 21300000, guid: ce1deca4af716c14db06506ea062d8d6, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}

Assets/Prefabs/UI/DisplayText.prefab

@@ -40,7 +40,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.019607844}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -83,6 +83,6 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -924, y: -528}
+  m_AnchoredPosition: {x: 16.252012, y: -16.145004}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}

Assets/Prefabs/UI/In-Game UI/GoldRoomUI.meta

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

Assets/Prefabs/UI/In-Game UI/LifeStoneUI.prefab

@@ -132,7 +132,7 @@ CanvasGroup:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1939101680453256}
   m_Enabled: 1
-  m_Alpha: 0.8
+  m_Alpha: 1
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0

Assets/Prefabs/UI/In-Game UI/NumberPrefab.prefab

@@ -68,7 +68,7 @@ MonoBehaviour:
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 81778bb508bfec649a5df19c4d050170, type: 3}
     m_FontSize: 0
     m_FontStyle: 0
     m_BestFit: 1

Assets/Prefabs/UI/In-Game UI/TetrisAlert.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: 1338359100350284}
+  m_IsPrefabAsset: 1
+--- !u!1 &1338359100350284
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224169727468035580}
+  - component: {fileID: 222774778044308276}
+  - component: {fileID: 114960655788542910}
+  - component: {fileID: 95858873648915710}
+  m_Layer: 5
+  m_Name: TetrisAlert
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!95 &95858873648915710
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1338359100350284}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 1181c36e3e208c242a28e608d6c27138, 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 &114960655788542910
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1338359100350284}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 21300000, guid: c0b6f5acba141784b9c2ecc24769cc64, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!222 &222774778044308276
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1338359100350284}
+  m_CullTransparentMesh: 0
+--- !u!224 &224169727468035580
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1338359100350284}
+  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}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 1920, y: 1080}
+  m_Pivot: {x: 0.5, y: 0.5}

Assets/Prefabs/Rooms/Portal.prefab.meta → Assets/Prefabs/UI/In-Game UI/TetrisAlert.prefab.meta

 fileFormatVersion: 2
-guid: ad5b720a4688efa4b8c3298d87df6f64
+guid: 79112b95c66232946a51697d95554cfd
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 100100000

Assets/Prefabs/UI/LeftRoom.prefab

@@ -21,6 +21,7 @@ GameObject:
   - component: {fileID: 224028503877495078}
   - component: {fileID: 222872641015213916}
   - component: {fileID: 114265606795912022}
+  - component: {fileID: 114705226397901368}
   m_Layer: 5
   m_Name: LeftRoom
   m_TagString: Untagged
@@ -28,6 +29,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1725471926797456
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224634567171211774}
+  - component: {fileID: 222578432823547446}
+  - component: {fileID: 114443374597620194}
+  m_Layer: 5
+  m_Name: sans
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!114 &114265606795912022
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -54,13 +72,66 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
-    m_Alignment: 4
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 'Left Room : '
+  m_Text: x0
+--- !u!114 &114443374597620194
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1725471926797456}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 21300000, guid: 322b1a680dce97a4e812522309ae2d56, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!114 &114705226397901368
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1468198505218658}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5751eb454a8c4cf40b6dae2b7f6dbbfc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 1, g: 1, b: 1, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+  m_size: 3
+  glintEffect: 0
+  glintVertex: 0
+  glintWidth: 0
+  glintColor: {r: 0, g: 0, b: 0, a: 0}
+--- !u!222 &222578432823547446
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1725471926797456}
+  m_CullTransparentMesh: 0
 --- !u!222 &222872641015213916
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -77,12 +148,31 @@ RectTransform:
   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_Children:
+  - {fileID: 224634567171211774}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -120, y: 380}
-  m_SizeDelta: {x: 220, y: 50}
+  m_AnchoredPosition: {x: -90, y: 380}
+  m_SizeDelta: {x: 60, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224634567171211774
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1725471926797456}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224028503877495078}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -55, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}

Assets/Prefabs/Rooms/Portal.prefab → Assets/Prefabs/UI/tetrisBack.prefab

@@ -9,81 +9,43 @@ Prefab:
     m_Modifications: []
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 1010086429062358}
+  m_RootGameObject: {fileID: 1601176785316170}
   m_IsPrefabAsset: 1
---- !u!1 &1010086429062358
+--- !u!1 &1601176785316170
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 4094573924144642}
-  - component: {fileID: 212265122276445044}
-  - component: {fileID: 61140323485140024}
-  - component: {fileID: 114959886973885082}
-  m_Layer: 18
-  m_Name: Portal
+  - component: {fileID: 4527744998027824}
+  - component: {fileID: 212597233584865390}
+  m_Layer: 14
+  m_Name: tetrisBack
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!4 &4094573924144642
+  m_IsActive: 1
+--- !u!4 &4527744998027824
 Transform:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1010086429062358}
+  m_GameObject: {fileID: 1601176785316170}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: -852, y: -300, 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!61 &61140323485140024
-BoxCollider2D:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1010086429062358}
-  m_Enabled: 1
-  m_Density: 1
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_UsedByEffector: 0
-  m_UsedByComposite: 0
-  m_Offset: {x: 2, y: 1.25}
-  m_SpriteTilingProperty:
-    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0, y: 0}
-    oldSize: {x: 4, y: 4}
-    newSize: {x: 4, y: 4}
-    adaptiveTilingThreshold: 0.5
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
-  serializedVersion: 2
-  m_Size: {x: 1, y: 2.5}
-  m_EdgeRadius: 0
---- !u!114 &114959886973885082
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1010086429062358}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b5ed2c384310eb6408bb42c91b195e15, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!212 &212265122276445044
+--- !u!212 &212597233584865390
 SpriteRenderer:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1010086429062358}
+  m_GameObject: {fileID: 1601176785316170}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 0
@@ -113,12 +75,12 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 6147483bafc37034d91c2afaff57cad1, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 465d0b328d8e5f64f8abcb8fa06289d3, 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: 4}
+  m_Size: {x: 4.8, y: 2.7}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
   m_WasSpriteAssigned: 1

Assets/Prefabs/UI/tetrisBack.prefab.meta

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

Assets/Scripts/CameraController.cs

@@ -21,9 +21,9 @@ public class CameraController : MonoBehaviour {
 
     public Vector3 originPos;
     
-
     private void Awake()
     {
+
     }
 
     // Use this for initialization
@@ -80,6 +80,7 @@ public class CameraController : MonoBehaviour {
                 GameManager.Instance.minimap.SetActive(true);
                 MapManager.Instance.clock.GetComponent<RectTransform>().Translate(inGameClockCoord - tetrisClockCoord);
                 GameManager.Instance.leftRoomCount.rectTransform.Translate(inGameLeftRoomCoord - tetrisLeftRoomCoord);
+                InventoryManager.Instance.coolUI.GetComponent<CanvasGroup>().alpha = 0.7f;
                 GameManager.gameState = GameState.Ingame;
                 StartCoroutine(MapManager.Instance.RoomFadeIn(MapManager.currentRoom));
                 grid.transform.position = Vector3.zero;
@@ -97,6 +98,7 @@ public class CameraController : MonoBehaviour {
                 GameManager.Instance.minimap.SetActive(false);
                 MapManager.Instance.clock.GetComponent<RectTransform>().Translate(tetrisClockCoord - inGameClockCoord);
                 GameManager.Instance.leftRoomCount.rectTransform.Translate(tetrisLeftRoomCoord - inGameLeftRoomCoord);
+                InventoryManager.Instance.coolUI.GetComponent<CanvasGroup>().alpha = 0;
                 if (gameState == GameState.Tetris)
                     GameManager.gameState = GameState.Tetris;
                 else if(gameState == GameState.Portal)
@@ -116,7 +118,7 @@ public class CameraController : MonoBehaviour {
                     transform.position = new Vector3(coord.x, coord.y, -1);
                     GetComponent<Camera>().orthographicSize = Mathf.Lerp(GetComponent<Camera>().orthographicSize, sizeDestination, Mathf.Sqrt(Time.deltaTime));
                 }
-                GetComponent<Camera>().cullingMask = 1 << LayerMask.NameToLayer("Tetris") | 1 << LayerMask.NameToLayer("Portal");
+                GetComponent<Camera>().cullingMask = 1 << LayerMask.NameToLayer("Tetris") | 1 << LayerMask.NameToLayer("Portal") | 1 << LayerMask.NameToLayer("UI");
                 transform.position = tetrisCameraCoord;
             }
             GetComponent<Camera>().orthographicSize = sizeDestination;

Assets/Scripts/Characters/Player.cs

@@ -9,27 +9,14 @@ public class Player : MonoBehaviour {
     public static float X = 0.7f, Y = 1.6f;
     public int ttx;
     public int tty;
-    public Text displayText;
 
     public GameObject particlePrefab;
     GameObject[] particles;
     bool gameover;
 
-    public IEnumerator DisplayText(string _text)
-    {
-        displayText.text = _text;
-        for (int i = 255; i >= 0; i -= 10)
-        {
-            yield return null;
-            displayText.transform.position = transform.position + new Vector3(0, 2, 0);
-            displayText.color = new Color(displayText.color.r, displayText.color.g, displayText.color.b, (float)i /255);
-        }
-        displayText.text = "";
-    }
 
     // Use this for initialization
     void Start () {
-        displayText = Instantiate(displayText, GameManager.Instance.textCanvas.transform);
         ttx = (int)(transform.position.x / 24f);
         tty = (int)(transform.position.y - 0.8f / 24f);
         lifeStoneManager = LifeStoneManager.Instance;

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; }    // Use GameManager.Instance.player instead
+    public GameObject player { get; private set; }
 
     // data of drop item
     [SerializeField]
@@ -33,9 +33,6 @@ public class EnemyManager : Singleton<EnemyManager>
     private uint EnemySpawnCount;
     public uint EnemyDeadCount;
 
-    // wall or platform
-    public LayerMask layerMaskWall;
-    public LayerMask layerMaskPlatform;
 
     // method
     // Constructor - protect calling raw constructor
@@ -49,7 +46,7 @@ public class EnemyManager : Singleton<EnemyManager>
     }
     private void Start()
     {
-        
+        player = GameManager.Instance.player;
     }
 
     // Spawn Enemy to Map
@@ -59,33 +56,37 @@ public class EnemyManager : Singleton<EnemyManager>
         Transform enemySpots = MapManager.currentRoom.roomInGame.transform.Find("enemy spot");
         foreach(Transform enemySpot in enemySpots)
         {
-            if (!enemySpot.gameObject.activeSelf) { continue; }
             GameObject enemy = enemySpot.gameObject.GetComponent<enemySpot>().enemyPrefab;
             foreach(Transform location in enemySpot)
             {
                 GameObject clone = PickFromPool(enemy);
                 clone.transform.position = location.position;
-                clone.transform.SetParent(MapManager.currentRoom.transform);
-            }
+                clone.transform.SetParent(MapManager.currentRoom.roomInGame.transform);
             }
         }
-
-    public bool IsClear()
-    {
-        return (EnemyDeadCount == EnemySpawnCount);
     }
 
-    public int CountEnemyInMap()
+    // Spawn Enemy to Map
+    public void SpawnEnemyToMap_forTest()
     {
-        int cnt = 0;
-        foreach(Transform obj in MapManager.currentRoom.transform)
+        EnemySpawnCount = EnemyDeadCount = 0;
+        Transform enemySpots = GameObject.Find("Grid").transform.GetChild(0).GetChild(0).Find("enemy spot");
+        foreach (Transform enemySpot in enemySpots)
         {
-            if (obj.gameObject.CompareTag("enemy"))
+            if (!enemySpot.gameObject.activeSelf) continue;
+            GameObject enemy = enemySpot.gameObject.GetComponent<enemySpot>().enemyPrefab;
+            foreach (Transform location in enemySpot)
             {
-                cnt++;
+                GameObject clone = PickFromPool(enemy);
+                clone.transform.position = location.position;
+                clone.transform.SetParent(MapManager.currentRoom.roomInGame.transform);
+            }
         }
     }
-        return cnt;
+
+    public bool IsClear()
+    {
+        return (EnemyDeadCount == EnemySpawnCount);
     }
 
     // Object Pool

Assets/Scripts/GameManager.cs

@@ -20,11 +20,14 @@ public class GameManager : Singleton<GameManager> {
 
     public GameObject player;
     public GameObject minimap;
+    public GameObject tetrisAlert;
     public Canvas gameOverCanvas;
     public Canvas inventoryCanvas;
     public Canvas textCanvas;
     public Timer clock;
     public Text leftRoomCount;
+    public Text displayText;
+    public Coroutine textCoroutine;
 
     // method
     // Constructor - protect calling raw constructor
@@ -40,6 +43,8 @@ public class GameManager : Singleton<GameManager> {
         isTutorial = false;
         Destroy(MapManager.currentRoom.gameObject);
         minimap.SetActive(true);
+        clock.gameObject.SetActive(true);
+        leftRoomCount.gameObject.SetActive(true);
         TetriminoSpawner.Instance.MakeInitialTetrimino();
         player.transform.position = MapManager.currentRoom.roomInGame.transform.Find("portal spot").position + spawnPosition;
         Camera.main.transform.position = player.transform.position + new Vector3(0, 0, -1);
@@ -55,7 +60,25 @@ public class GameManager : Singleton<GameManager> {
 
     public void CountLeftRoom()
     {
-        leftRoomCount.text = "Left Room : " + (MapManager.Instance.stageClearCondition[MapManager.currentStage] - MapManager.Instance.clearedRoomCount).ToString();
+        leftRoomCount.text = "x" + (MapManager.Instance.stageClearCondition[MapManager.currentStage] - MapManager.Instance.clearedRoomCount).ToString();
+    }
+    
+    public void DisplayText(string _text)
+    {
+        StopCoroutine(textCoroutine);
+        textCoroutine = StartCoroutine(DisplayTextCoroutine(_text));
+    }
+
+    public IEnumerator DisplayTextCoroutine(string _text)
+    {
+        displayText.text = _text;
+        for (int i = 255; i >= 0; i -= 10)
+        {
+            yield return null;
+            displayText.transform.position = player.transform.position + new Vector3(0, 2, 0);
+            displayText.color = new Color(displayText.color.r, displayText.color.g, displayText.color.b, (float)i / 255);
+        }
+        displayText.text = "";
     }
 
     void Awake()
@@ -64,24 +87,28 @@ public class GameManager : Singleton<GameManager> {
         gameOverCanvas = Instantiate(gameOverCanvas);
         textCanvas = Instantiate(textCanvas);
         InventoryManager.Instance.ui = inventoryCanvas.GetComponent<InventoryUI>();
-        inventoryCanvas.gameObject.SetActive(false);
-        gameOverCanvas.gameObject.SetActive(false);
         gameState = GameState.Ingame;
         minimap = GameObject.Find("Minimap");
-        minimap.SetActive(false);
         player = GameObject.Find("Player");
         MapManager.currentRoom = GameObject.Find("Room Tutorial").GetComponent<Room>();
-        player.transform.position = MapManager.currentRoom.roomInGame.transform.Find("player spot").position + spawnPosition;
-        Camera.main.transform.position = player.transform.position + new Vector3(0, 0, -1);
         clock = GameObject.Find("Clock").GetComponent<Timer>();
         leftRoomCount = GameObject.Find("LeftRoom").GetComponent<Text>();
-        isTutorial = true;
+        tetrisAlert = GameObject.Find("TetrisAlert");
     }
 
     // Use this for initialization
     void Start ()
     {
-
+        player.transform.position = MapManager.currentRoom.roomInGame.transform.Find("player spot").position + spawnPosition;
+        Camera.main.transform.position = player.transform.position + new Vector3(0, 0, -1);
+        inventoryCanvas.gameObject.SetActive(false);
+        gameOverCanvas.gameObject.SetActive(false);
+        minimap.SetActive(false);
+        clock.gameObject.SetActive(false);
+        leftRoomCount.gameObject.SetActive(false);
+        displayText = Instantiate(displayText, textCanvas.transform);
+        isTutorial = true;
+        textCoroutine = StartCoroutine(DisplayTextCoroutine(""));
     }
 	
 	// Update is called once per frame

Assets/Scripts/Item/DroppedItem.cs

@@ -59,7 +59,7 @@ public class DroppedItem : DroppedObject, IPlayerInteraction
     public void Apply()
     {
         if(LifeStoneManager.Instance.CountType(LifeStoneType.Gold) < price)
-            StartCoroutine(GameManager.Instance.player.GetComponent<Player>().DisplayText("Not enough gold"));
+            GameManager.Instance.DisplayText("금 생명석이 부족합니다!");
         else if (!itemAddon && inventoryManager.PushItem(item))
         {
             LifeStoneManager.Instance.ChangeToNormal(LifeStoneType.Gold, price);

Assets/Scripts/Item/InventoryManager.cs

@@ -83,10 +83,10 @@ public class InventoryManager : Singleton<InventoryManager> {
     }
     IEnumerator TestCoroutine()
     {
-        ItemInstantiate("ShockStick", player.transform.position, 1f);
+        /*ItemInstantiate("ShockStick", player.transform.position, 1f);
         yield return new WaitForSeconds(0.3f);
         ItemInstantiate("BitSword", player.transform.position, 1f);
-        yield return new WaitForSeconds(0.3f);
+        yield return new WaitForSeconds(0.3f);*/
         /*ItemInstantiate("Bow", player.transform.position, 1f);
         yield return new WaitForSeconds(0.3f);
         ItemInstantiate("OilCask", player.transform.position, 1f);
@@ -97,6 +97,7 @@ public class InventoryManager : Singleton<InventoryManager> {
         yield return new WaitForSeconds(0.3f);
         AddonInstantiate("GlowingHerb", player.transform.position, 1f);
         yield return new WaitForSeconds(0.3f);*/
+        yield return null;
     }
 
     IEnumerator PopoutCoroutine(GameObject obj)

Assets/Scripts/Normal.anim

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Normal
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.r
+    path: 
+    classID: 114
+    script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.g
+    path: 
+    classID: 114
+    script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.b
+    path: 
+    classID: 114
+    script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.a
+    path: 
+    classID: 114
+    script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 2526845255
+      script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+      typeID: 114
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 4215373228
+      script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+      typeID: 114
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 2334886179
+      script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+      typeID: 114
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 304273561
+      script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+      typeID: 114
+      customType: 0
+      isPPtrCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.r
+    path: 
+    classID: 114
+    script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.g
+    path: 
+    classID: 114
+    script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.b
+    path: 
+    classID: 114
+    script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.a
+    path: 
+    classID: 114
+    script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_GenerateMotionCurves: 0
+  m_Events: []

Assets/Scripts/Normal.anim.meta

+fileFormatVersion: 2
+guid: 66c208655e170aa489e5a19967a2db84
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/TetrisMap/MapManager.cs

@@ -331,7 +331,9 @@ public class MapManager : Singleton<MapManager> {
                 mapGrid[i, row].portal.SetActive(false);
             }
         leftPress.transform.localScale = new Vector3(0, 1, 1);
+        leftPress.pressHead.transform.localScale = new Vector3(-1, 1, 1);
         rightPress.transform.localScale = new Vector3(0, 1, 1);
+        rightPress.pressHead.transform.localScale = new Vector3(-1, 1, 1);
         float collapseRate = leftPress.transform.localScale.x;
         while (collapseRate < 20)
         {
@@ -345,7 +347,9 @@ public class MapManager : Singleton<MapManager> {
             else
                 collapseSpeed = (float)20 / collapseTime * Time.deltaTime;
             leftPress.transform.localScale += new Vector3(collapseSpeed, 0, 0);
+            leftPress.pressHead.transform.localScale = new Vector3(-1 / leftPress.transform.localScale.x, 1, 1);
             rightPress.transform.localScale += new Vector3(-collapseSpeed, 0, 0);
+            rightPress.pressHead.transform.localScale = new Vector3(-1 / rightPress.transform.localScale.x, 1, 1);
             collapseRate = leftPress.transform.localScale.x;
             if (collapseRate - doorCloseCounter * 4 >= (float)4 / 3)
             {
@@ -744,6 +748,8 @@ public class MapManager : Singleton<MapManager> {
             room.GetComponent<SpriteRenderer>().sprite = roomSurfaceSpritesDistributed[room.stage][(int)RoomSpriteType.Normal1 + room.roomConcept];
         else
             room.GetComponent<SpriteRenderer>().sprite = roomSurfaceSpritesDistributed[room.stage][(int)room.specialRoomType - 1];
+        if (!room.isRoomCleared)
+            room.GetComponent<SpriteRenderer>().color = new Color(0.5f, 0.5f, 0.5f);
         if (currentGhost != null)
             currentGhost.rooms[i].GetComponent<SpriteRenderer>().sprite = room.GetComponent<SpriteRenderer>().sprite;
     }

Assets/Scripts/TetrisMap/Portal.cs

@@ -4,6 +4,7 @@ using UnityEngine;
 
 public class Portal : MonoBehaviour, IPlayerInteraction  {
 
+    public GameObject highlight;
     bool isPortalUsed = false;
 
     public void Apply()
@@ -19,7 +20,12 @@ public class Portal : MonoBehaviour, IPlayerInteraction  {
 
     public void HighlightSwitch(bool enabled)
     {
-
+        if (highlight)
+        {
+            highlight.SetActive(enabled);
+            highlight.GetComponent<SpriteRenderer>().sortingOrder = -1 + (enabled ? 2 : 0);
+            GetComponent<SpriteRenderer>().sortingOrder = (enabled ? 2 : 0);
+        }
     }
 
     // Use this for initialization

Assets/Scripts/TetrisMap/Press.cs

@@ -27,6 +27,10 @@ public class Press : MonoBehaviour
     /// Number of presses created simultaneously with this press.
     /// </summary>
     public int simultaneouslyCreatedPressNumber;
+    /// <summary>
+    /// Head of the press.
+    /// </summary>
+    public GameObject pressHead;
     
 
     private void OnTriggerEnter2D(Collider2D collision)

Assets/Scripts/TetrisMap/Room.cs

@@ -370,14 +370,14 @@ public class Room : MonoBehaviour
     /// Open all the doors and change fog to cleared fog.
     /// </summary>
     public void FinishRoom()
-    {
-        if(isRoomCleared != true)
     {
         OpenDoor("Up");
         OpenDoor("Down");
         OpenDoor("Left");
         OpenDoor("Right");
-            Vector3 fogPosition = fog.transform.position;
+        if(!isRoomCleared)
+        {
+            /*Vector3 fogPosition = fog.transform.position;
             Destroy(fog.gameObject);
             fog = Instantiate(MapManager.Instance.clearedFog, fogPosition, Quaternion.identity, transform);
             fog.GetComponent<SpriteRenderer>().color = new Color(1, 1, 1, 0);
@@ -386,6 +386,7 @@ public class Room : MonoBehaviour
             GameManager.Instance.clock.clockSpeedStack -= 3;
             if (GameManager.Instance.clock.clockSpeedStack < 0)
                 GameManager.Instance.clock.clockSpeedStack = 0;
+            GetComponent<SpriteRenderer>().color = new Color(0.5f, 0.5f, 0.5f);*/
             roomInGame.RoomClear();
         }
         //Need to make extra works.

Assets/Scripts/TetrisMap/RoomInGame.cs

@@ -50,6 +50,17 @@ public class RoomInGame : MonoBehaviour {
     /// </summary>
     public virtual void RoomClear()
     {
+        Room room = transform.parent.GetComponent<Room>();
 
+        Vector3 fogPosition = room.fog.transform.position;
+        Destroy(room.fog.gameObject);
+        room.fog = Instantiate(MapManager.Instance.clearedFog, fogPosition, Quaternion.identity, transform);
+        room.fog.GetComponent<SpriteRenderer>().color = new Color(1, 1, 1, 0);
+        room.CreatePortal();
+        room.isRoomCleared = true;
+        GameManager.Instance.clock.clockSpeedStack -= 4;
+        if (GameManager.Instance.clock.clockSpeedStack < 0)
+            GameManager.Instance.clock.clockSpeedStack = 0;
+        room.GetComponent<SpriteRenderer>().color = new Color(1, 1, 1);
     }
 }

Assets/Scripts/TetrisMap/Rooms/TutorialRoomInGame.cs

@@ -9,6 +9,17 @@ public class TutorialRoomInGame : RoomInGame {
 	// Use this for initialization
 	void Start () {
         EnemyManager.Instance.SpawnEnemyToMap();
+        foreach (Transform child in transform.Find("item spot"))
+        {
+            if (child.name.Contains("LifeStone1"))
+                LifeStoneManager.Instance.InstantiateDroppedLifeStone(new LifeStoneInfo(new Vector2Int(1, 2), "BA"), child.position, 0);
+            else if (child.name.Contains("LifeStone2"))
+                LifeStoneManager.Instance.InstantiateDroppedLifeStone(new LifeStoneInfo(new Vector2Int(1, 1), "A"), child.position, 0);
+            else if (child.name.Contains("Item"))
+                InventoryManager.Instance.ItemInstantiate("Dagger", child.position, 0);
+            else if (child.name.Contains("Addon"))
+                InventoryManager.Instance.AddonInstantiate("ParchmentPiece", child.position, 0);
+        }
     }
 	
 	// Update is called once per frame

Assets/Scripts/TetrisMap/TetriminoSpawner.cs

@@ -119,7 +119,7 @@ public class TetriminoSpawner : Singleton<TetriminoSpawner> {
         {
             MapManager.currentGhost.rooms[i].mapCoord = te.rooms[i].mapCoord;
             MapManager.currentGhost.rooms[i].GetComponent<SpriteRenderer>().sprite = MapManager.currentTetrimino.rooms[i].GetComponent<SpriteRenderer>().sprite;
-            MapManager.currentGhost.rooms[i].GetComponent<SpriteRenderer>().color = new Color(1, 1, 1, 0.5f);
+            MapManager.currentGhost.rooms[i].GetComponent<SpriteRenderer>().color = new Color(1, 1, 1, 0.3f);
         }
     }
     /// <summary>

Assets/Scripts/TileManager.cs

@@ -175,8 +175,6 @@ public class TileManager : MonoBehaviour {
         CheckAllTiles(roomInGame);
         for(int y = 0; y < 24; y++)
         {
-            /*if (y % 3 == 0)
-                yield return null;*/
             for(int x = 0; x < 24; x++)
             {
                 if (roomInGame.wallTileInfo[x, y])
@@ -185,26 +183,34 @@ public class TileManager : MonoBehaviour {
                     CheckWallQuarterTile(roomInGame, new Vector2Int(x, y), new Vector2Int(1, 1)).ToString() +
                     CheckWallQuarterTile(roomInGame, new Vector2Int(x, y), new Vector2Int(-1, -1)).ToString() +
                     CheckWallQuarterTile(roomInGame, new Vector2Int(x, y), new Vector2Int(1, -1)).ToString();
-                    if(wallTilesDistributed[stage, concept].ContainsKey(tileName))
+                    if (wallTilesDistributed[stage, concept].ContainsKey(tileName))
                         wallTileMap.SetTile(new Vector3Int(x, y, 0), wallTilesDistributed[stage, concept][tileName]);
+                    else
+                        Debug.Log(stage + concept + tileName + " tile is missing!");
                 }
                 if (roomInGame.platformTileInfo[x, y] && y != 0 && y != 23)
                 {
                     string tileName = CheckPlatformTile(roomInGame, new Vector2Int(x, y)).ToString();
                     if (platformTilesDistributed[stage, concept].ContainsKey(tileName))
                         platformTileMap.SetTile(new Vector3Int(x, y, 0), platformTilesDistributed[stage, concept][tileName]);
+                    else
+                        Debug.Log(stage + concept + tileName + " tile is missing!");
                 }
                 if (roomInGame.ropeTileInfo[x, y])
                 {
                     string tileName = CheckRopeTile(roomInGame, new Vector2Int(x, y)).ToString();
                     if (ropeTilesDistributed[stage, concept].ContainsKey(tileName))
                         ropeTileMap.SetTile(new Vector3Int(x, y, 0), ropeTilesDistributed[stage, concept][tileName]);
+                    else
+                        Debug.Log(stage + concept + tileName + " tile is missing!");
                 }
                 if (roomInGame.spikeTileInfo[x, y])
                 {
                     string tileName = CheckSpikeTile(roomInGame, new Vector2Int(x, y)).ToString();
                     if (spikeTilesDistributed[stage, concept].ContainsKey(tileName))
                         spikeTileMap.SetTile(new Vector3Int(x, y, 0), spikeTilesDistributed[stage, concept][tileName]);
+                    else
+                        Debug.Log(stage + concept + tileName + " tile is missing!");
                 }
             }
         }

Assets/Scripts/UI/In-game UI/LifeStoneScript/DroppedLifeStone.cs

@@ -53,7 +53,7 @@ public class DroppedLifeStone : DroppedObject, IPlayerInteraction
     public void Apply()
     {
         if (LifeStoneManager.Instance.CountType(LifeStoneType.Gold) < price)
-            StartCoroutine(GameManager.Instance.player.GetComponent<Player>().DisplayText("Not enough gold"));
+            GameManager.Instance.DisplayText("금 생명석이 부족합니다!");
         else if (LifeStoneManager.Instance.PushLifeStone(info))
         {
             LifeStoneManager.Instance.ChangeToNormal(LifeStoneType.Gold, price);

Assets/Scripts/UI/In-game UI/LifeStoneScript/DroppedPotion.cs

@@ -10,7 +10,7 @@ public class DroppedPotion : DroppedObject, IPlayerInteraction{
     public void Apply()
     {
         if (LifeStoneManager.Instance.CountType(LifeStoneType.Gold) < price)
-            StartCoroutine(GameManager.Instance.player.GetComponent<Player>().DisplayText("Not enough gold"));
+            GameManager.Instance.DisplayText("금 생명석이 부족합니다!");
         LifeStoneManager.Instance.ChangeFromNormal(LifeStoneType.Gold, 3);
         if (priceTag)
             Destroy(priceTag.gameObject);

Assets/Scripts/UI/In-game UI/LifeStoneScript/LifeStoneManager.cs

@@ -330,7 +330,11 @@ public class LifeStoneManager : Singleton<LifeStoneManager> {
 		for (int i = 0; i <= 3 - pSize.x; i++)
 			if (minRow[i] < selectedRow) selectedRow = minRow[i];
 
-        if (selectedRow == lifeStoneRowNum) return false;
+        if (selectedRow == lifeStoneRowNum)
+        {
+            GameManager.Instance.DisplayText("생명석 자리가 없습니다!");
+            return false;
+        }
 
 		for (int i = 0; i <= 3 - pSize.x; i++)
 			if (minRow[i] == selectedRow) selColCand.Add(i);

Assets/Scripts/UI/In-game UI/Timer.cs

@@ -48,7 +48,8 @@ public class Timer : MonoBehaviour {
     {
         float previousZRotation = clockHand.transform.eulerAngles.z;
         float startTime = Time.time, endTime = startTime + 0.5f;
-        while(Time.time < endTime)
+        GameManager.Instance.tetrisAlert.GetComponent<Animator>().SetBool("isAlertOn", false);
+        while (Time.time < endTime)
         {
             yield return null;
             if(tetriminoWaitedTime < timeToFallTetrimino)
@@ -77,6 +78,8 @@ public class Timer : MonoBehaviour {
             }
             tetriminoWaitedTime = Time.time - tetriminoCreatedTime;
             clockHand.transform.eulerAngles = new Vector3(0, 0, -360 * tetriminoWaitedTime / timeToFallTetrimino);
+            if (timeToFallTetrimino - tetriminoWaitedTime <= 3)
+                GameManager.Instance.tetrisAlert.GetComponent<Animator>().SetBool("isAlertOn", true);
         }
         if(tetriminoWaitedTime >= timeToFallTetrimino)
             clockHand.transform.eulerAngles = Vector3.zero;

Assets/Sprites/Enemy/GoblinArcher/attack/goblin_archer_attack1.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/GoblinArcher/attack/goblin_archer_attack2.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/GoblinArcher/attack/goblin_archer_attack3.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/GoblinArcher/attack/goblin_archer_attack4.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/GoblinArcher/attack/goblin_archer_attack5.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/GoblinArcher/attack/goblin_archer_attack6.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/GoblinArcher/death/goblin_archer_death1.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/GoblinArcher/death/goblin_archer_death10.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/GoblinArcher/death/goblin_archer_death11.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/GoblinArcher/death/goblin_archer_death12.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/GoblinArcher/death/goblin_archer_death13.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/GoblinArcher/death/goblin_archer_death14.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/GoblinArcher/death/goblin_archer_death15.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/GoblinArcher/death/goblin_archer_death2.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/GoblinArcher/death/goblin_archer_death3.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/GoblinArcher/death/goblin_archer_death4.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/GoblinArcher/death/goblin_archer_death5.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/GoblinArcher/death/goblin_archer_death6.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/GoblinArcher/death/goblin_archer_death7.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/GoblinArcher/death/goblin_archer_death8.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/GoblinArcher/death/goblin_archer_death9.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/GoblinArcher/goblin_archer.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/GoblinArcher/hit/goblin_archer_hit1.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/GoblinArcher/hit/goblin_archer_hit2.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/GoblinArcher/hit/goblin_archer_hit3.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/GoblinArcher/idle/goblin_archer_idle1.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/GoblinArcher/idle/goblin_archer_idle2.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/Scarecrow/death/Scarecrow_Death1.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/Scarecrow/death/Scarecrow_Death10.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/Scarecrow/death/Scarecrow_Death2.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1

Assets/Sprites/Enemy/Scarecrow/death/Scarecrow_Death3.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1