고스트 오류 수정 및 드랍 구현 중

Assets/Prefabs/Ghost/GhostBoss.prefab

@@ -19,7 +19,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4120551927955160}
-  - component: {fileID: 114458326850872552}
+  - component: {fileID: 114905444694596716}
   m_Layer: 0
   m_Name: GhostBoss
   m_TagString: Tetrimino
@@ -88,7 +88,7 @@ MonoBehaviour:
   roomConcept: 0
   itemRoomType: 0
   specialRoomType: 0
---- !u!114 &114458326850872552
+--- !u!114 &114905444694596716
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -96,13 +96,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 1312529591873478}
   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}
   stage: 0
   roomConcept: 0
-  isBossTetrimino: 1
+  isBossTetrimino: 0
   tetriminoType: 7
   rooms:
   - {fileID: 114210848111338228}

Assets/Prefabs/Ghost/GhostI.prefab

@@ -36,7 +36,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4700813665444484}
-  - component: {fileID: 114517435805933300}
+  - component: {fileID: 114053834765157022}
   m_Layer: 0
   m_Name: GhostI
   m_TagString: Tetrimino
@@ -164,7 +164,7 @@ Transform:
   m_Father: {fileID: 4700813665444484}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &114517435805933300
+--- !u!114 &114053834765157022
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -172,7 +172,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1452542325203808}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6178b7e82dee01944993bbfb219fd0e6, type: 3}
+  m_Script: {fileID: 11500000, guid: 1a5e689aa2f6ba040908d66cf6e49094, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   mapCoord: {x: 0, y: 0, z: 0}

Assets/Prefabs/Ghost/GhostJ.prefab

@@ -19,7 +19,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4613034161563098}
-  - component: {fileID: 114546815076901496}
+  - component: {fileID: 114537953624067400}
   m_Layer: 0
   m_Name: GhostJ
   m_TagString: Tetrimino
@@ -215,7 +215,7 @@ MonoBehaviour:
   roomConcept: 0
   itemRoomType: 0
   specialRoomType: 5
---- !u!114 &114546815076901496
+--- !u!114 &114537953624067400
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -223,7 +223,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1322275178024760}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6178b7e82dee01944993bbfb219fd0e6, type: 3}
+  m_Script: {fileID: 11500000, guid: 1a5e689aa2f6ba040908d66cf6e49094, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   mapCoord: {x: 0, y: 0, z: 0}

Assets/Prefabs/Ghost/GhostL.prefab

@@ -19,7 +19,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4123968600731942}
-  - component: {fileID: 114210295018602186}
+  - component: {fileID: 114736330393983872}
   m_Layer: 0
   m_Name: GhostL
   m_TagString: Tetrimino
@@ -181,35 +181,29 @@ MonoBehaviour:
   roomConcept: 0
   itemRoomType: 0
   specialRoomType: 5
---- !u!114 &114210295018602186
+--- !u!114 &114444901825431860
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1407138458382474}
+  m_GameObject: {fileID: 1577310839979162}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6178b7e82dee01944993bbfb219fd0e6, type: 3}
+  m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   mapCoord: {x: 0, y: 0, z: 0}
+  doorInfo: 
   stage: 0
   roomConcept: 0
-  isBossTetrimino: 0
-  tetriminoType: 4
-  rooms:
-  - {fileID: 114444901825431860}
-  - {fileID: 114531211212271318}
-  - {fileID: 114448766238683968}
-  - {fileID: 114062451358731410}
-  rotatedAngle: 0
-  rotatedPosition: 00000000000000000000000000000000
---- !u!114 &114444901825431860
+  itemRoomType: 0
+  specialRoomType: 5
+--- !u!114 &114448766238683968
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1577310839979162}
+  m_GameObject: {fileID: 1558523978774278}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
@@ -221,12 +215,12 @@ MonoBehaviour:
   roomConcept: 0
   itemRoomType: 0
   specialRoomType: 5
---- !u!114 &114448766238683968
+--- !u!114 &114531211212271318
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1558523978774278}
+  m_GameObject: {fileID: 1493468813248684}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
@@ -238,23 +232,29 @@ MonoBehaviour:
   roomConcept: 0
   itemRoomType: 0
   specialRoomType: 5
