Merge branch 'enemy'

# Conflicts:
#	Assets/Prefabs/MapManager.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 0.prefab

Assets/Scripts/TetrisMap/Tetrimino.meta → Assets/Prefabs/Ghost.meta

 fileFormatVersion: 2
-guid: 2b9e9b103377e744b9dd392046d30fc7
+guid: 81b03ac01e8050c489b82c9d83d38ca9
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Prefabs/Ghost/GhostBoss.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: 1312529591873478}
+  m_IsPrefabAsset: 1
+--- !u!1 &1312529591873478
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4120551927955160}
+  - component: {fileID: 114905444694596716}
+  m_Layer: 0
+  m_Name: GhostBoss
+  m_TagString: Tetrimino
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1392094499396834
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4379492925354834}
+  - component: {fileID: 212529282815869948}
+  - component: {fileID: 114210848111338228}
+  m_Layer: 0
+  m_Name: Room1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4120551927955160
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1312529591873478}
+  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: 4379492925354834}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4379492925354834
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1392094499396834}
+  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: 4120551927955160}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &114210848111338228
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1392094499396834}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mapCoord: {x: 0, y: 0, z: 0}
+  doorInfo: 
+  stage: 0
+  roomConcept: 0
+  itemRoomType: 0
+  specialRoomType: 0
+--- !u!114 &114905444694596716
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1312529591873478}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1a5e689aa2f6ba040908d66cf6e49094, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mapCoord: {x: 0, y: 0, z: 0}
+  stage: 0
+  roomConcept: 0
+  isBossTetrimino: 0
+  tetriminoType: 7
+  rooms:
+  - {fileID: 114210848111338228}
+  rotatedAngle: 0
+  rotatedPosition: 00000000000000000000000000000000
+--- !u!212 &212529282815869948
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1392094499396834}
+  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: 09a55c7c9744ba04084ee582402b5c0f, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.39215687}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0

Assets/Scripts/TetrisMap/Tetrimino/TetriminoBoss.cs.meta → Assets/Prefabs/Ghost/GhostBoss.prefab.meta

 fileFormatVersion: 2
-guid: fd1dc16b46613744db6b1b22af43a6d0
-MonoImporter:
+guid: e494db59dc163164da23ae1ad850f540
+NativeFormatImporter:
   externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
+  mainObjectFileID: 100100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Scripts/TetrisMap/Tetrimino/TetriminoNormal.cs.meta → Assets/Prefabs/Ghost/GhostI.prefab.meta

 fileFormatVersion: 2
-guid: 6178b7e82dee01944993bbfb219fd0e6
-MonoImporter:
+guid: 4422a70761bf0ac4884c66372948586e
+NativeFormatImporter:
   externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
+  mainObjectFileID: 100100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Prefabs/Ghost/GhostJ.prefab.meta

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

Assets/Prefabs/Ghost/GhostL.prefab.meta

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

Assets/Prefabs/Ghost/GhostO.prefab.meta

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

Assets/Prefabs/Ghost/GhostS.prefab.meta

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

Assets/Prefabs/Ghost/GhostT.prefab.meta

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

Assets/Prefabs/Ghost/GhostZ.prefab.meta

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

Assets/Prefabs/MapManager.prefab

@@ -54,43 +54,25 @@ MonoBehaviour:
   grid: {fileID: 0}
   tetrisMapSize: 24
   tetrisMapCoord: {x: 0, y: 0, z: 0}
-  speed: 0
-  gravity: 0
+  fallSpeed: -0.1
+  initialFallSpeed: -0.1
+  gravity: 0.98
   collapseTime: 0
   fallTime: 0
   gameOver: 0
+  isTetriminoFalling: 0
   spawnBossTetrimino: 0
   tetrisMap: {fileID: 0}
   currentTetrimino: {fileID: 0}
+  currentGhost: {fileID: 0}
   normalRoomList:
