씬까지 다 커밋

f97fea9f · 18손재민 · 4094ea8e · f97fea9f · f97fea9f · f97fea9f
Commit f97fea9f authored Sep 29, 2018 by 18손재민
9 changed files
--- a/Assets/Prefabs/TetrisMap/TetriminoSpawner.prefab
+++ b/Assets/Prefabs/TetrisMap/TetriminoSpawner.prefab
@@ -22,7 +22,7 @@ GameObject:
  - component: {fileID: 114524961967938888}
  m_Layer: 0
  m_Name: TetriminoSpawner
-  m_TagString: Untagged
+  m_TagString: TetriminoSpawner
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0

--- a/Assets/Scenes/PlayScene.unity
+++ b/Assets/Scenes/PlayScene.unity
@@ -155,89 +155,347 @@ Prefab:
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: f6ef1c586e7764c41ba8349325635589, type: 2}
  m_IsPrefabAsset: 0
--- !u!1001 &58200620
+--- !u!1 &274491169
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 274491171}
+  - component: {fileID: 274491170}
+  m_Layer: 0
+  m_Name: TestTools
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &274491170
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 274491169}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f70662cea9642244afe9d8a44fa3211, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &274491171
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 274491169}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 4.5, y: 10, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 16
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &404787030
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 404787031}
+  - component: {fileID: 404787034}
+  - component: {fileID: 404787033}
+  - component: {fileID: 404787032}
+  m_Layer: 5
+  m_Name: MakeBoss
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &404787031
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 404787030}
+  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: 943225372}
+  m_Father: {fileID: 425021404}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 400, y: 0}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &404787032
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 404787030}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 404787033}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 274491170}
+        m_MethodName: SpawnBossTetrimino
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: boss
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+--- !u!114 &404787033
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 404787030}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!222 &404787034
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 404787030}
+  m_CullTransparentMesh: 0
+--- !u!1001 &408423940
 Prefab:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Modification:
    m_TransformParent: {fileID: 0}
    m_Modifications:
-    - target: {fileID: 4856635854947610, guid: 9a0baa75e701da64b8e07ec03aa166a1, type: 2}
+    - target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
      propertyPath: m_LocalPosition.x
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 4856635854947610, guid: 9a0baa75e701da64b8e07ec03aa166a1, type: 2}
+    - target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
      propertyPath: m_LocalPosition.y
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 4856635854947610, guid: 9a0baa75e701da64b8e07ec03aa166a1, type: 2}
+    - target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
      propertyPath: m_LocalPosition.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 4856635854947610, guid: 9a0baa75e701da64b8e07ec03aa166a1, type: 2}
+    - target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
      propertyPath: m_LocalRotation.x
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 4856635854947610, guid: 9a0baa75e701da64b8e07ec03aa166a1, type: 2}
+    - target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
      propertyPath: m_LocalRotation.y
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 4856635854947610, guid: 9a0baa75e701da64b8e07ec03aa166a1, type: 2}
+    - target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
      propertyPath: m_LocalRotation.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 4856635854947610, guid: 9a0baa75e701da64b8e07ec03aa166a1, type: 2}
+    - target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
      propertyPath: m_LocalRotation.w
      value: 1
      objectReference: {fileID: 0}
-    - target: {fileID: 4856635854947610, guid: 9a0baa75e701da64b8e07ec03aa166a1, type: 2}
+    - target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
      propertyPath: m_RootOrder
      value: 1
      objectReference: {fileID: 0}
    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 9a0baa75e701da64b8e07ec03aa166a1, type: 2}
+  m_SourcePrefab: {fileID: 100100000, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
  m_IsPrefabAsset: 0
--- !u!1001 &408423940
+--- !u!1 &425021400
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 425021404}
+  - component: {fileID: 425021403}
+  - component: {fileID: 425021402}
+  - component: {fileID: 425021401}
+  m_Layer: 5
+  m_Name: tetrisMapCanvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &425021401
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 425021400}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &425021402
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 425021400}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+--- !u!223 &425021403
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 425021400}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!224 &425021404
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 425021400}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_Children:
+  - {fileID: 1967543486}
+  - {fileID: 404787031}
+  m_Father: {fileID: 0}
+  m_RootOrder: 11
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!1001 &433279376
 Prefab:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Modification:
    m_TransformParent: {fileID: 0}
    m_Modifications:
