Merge branch 'tetris' into enemy 고블린 스프라이트 크기와 콜라이더 크기 수정, 고블린 생성 버튼 복구할것

# Conflicts:
#	Assets/Prefabs/Characters/Player.prefab
#	Assets/Prefabs/Rooms/SpecialRoom/Room Start.prefab
#	Assets/Prefabs/TetrisMap/TestTools.prefab
#	Assets/Scenes/PlayScene.unity

Assets/Animation/LifeStone/Animation/Amethyst_Normal.anim

@@ -19,13 +19,15 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: 21300024, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - time: 0.083333336
-      value: {fileID: 21300022, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - time: 0.16666667
-      value: {fileID: 21300020, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
+      value: {fileID: 21300006, guid: 40a43371677ecc546b6c859520dfd335, type: 3}
+    - time: 0.06666667
+      value: {fileID: 21300004, guid: 40a43371677ecc546b6c859520dfd335, type: 3}
+    - time: 0.13333334
+      value: {fileID: 21300002, guid: 40a43371677ecc546b6c859520dfd335, type: 3}
+    - time: 0.2
+      value: {fileID: 21300000, guid: 40a43371677ecc546b6c859520dfd335, type: 3}
     - time: 0.25
-      value: {fileID: 21300018, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
+      value: {fileID: 21300000, guid: 40a43371677ecc546b6c859520dfd335, type: 3}
     attribute: m_Sprite
     path: 
     classID: 114
@@ -45,10 +47,11 @@ AnimationClip:
       customType: 0
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: 21300024, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - {fileID: 21300022, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - {fileID: 21300020, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - {fileID: 21300018, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
+    - {fileID: 21300006, guid: 40a43371677ecc546b6c859520dfd335, type: 3}
+    - {fileID: 21300004, guid: 40a43371677ecc546b6c859520dfd335, type: 3}
+    - {fileID: 21300002, guid: 40a43371677ecc546b6c859520dfd335, type: 3}
+    - {fileID: 21300000, guid: 40a43371677ecc546b6c859520dfd335, type: 3}
+    - {fileID: 21300000, guid: 40a43371677ecc546b6c859520dfd335, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}

Assets/Animation/LifeStone/Animation/Amethyst_destroy.anim

@@ -19,13 +19,17 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: 21300042, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - time: 0.033333335
-      value: {fileID: 21300044, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - time: 0.06666667
-      value: {fileID: 21300046, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - time: 0.1
-      value: {fileID: 21300048, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
+      value: {fileID: 21300020, guid: 94363d870cb1eac449c1ae5f2755e550, type: 3}
+    - time: 0.083333336
+      value: {fileID: 21300022, guid: 94363d870cb1eac449c1ae5f2755e550, type: 3}
+    - time: 0.16666667
+      value: {fileID: 21300024, guid: 94363d870cb1eac449c1ae5f2755e550, type: 3}
+    - time: 0.25
+      value: {fileID: 21300026, guid: 94363d870cb1eac449c1ae5f2755e550, type: 3}
+    - time: 0.33333334
+      value: {fileID: 21300028, guid: 94363d870cb1eac449c1ae5f2755e550, type: 3}
+    - time: 0.4
+      value: {fileID: 21300028, guid: 94363d870cb1eac449c1ae5f2755e550, type: 3}
     attribute: m_Sprite
     path: 
     classID: 114
@@ -45,16 +49,18 @@ AnimationClip:
       customType: 0
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: 21300042, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - {fileID: 21300044, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - {fileID: 21300046, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - {fileID: 21300048, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
+    - {fileID: 21300020, guid: 94363d870cb1eac449c1ae5f2755e550, type: 3}
+    - {fileID: 21300022, guid: 94363d870cb1eac449c1ae5f2755e550, type: 3}
+    - {fileID: 21300024, guid: 94363d870cb1eac449c1ae5f2755e550, type: 3}
+    - {fileID: 21300026, guid: 94363d870cb1eac449c1ae5f2755e550, type: 3}
+    - {fileID: 21300028, guid: 94363d870cb1eac449c1ae5f2755e550, type: 3}
+    - {fileID: 21300028, guid: 94363d870cb1eac449c1ae5f2755e550, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.11666667
+    m_StopTime: 0.4166667
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0

Assets/Animation/LifeStone/Animation/Gold_Normal.anim

@@ -20,11 +20,13 @@ AnimationClip:
   - curve:
     - time: 0
       value: {fileID: 21300006, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
-    - time: 0.033333335
-      value: {fileID: 21300004, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
     - time: 0.06666667
+      value: {fileID: 21300004, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
+    - time: 0.13333334
       value: {fileID: 21300002, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
-    - time: 0.1
+    - time: 0.2
+      value: {fileID: 21300000, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
+    - time: 0.25
       value: {fileID: 21300000, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
     attribute: m_Sprite
     path: 
@@ -49,12 +51,13 @@ AnimationClip:
     - {fileID: 21300004, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
     - {fileID: 21300002, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
     - {fileID: 21300000, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
+    - {fileID: 21300000, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.11666667
+    m_StopTime: 0.26666668
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0

Assets/Animation/LifeStone/Animation/Gold_destroy.anim

@@ -19,13 +19,17 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: 21300034, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - time: 0.033333335
-      value: {fileID: 21300036, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - time: 0.06666667
-      value: {fileID: 21300038, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - time: 0.1
-      value: {fileID: 21300040, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
+      value: {fileID: 21300010, guid: 3091d9d5936853d4481b47e957f2b956, type: 3}
+    - time: 0.083333336
+      value: {fileID: 21300012, guid: 3091d9d5936853d4481b47e957f2b956, type: 3}
+    - time: 0.16666667
+      value: {fileID: 21300014, guid: 3091d9d5936853d4481b47e957f2b956, type: 3}
+    - time: 0.25
+      value: {fileID: 21300016, guid: 3091d9d5936853d4481b47e957f2b956, type: 3}
+    - time: 0.33333334
+      value: {fileID: 21300018, guid: 3091d9d5936853d4481b47e957f2b956, type: 3}
+    - time: 0.4
+      value: {fileID: 21300018, guid: 3091d9d5936853d4481b47e957f2b956, type: 3}
     attribute: m_Sprite
     path: 
     classID: 114
@@ -45,16 +49,18 @@ AnimationClip:
       customType: 0
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: 21300034, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - {fileID: 21300036, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - {fileID: 21300038, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - {fileID: 21300040, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
+    - {fileID: 21300010, guid: 3091d9d5936853d4481b47e957f2b956, type: 3}
+    - {fileID: 21300012, guid: 3091d9d5936853d4481b47e957f2b956, type: 3}
+    - {fileID: 21300014, guid: 3091d9d5936853d4481b47e957f2b956, type: 3}
+    - {fileID: 21300016, guid: 3091d9d5936853d4481b47e957f2b956, type: 3}
+    - {fileID: 21300018, guid: 3091d9d5936853d4481b47e957f2b956, type: 3}
+    - {fileID: 21300018, guid: 3091d9d5936853d4481b47e957f2b956, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.11666667
+    m_StopTime: 0.4166667
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0

Assets/Animation/LifeStone/Animation/Normal_Amethyst.anim

@@ -19,13 +19,15 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: 21300018, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - time: 0.083333336
-      value: {fileID: 21300020, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - time: 0.16666667
-      value: {fileID: 21300022, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
+      value: {fileID: 21300000, guid: 40a43371677ecc546b6c859520dfd335, type: 3}
+    - time: 0.06666667
+      value: {fileID: 21300002, guid: 40a43371677ecc546b6c859520dfd335, type: 3}
+    - time: 0.13333334
+      value: {fileID: 21300004, guid: 40a43371677ecc546b6c859520dfd335, type: 3}
+    - time: 0.2
+      value: {fileID: 21300006, guid: 40a43371677ecc546b6c859520dfd335, type: 3}
     - time: 0.25
-      value: {fileID: 21300024, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
+      value: {fileID: 21300006, guid: 40a43371677ecc546b6c859520dfd335, type: 3}
     attribute: m_Sprite
     path: 
     classID: 114
@@ -45,10 +47,11 @@ AnimationClip:
       customType: 0
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: 21300018, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - {fileID: 21300020, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - {fileID: 21300022, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - {fileID: 21300024, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
+    - {fileID: 21300000, guid: 40a43371677ecc546b6c859520dfd335, type: 3}
+    - {fileID: 21300002, guid: 40a43371677ecc546b6c859520dfd335, type: 3}
+    - {fileID: 21300004, guid: 40a43371677ecc546b6c859520dfd335, type: 3}
+    - {fileID: 21300006, guid: 40a43371677ecc546b6c859520dfd335, type: 3}
+    - {fileID: 21300006, guid: 40a43371677ecc546b6c859520dfd335, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}

Assets/Animation/LifeStone/Animation/Normal_Gold.anim

@@ -20,11 +20,13 @@ AnimationClip:
   - curve:
     - time: 0
       value: {fileID: 21300000, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
-    - time: 0.033333335
-      value: {fileID: 21300002, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
     - time: 0.06666667
+      value: {fileID: 21300002, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
+    - time: 0.13333334
       value: {fileID: 21300004, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
-    - time: 0.1
+    - time: 0.2
+      value: {fileID: 21300006, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
+    - time: 0.25
       value: {fileID: 21300006, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
     attribute: m_Sprite
     path: 
@@ -49,12 +51,13 @@ AnimationClip:
     - {fileID: 21300002, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
     - {fileID: 21300004, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
     - {fileID: 21300006, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
+    - {fileID: 21300006, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.11666667
+    m_StopTime: 0.26666668
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0

Assets/Animation/LifeStone/Animation/Normal_destroy.anim

@@ -19,13 +19,17 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: 21300026, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - time: 0.033333335
-      value: {fileID: 21300028, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - time: 0.06666667
-      value: {fileID: 21300030, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - time: 0.1
-      value: {fileID: 21300032, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
+      value: {fileID: 21300000, guid: 096367e9a231d2343b36ebeecc96b901, type: 3}
+    - time: 0.083333336
+      value: {fileID: 21300002, guid: 096367e9a231d2343b36ebeecc96b901, type: 3}
+    - time: 0.16666667
+      value: {fileID: 21300004, guid: 096367e9a231d2343b36ebeecc96b901, type: 3}
+    - time: 0.25
+      value: {fileID: 21300006, guid: 096367e9a231d2343b36ebeecc96b901, type: 3}
+    - time: 0.33333334
+      value: {fileID: 21300008, guid: 096367e9a231d2343b36ebeecc96b901, type: 3}
+    - time: 0.4
+      value: {fileID: 21300008, guid: 096367e9a231d2343b36ebeecc96b901, type: 3}
     attribute: m_Sprite
     path: 
     classID: 114
@@ -45,16 +49,18 @@ AnimationClip:
       customType: 0
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: 21300026, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - {fileID: 21300028, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - {fileID: 21300030, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
-    - {fileID: 21300032, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
+    - {fileID: 21300000, guid: 096367e9a231d2343b36ebeecc96b901, type: 3}
+    - {fileID: 21300002, guid: 096367e9a231d2343b36ebeecc96b901, type: 3}
+    - {fileID: 21300004, guid: 096367e9a231d2343b36ebeecc96b901, type: 3}
+    - {fileID: 21300006, guid: 096367e9a231d2343b36ebeecc96b901, type: 3}
+    - {fileID: 21300008, guid: 096367e9a231d2343b36ebeecc96b901, type: 3}
+    - {fileID: 21300008, guid: 096367e9a231d2343b36ebeecc96b901, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.11666667
+    m_StopTime: 0.4166667
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0

Assets/Prefabs/Characters/Enemy/Goblin.prefab

@@ -99,7 +99,7 @@ Transform:
   m_GameObject: {fileID: 1636491341446076}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 6.876, y: 1.034, z: -0.1645136}
-  m_LocalScale: {x: 2, y: 2, z: 1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4015301101001556}
   m_Father: {fileID: 0}
@@ -137,7 +137,7 @@ BoxCollider2D:
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: -0.030994058, y: 0.3586455}
+  m_Offset: {x: 0.08, y: 0.325}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0, y: 0}
@@ -148,7 +148,7 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 0.4066851, y: 0.71662545}
+  m_Size: {x: 0.55, y: 1.1}
   m_EdgeRadius: 0
 --- !u!61 &61362187134790794
 BoxCollider2D:
@@ -212,9 +212,6 @@ MonoBehaviour:
   attackRange: 2
   patrolSpeed: 5
   trackSpeed: 7
-  attackDelay: 1
-  attackDuration: 1
-  invincible: 0
   playerDistance: 0
 --- !u!114 &114468655689627186
 MonoBehaviour:

Assets/Prefabs/Characters/Player.prefab

@@ -42,6 +42,8 @@ GameObject:
   m_Component:
   - component: {fileID: 4710911479571038}
   - component: {fileID: 61129044981816742}
+  - component: {fileID: 114402380471012178}
+  - component: {fileID: 60342798607647292}
   - component: {fileID: 114190796731463818}
   m_Layer: 0
   m_Name: AttackColider
@@ -91,12 +93,40 @@ Rigidbody2D:
   m_Mass: 1
   m_LinearDrag: 0
   m_AngularDrag: 0.05
-  m_GravityScale: 5
+  m_GravityScale: 3
   m_Material: {fileID: 0}
-  m_Interpolate: 0
+  m_Interpolate: 1
   m_SleepingMode: 1
   m_CollisionDetection: 1
   m_Constraints: 4
+--- !u!60 &60342798607647292
+PolygonCollider2D:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1862495014651308}
+  m_Enabled: 0
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: -0.69, y: 0.7}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  m_Points:
+    m_Paths:
+    - - {x: -1.7706409, y: 1.7276601}
+      - {x: -2.1208076, y: 1.4114912}
+      - {x: 0.18838578, y: -1.1243366}
+      - {x: 0.58778536, y: -0.80901694}
 --- !u!61 &61019994424895448
 BoxCollider2D:
   m_ObjectHideFlags: 1
@@ -167,7 +197,7 @@ Animator:
   m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!114 &114190796731463818
 MonoBehaviour:
-  m_ObjectHideFlags: 1
+  m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1862495014651308}
@@ -194,36 +224,50 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   rbGravityScale: 3
   rbAttackGravityScale: 0.5
-  maxSpeed: 3
-  maxDashSpeed: 6
-  accerlation: 1200
+  maxSpeed: 4
+  maxDashSpeed: 7
+  acceleration: 20
+  deceleration: 20
   jumpSpeed: 11
   ropeSpeed: 3
   doubleJumpSpeed: 10
-  dashAccerlation: 2000
-  isDashing: 0
+  dashAcceleration: 50
   platformCollider: {fileID: 0}
-  horizontal: 0
-  horizontalRaw: 0
-  dashStart: 0
   groundLayer:
     serializedVersion: 2
-    m_Bits: 256
+    m_Bits: 6400
   ropeLayer:
     serializedVersion: 2
     m_Bits: 512
+  boxHeight: 0.3
+  ropeUp: 0.6
+  ropeDown: 0.8
   platformLayer:
     serializedVersion: 2
     m_Bits: 2048
-  outerwallLayer:
+  itemLayer:
     serializedVersion: 2
-    m_Bits: 4096
-  ropeDistance: 0.3
+    m_Bits: 8192
   rayDistance: 1
-  ropeUp: 0.6
-  ropeDown: 0.8
+  lastDropItem: {fileID: 0}
   playerState: 0
   previousState: 0
+--- !u!114 &114402380471012178
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1862495014651308}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 64f948f7c7aacab409fe963a6f9e0d2a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  damage: 0
+  knockBackMultiplier: 1
+  debuffNum: 0
+  debuffType: 
+  debuffTime: 00000000000000000000000000000000000000000000000000000000000000000000000000000000
 --- !u!114 &114880704145925944
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -246,9 +290,9 @@ MonoBehaviour:
   comboTime: 1
   time: {fileID: 0}
   combo: {fileID: 0}
-  comboArray: 
+  comboArray: AB
   StartTime: 0
-  anim: {fileID: 0}
+  anim: {fileID: 95992411616135034}
   aoc: {fileID: 0}
   normalAttack:
   - {fileID: 7400000, guid: be4bdbaff27cc7c46a79b3ef4e1fe3f6, type: 2}
@@ -267,7 +311,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   LCUI: {fileID: 0}
-  ttx: 0
+  ttx: 8
   tty: 0
 --- !u!212 &212187280661781960
 SpriteRenderer:
@@ -304,7 +348,7 @@ SpriteRenderer:
   m_SortingLayerID: -2078941185
   m_SortingLayer: 7
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: bae70a52c1619cd478cb9d32f0cb7083, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 92d166e0c2a85a14facee45f5a5a8444, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0

Assets/Prefabs/GameManager.prefab

@@ -51,3 +51,5 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 97912f0a2214a8a4f8023ed30629bb30, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  gameOverCanvas: {fileID: 0}
+  inventoryCanvas: {fileID: 0}

Assets/Prefabs/MapManager.prefab

@@ -73,6 +73,10 @@ MonoBehaviour:
     type: 2}
   inGameDoorRight: {fileID: 1668375270989012, guid: fa868e0924825b54896b61a69e93391f,
     type: 2}
+  portalSurface: {fileID: 1272210399781394, guid: 94f4bf6088d377c4780a5bc55baaabe0,
+    type: 2}
+  portalExist: {fileID: 21300000, guid: d2894481921999843ae1800d4b65ded6, type: 3}
+  portalSelected: {fileID: 21300000, guid: ab953b34dd9966f409d851b274ed4d9f, type: 3}
   normalRoomList1:
   - {fileID: 114452746530220676, guid: 3c35322ac2c308d49aadf20738b69c8b, type: 2}
   - {fileID: 114071400998216906, guid: 7fd2833846bb116479bd74d2a5b75487, type: 2}

Assets/Prefabs/Pickups/Addon.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: 1007759869299288}
-  m_IsPrefabAsset: 1
---- !u!1 &1007759869299288
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4671478330306208}
-  - component: {fileID: 114131886443682132}
-  m_Layer: 0
-  m_Name: Addon
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &4671478330306208
-Transform:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1007759869299288}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &114131886443682132
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1007759869299288}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 138c726404f3fd444abdec4d37ba3b85, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 

Assets/Prefabs/Pickups/Frame.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: 1536692734079516}
-  m_IsPrefabAsset: 1
---- !u!1 &1536692734079516
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4590347336141776}
-  - component: {fileID: 114780538278930512}
-  m_Layer: 0
-  m_Name: Frame
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &4590347336141776
-Transform:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1536692734079516}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &114780538278930512
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1536692734079516}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8af377227dc260b4aa0846ed539ffd3c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 

Assets/Prefabs/Pickups/Item.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: 1892097559098470}
-  m_IsPrefabAsset: 1
---- !u!1 &1892097559098470
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4694445303096730}
-  - component: {fileID: 114583774776711718}
-  m_Layer: 0
-  m_Name: Item
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &4694445303096730
-Transform:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1892097559098470}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &114583774776711718
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1892097559098470}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9574d82cade29e6419b802dfbd1c8c64, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 

Assets/Prefabs/Pickups/LifeCrystal.prefab.meta

-fileFormatVersion: 2
-guid: 86dcaa3d062378746bffa7e9c773fa12
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 100100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Prefabs/Pickups/Potion.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: 1919051286898630}
-  m_IsPrefabAsset: 1
---- !u!1 &1919051286898630
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4437898873928542}
-  - component: {fileID: 114034260101831288}
-  m_Layer: 0
-  m_Name: Potion
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &4437898873928542
-Transform:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1919051286898630}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &114034260101831288
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1919051286898630}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d9fdb539a8c32be4bb032f0a7434f6a6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 

Assets/Prefabs/Pickups/Potion.prefab.meta

-fileFormatVersion: 2
-guid: d8bc3f2dd1b5a704e86716847680ea95
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 100100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Prefabs/Rooms/Portal.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: 1010086429062358}
+  m_IsPrefabAsset: 1
+--- !u!1 &1010086429062358
+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: 0
+  m_Name: Portal
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &4094573924144642
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1010086429062358}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!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
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1010086429062358}
+  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: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: 6147483bafc37034d91c2afaff57cad1, 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

Assets/Prefabs/Pickups/Item.prefab.meta → Assets/Prefabs/Rooms/Portal.prefab.meta

 fileFormatVersion: 2
-guid: 1ca84ddb657019041a7cfe19bb2885b7
+guid: ad5b720a4688efa4b8c3298d87df6f64
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 100100000

Assets/Prefabs/Pickups/Addon.prefab.meta → Assets/Prefabs/TetrisMap/Portal.prefab.meta

 fileFormatVersion: 2
-guid: 1ccb31a1ed695bb4ba0f4cb27dc7ecea
+guid: 93ba58b5e24488741a018d983b59c580
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 100100000

Assets/Prefabs/Pickups/Frame.prefab.meta → Assets/Prefabs/TetrisMap/PortalSurface.prefab.meta

 fileFormatVersion: 2
-guid: 0222e2d8b56397143aea40e4c1d2f7df
+guid: 94f4bf6088d377c4780a5bc55baaabe0
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 100100000

Assets/Prefabs/UI/GameOverScreen.prefab.meta

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

Assets/Prefabs/Pickups/DroppedItem.prefab.meta → Assets/Prefabs/UI/In-Game UI/InventoryUI/DroppedItem.prefab.meta

 fileFormatVersion: 2
-guid: 4a28c3bf4e32d654facd1cc72d68c10b
+guid: ee63f05b79e18ce4bad2c226aa70a28e
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 100100000