---- !u!114 &114531211212271318
+--- !u!114 &114736330393983872
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1493468813248684}
+  m_GameObject: {fileID: 1407138458382474}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
+  m_Script: {fileID: 11500000, guid: 1a5e689aa2f6ba040908d66cf6e49094, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   mapCoord: {x: 0, y: 0, z: 0}
-  doorInfo: 
   stage: 0
   roomConcept: 0
-  itemRoomType: 0
-  specialRoomType: 5
+  isBossTetrimino: 0
+  tetriminoType: 4
+  rooms:
+  - {fileID: 114444901825431860}
+  - {fileID: 114531211212271318}
+  - {fileID: 114448766238683968}
+  - {fileID: 114062451358731410}
+  rotatedAngle: 0
+  rotatedPosition: 00000000000000000000000000000000
 --- !u!212 &212097367559786514
 SpriteRenderer:
   m_ObjectHideFlags: 1

Assets/Prefabs/Ghost/GhostO.prefab

@@ -70,7 +70,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4098891831266246}
-  - component: {fileID: 114130124184006024}
+  - component: {fileID: 114947735366378556}
   m_Layer: 0
   m_Name: GhostO
   m_TagString: Tetrimino
@@ -181,35 +181,29 @@ MonoBehaviour:
   roomConcept: 0
   itemRoomType: 0
   specialRoomType: 5
---- !u!114 &114130124184006024
+--- !u!114 &114598567403949624
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1743565552658404}
+  m_GameObject: {fileID: 1310243996629154}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6178b7e82dee01944993bbfb219fd0e6, type: 3}
+  m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   mapCoord: {x: 0, y: 0, z: 0}
+  doorInfo: 
   stage: 0
   roomConcept: 0
-  isBossTetrimino: 0
-  tetriminoType: 1
-  rooms:
-  - {fileID: 114906670325013078}
-  - {fileID: 114956266064066172}
-  - {fileID: 114015669770348502}
-  - {fileID: 114598567403949624}
-  rotatedAngle: 0
-  rotatedPosition: 00000000000000000000000000000000
---- !u!114 &114598567403949624
+  itemRoomType: 0
+  specialRoomType: 5
+--- !u!114 &114906670325013078
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1310243996629154}
+  m_GameObject: {fileID: 1436033710741270}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
@@ -221,23 +215,29 @@ MonoBehaviour:
   roomConcept: 0
   itemRoomType: 0
   specialRoomType: 5
---- !u!114 &114906670325013078
+--- !u!114 &114947735366378556
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1436033710741270}
+  m_GameObject: {fileID: 1743565552658404}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
+  m_Script: {fileID: 11500000, guid: 1a5e689aa2f6ba040908d66cf6e49094, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   mapCoord: {x: 0, y: 0, z: 0}
-  doorInfo: 
   stage: 0
   roomConcept: 0
-  itemRoomType: 0
-  specialRoomType: 5
+  isBossTetrimino: 0
+  tetriminoType: 1
+  rooms:
+  - {fileID: 114906670325013078}
+  - {fileID: 114956266064066172}
+  - {fileID: 114015669770348502}
+  - {fileID: 114598567403949624}
+  rotatedAngle: 0
+  rotatedPosition: 00000000000000000000000000000000
 --- !u!114 &114956266064066172
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Prefabs/Ghost/GhostS.prefab

@@ -36,7 +36,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4141114817553280}
-  - component: {fileID: 114127382723504616}
+  - component: {fileID: 114899122583804542}
   m_Layer: 0
   m_Name: GhostS
   m_TagString: Tetrimino
@@ -181,35 +181,29 @@ MonoBehaviour:
   roomConcept: 0
   itemRoomType: 0
   specialRoomType: 5
---- !u!114 &114127382723504616
+--- !u!114 &114680466818262228
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1138400684481030}
+  m_GameObject: {fileID: 1081213943593638}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6178b7e82dee01944993bbfb219fd0e6, type: 3}
+  m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   mapCoord: {x: 0, y: 0, z: 0}
+  doorInfo: 
   stage: 0
   roomConcept: 0
-  isBossTetrimino: 0
-  tetriminoType: 5
-  rooms:
-  - {fileID: 114912133832314504}
-  - {fileID: 114784829791810660}
-  - {fileID: 114680466818262228}
-  - {fileID: 114119725928930278}
-  rotatedAngle: 0
-  rotatedPosition: 00000000000000000000000000000000
---- !u!114 &114680466818262228
+  itemRoomType: 0
+  specialRoomType: 5
+--- !u!114 &114784829791810660
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1081213943593638}
+  m_GameObject: {fileID: 1881918438443356}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
@@ -221,23 +215,29 @@ MonoBehaviour:
   roomConcept: 0
   itemRoomType: 0
   specialRoomType: 5