-    - target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
+    - target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2}
      propertyPath: m_LocalPosition.x
-      value: 0
+      value: 4.5
      objectReference: {fileID: 0}
-    - target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
+    - target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2}
      propertyPath: m_LocalPosition.y
-      value: 0
+      value: 10
      objectReference: {fileID: 0}
-    - target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
+    - target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2}
      propertyPath: m_LocalPosition.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
+    - target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2}
      propertyPath: m_LocalRotation.x
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
+    - target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2}
      propertyPath: m_LocalRotation.y
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
+    - target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2}
      propertyPath: m_LocalRotation.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
+    - target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2}
      propertyPath: m_LocalRotation.w
      value: 1
      objectReference: {fileID: 0}
-    - target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
+    - target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2}
      propertyPath: m_RootOrder
-      value: 2
+      value: 14
      objectReference: {fileID: 0}
    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
+  m_SourcePrefab: {fileID: 100100000, guid: 668207ef06c134e40b24375977c2c930, type: 2}
  m_IsPrefabAsset: 0
 --- !u!1 &519420028
 GameObject:
@@ -287,7 +545,7 @@ Camera:
  far clip plane: 1000
  field of view: 60
  orthographic: 1
-  orthographic size: 5
+  orthographic size: 11
  m_Depth: -1
  m_CullingMask:
    serializedVersion: 2
@@ -310,11 +568,11 @@ Transform:
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 519420028}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -10}
+  m_LocalPosition: {x: 4.5, y: 14, z: -10}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &695959412
 Prefab:
@@ -353,11 +611,190 @@ Prefab:
      objectReference: {fileID: 0}
    - target: {fileID: 4993480467195818, guid: cba9c4d8180e52145ab0ab6ff0678c10, type: 2}
      propertyPath: m_RootOrder
-      value: 8
+      value: 7
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: cba9c4d8180e52145ab0ab6ff0678c10, type: 2}
  m_IsPrefabAsset: 0
+--- !u!1001 &781926695
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4821016865928708, guid: afe4a2cb44239b649a3ffa70af5c2d84, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4821016865928708, guid: afe4a2cb44239b649a3ffa70af5c2d84, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4821016865928708, guid: afe4a2cb44239b649a3ffa70af5c2d84, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4821016865928708, guid: afe4a2cb44239b649a3ffa70af5c2d84, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4821016865928708, guid: afe4a2cb44239b649a3ffa70af5c2d84, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4821016865928708, guid: afe4a2cb44239b649a3ffa70af5c2d84, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4821016865928708, guid: afe4a2cb44239b649a3ffa70af5c2d84, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4821016865928708, guid: afe4a2cb44239b649a3ffa70af5c2d84, type: 2}
+      propertyPath: m_RootOrder
+      value: 15
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: afe4a2cb44239b649a3ffa70af5c2d84, type: 2}
+  m_IsPrefabAsset: 0
+--- !u!1 &826079602
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 826079605}
+  - component: {fileID: 826079604}
+  - component: {fileID: 826079603}
+  m_Layer: 0
+  m_Name: EventSystem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &826079603
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 826079602}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalAxis: Horizontal
+  m_VerticalAxis: Vertical
+  m_SubmitButton: Submit
+  m_CancelButton: Cancel
+  m_InputActionsPerSecond: 10
+  m_RepeatDelay: 0.5
+  m_ForceModuleActive: 0
+--- !u!114 &826079604
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 826079602}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_FirstSelected: {fileID: 0}
+  m_sendNavigationEvents: 1
+  m_DragThreshold: 10
+--- !u!4 &826079605
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 826079602}
+  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: 12
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &943225371
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 943225372}
+  - component: {fileID: 943225374}
+  - component: {fileID: 943225373}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &943225372
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 943225371}
+  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: 404787031}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &943225373
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 943225371}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Make Boss
+--- !u!222 &943225374
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 943225371}
+  m_CullTransparentMesh: 0
 --- !u!1001 &1025158475
 Prefab:
  m_ObjectHideFlags: 0
@@ -395,7 +832,7 @@ Prefab:
      objectReference: {fileID: 0}
    - target: {fileID: 4388258417166718, guid: 48d5863f34621bc4abab84b742407e5a, type: 2}
      propertyPath: m_RootOrder