-  - {fileID: 114867965473581566, guid: 3c35322ac2c308d49aadf20738b69c8b, type: 2}
-  - {fileID: 114492511082352868, guid: ab849dd6d89e7254f83aac30e7b19a30, type: 2}
-  - {fileID: 114559990482232978, guid: 8a277fab4c930814a89f83d11e915f3b, type: 2}
-  - {fileID: 114408584516131240, guid: 5712fafd2b645fe488586143d15320c3, type: 2}
-  - {fileID: 114595926560157356, guid: e755ae028f96c11478d088a2fbc15284, type: 2}
-  - {fileID: 114782876047334178, guid: b2aea3753aeb72e48877392a65019c75, type: 2}
-  - {fileID: 114470026489049436, guid: 1b7e15c651b43934ba83bf5af546dac8, type: 2}
-  - {fileID: 114863265537427244, guid: bcdfbba992e4b5c40a05376093119de1, type: 2}
-  - {fileID: 114949247335388822, guid: 342cab59f70a5b342a805799c5ae6207, type: 2}
-  - {fileID: 114484571057831710, guid: 1c41b406c1de80c4e93930331d2fa697, type: 2}
-  - {fileID: 114743815453509364, guid: f0254b56972e32745aef8a6fd6e5f500, type: 2}
-  - {fileID: 114788150064050122, guid: 6ed897f0c1013fc4883f7bf0db7b4e1a, type: 2}
-  - {fileID: 114377614119600362, guid: a3477b8af02171c478e610b1347cfa30, type: 2}
-  - {fileID: 114471976571779658, guid: a02cf80bd4dc5bf4eb59b598c282b924, type: 2}
-  - {fileID: 114416208672800444, guid: bc907848815150142844bfc2c5587c9f, type: 2}
-  - {fileID: 114966549601019394, guid: 0c232948c60d71447838601bcd333755, type: 2}
-  - {fileID: 114151492124372836, guid: c77255b74b15422448c3752f223cf177, type: 2}
-  - {fileID: 114869574872569484, guid: 478354a3449548a44ba40d516d1cc3cd, type: 2}
-  - {fileID: 114518681048152984, guid: 5d9d617a37ddce4448c92cca0946ab18, type: 2}
-  - {fileID: 114849596069850384, guid: bfa57985877d23b46929238f077b40df, type: 2}
-  itemRoomList:
-  - {fileID: 114748839344937290, guid: 7da800d1a4355fd4aa02e3518cd9e1fb, type: 2}
+  - {fileID: 114608209787691684, guid: 702a2175c3762fd4b9bc1fac0357a1a0, type: 2}
   specialRoomList:
-  - {fileID: 114422406439171286, guid: 8fddb267ac5bdf84b9def0dab7ff2071, type: 2}
-  - {fileID: 114177111557011372, guid: 2514de8c1d17b734592b5fe2cdc74560, type: 2}
-  - {fileID: 114835259102846824, guid: ea5defee5777b0044b3d684971c1dc40, type: 2}
-  - {fileID: 114582147988528222, guid: 8e573eb3b8b071c47a4ee92adf1a9644, type: 2}
+  - {fileID: 114495009210863316, guid: 4b147f1162668f44aa55982681399aec, type: 2}
+  - {fileID: 114206258087780418, guid: 00a3cc75c0f86a5429975c059b71c269, type: 2}
   - {fileID: 114589998919791384, guid: fe17cba28f910e54faf7b866f86bfd3e, type: 2}
   - {fileID: 114834209009617488, guid: f6834170b7152ee4db0dc7e165dcca70, type: 2}
+  - {fileID: 114310635400106216, guid: 7da800d1a4355fd4aa02e3518cd9e1fb, type: 2}
+  - {fileID: 114076836714455396, guid: 1ec0004bbafe6764d9462251b866e6e6, type: 2}
   controlCurrentTetrimino: 0
   startRoom: {fileID: 0}

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

