Commit 98830534 authored by 18손재민's avatar 18손재민

테트리미노랑 방 위치 동기화 및 크기 수정 이제 따로 작업 가능

parent d052546b
......@@ -51,7 +51,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9719103beb138e041b0a7ec9e24aefb0, type: 3}
m_Name:
m_EditorClassIdentifier:
inTetris: 0
grid: {fileID: 0}
tetrisMapSize: 1
tetrisMapCoord: {x: 0, y: 0, z: 0}
speed: 0
......@@ -60,8 +60,7 @@ MonoBehaviour:
fallTime: 0
gameOver: 0
spawnBossTetrimino: 0
tetrisMap: {fileID: 1922867542630168, guid: 668207ef06c134e40b24375977c2c930, type: 2}
mapLeftEnd: {fileID: 1580782092139588, guid: 668207ef06c134e40b24375977c2c930, type: 2}
mapRightEnd: {fileID: 1042490470800312, guid: 668207ef06c134e40b24375977c2c930,
type: 2}
tetrisMap: {fileID: 0}
currentTetrimino: {fileID: 0}
halfRoomList:
- {fileID: 114931030853536078, guid: 279f5b34ed5c53545990e499c74cbbe7, type: 2}
......@@ -19,6 +19,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4861876781168000}
- component: {fileID: 114931030853536078}
- component: {fileID: 8195094281964402364}
- component: {fileID: 3664157346213556122}
- component: {fileID: 50808621241149756}
......@@ -70,7 +71,7 @@ CompositeCollider2D:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1306971874785268}
m_Enabled: 1
m_Enabled: 0
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
......@@ -110,6 +111,18 @@ CompositeCollider2D:
- {x: 23, y: 11}
- {x: 23, y: 1}
m_VertexDistance: 0.0005
--- !u!114 &114931030853536078
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1306971874785268}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2efb10f83deccf8428c34c30aa2032d0, type: 3}
m_Name:
m_EditorClassIdentifier:
doorInfo: 0
--- !u!19719996 &2113883504774285740
TilemapCollider2D:
m_ObjectHideFlags: 1
......
......@@ -51,8 +51,8 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1690644780631946}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -4.3699484, y: 1.660439, z: 0}
m_LocalScale: {x: 24, y: 24, z: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4653007209432888}
m_Father: {fileID: 0}
......
......@@ -102,7 +102,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1794754551034900}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 3, z: 0}
m_LocalPosition: {x: 0, y: 72, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4885249480576364}
......@@ -115,7 +115,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1278771435863926}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: 0}
m_LocalPosition: {x: 0, y: 24, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4885249480576364}
......@@ -128,8 +128,8 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1986824515730090}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 7.85, y: 2.58, z: 0}
m_LocalScale: {x: 24, y: 24, z: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4959807369913172}
- {fileID: 4417427676875474}
......@@ -145,7 +145,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1215456992061978}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 2, z: 0}
m_LocalPosition: {x: 0, y: 48, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4885249480576364}
......
......@@ -102,7 +102,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1742200576591358}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1, y: 0, z: 0}
m_LocalPosition: {x: 24, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4932166892105634}
......@@ -115,7 +115,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1822010819307074}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1, y: 2, z: 0}
m_LocalPosition: {x: 24, y: 48, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4932166892105634}
......@@ -141,7 +141,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1099210194409224}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1, y: 1, z: 0}
m_LocalPosition: {x: 24, y: 24, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4932166892105634}
......@@ -154,8 +154,8 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1058256109692646}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2.15, y: -0.97, z: 0}
m_LocalScale: {x: 24, y: 24, z: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4770256559059570}
- {fileID: 4403275080892776}
......
......@@ -115,7 +115,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1084491534076158}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1, y: 0, z: 0}
m_LocalPosition: {x: 24, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4673972717886742}
......@@ -128,7 +128,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1896366675778704}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 2, z: 0}
m_LocalPosition: {x: 0, y: 48, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4673972717886742}
......@@ -141,8 +141,8 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1409840693504816}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2.77, y: 3.1, z: 0}
m_LocalScale: {x: 24, y: 24, z: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4480540641426352}
- {fileID: 4890462092246654}
......@@ -158,7 +158,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1864982080013174}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: 0}
m_LocalPosition: {x: 0, y: 24, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4673972717886742}
......
......@@ -102,8 +102,8 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1599875259397162}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 5.6, y: -0.21, z: 0}
m_LocalScale: {x: 24, y: 24, z: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4959495535370206}
- {fileID: 4534782373203126}
......@@ -119,7 +119,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1821233894851780}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1, y: 0, z: 0}
m_LocalPosition: {x: 24, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4122900828095350}
......@@ -132,7 +132,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1245233073849682}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1, y: 1, z: 0}
m_LocalPosition: {x: 24, y: 24, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4122900828095350}
......@@ -145,7 +145,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1419486603488018}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: 0}
m_LocalPosition: {x: 0, y: 24, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4122900828095350}
......
......@@ -102,7 +102,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1102001936555868}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2, y: 1, z: 0}
m_LocalPosition: {x: 48, y: 24, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4471651650155636}
......@@ -115,7 +115,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1462232883167424}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1, y: 0, z: 0}
m_LocalPosition: {x: 24, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4471651650155636}
......@@ -128,7 +128,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1313472446307016}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1, y: 1, z: 0}
m_LocalPosition: {x: 24, y: 24, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4471651650155636}
......@@ -141,8 +141,8 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1051411815441030}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 10.24, y: 0.14, z: 0}
m_LocalScale: {x: 24, y: 24, z: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4996993573163862}
- {fileID: 4153319652066896}
......
......@@ -102,7 +102,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1456641584809498}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1, y: 0, z: 0}
m_LocalPosition: {x: 24, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4747878049517392}
......@@ -128,7 +128,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1611631327942846}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1, y: 1, z: 0}
m_LocalPosition: {x: 24, y: 24, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4747878049517392}
......@@ -141,8 +141,8 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1216064749225226}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 14.87, y: 0.76, z: 0}
m_LocalScale: {x: 24, y: 24, z: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4373465258801912}
- {fileID: 4268777523006110}
......@@ -158,7 +158,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1653214530159006}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2, y: 0, z: 0}
m_LocalPosition: {x: 48, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4747878049517392}
......
......@@ -102,7 +102,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1414814848578718}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2, y: 0, z: 0}
m_LocalPosition: {x: 48, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4236268032666254}
......@@ -115,8 +115,8 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1597348377621660}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 11.8, y: 3.97, z: 0}
m_LocalScale: {x: 24, y: 24, z: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4665049468911534}
- {fileID: 4244611340582260}
......@@ -132,7 +132,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1608386852174400}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1, y: 1, z: 0}
m_LocalPosition: {x: 24, y: 24, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4236268032666254}
......@@ -145,7 +145,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1935204171494592}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1, y: 0, z: 0}
m_LocalPosition: {x: 24, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4236268032666254}
......@@ -158,7 +158,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1772186685877324}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: 0}
m_LocalPosition: {x: 0, y: 24, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4236268032666254}
......
......@@ -9,47 +9,17 @@ Prefab:
m_Modifications: []
m_RemovedComponents: []
m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1922867542630168}
m_RootGameObject: {fileID: 1320366940629302}
m_IsPrefabAsset: 1
--- !u!1 &1042490470800312
--- !u!1 &1320366940629302
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4767327450980822}
m_Layer: 0
m_Name: RightEnd
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1580782092139588
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4213530050205380}
m_Layer: 0
m_Name: LeftEnd
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1922867542630168
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4872207070014624}
- component: {fileID: 212055559141072096}
- component: {fileID: 4261523127650414}
- component: {fileID: 212749840812274522}
m_Layer: 0
m_Name: TetrisMap
m_TagString: Untagged
......@@ -57,53 +27,25 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4213530050205380
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1580782092139588}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -5, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4872207070014624}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4767327450980822
--- !u!4 &4261523127650414
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1042490470800312}
m_GameObject: {fileID: 1320366940629302}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 5, y: 0, z: 0}
m_LocalPosition: {x: 120, y: 252, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4872207070014624}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4872207070014624
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1922867542630168}
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:
- {fileID: 4213530050205380}
- {fileID: 4767327450980822}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &212055559141072096
--- !u!212 &212749840812274522
SpriteRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1922867542630168}
m_GameObject: {fileID: 1320366940629302}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
......
......@@ -155,11 +155,6 @@ Prefab:
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f6ef1c586e7764c41ba8349325635589, type: 2}
m_IsPrefabAsset: 0
--- !u!4 &172849437 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4861876781168000, guid: 279f5b34ed5c53545990e499c74cbbe7,
type: 2}
m_PrefabInternal: {fileID: 1603410094}
--- !u!4 &262016745 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4388258417166718, guid: 48d5863f34621bc4abab84b742407e5a,
......@@ -247,60 +242,6 @@ Prefab:
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
m_IsPrefabAsset: 0
--- !u!1001 &433279376
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2}
propertyPath: m_LocalPosition.x
value: 132
objectReference: {fileID: 0}
- target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2}
propertyPath: m_LocalPosition.y
value: 253
objectReference: {fileID: 0}
- target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2}
propertyPath: m_RootOrder
value: 8
objectReference: {fileID: 0}
- target: {fileID: 1922867542630168, guid: 668207ef06c134e40b24375977c2c930, type: 2}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2}
propertyPath: m_LocalScale.x
value: 24
objectReference: {fileID: 0}
- target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2}
propertyPath: m_LocalScale.y
value: 24
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 668207ef06c134e40b24375977c2c930, type: 2}
m_IsPrefabAsset: 0
--- !u!1 &489222433
GameObject:
m_ObjectHideFlags: 0
......@@ -614,9 +555,24 @@ Prefab:
propertyPath: m_RootOrder
value: 9
objectReference: {fileID: 0}
- target: {fileID: 114144154128578016, guid: afe4a2cb44239b649a3ffa70af5c2d84,
type: 2}
propertyPath: grid
value:
objectReference: {fileID: 1244139631}
- target: {fileID: 114144154128578016, guid: afe4a2cb44239b649a3ffa70af5c2d84,
type: 2}
propertyPath: tetrisMap
value:
objectReference: {fileID: 782891951}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: afe4a2cb44239b649a3ffa70af5c2d84, type: 2}
m_IsPrefabAsset: 0
--- !u!1 &782891951 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1320366940629302, guid: 668207ef06c134e40b24375977c2c930,
type: 2}
m_PrefabInternal: {fileID: 1333464572}
--- !u!1 &826079602
GameObject:
m_ObjectHideFlags: 0
......@@ -799,99 +755,93 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 172849437}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1501222773
--- !u!1001 &1333464572
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 2088383385}
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
- target: {fileID: 4261523127650414, guid: 668207ef06c134e40b24375977c2c930, type: 2}
propertyPath: m_LocalPosition.x
value: -640
value: 120
objectReference: {fileID: 0}
- target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
- target: {fileID: 4261523127650414, guid: 668207ef06c134e40b24375977c2c930, type: 2}
propertyPath: m_LocalPosition.y
value: -360
value: 252
objectReference: {fileID: 0}
- target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
- target: {fileID: 4261523127650414, guid: 668207ef06c134e40b24375977c2c930, type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
- target: {fileID: 4261523127650414, guid: 668207ef06c134e40b24375977c2c930, type: 2}
propertyPath: m_LocalRotation.x
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
- target: {fileID: 4261523127650414, guid: 668207ef06c134e40b24375977c2c930, type: 2}
propertyPath: m_LocalRotation.y
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
- target: {fileID: 4261523127650414, guid: 668207ef06c134e40b24375977c2c930, type: 2}
propertyPath: m_LocalRotation.z
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
- target: {fileID: 4261523127650414, guid: 668207ef06c134e40b24375977c2c930, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
- target: {fileID: 4261523127650414, guid: 668207ef06c134e40b24375977c2c930, type: 2}
propertyPath: m_RootOrder
value: 0
value: 8
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
m_SourcePrefab: {fileID: 100100000, guid: 668207ef06c134e40b24375977c2c930, type: 2}
m_IsPrefabAsset: 0
--- !u!1001 &1603410094
--- !u!1001 &1501222773
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1244139631}
m_TransformParent: {fileID: 2088383385}
m_Modifications:
- target: {fileID: 4861876781168000, guid: 279f5b34ed5c53545990e499c74cbbe7, type: 2}
- target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
propertyPath: m_LocalPosition.x
value: 0
value: -640
objectReference: {fileID: 0}
- target: {fileID: 4861876781168000, guid: 279f5b34ed5c53545990e499c74cbbe7, type: 2}
- target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
propertyPath: m_LocalPosition.y
value: 0
value: -360
objectReference: {fileID: 0}
- target: {fileID: 4861876781168000, guid: 279f5b34ed5c53545990e499c74cbbe7, type: 2}
- target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4861876781168000, guid: 279f5b34ed5c53545990e499c74cbbe7, type: 2}
- target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4861876781168000, guid: 279f5b34ed5c53545990e499c74cbbe7, type: 2}
- target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4861876781168000, guid: 279f5b34ed5c53545990e499c74cbbe7, type: 2}
- target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4861876781168000, guid: 279f5b34ed5c53545990e499c74cbbe7, type: 2}
- target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4861876781168000, guid: 279f5b34ed5c53545990e499c74cbbe7, type: 2}
- target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 66289433936503254, guid: 279f5b34ed5c53545990e499c74cbbe7,
type: 2}
propertyPath: m_Material
value:
objectReference: {fileID: 6200000, guid: 75bcbc84e3971cc4da003035c7183a62, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 279f5b34ed5c53545990e499c74cbbe7, type: 2}
m_SourcePrefab: {fileID: 100100000, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
m_IsPrefabAsset: 0
--- !u!4 &1743414573 stripped
Transform:
......
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class HalfRoom : MonoBehaviour {
/// <summary>
/// The enum for door information.
/// </summary>
public DoorInfo doorInfo;
public enum DoorInfo { None, Left, Right, Both };
}
fileFormatVersion: 2
guid: 2efb10f83deccf8428c34c30aa2032d0
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -8,6 +8,7 @@ public class MapManager : MonoBehaviour {
* variables
* */
public Transform grid;
/// <summary>
/// Tetris map's size.
/// </summary>
......@@ -49,12 +50,14 @@ public class MapManager : MonoBehaviour {
/// Tetris map.
/// </summary>
public GameObject tetrisMap;
public GameObject mapLeftEnd, mapRightEnd;
/// <summary>
/// Current tetrimino waiting for falling.
/// </summary>
public Tetrimino currentTetrimino;
/// <summary>
/// List for the half Room candidates.
/// </summary>
public HalfRoom[] halfRoomList;
/*
* functions
......@@ -74,15 +77,15 @@ public class MapManager : MonoBehaviour {
/// <summary>
/// Check if tetrimino is in right x coordinate.
/// </summary>
/// <param name="TE">-1 for over left end, 1 for over right end, 0 for right place.</param>
/// <param name="te">-1 for over left end, 1 for over right end, 0 for right place.</param>
/// <returns></returns>
public int IsRightTetrimino(Tetrimino TE)
public int IsRightTetrimino(Tetrimino te)
{
for (int i = 0; i < TE.rooms.Length; i++)
for (int i = 0; i < te.rooms.Length; i++)
{
if (TE.rooms[i].mapCoord.x < 0)
if (te.rooms[i].mapCoord.x < 0)
return -1;
else if (TE.rooms[i].mapCoord.x > width - 1)
else if (te.rooms[i].mapCoord.x > width - 1)
return 1;
}
return 0;
......@@ -90,18 +93,18 @@ public class MapManager : MonoBehaviour {
/// <summary>
/// Make Tetrimino in right X coordinate.
/// </summary>
/// <param name="TE">Tetrimino.</param>
public void MakeTetriminoRightPlace(Tetrimino TE)
/// <param name="te">Tetrimino.</param>
public void MakeTetriminoRightPlace(Tetrimino te)
{
while (true)
{
if (IsRightTetrimino(TE) == 1)
if (IsRightTetrimino(te) == 1)
{
TE.mapCoord += new Vector3(-1, 0, 0);
te.mapCoord += new Vector3(-1, 0, 0);
}
else if (IsRightTetrimino(TE) == -1)
else if (IsRightTetrimino(te) == -1)
{
TE.mapCoord += new Vector3(1, 0, 0);
te.mapCoord += new Vector3(1, 0, 0);
}
else
break;
......@@ -161,8 +164,8 @@ public class MapManager : MonoBehaviour {
/// <summary>
/// Update rooms coordinates on mapCoord.
/// </summary>
/// <param name="TE">Tetrimino you want to update on map.</param>
public void UpdateMap(Tetrimino TE)
/// <param name="te">Tetrimino you want to update on map.</param>
public void UpdateMap(Tetrimino te)
{
}
......@@ -177,7 +180,7 @@ public class MapManager : MonoBehaviour {
public void TetriminoDown(Tetrimino TE)
public void TetriminoDown(Tetrimino te)
{
}
......@@ -185,59 +188,78 @@ public class MapManager : MonoBehaviour {
{
}
/*public void TetriminoMove(Tetrimino TE)
/*public void TetriminoMove(Tetrimino te)
{
if (Input.GetKeyDown(KeyCode.LeftArrow) && inTetris)
{
TE.transform.position += new Vector3(-tetrisMapSize, 0, 0);
if (IsRightTetrimino(TE) != 0)
TE.transform.position += new Vector3(tetrisMapSize, 0, 0);
te.transform.position += new Vector3(-tetrisMapSize, 0, 0);
if (IsRightTetrimino(te) != 0)
te.transform.position += new Vector3(tetrisMapSize, 0, 0);
}
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);
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)
public void TetriminoMove(Tetrimino te)
{
if (Input.GetKeyDown(KeyCode.LeftArrow) && GameManager.gameState == GameManager.GameState.Tetris)
{
TE.mapCoord += new Vector3(-1, 0, 0);
te.mapCoord += new Vector3(-1, 0, 0);
SetRoomMapCoord(currentTetrimino);
if (IsRightTetrimino(TE) != 0)
TE.mapCoord += new Vector3(1, 0, 0);
if (IsRightTetrimino(te) != 0)
te.mapCoord += new Vector3(1, 0, 0);
}
else if (Input.GetKeyDown(KeyCode.RightArrow) && GameManager.gameState == GameManager.GameState.Tetris)
{
TE.mapCoord += new Vector3(1, 0, 0);
te.mapCoord += new Vector3(1, 0, 0);
SetRoomMapCoord(currentTetrimino);
if (IsRightTetrimino(TE) != 0)
TE.mapCoord += new Vector3(-1, 0, 0);
if (IsRightTetrimino(te) != 0)
te.mapCoord += new Vector3(-1, 0, 0);
}
SetRoomMapCoord(currentTetrimino);
}
public void TetriminoRotate(Tetrimino TE)
public void TetriminoRotate(Tetrimino te)
{
}
public void SetRoomMapCoord(Tetrimino TE)
public void SetRoomMapCoord(Tetrimino te)
{
for (int i = 0; i < TE.rooms.Length; i++)
for (int i = 0; i < te.rooms.Length; i++)
{
TE.rooms[i].mapCoord = TE.mapCoord + TE.rooms[i].transform.localPosition;
te.rooms[i].mapCoord = te.mapCoord + te.rooms[i].transform.localPosition;
}
}
public void InitiateTetrimino()
public void CreateRoom(Tetrimino te)
{
for (int i = 0; i < te.rooms.Length; i++)
{
te.rooms[i].transform.parent = grid;
te.rooms[i].transform.localScale = new Vector3(1, 1, 1);
HalfRoom halfRoomUp = Instantiate(halfRoomList[Random.Range(0, halfRoomList.Length)], te.rooms[i].transform.position + new Vector3(0, 12, 0),
Quaternion.identity, te.rooms[i].transform);
HalfRoom halfRoomDown = Instantiate(halfRoomList[Random.Range(0, halfRoomList.Length)], te.rooms[i].transform.position + new Vector3(0, 0, 0),
Quaternion.identity, te.rooms[i].transform);
}
Destroy(te.gameObject);
}
/*
* Test
* */
public void Test()
{
if(Input.GetKeyDown(KeyCode.Alpha0))
{
CreateRoom(currentTetrimino);
}
}
// Use this for initialization
void Start () {
......@@ -245,7 +267,8 @@ public class MapManager : MonoBehaviour {
// Update is called once per frame
void Update() {
TetriminoMove(currentTetrimino);
currentTetrimino.transform.position = currentTetrimino.mapCoord * tetrisMapSize + tetrisMapCoord;
Test();
//TetriminoMove(currentTetrimino);
//currentTetrimino.transform.position = currentTetrimino.mapCoord * tetrisMapSize + tetrisMapCoord;
}
}
......@@ -37,12 +37,14 @@ public class TetriminoSpawner : MonoBehaviour {
}
else
randomTetrimino = TetriminoRandomizer();
MM.currentTetrimino = Instantiate(tetriminoes[randomTetrimino], MM.tetrisMapCoord + MM.tetrisMapSize * new Vector3(randomPosition, MapManager.realHeight + 1, MM.tetrisMapCoord.z), Quaternion.identity);
//MM.currentTetrimino = Instantiate(tetriminoes[randomTetrimino], MM.tetrisMapCoord + MM.tetrisMapSize * new Vector3(randomPosition, MapManager.realHeight + 1, MM.tetrisMapCoord.z), Quaternion.identity);
MM.currentTetrimino = Instantiate(tetriminoes[randomTetrimino], MM.tetrisMapCoord + MM.tetrisMapSize * new Vector3(0, 0, 0), Quaternion.identity);
MM.MakeTetriminoRightPlace(MM.currentTetrimino);
MM.currentTetrimino.mapCoord = (MM.currentTetrimino.transform.position - MM.tetrisMapCoord) / MM.tetrisMapSize;
MM.SetRoomMapCoord(MM.currentTetrimino);
}
}
/// <summary>
/// Logic for random tetrimino.
/// </summary>
......
......@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
filterMode: 0
aniso: -1
mipBias: -100
wrapU: 1
......@@ -43,9 +43,9 @@ TextureImporter:
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
alignment: 6
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 256
spritePixelsToUnits: 10.666667
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
......
......@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
filterMode: 0
aniso: -1
mipBias: -100
wrapU: 1
......@@ -43,9 +43,9 @@ TextureImporter:
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
alignment: 6
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 256
spritePixelsToUnits: 10.666667
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
......
......@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
filterMode: 0
aniso: -1
mipBias: -100
wrapU: 1
......@@ -43,9 +43,9 @@ TextureImporter:
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
alignment: 6
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 256
spritePixelsToUnits: 10.666667
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
......
......@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
filterMode: 0
aniso: -1
mipBias: -100
wrapU: 1
......@@ -43,9 +43,9 @@ TextureImporter:
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
alignment: 6
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 256
spritePixelsToUnits: 10.666667
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
......
......@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
filterMode: 0
aniso: -1
mipBias: -100
wrapU: 1
......@@ -43,9 +43,9 @@ TextureImporter:
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
alignment: 6
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 256
spritePixelsToUnits: 10.666667
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
......
......@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
filterMode: 0
aniso: -1
mipBias: -100
wrapU: 1
......@@ -43,9 +43,9 @@ TextureImporter:
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
alignment: 6
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 256
spritePixelsToUnits: 10.666667
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
......
......@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
filterMode: 0
aniso: -1
mipBias: -100
wrapU: 1
......@@ -43,9 +43,9 @@ TextureImporter:
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
alignment: 6
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 256
spritePixelsToUnits: 10.666667
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
......
......@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
filterMode: 0
aniso: -1
mipBias: -100
wrapU: 1
......@@ -43,9 +43,9 @@ TextureImporter:
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
alignment: 6
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 256
spritePixelsToUnits: 10.666667
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
......
......@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
filterMode: 0
aniso: -1
mipBias: -100
wrapU: 1
......@@ -43,9 +43,9 @@ TextureImporter:
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
alignment: 6
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 256
spritePixelsToUnits: 10.666667
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
......
......@@ -44,8 +44,8 @@ TextureImporter:
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 256
spritePivot: {x: 0, y: 0.5}
spritePixelsToUnits: 10.666667
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment