Commit 4094ea8e authored by 18손재민's avatar 18손재민

보스룸이랑 각 방들 추가

parent a0f9da08
......@@ -9,17 +9,17 @@ Prefab:
m_Modifications: []
m_RemovedComponents: []
m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1448191776064200}
m_RootGameObject: {fileID: 1519889983907966}
m_IsPrefabAsset: 1
--- !u!1 &1448191776064200
--- !u!1 &1519889983907966
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4856635854947610}
- component: {fileID: 114733631161331600}
- component: {fileID: 4821016865928708}
- component: {fileID: 114144154128578016}
m_Layer: 0
m_Name: MapManager
m_TagString: MapManager
......@@ -27,12 +27,12 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4856635854947610
--- !u!4 &4821016865928708
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1448191776064200}
m_GameObject: {fileID: 1519889983907966}
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}
......@@ -40,17 +40,18 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &114733631161331600
--- !u!114 &114144154128578016
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1448191776064200}
m_GameObject: {fileID: 1519889983907966}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9719103beb138e041b0a7ec9e24aefb0, type: 3}
m_Name:
m_EditorClassIdentifier:
inTetris: 0
tetrisMapSize: 1
tetrisMapCoord: {x: 0, y: 0, z: 0}
speed: 0
......@@ -58,4 +59,9 @@ MonoBehaviour:
collapseTime: 0
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}
currentTetrimino: {fileID: 0}
fileFormatVersion: 2
guid: 9a0baa75e701da64b8e07ec03aa166a1
guid: afe4a2cb44239b649a3ffa70af5c2d84
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1690644780631946}
m_IsPrefabAsset: 1
--- !u!1 &1471743158256186
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4653007209432888}
- component: {fileID: 212305400664589542}
- component: {fileID: 114058333184934226}
m_Layer: 0
m_Name: Room1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1690644780631946
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4326677061616058}
- component: {fileID: 114953302277862202}
m_Layer: 0
m_Name: TetriminoBoss
m_TagString: Tetrimino
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4326677061616058
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
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: 1, y: 1, z: 1}
m_Children:
- {fileID: 4653007209432888}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4653007209432888
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1471743158256186}
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: 4326677061616058}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &114058333184934226
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1471743158256186}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!114 &114953302277862202
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1690644780631946}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fd1dc16b46613744db6b1b22af43a6d0, type: 3}
m_Name:
m_EditorClassIdentifier:
mapCoord: {x: 0, y: 0, z: 0}
stage: 0
roomConcept: 0
isBossTetrimino: 1
tetriminoType: 7
rooms:
- {fileID: 114058333184934226}
--- !u!212 &212305400664589542
SpriteRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1471743158256186}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 4294967295
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 09a55c7c9744ba04084ee582402b5c0f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
fileFormatVersion: 2
guid: bd086e7cd95d6774583cbacdf6d8e445
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
......@@ -20,6 +20,7 @@ GameObject:
m_Component:
- component: {fileID: 4907672861611838}
- component: {fileID: 212420025513127278}
- component: {fileID: 114896605901929710}
m_Layer: 0
m_Name: Room3
m_TagString: Untagged
......@@ -36,6 +37,7 @@ GameObject:
m_Component:
- component: {fileID: 4959807369913172}
- component: {fileID: 212152418876382836}
- component: {fileID: 114128992769977540}
m_Layer: 0
m_Name: Room1
m_TagString: Untagged
......@@ -52,6 +54,7 @@ GameObject:
m_Component:
- component: {fileID: 4417427676875474}
- component: {fileID: 212396526213553696}
- component: {fileID: 114753577101051656}
m_Layer: 0
m_Name: Room2
m_TagString: Untagged
......@@ -68,6 +71,7 @@ GameObject:
m_Component:
- component: {fileID: 4193237758475062}
- component: {fileID: 212803665595841428}
- component: {fileID: 114323397412866622}
m_Layer: 0
m_Name: Room4
m_TagString: Untagged
......@@ -160,6 +164,57 @@ Transform:
m_Father: {fileID: 4885249480576364}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &114128992769977540
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1267037633818366}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!114 &114323397412866622
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1794754551034900}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!114 &114753577101051656
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1278771435863926}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!114 &114851979720776072
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -176,6 +231,28 @@ MonoBehaviour:
roomConcept: 0
isBossTetrimino: 0
tetriminoType: 0
rooms:
- {fileID: 114128992769977540}
- {fileID: 114753577101051656}
- {fileID: 114896605901929710}
- {fileID: 114323397412866622}
--- !u!114 &114896605901929710
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1215456992061978}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!212 &212152418876382836
SpriteRenderer:
m_ObjectHideFlags: 1
......
......@@ -36,6 +36,7 @@ GameObject:
m_Component:
- component: {fileID: 4787224872683594}
- component: {fileID: 212217916792787406}
- component: {fileID: 114787691033818184}
m_Layer: 0
m_Name: Room3
m_TagString: Untagged
......@@ -52,6 +53,7 @@ GameObject:
m_Component:
- component: {fileID: 4403275080892776}
- component: {fileID: 212126832506047450}
- component: {fileID: 114163463770396558}
m_Layer: 0
m_Name: Room2
m_TagString: Untagged
......@@ -68,6 +70,7 @@ GameObject:
m_Component:
- component: {fileID: 4770256559059570}
- component: {fileID: 212761434984449876}
- component: {fileID: 114026131151242260}
m_Layer: 0
m_Name: Room1
m_TagString: Untagged
......@@ -84,6 +87,7 @@ GameObject:
m_Component:
- component: {fileID: 4759911669955744}
- component: {fileID: 212099572598103474}
- component: {fileID: 114466843507187060}
m_Layer: 0
m_Name: Room4
m_TagString: Untagged
......@@ -160,6 +164,74 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &114026131151242260
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1793228358817202}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!114 &114163463770396558
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1742200576591358}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!114 &114466843507187060
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1822010819307074}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!114 &114787691033818184
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1099210194409224}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!114 &114826030636358216
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -176,6 +248,11 @@ MonoBehaviour:
roomConcept: 0
isBossTetrimino: 0
tetriminoType: 3
rooms:
- {fileID: 114026131151242260}
- {fileID: 114163463770396558}
- {fileID: 114787691033818184}
- {fileID: 114466843507187060}
--- !u!212 &212099572598103474
SpriteRenderer:
m_ObjectHideFlags: 1
......
......@@ -20,6 +20,7 @@ GameObject:
m_Component:
- component: {fileID: 4540519855280918}
- component: {fileID: 212792642510107936}
- component: {fileID: 114077791275824818}
m_Layer: 0
m_Name: Room4
m_TagString: Untagged
......@@ -52,6 +53,7 @@ GameObject:
m_Component:
- component: {fileID: 4480540641426352}
- component: {fileID: 212924378997013916}
- component: {fileID: 114346591663730294}
m_Layer: 0
m_Name: Room1
m_TagString: Untagged
......@@ -68,6 +70,7 @@ GameObject:
m_Component:
- component: {fileID: 4890462092246654}
- component: {fileID: 212873652807541368}
- component: {fileID: 114135637264954520}
m_Layer: 0
m_Name: Room2
m_TagString: Untagged
......@@ -84,6 +87,7 @@ GameObject:
m_Component:
- component: {fileID: 4544835616051996}
- component: {fileID: 212148613173218532}
- component: {fileID: 114317610525364840}
m_Layer: 0
m_Name: Room3
m_TagString: Untagged
......@@ -160,6 +164,74 @@ Transform:
m_Father: {fileID: 4673972717886742}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &114077791275824818
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1084491534076158}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!114 &114135637264954520
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1864982080013174}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!114 &114317610525364840
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1896366675778704}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!114 &114346591663730294
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1569769405237572}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!114 &114568813863931164
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -176,6 +248,11 @@ MonoBehaviour:
roomConcept: 0
isBossTetrimino: 0
tetriminoType: 4
rooms:
- {fileID: 114346591663730294}
- {fileID: 114135637264954520}
- {fileID: 114317610525364840}
- {fileID: 114077791275824818}
--- !u!212 &212148613173218532
SpriteRenderer:
m_ObjectHideFlags: 1
......
......@@ -20,6 +20,7 @@ GameObject:
m_Component:
- component: {fileID: 4392876965490690}
- component: {fileID: 212485744245122418}
- component: {fileID: 114908975501692068}
m_Layer: 0
m_Name: Room3
m_TagString: Untagged
......@@ -36,6 +37,7 @@ GameObject:
m_Component:
- component: {fileID: 4534782373203126}
- component: {fileID: 212207191686043862}
- component: {fileID: 114213829136544718}
m_Layer: 0
m_Name: Room2
m_TagString: Untagged
......@@ -52,6 +54,7 @@ GameObject:
m_Component:
- component: {fileID: 4959495535370206}
- component: {fileID: 212984217112136474}
- component: {fileID: 114533639654252892}
m_Layer: 0
m_Name: Room1
m_TagString: Untagged
......@@ -84,6 +87,7 @@ GameObject:
m_Component:
- component: {fileID: 4234876044225368}
- component: {fileID: 212675274623552654}
- component: {fileID: 114152283449124112}
m_Layer: 0
m_Name: Room4
m_TagString: Untagged
......@@ -160,6 +164,40 @@ Transform:
m_Father: {fileID: 4122900828095350}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &114152283449124112
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1821233894851780}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!114 &114213829136544718
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1419486603488018}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!114 &114426654816215182
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -176,6 +214,45 @@ MonoBehaviour:
roomConcept: 0
isBossTetrimino: 0
tetriminoType: 1
rooms:
- {fileID: 114533639654252892}
- {fileID: 114213829136544718}
- {fileID: 114908975501692068}
- {fileID: 114152283449124112}
--- !u!114 &114533639654252892
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1561406108541174}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!114 &114908975501692068
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1245233073849682}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!212 &212207191686043862
SpriteRenderer:
m_ObjectHideFlags: 1
......
......@@ -36,6 +36,7 @@ GameObject:
m_Component:
- component: {fileID: 4090505475429662}
- component: {fileID: 212983047869552424}
- component: {fileID: 114958419371570988}
m_Layer: 0
m_Name: Room4
m_TagString: Untagged
......@@ -52,6 +53,7 @@ GameObject:
m_Component:
- component: {fileID: 4996993573163862}
- component: {fileID: 212368084699848572}
- component: {fileID: 114079261310535460}
m_Layer: 0
m_Name: Room1
m_TagString: Untagged
......@@ -68,6 +70,7 @@ GameObject:
m_Component:
- component: {fileID: 4368727385002576}
- component: {fileID: 212561911640154946}
- component: {fileID: 114184053320687194}
m_Layer: 0
m_Name: Room3
m_TagString: Untagged
......@@ -84,6 +87,7 @@ GameObject:
m_Component:
- component: {fileID: 4153319652066896}
- component: {fileID: 212835336817168174}
- component: {fileID: 114316302151506316}
m_Layer: 0
m_Name: Room2
m_TagString: Untagged
......@@ -160,6 +164,57 @@ Transform:
m_Father: {fileID: 4471651650155636}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &114079261310535460
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1191491172294716}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!114 &114184053320687194
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1313472446307016}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!114 &114316302151506316
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1462232883167424}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!114 &114491658978157548
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -176,6 +231,28 @@ MonoBehaviour:
roomConcept: 0
isBossTetrimino: 0
tetriminoType: 5
rooms:
- {fileID: 114079261310535460}
- {fileID: 114316302151506316}
- {fileID: 114184053320687194}
- {fileID: 114958419371570988}
--- !u!114 &114958419371570988
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1102001936555868}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!212 &212368084699848572
SpriteRenderer:
m_ObjectHideFlags: 1
......
......@@ -36,6 +36,7 @@ GameObject:
m_Component:
- component: {fileID: 4373465258801912}
- component: {fileID: 212495504667015990}
- component: {fileID: 114609423914388260}
m_Layer: 0
m_Name: Room1
m_TagString: Untagged
......@@ -52,6 +53,7 @@ GameObject:
m_Component:
- component: {fileID: 4268777523006110}
- component: {fileID: 212172714904819908}
- component: {fileID: 114555629497930862}
m_Layer: 0
m_Name: Room2
m_TagString: Untagged
......@@ -68,6 +70,7 @@ GameObject:
m_Component:
- component: {fileID: 4423275367774766}
- component: {fileID: 212571583154279740}
- component: {fileID: 114250342630536598}
m_Layer: 0
m_Name: Room3
m_TagString: Untagged
......@@ -84,6 +87,7 @@ GameObject:
m_Component:
- component: {fileID: 4771158449934644}
- component: {fileID: 212365835628450406}
- component: {fileID: 114030767890393412}
m_Layer: 0
m_Name: Room4
m_TagString: Untagged
......@@ -160,6 +164,74 @@ Transform:
m_Father: {fileID: 4747878049517392}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &114030767890393412
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1653214530159006}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!114 &114250342630536598
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1611631327942846}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!114 &114555629497930862
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1456641584809498}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!114 &114609423914388260
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1395965772409232}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!114 &114813872723638092
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -176,6 +248,11 @@ MonoBehaviour:
roomConcept: 0
isBossTetrimino: 0
tetriminoType: 2
rooms:
- {fileID: 114609423914388260}
- {fileID: 114555629497930862}
- {fileID: 114250342630536598}
- {fileID: 114030767890393412}
--- !u!212 &212172714904819908
SpriteRenderer:
m_ObjectHideFlags: 1
......
......@@ -20,6 +20,7 @@ GameObject:
m_Component:
- component: {fileID: 4079089229698490}
- component: {fileID: 212831729219815424}
- component: {fileID: 114042954375696702}
m_Layer: 0
m_Name: Room4
m_TagString: Untagged
......@@ -52,6 +53,7 @@ GameObject:
m_Component:
- component: {fileID: 4244611340582260}
- component: {fileID: 212935891151791270}
- component: {fileID: 114930072884505966}
m_Layer: 0
m_Name: Room2
m_TagString: Untagged
......@@ -68,6 +70,7 @@ GameObject:
m_Component:
- component: {fileID: 4665049468911534}
- component: {fileID: 212024274712184554}
- component: {fileID: 114253788358578218}
m_Layer: 0
m_Name: Room1
m_TagString: Untagged
......@@ -84,6 +87,7 @@ GameObject:
m_Component:
- component: {fileID: 4563286847724018}
- component: {fileID: 212711777702940164}
- component: {fileID: 114970417993025404}
m_Layer: 0
m_Name: Room3
m_TagString: Untagged
......@@ -160,6 +164,23 @@ Transform:
m_Father: {fileID: 4236268032666254}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &114042954375696702
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1414814848578718}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!114 &114116348516849362
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -176,6 +197,62 @@ MonoBehaviour:
roomConcept: 0
isBossTetrimino: 0
tetriminoType: 6
rooms:
- {fileID: 114930072884505966}
- {fileID: 114970417993025404}
- {fileID: 114042954375696702}
- {fileID: 114253788358578218}
--- !u!114 &114253788358578218
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1772186685877324}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!114 &114930072884505966
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1608386852174400}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!114 &114970417993025404
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1935204171494592}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name:
m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0}
doorInfo:
stage: 0
roomConcept: 0
itemRoomType: 0
specialRoomType: 0
--- !u!212 &212024274712184554
SpriteRenderer:
m_ObjectHideFlags: 1
......
......@@ -9,17 +9,17 @@ Prefab:
m_Modifications: []
m_RemovedComponents: []
m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1930818555787314}
m_RootGameObject: {fileID: 1843378067650898}
m_IsPrefabAsset: 1
--- !u!1 &1930818555787314
--- !u!1 &1843378067650898
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4625643684679394}
- component: {fileID: 114194866421644552}
- component: {fileID: 4675487918418904}
- component: {fileID: 114524961967938888}
m_Layer: 0
m_Name: TetriminoSpawner
m_TagString: Untagged
......@@ -27,12 +27,12 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4625643684679394
--- !u!4 &4675487918418904
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1930818555787314}
m_GameObject: {fileID: 1843378067650898}
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}
......@@ -40,12 +40,12 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &114194866421644552
--- !u!114 &114524961967938888
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1930818555787314}
m_GameObject: {fileID: 1843378067650898}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 47d7361e314e48c489ecf897284be41d, type: 3}
......@@ -59,3 +59,4 @@ MonoBehaviour:
- {fileID: 114491658978157548, guid: 5103895df6a85964aa1f8aaeb7115696, type: 2}
- {fileID: 114813872723638092, guid: dfde2a88976e71b45b094b126823a49f, type: 2}
- {fileID: 114116348516849362, guid: 40858eb0c94aa6c45be70d235179724b, type: 2}
- {fileID: 114953302277862202, guid: bd086e7cd95d6774583cbacdf6d8e445, type: 2}
fileFormatVersion: 2
guid: 2cec425624347874e8fd6637b7f5d1e5
guid: 2e1b9fc1064aaf54487c99316fe18286
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
......
......@@ -9,17 +9,47 @@ Prefab:
m_Modifications: []
m_RemovedComponents: []
m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1163151034403664}
m_RootGameObject: {fileID: 1922867542630168}
m_IsPrefabAsset: 1
--- !u!1 &1163151034403664
--- !u!1 &1042490470800312
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4813594768711528}
- component: {fileID: 212959420601833118}
- 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}
m_Layer: 0
m_Name: TetrisMap
m_TagString: Untagged
......@@ -27,25 +57,53 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4813594768711528
--- !u!4 &4213530050205380
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1163151034403664}
m_GameObject: {fileID: 1580782092139588}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 4.5, y: 10, z: 0}
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
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1042490470800312}
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: 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 &212959420601833118
--- !u!212 &212055559141072096
SpriteRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1163151034403664}
m_GameObject: {fileID: 1922867542630168}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
......
fileFormatVersion: 2
guid: 8a68e8e3ec2ebef44a39aa97d77688d9
guid: 668207ef06c134e40b24375977c2c930
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
......
......@@ -7,9 +7,14 @@ public class MapManager : MonoBehaviour {
/*
* variables
* */
/// <summary>
/// Tetris map's size.
/// </summary>
/// <summary>
/// If camera is at tetris map, it is true.
/// If camera is at player, it is false.
/// </summary>
public bool inTetris;
/// <summary>
/// Tetris map's size.
/// </summary>
public float tetrisMapSize = 1;
/// <summary>
/// Tetris map's coordinates.
......@@ -32,7 +37,6 @@ public class MapManager : MonoBehaviour {
/// Absolute coordinates on tetris map.
/// </summary>
public static Room[,] mapCoord = new Room[width, height];
/// <summary>
/// Tetris Y axis coordinates on Unity.
/// </summary>
......@@ -42,6 +46,15 @@ public class MapManager : MonoBehaviour {
/// </summary>
public bool gameOver = false;
/// <summary>
/// Choose to make a boss tetrimino or not.
/// </summary>
public bool spawnBossTetrimino = false;
/// <summary>
/// Tetris map.
/// </summary>
public GameObject tetrisMap;
public GameObject mapLeftEnd, mapRightEnd;
/// <summary>
/// Current tetrimino waiting for falling.
/// </summary>
public Tetrimino currentTetrimino;
......@@ -62,6 +75,43 @@ public class MapManager : MonoBehaviour {
return new Vector3(Mathf.Round(coord.x), Mathf.Round(coord.y), coord.z);
}
*/
/// <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>
/// <returns></returns>
public int IsRightTetrimino(Tetrimino TE)
{
for (int i = 0; i < TE.rooms.Length; i++)
{
if (TE.rooms[i].transform.position.x < mapLeftEnd.transform.position.x)
return -1;
else if (TE.rooms[i].transform.position.x > mapRightEnd.transform.position.x)
return 1;
}
return 0;
}
/// <summary>
/// Make Tetrimino in right X coordinate.
/// </summary>
/// <param name="TE">Tetrimino.</param>
public void MakeTetriminoRightPlace(Tetrimino TE)
{
while (true)
{
if (IsRightTetrimino(TE) == 1)
{
TE.transform.position += new Vector3(-tetrisMapSize, 0, 0);
}
else if (IsRightTetrimino(TE) == -1)
{
TE.transform.position += new Vector3(tetrisMapSize, 0, 0);
}
else
break;
}
}
/// <summary>
/// Delete one row.
/// </summary>
......@@ -109,10 +159,7 @@ public class MapManager : MonoBehaviour {
GameObject[] tetriminoes = GameObject.FindGameObjectsWithTag("Tetrimino");
foreach(GameObject child in tetriminoes)
{
int count = 0;
foreach (Transform t in child.transform)
count++;
if (count == 0)
if(child.transform.childCount == 0)
Destroy(child.gameObject);
}
}
......@@ -139,9 +186,24 @@ public class MapManager : MonoBehaviour {
{
}
public void TetriminoMove(Tetrimino TE)
public void GhostDown()
{
}
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);
}
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 TetriminoRotate(Tetrimino TE)
{
......@@ -152,15 +214,21 @@ 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 () {
TetriminoMove(currentTetrimino);
}
}
......@@ -4,6 +4,9 @@ using UnityEngine;
public class Tetrimino : MonoBehaviour {
/*
* variables
* */
/// <summary>
/// Tetrimino's Location on tetris map.
/// Not related to real location.
......@@ -14,7 +17,7 @@ public class Tetrimino : MonoBehaviour {
/// </summary>
public int stage;
/// <summary>
/// Tetrimino room's concept.
/// Tetrimino's room concept.
/// </summary>
public int roomConcept;
/// <summary>
......@@ -24,11 +27,19 @@ public class Tetrimino : MonoBehaviour {
/// <summary>
/// Enum for tetriminno types.
/// </summary>
public enum TetriminoType { I, O, T, J, L, S, Z };
public enum TetriminoType { I, O, T, J, L, S, Z, Boss };
/// <summary>
/// Tetrimino types.
/// </summary>
public TetriminoType tetriminoType;
/// <summary>
/// Each rooms for this tetrimino.
/// </summary>
public Room[] rooms;
/*
* functions
* */
......
......@@ -4,13 +4,8 @@ using UnityEngine;
public class TetriminoBoss : Tetrimino {
// Use this for initialization
void Start () {
}
// Update is called once per frame
void Update () {
}
void Awake()
{
isBossTetrimino = true;
}
}
......@@ -3,14 +3,9 @@ using System.Collections.Generic;
using UnityEngine;
public class TetriminoNormal : Tetrimino {
/*
* functions
* */
// Use this for initialization
void Start () {
}
// Update is called once per frame
void Update () {
}
}
......@@ -10,8 +10,11 @@ public class TetriminoSpawner : MonoBehaviour {
/// <summary>
/// All tetriminoes.
/// </summary>
public Tetrimino[] tetriminoes = new Tetrimino[7];
public Tetrimino[] tetriminoes;
/// <summary>
/// Save probability of which tetrimino will be made next.
/// </summary>
int[] randomTetrimino = { 1, 1, 1, 1, 1, 1, 1 };
/*
......@@ -26,11 +29,22 @@ public class TetriminoSpawner : MonoBehaviour {
if (!MM.gameOver)
{
int randomPosition = Random.Range(0, MapManager.width);
int randomTetrimino = TetriminoRandomizer();
int randomTetrimino;
if (MM.spawnBossTetrimino)
{
randomTetrimino = 7;
MM.spawnBossTetrimino = false;
}
else
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);
}
}
/// <summary>
/// Logic for random tetrimino.
/// </summary>
/// <returns>Tetrimino that would be made next.</returns>
int TetriminoRandomizer()
{
int sum = 0, count;
......@@ -52,6 +66,10 @@ public class TetriminoSpawner : MonoBehaviour {
}
/*
* Test
* */
public void ChangeTetrimino()
{
var MM = GameObject.FindGameObjectWithTag("MapManager").GetComponent<MapManager>();
......
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