@@ -549,6 +549,15 @@ Tilemap:
       m_ObjectToInstantiate: {fileID: 0}
       m_TileFlags: 1
       m_ColliderType: 1
+  - first: {x: 6, y: 7, z: 0}
+    second:
+      m_TileIndex: 0
+      m_TileSpriteIndex: 0
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
   - first: {x: 23, y: 7, z: 0}
     second:
       m_TileIndex: 1
@@ -567,6 +576,33 @@ Tilemap:
       m_ObjectToInstantiate: {fileID: 0}
       m_TileFlags: 1
       m_ColliderType: 1
+  - first: {x: 6, y: 8, z: 0}
+    second:
+      m_TileIndex: 0
+      m_TileSpriteIndex: 0
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 15, y: 8, z: 0}
+    second:
+      m_TileIndex: 0
+      m_TileSpriteIndex: 0
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 16, y: 8, z: 0}
+    second:
+      m_TileIndex: 0
+      m_TileSpriteIndex: 0
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
   - first: {x: 23, y: 8, z: 0}
     second:
       m_TileIndex: 1
@@ -585,6 +621,33 @@ Tilemap:
       m_ObjectToInstantiate: {fileID: 0}
       m_TileFlags: 1
       m_ColliderType: 1
+  - first: {x: 6, y: 11, z: 0}
+    second:
+      m_TileIndex: 0
+      m_TileSpriteIndex: 0
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 13, y: 11, z: 0}
+    second:
+      m_TileIndex: 0
+      m_TileSpriteIndex: 0
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 16, y: 11, z: 0}
+    second:
+      m_TileIndex: 0
+      m_TileSpriteIndex: 0
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
   - first: {x: 23, y: 11, z: 0}
     second:
       m_TileIndex: 1
@@ -603,6 +666,42 @@ Tilemap:
       m_ObjectToInstantiate: {fileID: 0}
       m_TileFlags: 1
       m_ColliderType: 1
+  - first: {x: 6, y: 12, z: 0}
+    second:
+      m_TileIndex: 0
+      m_TileSpriteIndex: 0
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 12, y: 12, z: 0}
+    second:
+      m_TileIndex: 0
+      m_TileSpriteIndex: 0
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 13, y: 12, z: 0}
+    second:
+      m_TileIndex: 0
+      m_TileSpriteIndex: 0
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 16, y: 12, z: 0}
+    second:
+      m_TileIndex: 0
+      m_TileSpriteIndex: 0
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
   - first: {x: 23, y: 12, z: 0}
     second:
       m_TileIndex: 1
@@ -621,6 +720,33 @@ Tilemap:
       m_ObjectToInstantiate: {fileID: 0}
       m_TileFlags: 1
       m_ColliderType: 1
+  - first: {x: 6, y: 13, z: 0}
+    second:
+      m_TileIndex: 0
+      m_TileSpriteIndex: 0
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 12, y: 13, z: 0}
+    second:
+      m_TileIndex: 0
+      m_TileSpriteIndex: 0
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 16, y: 13, z: 0}
+    second:
+      m_TileIndex: 0
+      m_TileSpriteIndex: 0
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
   - first: {x: 23, y: 13, z: 0}
     second:
       m_TileIndex: 1
@@ -639,6 +765,33 @@ Tilemap:
       m_ObjectToInstantiate: {fileID: 0}
       m_TileFlags: 1
       m_ColliderType: 1
+  - first: {x: 6, y: 14, z: 0}
+    second:
+      m_TileIndex: 0
+      m_TileSpriteIndex: 0
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 11, y: 14, z: 0}
+    second:
+      m_TileIndex: 0
+      m_TileSpriteIndex: 0
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 16, y: 14, z: 0}
+    second:
+      m_TileIndex: 0
+      m_TileSpriteIndex: 0
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
   - first: {x: 23, y: 14, z: 0}
     second:
       m_TileIndex: 1
@@ -657,6 +810,33 @@ Tilemap:
       m_ObjectToInstantiate: {fileID: 0}
       m_TileFlags: 1
       m_ColliderType: 1