---- !u!114 &114784829791810660
+--- !u!114 &114899122583804542
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1881918438443356}
+  m_GameObject: {fileID: 1138400684481030}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
+  m_Script: {fileID: 11500000, guid: 1a5e689aa2f6ba040908d66cf6e49094, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   mapCoord: {x: 0, y: 0, z: 0}
-  doorInfo: 
   stage: 0
   roomConcept: 0
-  itemRoomType: 0
-  specialRoomType: 5
+  isBossTetrimino: 0
+  tetriminoType: 5
+  rooms:
+  - {fileID: 114912133832314504}
+  - {fileID: 114784829791810660}
+  - {fileID: 114680466818262228}
+  - {fileID: 114119725928930278}
+  rotatedAngle: 0
+  rotatedPosition: 00000000000000000000000000000000
 --- !u!114 &114912133832314504
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Prefabs/Ghost/GhostT.prefab

@@ -36,7 +36,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4700052749380560}
-  - component: {fileID: 114092561358859646}
+  - component: {fileID: 114189149810088422}
   m_Layer: 0
   m_Name: GhostT
   m_TagString: Tetrimino
@@ -164,46 +164,46 @@ Transform:
   m_Father: {fileID: 4700052749380560}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &114092561358859646
+--- !u!114 &114176652732079518
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1778553666691550}
+  m_GameObject: {fileID: 1542167045302908}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6178b7e82dee01944993bbfb219fd0e6, type: 3}
+  m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   mapCoord: {x: 0, y: 0, z: 0}
+  doorInfo: 
   stage: 0
   roomConcept: 0
-  isBossTetrimino: 0
-  tetriminoType: 2
-  rooms:
-  - {fileID: 114791520742199662}
-  - {fileID: 114284208054585426}
-  - {fileID: 114567680594745634}
-  - {fileID: 114176652732079518}
-  rotatedAngle: 0
-  rotatedPosition: 00000000000000000000000000000000
---- !u!114 &114176652732079518
+  itemRoomType: 0
+  specialRoomType: 5
+--- !u!114 &114189149810088422
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1542167045302908}
+  m_GameObject: {fileID: 1778553666691550}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
+  m_Script: {fileID: 11500000, guid: 1a5e689aa2f6ba040908d66cf6e49094, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   mapCoord: {x: 0, y: 0, z: 0}
-  doorInfo: 
   stage: 0
   roomConcept: 0
-  itemRoomType: 0
-  specialRoomType: 5
+  isBossTetrimino: 0
+  tetriminoType: 2
+  rooms:
+  - {fileID: 114791520742199662}
+  - {fileID: 114284208054585426}
+  - {fileID: 114567680594745634}
+  - {fileID: 114176652732079518}
+  rotatedAngle: 0
+  rotatedPosition: 00000000000000000000000000000000
 --- !u!114 &114284208054585426
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Prefabs/Ghost/GhostZ.prefab

@@ -70,7 +70,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4716984633859238}
-  - component: {fileID: 114437822575329484}
+  - component: {fileID: 114714828130834384}
   m_Layer: 0
   m_Name: GhostZ
   m_TagString: Tetrimino
@@ -198,7 +198,7 @@ MonoBehaviour:
   roomConcept: 0
   itemRoomType: 0
   specialRoomType: 5
---- !u!114 &114437822575329484
+--- !u!114 &114714828130834384
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -206,7 +206,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1660984219625002}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6178b7e82dee01944993bbfb219fd0e6, type: 3}
+  m_Script: {fileID: 11500000, guid: 1a5e689aa2f6ba040908d66cf6e49094, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   mapCoord: {x: 0, y: 0, z: 0}
@@ -215,10 +215,10 @@ MonoBehaviour:
   isBossTetrimino: 0
   tetriminoType: 6
   rooms:
+  - {fileID: 114733784849854298}
   - {fileID: 114201829585522972}
   - {fileID: 114846600314032394}
   - {fileID: 114122411231735484}
-  - {fileID: 114733784849854298}
   rotatedAngle: 0
   rotatedPosition: 00000000000000000000000000000000
 --- !u!114 &114733784849854298

Assets/Prefabs/MapManager.prefab

@@ -54,20 +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: 114608209787691684, guid: 702a2175c3762fd4b9bc1fac0357a1a0, type: 2}
-  itemRoomList: []
   specialRoomList:
-  - {fileID: 114076836714455396, guid: 1ec0004bbafe6764d9462251b866e6e6, 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: 114495009210863316, guid: 4b147f1162668f44aa55982681399aec, type: 2}
+  - {fileID: 114076836714455396, guid: 1ec0004bbafe6764d9462251b866e6e6, type: 2}
+  controlCurrentTetrimino: 0
+  startRoom: {fileID: 0}

Assets/Prefabs/Rooms/ItemRoom.meta

-fileFormatVersion: 2
-guid: 0aa1c86779a88b84fb24b8cbe899753a
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  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/Tetrimino/TetriminoI.prefab