-      value: 9
+      value: 8
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 48d5863f34621bc4abab84b742407e5a, type: 2}
@@ -437,7 +874,7 @@ Prefab:
      objectReference: {fileID: 0}
    - target: {fileID: 4613509870180406, guid: 54c1a7b414e41724197333a9e17dd49b, type: 2}
      propertyPath: m_RootOrder
-      value: 3
+      value: 2
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 54c1a7b414e41724197333a9e17dd49b, type: 2}
@@ -480,8 +917,83 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 11
+  m_RootOrder: 10
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1316295222
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1316295223}
+  - component: {fileID: 1316295225}
+  - component: {fileID: 1316295224}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1316295223
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1316295222}
+  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: 1967543486}
+  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1316295224
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1316295222}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Change
+--- !u!222 &1316295225
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1316295222}
+  m_CullTransparentMesh: 0
 --- !u!1001 &1501222773
 Prefab:
  m_ObjectHideFlags: 0
@@ -519,7 +1031,7 @@ Prefab:
      objectReference: {fileID: 0}
    - target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
      propertyPath: m_RootOrder
-      value: 7
+      value: 6
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
@@ -561,7 +1073,7 @@ Prefab:
      objectReference: {fileID: 0}
    - target: {fileID: 4763351520509106, guid: eee5e95837869204b89ebdea980073f1, type: 2}
      propertyPath: m_RootOrder
-      value: 5
+      value: 4
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: eee5e95837869204b89ebdea980073f1, type: 2}
@@ -603,7 +1115,7 @@ Prefab:
      objectReference: {fileID: 0}
    - target: {fileID: 4731340437899790, guid: a68e01f0fb856c94ebb4cbd2fd3b04d4, type: 2}
      propertyPath: m_RootOrder
-      value: 6
+      value: 5
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: a68e01f0fb856c94ebb4cbd2fd3b04d4, type: 2}
@@ -645,8 +1157,173 @@ Prefab:
      objectReference: {fileID: 0}
    - target: {fileID: 4984995512629892, guid: db8ba922663aef344b297c3c8755e633, type: 2}
      propertyPath: m_RootOrder
-      value: 10
+      value: 9
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: db8ba922663aef344b297c3c8755e633, type: 2}
  m_IsPrefabAsset: 0
+--- !u!1 &1967543485
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1967543486}
+  - component: {fileID: 1967543489}
+  - component: {fileID: 1967543488}
+  - component: {fileID: 1967543487}
+  m_Layer: 5
+  m_Name: Change
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1967543486
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1967543485}
+  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: 1316295223}
+  m_Father: {fileID: 425021404}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 400, y: -100}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1967543487
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1967543485}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1967543488}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 274491170}
+        m_MethodName: ChangeTetrimino
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+--- !u!114 &1967543488
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1967543485}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!222 &1967543489
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1967543485}
+  m_CullTransparentMesh: 0
+--- !u!1001 &2042136941
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4675487918418904, guid: 2e1b9fc1064aaf54487c99316fe18286, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4675487918418904, guid: 2e1b9fc1064aaf54487c99316fe18286, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4675487918418904, guid: 2e1b9fc1064aaf54487c99316fe18286, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4675487918418904, guid: 2e1b9fc1064aaf54487c99316fe18286, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4675487918418904, guid: 2e1b9fc1064aaf54487c99316fe18286, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4675487918418904, guid: 2e1b9fc1064aaf54487c99316fe18286, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4675487918418904, guid: 2e1b9fc1064aaf54487c99316fe18286, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4675487918418904, guid: 2e1b9fc1064aaf54487c99316fe18286, type: 2}
+      propertyPath: m_RootOrder
+      value: 13
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 2e1b9fc1064aaf54487c99316fe18286, type: 2}
+  m_IsPrefabAsset: 0
--- a/Assets/Scripts/TetrisMap/MapManager.cs
+++ b/Assets/Scripts/TetrisMap/MapManager.cs
@@ -36,7 +36,7 @@ public class MapManager : MonoBehaviour {
    /// <summary>
    /// Absolute coordinates on tetris map.
    /// </summary>
-    public static Room[,] mapCoord = new Room[width, height];
+    public static Room[,] mapGrid = new Room[width, height];
    /// <summary>
    /// Tetris Y axis coordinates on Unity.
    /// </summary>
@@ -84,9 +84,9 @@ public class MapManager : MonoBehaviour {
    {
        for (int i = 0; i < TE.rooms.Length; i++)
        {
-            if (TE.rooms[i].transform.position.x < mapLeftEnd.transform.position.x)
+            if (TE.rooms[i].mapCoord.x < 0)
                return -1;
-            else if (TE.rooms[i].transform.position.x > mapRightEnd.transform.position.x)
+            else if (TE.rooms[i].mapCoord.x > width - 1)
                return 1;
        }
        return 0;
@@ -101,17 +101,16 @@ public class MapManager : MonoBehaviour {
        {
            if (IsRightTetrimino(TE) == 1)
            {
-                TE.transform.position += new Vector3(-tetrisMapSize, 0, 0);
+                TE.mapCoord += new Vector3(-1, 0, 0);
            }
            else if (IsRightTetrimino(TE) == -1)
            {
-                TE.transform.position += new Vector3(tetrisMapSize, 0, 0);
+                TE.mapCoord += new Vector3(1, 0, 0);
            }
            else
                break;
        }
    }
-
    /// <summary>
    /// Delete one row.
    /// </summary>
@@ -120,8 +119,8 @@ public class MapManager : MonoBehaviour {
    {
        for(int x = 0; x < width; x++)
        {
-            Destroy(mapCoord[x, row].gameObject);
-            mapCoord[x, row] = null;
+            Destroy(mapGrid[x, row].gameObject);
+            mapGrid[x, row] = null;
        }
    }
    /// <summary>
@@ -134,8 +133,8 @@ public class MapManager : MonoBehaviour {
        {
            for(int x = 0; x < width; x++)
            {
-                mapCoord[x, y - 1] = mapCoord[x, y];
-                mapCoord[x, y] = null;
+                mapGrid[x, y - 1] = mapGrid[x, y];
+                mapGrid[x, y] = null;
            }
        }
    }
@@ -147,7 +146,7 @@ public class MapManager : MonoBehaviour {
    public static bool IsRowFull(int row)
    {
        for (int x = 0; x < width; x++)
-            if (mapCoord[x, row] != null && mapCoord[x, row].specialRoomType == Room.SpecialRoomType.Boss)
+            if (mapGrid[x, row] != null && mapGrid[x, row].specialRoomType == Room.SpecialRoomType.Boss)
                return false;
        return true;
    }
@@ -190,24 +189,49 @@ public class MapManager : MonoBehaviour {
    {

    }
-    public void TetriminoMove(Tetrimino TE)
+    /*public void TetriminoMove(Tetrimino TE)
    {
-        if(Input.GetKeyDown(KeyCode.LeftArrow) && inTetris)
+        if (Input.GetKeyDown(KeyCode.LeftArrow) && inTetris)
        {
            TE.transform.position += new Vector3(-tetrisMapSize, 0, 0);
-            if(IsRightTetrimino(TE) != 0)
+            if (IsRightTetrimino(TE) != 0)
                TE.transform.position += new Vector3(tetrisMapSize, 0, 0);
        }
-        else if(Input.GetKeyDown(KeyCode.RightArrow) && inTetris)
+        else if (Input.GetKeyDown(KeyCode.RightArrow) && inTetris)
        {
            TE.transform.position += new Vector3(tetrisMapSize, 0, 0);
            if (IsRightTetrimino(TE) != 0)
                TE.transform.position += new Vector3(-tetrisMapSize, 0, 0);
        }
+    }*/
+    public void TetriminoMove(Tetrimino TE)
+    {
+        if (Input.GetKeyDown(KeyCode.LeftArrow) && inTetris)
+        {
+            TE.mapCoord += new Vector3(-1, 0, 0);
+            SetRoomMapCoord(currentTetrimino);
+            if (IsRightTetrimino(TE) != 0)
+                TE.mapCoord += new Vector3(1, 0, 0);
+        }
+        else if (Input.GetKeyDown(KeyCode.RightArrow) && inTetris)
+        {
+            TE.mapCoord += new Vector3(1, 0, 0);
+            SetRoomMapCoord(currentTetrimino);
+            if (IsRightTetrimino(TE) != 0)
+                TE.mapCoord += new Vector3(-1, 0, 0);
+        }
+        SetRoomMapCoord(currentTetrimino);
    }
    public void TetriminoRotate(Tetrimino TE)
    {

+    }
+    public void SetRoomMapCoord(Tetrimino TE)
+    {
+        for (int i = 0; i < TE.rooms.Length; i++)
+        {
+            TE.rooms[i].mapCoord = TE.mapCoord + TE.rooms[i].transform.localPosition;
+        }
    }
    public void InitiateTetrimino()
    {
@@ -217,18 +241,15 @@ public class MapManager : MonoBehaviour {
    /*
     * Test
     * */
-    public void SpawnBossTetrimino()
-    {
-        spawnBossTetrimino = true;
-    }
+
    // Use this for initialization
    void Start () {
        inTetris = true;
    }

    // Update is called once per frame
-	void Update () {
+    void Update() {
        TetriminoMove(currentTetrimino);
+        currentTetrimino.transform.position = currentTetrimino.mapCoord * tetrisMapSize + tetrisMapCoord;
    }
-
 }
--- a/Assets/Scripts/TetrisMap/Room.cs
+++ b/Assets/Scripts/TetrisMap/Room.cs
@@ -11,7 +11,7 @@ public class Room : MonoBehaviour
    /// Room's Location on tetris map.
    /// Not related to real location.
    /// </summary>
-    public Vector3 mapLocation;
+    public Vector3 mapCoord;
    /// <summary>
    /// Door info per rooms.
    /// 0 for up, 1 for down.

--- a/Assets/Scripts/TetrisMap/Test.cs
+++ b/Assets/Scripts/TetrisMap/Test.cs
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Test : MonoBehaviour {
+
+
+    public void ChangeTetrimino()
+    {
+        var MM = GameObject.FindGameObjectWithTag("MapManager").GetComponent<MapManager>();
+        var TS = GameObject.FindGameObjectWithTag("TetriminoSpawner").GetComponent<TetriminoSpawner>();
+        Destroy(MM.currentTetrimino.gameObject);
+        TS.MakeTetrimino();
+    }
+    public void SpawnBossTetrimino()
+    {
+        var MM = GameObject.FindGameObjectWithTag("MapManager").GetComponent<MapManager>();
+        MM.spawnBossTetrimino = true;
+    }
+
+
+    // Use this for initialization
+    void Start () {
+		
+	}
+	
+	// Update is called once per frame
+	void Update () {
+		
+	}
+}
--- a/Assets/Scripts/TetrisMap/Test.cs.meta
+++ b/Assets/Scripts/TetrisMap/Test.cs.meta
+fileFormatVersion: 2
+guid: 4f70662cea9642244afe9d8a44fa3211
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/TetrisMap/Tetrimino/Tetrimino.cs
+++ b/Assets/Scripts/TetrisMap/Tetrimino/Tetrimino.cs
@@ -49,5 +49,4 @@ public class Tetrimino : MonoBehaviour {



-
 }
--- a/Assets/Scripts/TetrisMap/TetriminoSpawner.cs
+++ b/Assets/Scripts/TetrisMap/TetriminoSpawner.cs
@@ -39,6 +39,8 @@ public class TetriminoSpawner : MonoBehaviour {
                randomTetrimino = TetriminoRandomizer();
            MM.currentTetrimino = Instantiate(tetriminoes[randomTetrimino], MM.tetrisMapCoord + MM.tetrisMapSize * new Vector3(randomPosition, MapManager.realHeight + 1, MM.tetrisMapCoord.z), Quaternion.identity);
            MM.MakeTetriminoRightPlace(MM.currentTetrimino);
+            MM.currentTetrimino.mapCoord = (MM.currentTetrimino.transform.position - MM.tetrisMapCoord) / MM.tetrisMapSize;
+            MM.SetRoomMapCoord(MM.currentTetrimino);
        }
    }
    /// <summary>
@@ -65,17 +67,10 @@ public class TetriminoSpawner : MonoBehaviour {
        return count;
    }

-
-
    /*
     * Test
     * */
-    public void ChangeTetrimino()
-    {
-        var MM = GameObject.FindGameObjectWithTag("MapManager").GetComponent<MapManager>();
-        Destroy(MM.currentTetrimino.gameObject);
-        MakeTetrimino();
-    }
+
    // Use this for initialization
    void Start () {
        MakeTetrimino();

--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -6,6 +6,7 @@ TagManager:
  tags:
  - MapManager
  - Tetrimino
+  - TetriminoSpawner
  layers:
  - Default
  - TransparentFX