+  - first: {x: 6, y: 15, z: 0}
+    second:
+      m_TileIndex: 0
+      m_TileSpriteIndex: 0
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 10, y: 15, z: 0}
+    second:
+      m_TileIndex: 0
+      m_TileSpriteIndex: 0
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 16, y: 15, z: 0}
+    second:
+      m_TileIndex: 0
+      m_TileSpriteIndex: 0
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
   - first: {x: 23, y: 15, z: 0}
     second:
       m_TileIndex: 1
@@ -675,6 +855,33 @@ Tilemap:
       m_ObjectToInstantiate: {fileID: 0}
       m_TileFlags: 1
       m_ColliderType: 1
+  - first: {x: 6, y: 16, z: 0}
+    second:
+      m_TileIndex: 0
+      m_TileSpriteIndex: 0
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 9, y: 16, z: 0}
+    second:
+      m_TileIndex: 0
+      m_TileSpriteIndex: 0
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 16, y: 16, z: 0}
+    second:
+      m_TileIndex: 0
+      m_TileSpriteIndex: 0
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
   - first: {x: 23, y: 16, z: 0}
     second:
       m_TileIndex: 1

Assets/Prefabs/Rooms/SpecialRoom/Room Item.prefab.meta

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

Assets/Prefabs/Tetrimino/TetriminoBoss.prefab

@@ -36,7 +36,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4326677061616058}
-  - component: {fileID: 114953302277862202}
+  - component: {fileID: 114725924278317946}
   m_Layer: 0
   m_Name: TetriminoBoss
   m_TagString: Tetrimino
@@ -87,8 +87,8 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
---- !u!114 &114953302277862202
+  specialRoomType: 5
+--- !u!114 &114725924278317946
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -96,7 +96,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1690644780631946}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fd1dc16b46613744db6b1b22af43a6d0, type: 3}
+  m_Script: {fileID: 11500000, guid: 1a5e689aa2f6ba040908d66cf6e49094, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   mapCoord: {x: 0, y: 0, z: 0}
@@ -106,6 +106,8 @@ MonoBehaviour:
   tetriminoType: 7
   rooms:
   - {fileID: 114058333184934226}
+  rotatedAngle: 0
+  rotatedPosition: 00000000000000000000000000000000
 --- !u!212 &212305400664589542
 SpriteRenderer:
   m_ObjectHideFlags: 1

Assets/Prefabs/TetrisMap/Ghost.prefab.meta

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

Assets/Prefabs/TetrisMap/Room.prefab.meta

 fileFormatVersion: 2
-guid: 550ebad07a64bef4f8fac7a12941a8e5
+guid: 753bff13f4681a1409c96a1726be8907
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 100100000

Assets/Scripts/GameManager.cs

@@ -19,7 +19,7 @@ public class GameManager : MonoBehaviour {
         TS.MakeInitialTetrimino();
         Vector2 coord = GameObject.Find("MapManager").GetComponent<MapManager>().startRoom.transform.position;
 
-        GameObject.Find("Player").transform.position = new Vector2(coord.x, coord.y) + new Vector2(3, 3);
+        //GameObject.Find("Player").transform.position = new Vector2(coord.x, coord.y) + new Vector2(3, 3);
 
     }
 	

Assets/Scripts/TetrisMap/Room.cs

@@ -31,11 +31,12 @@ public class Room : MonoBehaviour
     /// <summary>
     /// Item room type per rooms.
     /// 0 for normal room, 1~ for item rooms.
+    /// </summary>
     public int itemRoomType;
     /// <summary>
     /// Enum for special room types.
     /// </summary>
-    public enum SpecialRoomType { Boss, BothSide, Gold, Amethyst, Start, Normal };
+    public enum SpecialRoomType { Start, Item, BothSide, Gold, Amethyst, Boss, Normal };
     /// <summary>
     /// Special room types.
     /// </summary>