@@ -87,7 +87,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4885249480576364}
-  - component: {fileID: 114851979720776072}
+  - component: {fileID: 114984013789810744}
   m_Layer: 0
   m_Name: TetriminoI
   m_TagString: Tetrimino
@@ -180,7 +180,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 5
+  specialRoomType: 6
 --- !u!114 &114323397412866622
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -197,7 +197,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 5
+  specialRoomType: 6
 --- !u!114 &114753577101051656
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -214,45 +214,47 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 5
---- !u!114 &114851979720776072
+  specialRoomType: 6
+--- !u!114 &114896605901929710
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1986824515730090}
+  m_GameObject: {fileID: 1215456992061978}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6178b7e82dee01944993bbfb219fd0e6, type: 3}
+  m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   mapCoord: {x: 0, y: 0, z: 0}
+  doorInfo: 
   stage: 0
   roomConcept: 0
-  isBossTetrimino: 0
-  tetriminoType: 0
-  rooms:
-  - {fileID: 114128992769977540}
-  - {fileID: 114753577101051656}
-  - {fileID: 114896605901929710}
-  - {fileID: 114323397412866622}
---- !u!114 &114896605901929710
+  itemRoomType: 0
+  specialRoomType: 6
+--- !u!114 &114984013789810744
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1215456992061978}
+  m_GameObject: {fileID: 1986824515730090}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
+  m_Script: {fileID: 11500000, guid: 1a5e689aa2f6ba040908d66cf6e49094, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   mapCoord: {x: 0, y: 0, z: 0}
-  doorInfo: 
   stage: 0
   roomConcept: 0
-  itemRoomType: 0
-  specialRoomType: 5
+  isBossTetrimino: 0
+  tetriminoType: 0
+  rooms:
+  - {fileID: 114128992769977540}
+  - {fileID: 114753577101051656}
+  - {fileID: 114896605901929710}
+  - {fileID: 114323397412866622}
+  rotatedAngle: 0
+  rotatedPosition: 00000000000000000000000000000000
 --- !u!212 &212152418876382836
 SpriteRenderer:
   m_ObjectHideFlags: 1

Assets/Prefabs/Tetrimino/TetriminoJ.prefab

@@ -19,7 +19,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4932166892105634}
-  - component: {fileID: 114826030636358216}
+  - component: {fileID: 114102666305218160}
   m_Layer: 0
   m_Name: TetriminoJ
   m_TagString: Tetrimino
@@ -180,30 +180,36 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 5
---- !u!114 &114163463770396558
+  specialRoomType: 6
+--- !u!114 &114102666305218160
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1742200576591358}
+  m_GameObject: {fileID: 1058256109692646}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
+  m_Script: {fileID: 11500000, guid: 1a5e689aa2f6ba040908d66cf6e49094, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   mapCoord: {x: 0, y: 0, z: 0}
-  doorInfo: 
   stage: 0
   roomConcept: 0
-  itemRoomType: 0
-  specialRoomType: 5
---- !u!114 &114466843507187060
+  isBossTetrimino: 0
+  tetriminoType: 3
+  rooms:
+  - {fileID: 114026131151242260}
+  - {fileID: 114163463770396558}
+  - {fileID: 114787691033818184}
+  - {fileID: 114466843507187060}
+  rotatedAngle: 0
+  rotatedPosition: 00000000000000000000000000000000
+--- !u!114 &114163463770396558
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1822010819307074}
+  m_GameObject: {fileID: 1742200576591358}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
@@ -214,13 +220,13 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 5
---- !u!114 &114787691033818184
+  specialRoomType: 6
+--- !u!114 &114466843507187060
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1099210194409224}
+  m_GameObject: {fileID: 1822010819307074}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
@@ -231,28 +237,24 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 5
---- !u!114 &114826030636358216
+  specialRoomType: 6
+--- !u!114 &114787691033818184
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1058256109692646}
+  m_GameObject: {fileID: 1099210194409224}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6178b7e82dee01944993bbfb219fd0e6, type: 3}
+  m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   mapCoord: {x: 0, y: 0, z: 0}
+  doorInfo: 
   stage: 0
   roomConcept: 0
-  isBossTetrimino: 0
-  tetriminoType: 3
-  rooms:
-  - {fileID: 114026131151242260}
-  - {fileID: 114163463770396558}
-  - {fileID: 114787691033818184}
-  - {fileID: 114466843507187060}
+  itemRoomType: 0
+  specialRoomType: 6
 --- !u!212 &212099572598103474
 SpriteRenderer:
   m_ObjectHideFlags: 1

Assets/Prefabs/Tetrimino/TetriminoL.prefab

@@ -36,7 +36,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4673972717886742}
-  - component: {fileID: 114568813863931164}
+  - component: {fileID: 114580369929242780}
   m_Layer: 0
   m_Name: TetriminoL
   m_TagString: Tetrimino
@@ -180,7 +180,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 5
+  specialRoomType: 6
 --- !u!114 &114135637264954520
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -197,7 +197,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 5
+  specialRoomType: 6
 --- !u!114 &114317610525364840
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -214,7 +214,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 5
+  specialRoomType: 6
 --- !u!114 &114346591663730294
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -231,8 +231,8 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 5
---- !u!114 &114568813863931164
+  specialRoomType: 6
+--- !u!114 &114580369929242780
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -240,7 +240,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1409840693504816}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6178b7e82dee01944993bbfb219fd0e6, type: 3}
+  m_Script: {fileID: 11500000, guid: 1a5e689aa2f6ba040908d66cf6e49094, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   mapCoord: {x: 0, y: 0, z: 0}
@@ -253,6 +253,8 @@ MonoBehaviour:
   - {fileID: 114135637264954520}
   - {fileID: 114317610525364840}
   - {fileID: 114077791275824818}
+  rotatedAngle: 0
+  rotatedPosition: 00000000000000000000000000000000
 --- !u!212 &212148613173218532
 SpriteRenderer:
   m_ObjectHideFlags: 1

Assets/Prefabs/Tetrimino/TetriminoO.prefab

@@ -70,7 +70,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4122900828095350}
-  - component: {fileID: 114426654816215182}
+  - component: {fileID: 114050247151628558}
   m_Layer: 0
   m_Name: TetriminoO
   m_TagString: Tetrimino
@@ -164,29 +164,35 @@ Transform:
   m_Father: {fileID: 4122900828095350}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &114152283449124112
+--- !u!114 &114050247151628558
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1821233894851780}
+  m_GameObject: {fileID: 1599875259397162}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
+  m_Script: {fileID: 11500000, guid: 1a5e689aa2f6ba040908d66cf6e49094, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   mapCoord: {x: 0, y: 0, z: 0}
-  doorInfo: 
   stage: 0
   roomConcept: 0
-  itemRoomType: 0
-  specialRoomType: 5
---- !u!114 &114213829136544718
+  isBossTetrimino: 0
+  tetriminoType: 1
+  rooms:
+  - {fileID: 114533639654252892}
+  - {fileID: 114213829136544718}
+  - {fileID: 114908975501692068}
+  - {fileID: 114152283449124112}
+  rotatedAngle: 0
+  rotatedPosition: 00000000000000000000000000000000
+--- !u!114 &114152283449124112
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1419486603488018}
+  m_GameObject: {fileID: 1821233894851780}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
@@ -197,28 +203,24 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 5
---- !u!114 &114426654816215182
+  specialRoomType: 6
+--- !u!114 &114213829136544718
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1599875259397162}
+  m_GameObject: {fileID: 1419486603488018}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6178b7e82dee01944993bbfb219fd0e6, type: 3}
+  m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   mapCoord: {x: 0, y: 0, z: 0}
+  doorInfo: 
   stage: 0
   roomConcept: 0
-  isBossTetrimino: 0
-  tetriminoType: 1
-  rooms:
-  - {fileID: 114533639654252892}
-  - {fileID: 114213829136544718}
-  - {fileID: 114908975501692068}
-  - {fileID: 114152283449124112}
+  itemRoomType: 0
+  specialRoomType: 6
 --- !u!114 &114533639654252892
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -235,7 +237,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 5
+  specialRoomType: 6
 --- !u!114 &114908975501692068
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -252,7 +254,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 5
+  specialRoomType: 6
 --- !u!212 &212207191686043862
 SpriteRenderer:
   m_ObjectHideFlags: 1

Assets/Prefabs/Tetrimino/TetriminoS.prefab

@@ -19,7 +19,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4471651650155636}
-  - component: {fileID: 114491658978157548}
+  - component: {fileID: 114735100100628106}
   m_Layer: 0
   m_Name: TetriminoS
   m_TagString: Tetrimino
@@ -180,7 +180,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 5
+  specialRoomType: 6
 --- !u!114 &114184053320687194
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -197,7 +197,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 5
+  specialRoomType: 6
 --- !u!114 &114316302151506316
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -214,8 +214,8 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 5
---- !u!114 &114491658978157548
+  specialRoomType: 6
+--- !u!114 &114735100100628106
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -223,7 +223,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1051411815441030}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6178b7e82dee01944993bbfb219fd0e6, type: 3}
+  m_Script: {fileID: 11500000, guid: 1a5e689aa2f6ba040908d66cf6e49094, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   mapCoord: {x: 0, y: 0, z: 0}
@@ -236,6 +236,8 @@ MonoBehaviour:
   - {fileID: 114316302151506316}
   - {fileID: 114184053320687194}
   - {fileID: 114958419371570988}
+  rotatedAngle: 0
+  rotatedPosition: 00000000000000000000000000000000
 --- !u!114 &114958419371570988
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -252,7 +254,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 5
+  specialRoomType: 6
 --- !u!212 &212368084699848572
 SpriteRenderer:
   m_ObjectHideFlags: 1

Assets/Prefabs/Tetrimino/TetriminoT.prefab

@@ -19,7 +19,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4747878049517392}
-  - component: {fileID: 114813872723638092}
+  - component: {fileID: 114136320919795954}
   m_Layer: 0
   m_Name: TetriminoT
   m_TagString: Tetrimino
@@ -180,30 +180,36 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 5
---- !u!114 &114250342630536598
+  specialRoomType: 6
+--- !u!114 &114136320919795954
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1611631327942846}
+  m_GameObject: {fileID: 1216064749225226}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
+  m_Script: {fileID: 11500000, guid: 1a5e689aa2f6ba040908d66cf6e49094, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   mapCoord: {x: 0, y: 0, z: 0}
-  doorInfo: 
   stage: 0
   roomConcept: 0
-  itemRoomType: 0
-  specialRoomType: 5
---- !u!114 &114555629497930862
+  isBossTetrimino: 0
+  tetriminoType: 2
+  rooms:
+  - {fileID: 114609423914388260}
+  - {fileID: 114555629497930862}
+  - {fileID: 114250342630536598}
+  - {fileID: 114030767890393412}
+  rotatedAngle: 0
+  rotatedPosition: 00000000000000000000000000000000
+--- !u!114 &114250342630536598
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1456641584809498}
+  m_GameObject: {fileID: 1611631327942846}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
@@ -214,13 +220,13 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 5
---- !u!114 &114609423914388260
+  specialRoomType: 6
+--- !u!114 &114555629497930862
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1395965772409232}
+  m_GameObject: {fileID: 1456641584809498}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
@@ -231,28 +237,24 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 5
---- !u!114 &114813872723638092
+  specialRoomType: 6
+--- !u!114 &114609423914388260
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1216064749225226}
+  m_GameObject: {fileID: 1395965772409232}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6178b7e82dee01944993bbfb219fd0e6, type: 3}
+  m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   mapCoord: {x: 0, y: 0, z: 0}
+  doorInfo: 
   stage: 0
   roomConcept: 0
-  isBossTetrimino: 0
-  tetriminoType: 2
-  rooms:
-  - {fileID: 114609423914388260}
-  - {fileID: 114555629497930862}
-  - {fileID: 114250342630536598}
-  - {fileID: 114030767890393412}
+  itemRoomType: 0
+  specialRoomType: 6
 --- !u!212 &212172714904819908
 SpriteRenderer:
   m_ObjectHideFlags: 1

Assets/Prefabs/Tetrimino/TetriminoZ.prefab

@@ -36,7 +36,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4236268032666254}
-  - component: {fileID: 114116348516849362}
+  - component: {fileID: 114659339528811892}
   m_Layer: 0
   m_Name: TetriminoZ
   m_TagString: Tetrimino
@@ -180,45 +180,47 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 5
---- !u!114 &114116348516849362
+  specialRoomType: 6
+--- !u!114 &114253788358578218
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1597348377621660}
+  m_GameObject: {fileID: 1772186685877324}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6178b7e82dee01944993bbfb219fd0e6, type: 3}
+  m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   mapCoord: {x: 0, y: 0, z: 0}
+  doorInfo: 
   stage: 0
   roomConcept: 0
-  isBossTetrimino: 0
-  tetriminoType: 6
-  rooms:
-  - {fileID: 114930072884505966}
-  - {fileID: 114970417993025404}
-  - {fileID: 114042954375696702}
-  - {fileID: 114253788358578218}
---- !u!114 &114253788358578218
+  itemRoomType: 0
+  specialRoomType: 6
+--- !u!114 &114659339528811892
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1772186685877324}
+  m_GameObject: {fileID: 1597348377621660}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
+  m_Script: {fileID: 11500000, guid: 1a5e689aa2f6ba040908d66cf6e49094, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   mapCoord: {x: 0, y: 0, z: 0}
-  doorInfo: 
   stage: 0
   roomConcept: 0
-  itemRoomType: 0
-  specialRoomType: 5
+  isBossTetrimino: 0
+  tetriminoType: 6
+  rooms:
+  - {fileID: 114253788358578218}
+  - {fileID: 114930072884505966}
+  - {fileID: 114970417993025404}
+  - {fileID: 114042954375696702}
+  rotatedAngle: 0
+  rotatedPosition: 00000000000000000000000000000000
 --- !u!114 &114930072884505966
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -235,7 +237,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 5
+  specialRoomType: 6
 --- !u!114 &114970417993025404
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -252,7 +254,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 5
+  specialRoomType: 6
 --- !u!212 &212024274712184554
 SpriteRenderer:
   m_ObjectHideFlags: 1

Assets/Prefabs/TetrisMap/Room.prefab

@@ -57,7 +57,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 5
+  specialRoomType: 0
 --- !u!212 &212869044712785006
 SpriteRenderer:
   m_ObjectHideFlags: 1

Assets/Prefabs/TetrisMap/TetriminoSpawner.prefab

@@ -52,13 +52,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   tetriminoes:
-  - {fileID: 114851979720776072, guid: ae83e2da964009040b28d5cf2dc0c005, type: 2}
-  - {fileID: 114826030636358216, guid: 1f5bb4ba4a682f14daf423ec3826f307, type: 2}
-  - {fileID: 114568813863931164, guid: 7b6deb9891716bf4dab3b397f5e07ae6, type: 2}
-  - {fileID: 114426654816215182, guid: 5fe7b9cfe8ee4ef45ba6caae7bfcdd3c, type: 2}
-  - {fileID: 114491658978157548, guid: 5103895df6a85964aa1f8aaeb7115696, type: 2}
-  - {fileID: 114813872723638092, guid: dfde2a88976e71b45b094b126823a49f, type: 2}
-  - {fileID: 114116348516849362, guid: 40858eb0c94aa6c45be70d235179724b, type: 2}
-  - {fileID: 114953302277862202, guid: bd086e7cd95d6774583cbacdf6d8e445, type: 2}
-  ghostRoom: {fileID: 114797574393229602, guid: a60932c06704df540adaf84e1482c1d6,
-    type: 2}
+  - {fileID: 114984013789810744, guid: ae83e2da964009040b28d5cf2dc0c005, type: 2}
+  - {fileID: 114102666305218160, guid: 1f5bb4ba4a682f14daf423ec3826f307, type: 2}
+  - {fileID: 114580369929242780, guid: 7b6deb9891716bf4dab3b397f5e07ae6, type: 2}
+  - {fileID: 114050247151628558, guid: 5fe7b9cfe8ee4ef45ba6caae7bfcdd3c, type: 2}
+  - {fileID: 114735100100628106, guid: 5103895df6a85964aa1f8aaeb7115696, type: 2}
+  - {fileID: 114136320919795954, guid: dfde2a88976e71b45b094b126823a49f, type: 2}
+  - {fileID: 114659339528811892, guid: 40858eb0c94aa6c45be70d235179724b, type: 2}
+  - {fileID: 114725924278317946, guid: bd086e7cd95d6774583cbacdf6d8e445, type: 2}
+  ghosts:
+  - {fileID: 114053834765157022, guid: 4422a70761bf0ac4884c66372948586e, type: 2}
+  - {fileID: 114537953624067400, guid: d5817275e3767a64781b72bcebb0ef8a, type: 2}
+  - {fileID: 114736330393983872, guid: 47e8f93d4209f34478b17a16248c8d0b, type: 2}
+  - {fileID: 114947735366378556, guid: 8344e57989c72184ab94ae0131761045, type: 2}
+  - {fileID: 114899122583804542, guid: c9c06793c7ca051448105a02e6071c28, type: 2}
+  - {fileID: 114189149810088422, guid: 325dd059e71f73542b872ad9735499c9, type: 2}
+  - {fileID: 114714828130834384, guid: 818f089e5ff4b8a4aa2cbb5570f5f36e, type: 2}
+  - {fileID: 114905444694596716, guid: e494db59dc163164da23ae1ad850f540, type: 2}

Assets/Scripts/TetrisMap/MapManager.cs

@@ -21,13 +21,15 @@ public class MapManager : MonoBehaviour {
     /// <summary>
     /// Tetrimino falling speed.
     /// </summary>
-    public float speed;
+    public float fallSpeed = -0.1f;
+    public float initialFallSpeed = -0.1f;
     /// <summary>
     /// Tetrimino falling gravity.
     /// </summary>
-    public float gravity;
+    public float gravity = 0.98f;
     public float collapseTime;
     public float fallTime;
+    float initialFallTime;
 
     public static int height = 24, width = 10, realHeight = height - 5;
 
@@ -67,10 +69,10 @@ public class MapManager : MonoBehaviour {
     /// List for the normal Room candidates.
     /// </summary>
     public RoomInGame[] normalRoomList;
-    /// <summary>
+    /*/// <summary>
     /// List for the item Room candidates.
     /// </summary>
-    public RoomInGame[] itemRoomList;
+    public RoomInGame[] itemRoomList;*/
     /// <summary>
     /// List for the special Room candidates.
     /// </summary>
@@ -330,12 +332,6 @@ public class MapManager : MonoBehaviour {
         }
         te.mapCoord += coord;
     }
-
-
-
-
-
-    //완성해야됨
     /// <summary>
     /// Get tetrimino's mapCoord down.
     /// </summary>
@@ -349,6 +345,7 @@ public class MapManager : MonoBehaviour {
         }
         MoveTetriminoMapCoord(te, new Vector3(0, 1, 0));
         isTetriminoFalling = true;
+        initialFallTime = Time.time;
         StartCoroutine(TetriminoDown(te));
         //EndTetrimino(currentTetrimino);
     }
@@ -359,6 +356,7 @@ public class MapManager : MonoBehaviour {
     public void EndTetrimino(Tetrimino te)
     {
         te.transform.position = new Vector3(te.mapCoord.x * tetrisMapSize, tetrisYCoord[(int)te.mapCoord.y], te.mapCoord.z * tetrisMapSize);
+        fallSpeed = initialFallSpeed;
         UpdateMap(te);
         CreateRoom(te);
         DeleteFullRows();
@@ -374,8 +372,10 @@ public class MapManager : MonoBehaviour {
     {
         while(te.transform.position.y > tetrisYCoord[(int)te.mapCoord.y])
         {
-            yield return new WaitForSeconds(0.2f);
-            te.transform.position += new Vector3(0, -24, 0);
+            yield return new WaitForSeconds(0.01f);
+            fallTime = Time.time - initialFallTime;
+            fallSpeed += gravity * fallTime * fallTime;
+            te.transform.position += new Vector3(0, -fallSpeed, 0);
         }
         EndTetrimino(currentTetrimino);
     }
@@ -400,11 +400,6 @@ public class MapManager : MonoBehaviour {
         }
         MoveTetriminoMapCoord(ghost, new Vector3(0, 1, 0));
     }
-    //완성해야됨
-
-
-        
-
     /// <summary>
     /// Press Left arrow/Right arrow to move left/right, Space to drop.
     /// </summary>
@@ -454,20 +449,21 @@ public class MapManager : MonoBehaviour {
             UpdateMap(currentTetrimino);
             te.rooms[i].transform.parent = grid;
             te.rooms[i].transform.position += new Vector3(0, 0, -2);
-            if (te.rooms[i].itemRoomType != 0) ;
-            else if (te.rooms[i].specialRoomType != Room.SpecialRoomType.Normal)
+            if (te.rooms[i].specialRoomType != Room.SpecialRoomType.Normal)
+            {
                 Instantiate(specialRoomList[(int)te.rooms[i].specialRoomType], te.rooms[i].transform.position + new Vector3(0, 0, 2), Quaternion.identity, te.rooms[i].transform);
+            }
             else
                 Instantiate(normalRoomList[Random.Range(0, normalRoomList.Length)], te.rooms[i].transform.position + new Vector3(0, 0, 2), Quaternion.identity, te.rooms[i].transform);
         }
         Destroy(te.gameObject);
     }
+    /*public void UpgradeRoom(Tetrimino te, Room.SpecialRoomType)
+    {
 
-    /*
-     * Test
-     * */
+    }*/
 
-    void Awake()
+    void Awake ()
     {
         Tetrimino.rotationInformation[0].horizontalLength = new int[4] { 1, 4, 1, 4 };  //I
         Tetrimino.rotationInformation[1].horizontalLength = new int[4] { 2, 2, 2, 2 };  //O

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>

Assets/Scripts/TetrisMap/Tetrimino.meta

-fileFormatVersion: 2
-guid: 2b9e9b103377e744b9dd392046d30fc7
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/TetrisMap/Tetrimino/TetriminoBoss.cs

-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class TetriminoBoss : Tetrimino {
-
-    void Awake()
-    {
-        isBossTetrimino = true;
-    }
-}

Assets/Scripts/TetrisMap/Tetrimino/TetriminoBoss.cs.meta

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

Assets/Scripts/TetrisMap/Tetrimino/TetriminoNormal.cs

-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class TetriminoNormal : Tetrimino {
-    
-    /*
-     * functions
-     * */
-
-}

Assets/Scripts/TetrisMap/Tetrimino/TetriminoNormal.cs.meta

-fileFormatVersion: 2
-guid: 6178b7e82dee01944993bbfb219fd0e6
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: