Skip to content

tetra-tower
tetra-tower
Commit 926ba458 authored by 18손재민's avatar 18손재민
Browse files
Options

방 클리어하는 함수 새로 팜

parent 214fbfeb
Show whitespace changes
Inline Side-by-side
Showing with 462 additions and 92 deletions
Assets/Scenes/PlayScene.unity
View file @ 926ba458
...@@ -732,6 +732,11 @@ GameObject: ...@@ -732,6 +732,11 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 1874721051176178, guid: c179f0931cfabec428a868a6edc543b0, m_CorrespondingSourceObject: {fileID: 1874721051176178, guid: c179f0931cfabec428a868a6edc543b0,
type: 2} type: 2}
m_PrefabInternal: {fileID: 1711972807} m_PrefabInternal: {fileID: 1711972807}
--- !u!4 &932337239 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4180646400299094, guid: f6834170b7152ee4db0dc7e165dcca70,
type: 2}
m_PrefabInternal: {fileID: 2120518040}
--- !u!1001 &1001020222 --- !u!1001 &1001020222
Prefab: Prefab:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -873,6 +878,7 @@ Transform: ...@@ -873,6 +878,7 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 932337239}
- {fileID: 1047338944} - {fileID: 1047338944}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 4 m_RootOrder: 4
...@@ -1022,6 +1028,10 @@ Prefab: ...@@ -1022,6 +1028,10 @@ Prefab:
propertyPath: m_Pivot.y propertyPath: m_Pivot.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1560605499280558, guid: 7c6db9a9ca4150a438bd5114c58a37cf, type: 2}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7c6db9a9ca4150a438bd5114c58a37cf, type: 2} m_SourcePrefab: {fileID: 100100000, guid: 7c6db9a9ca4150a438bd5114c58a37cf, type: 2}
m_IsPrefabAsset: 0 m_IsPrefabAsset: 0
...@@ -1185,6 +1195,36 @@ Prefab: ...@@ -1185,6 +1195,36 @@ Prefab:
m_Modification: m_Modification:
m_TransformParent: {fileID: 1244139631} m_TransformParent: {fileID: 1244139631}
m_Modifications: m_Modifications:
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_Tiles.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 66542705980255800, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_ColliderPaths.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 66542705980255800, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 66542705980255800, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.size
value: 4
objectReference: {fileID: 0}
- target: {fileID: 66542705980255800, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 66542705980255800, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.size
value: 4
objectReference: {fileID: 0}
- target: {fileID: 4542814694995438, guid: 29d5569197813594db51adf0d061bc36, type: 2} - target: {fileID: 4542814694995438, guid: 29d5569197813594db51adf0d061bc36, type: 2}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 0 value: 0
...@@ -1215,8 +1255,242 @@ Prefab: ...@@ -1215,8 +1255,242 @@ Prefab:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4542814694995438, guid: 29d5569197813594db51adf0d061bc36, type: 2} - target: {fileID: 4542814694995438, guid: 29d5569197813594db51adf0d061bc36, type: 2}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_Tiles.Array.data[0].first.x
value: 18
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_Tiles.Array.data[0].first.y
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_Tiles.Array.data[0].second.m_TileIndex
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_Tiles.Array.data[0].second.m_TileSpriteIndex
value: 6
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_Tiles.Array.data[0].second.m_TileFlags
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_Tiles.Array.data[0].second.m_ColliderType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_TileAssetArray.Array.data[5].m_RefCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_TileAssetArray.Array.data[5].m_Data
value:
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_TileSpriteArray.Array.data[6].m_RefCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_TileSpriteArray.Array.data[6].m_Data
value:
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_TileMatrixArray.Array.data[0].m_RefCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_TileMatrixArray.Array.data[0].m_Data.e00
value: 9.813031e+16
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_TileMatrixArray.Array.data[0].m_Data.e01
value: 9e-44
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_TileMatrixArray.Array.data[0].m_Data.e02
value: NaN
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_TileMatrixArray.Array.data[0].m_Data.e11
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_TileMatrixArray.Array.data[0].m_Data.e12
value: NaN
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_TileMatrixArray.Array.data[0].m_Data.e22
value: 5.5e-44
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_TileMatrixArray.Array.data[0].m_Data.e32
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_TileMatrixArray.Array.data[0].m_Data.e33
value: 1e-45
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_TileColorArray.Array.data[0].m_RefCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_TileColorArray.Array.data[0].m_Data.r
value: 2.5e-44
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_TileColorArray.Array.data[0].m_Data.g
value: 2.5e-44
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_TileColorArray.Array.data[0].m_Data.b
value: 2.5e-44
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_TileColorArray.Array.data[0].m_Data.a
value: 2.5e-44
objectReference: {fileID: 0}
- target: {fileID: 66542705980255800, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[0].X
value: 200000000
objectReference: {fileID: 0}
- target: {fileID: 66542705980255800, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[0].Y
value: 22031250
objectReference: {fileID: 0}
- target: {fileID: 66542705980255800, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[1].X
value: 180000000
objectReference: {fileID: 0}
- target: {fileID: 66542705980255800, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[1].Y
value: 22031250
objectReference: {fileID: 0}
- target: {fileID: 66542705980255800, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[2].X
value: 180000000
objectReference: {fileID: 0}
- target: {fileID: 66542705980255800, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[2].Y
value: 17968750
objectReference: {fileID: 0}
- target: {fileID: 66542705980255800, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[3].X
value: 200000000
objectReference: {fileID: 0}
- target: {fileID: 66542705980255800, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[3].Y
value: 17968750
objectReference: {fileID: 0}
- target: {fileID: 66542705980255800, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[0].x
value: 20
objectReference: {fileID: 0}
- target: {fileID: 66542705980255800, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[0].y
value: 2.203125
objectReference: {fileID: 0}
- target: {fileID: 66542705980255800, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[1].x
value: 18
objectReference: {fileID: 0}
- target: {fileID: 66542705980255800, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[1].y
value: 2.203125
objectReference: {fileID: 0}
- target: {fileID: 66542705980255800, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[2].x
value: 18
objectReference: {fileID: 0}
- target: {fileID: 66542705980255800, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[2].y
value: 1.796875
objectReference: {fileID: 0}
- target: {fileID: 66542705980255800, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[3].x
value: 20
objectReference: {fileID: 0}
- target: {fileID: 66542705980255800, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[3].y
value: 1.796875
objectReference: {fileID: 0}
- target: {fileID: 3664157344472397212, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_ChunkCullingBounds.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3664157344472397212, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_ChunkCullingBounds.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_TileMatrixArray.Array.data[0].m_Data.e03
value: 4.5e-44
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_TileMatrixArray.Array.data[0].m_Data.e20
value: 1.44e-42
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_TileMatrixArray.Array.data[0].m_Data.e21
value: 4.6771786e-29
objectReference: {fileID: 0}
- target: {fileID: 8195094281470038606, guid: 29d5569197813594db51adf0d061bc36,
type: 2}
propertyPath: m_TileMatrixArray.Array.data[0].m_Data.e23
value: 4.674001e-29
objectReference: {fileID: 0}
- target: {fileID: 1336968304314136, guid: 29d5569197813594db51adf0d061bc36, type: 2}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 29d5569197813594db51adf0d061bc36, type: 2} m_SourcePrefab: {fileID: 100100000, guid: 29d5569197813594db51adf0d061bc36, type: 2}
m_IsPrefabAsset: 0 m_IsPrefabAsset: 0
...@@ -1577,3 +1851,59 @@ RectTransform: ...@@ -1577,3 +1851,59 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0} m_Pivot: {x: 0, y: 0}
--- !u!1001 &2120518040
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1244139631}
m_Modifications:
- target: {fileID: 66423678504979326, guid: f6834170b7152ee4db0dc7e165dcca70,
type: 2}
propertyPath: m_ColliderPaths.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 66756967381453834, guid: f6834170b7152ee4db0dc7e165dcca70,
type: 2}
propertyPath: m_ColliderPaths.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4180646400299094, guid: f6834170b7152ee4db0dc7e165dcca70, type: 2}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4180646400299094, guid: f6834170b7152ee4db0dc7e165dcca70, type: 2}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4180646400299094, guid: f6834170b7152ee4db0dc7e165dcca70, type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4180646400299094, guid: f6834170b7152ee4db0dc7e165dcca70, type: 2}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4180646400299094, guid: f6834170b7152ee4db0dc7e165dcca70, type: 2}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4180646400299094, guid: f6834170b7152ee4db0dc7e165dcca70, type: 2}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4180646400299094, guid: f6834170b7152ee4db0dc7e165dcca70, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4180646400299094, guid: f6834170b7152ee4db0dc7e165dcca70, type: 2}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1934928217517870, guid: f6834170b7152ee4db0dc7e165dcca70, type: 2}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f6834170b7152ee4db0dc7e165dcca70, type: 2}
m_IsPrefabAsset: 0
Assets/Scripts/TetrisMap/MapManager.cs
View file @ 926ba458
...@@ -988,70 +988,70 @@ public class MapManager : Singleton<MapManager> { ...@@ -988,70 +988,70 @@ public class MapManager : Singleton<MapManager> {
Tetrimino.rotationInformation[5].horizontalLength = new int[4] { 3, 2, 3, 2 }; //S Tetrimino.rotationInformation[5].horizontalLength = new int[4] { 3, 2, 3, 2 }; //S
Tetrimino.rotationInformation[6].horizontalLength = new int[4] { 3, 2, 3, 2 }; //Z Tetrimino.rotationInformation[6].horizontalLength = new int[4] { 3, 2, 3, 2 }; //Z
Tetrimino.rotationInformation[7].horizontalLength = new int[4] { 1, 1, 1, 1 }; //Boss Tetrimino.rotationInformation[7].horizontalLength = new int[4] { 1, 1, 1, 1 }; //Boss
ItemRoomInGame.itemRoomInformation[0] = new RoomItemInfo( ItemRoomInGame.itemRoomInformation[0] = new RoomItemInfo<ItemRoomItemInfo>(
new ItemSpawnInfo[8] new ItemRoomItemInfo[8]
{ {
new ItemSpawnInfo(12.5f, new ItemSpawnType[2] { ItemSpawnType.Item, ItemSpawnType.GoldPotion }, new ItemRoomItemInfo(12.5f, new ItemSpawnType[2] { ItemSpawnType.Item, ItemSpawnType.GoldPotion },
new ItemQuality[2] { ItemQuality.Ordinary, ItemQuality.None }, new int[2] { 1, 2 }), new ItemQuality[2] { ItemQuality.Ordinary, ItemQuality.None }, new int[2] { 1, 2 }),
new ItemSpawnInfo(12.5f, new ItemSpawnType[2] { ItemSpawnType.Addon, ItemSpawnType.GoldPotion }, new ItemRoomItemInfo(12.5f, new ItemSpawnType[2] { ItemSpawnType.Addon, ItemSpawnType.GoldPotion },
new ItemQuality[2] { ItemQuality.Ordinary, ItemQuality.None }, new int[2] { 1, 2 }), new ItemQuality[2] { ItemQuality.Ordinary, ItemQuality.None }, new int[2] { 1, 2 }),
new ItemSpawnInfo(12.5f, new ItemSpawnType[2] { ItemSpawnType.Item, ItemSpawnType.LifeStone }, new ItemRoomItemInfo(12.5f, new ItemSpawnType[2] { ItemSpawnType.Item, ItemSpawnType.LifeStone },
new ItemQuality[2] { ItemQuality.Ordinary, ItemQuality.Gold }, new int[2] { 1, 1 }), new ItemQuality[2] { ItemQuality.Ordinary, ItemQuality.Gold }, new int[2] { 1, 1 }),
new ItemSpawnInfo(12.5f, new ItemSpawnType[2] { ItemSpawnType.Addon, ItemSpawnType.LifeStone }, new ItemRoomItemInfo(12.5f, new ItemSpawnType[2] { ItemSpawnType.Addon, ItemSpawnType.LifeStone },
new ItemQuality[2] { ItemQuality.Ordinary, ItemQuality.Gold }, new int[2] { 1, 1 }), new ItemQuality[2] { ItemQuality.Ordinary, ItemQuality.Gold }, new int[2] { 1, 1 }),
new ItemSpawnInfo(17, new ItemSpawnType[2] { ItemSpawnType.Item, ItemSpawnType.Addon }, new ItemRoomItemInfo(17, new ItemSpawnType[2] { ItemSpawnType.Item, ItemSpawnType.Addon },
new ItemQuality[2] { ItemQuality.Ordinary, ItemQuality.Ordinary }, new int[2] { 1, 1 }), new ItemQuality[2] { ItemQuality.Ordinary, ItemQuality.Ordinary }, new int[2] { 1, 1 }),
new ItemSpawnInfo(25, new ItemSpawnType[2] { ItemSpawnType.Item, ItemSpawnType.Addon }, new ItemRoomItemInfo(25, new ItemSpawnType[2] { ItemSpawnType.Item, ItemSpawnType.Addon },
new ItemQuality[2] { ItemQuality.Ordinary, ItemQuality.Study }, new int[2] { 1, 1 }), new ItemQuality[2] { ItemQuality.Ordinary, ItemQuality.Study }, new int[2] { 1, 1 }),
new ItemSpawnInfo(4, new ItemSpawnType[1] { ItemSpawnType.Item }, new ItemRoomItemInfo(4, new ItemSpawnType[1] { ItemSpawnType.Item },
new ItemQuality[1] { ItemQuality.Superior }, new int[1] { 1 }), new ItemQuality[1] { ItemQuality.Superior }, new int[1] { 1 }),
new ItemSpawnInfo(4, new ItemSpawnType[1] { ItemSpawnType.Addon }, new ItemRoomItemInfo(4, new ItemSpawnType[1] { ItemSpawnType.Addon },
new ItemQuality[1] { ItemQuality.Superior }, new int[1] { 1 }) new ItemQuality[1] { ItemQuality.Superior }, new int[1] { 1 })
}); });
ItemRoomInGame.itemRoomInformation[1] = new RoomItemInfo( ItemRoomInGame.itemRoomInformation[1] = new RoomItemInfo<ItemRoomItemInfo>(
new ItemSpawnInfo[7] new ItemRoomItemInfo[7]
{ {
new ItemSpawnInfo(10, new ItemSpawnType[2] { ItemSpawnType.Item, ItemSpawnType.GoldPotion }, new ItemRoomItemInfo(10, new ItemSpawnType[2] { ItemSpawnType.Item, ItemSpawnType.GoldPotion },
new ItemQuality[2] { ItemQuality.Superior, ItemQuality.None }, new int[2] { 1, 3 }), new ItemQuality[2] { ItemQuality.Superior, ItemQuality.None }, new int[2] { 1, 3 }),
new ItemSpawnInfo(10, new ItemSpawnType[2] { ItemSpawnType.Addon, ItemSpawnType.GoldPotion }, new ItemRoomItemInfo(10, new ItemSpawnType[2] { ItemSpawnType.Addon, ItemSpawnType.GoldPotion },
new ItemQuality[2] { ItemQuality.Superior, ItemQuality.None }, new int[2] { 1, 3 }), new ItemQuality[2] { ItemQuality.Superior, ItemQuality.None }, new int[2] { 1, 3 }),
new ItemSpawnInfo(20, new ItemSpawnType[3] { ItemSpawnType.Addon, ItemSpawnType.Addon, ItemSpawnType.Addon }, new ItemRoomItemInfo(20, new ItemSpawnType[3] { ItemSpawnType.Addon, ItemSpawnType.Addon, ItemSpawnType.Addon },
new ItemQuality[3] { ItemQuality.Superior, ItemQuality.Ordinary, ItemQuality.Study }, new int[3] { 1, 1, 1 }), new ItemQuality[3] { ItemQuality.Superior, ItemQuality.Ordinary, ItemQuality.Study }, new int[3] { 1, 1, 1 }),
new ItemSpawnInfo(20, new ItemSpawnType[2] { ItemSpawnType.Item, ItemSpawnType.Addon }, new ItemRoomItemInfo(20, new ItemSpawnType[2] { ItemSpawnType.Item, ItemSpawnType.Addon },
new ItemQuality[2] { ItemQuality.Superior, ItemQuality.Study }, new int[2] { 1, 2 }), new ItemQuality[2] { ItemQuality.Superior, ItemQuality.Study }, new int[2] { 1, 2 }),
new ItemSpawnInfo(20, new ItemSpawnType[3] { ItemSpawnType.Item, ItemSpawnType.Addon, ItemSpawnType.LifeStone }, new ItemRoomItemInfo(20, new ItemSpawnType[3] { ItemSpawnType.Item, ItemSpawnType.Addon, ItemSpawnType.LifeStone },
new ItemQuality[3] { ItemQuality.Superior, ItemQuality.Ordinary, ItemQuality.None }, new int[3] { 1, 1, 1 }), new ItemQuality[3] { ItemQuality.Superior, ItemQuality.Ordinary, ItemQuality.None }, new int[3] { 1, 1, 1 }),
new ItemSpawnInfo(10, new ItemSpawnType[2] { ItemSpawnType.Item, ItemSpawnType.LifeStone }, new ItemRoomItemInfo(10, new ItemSpawnType[2] { ItemSpawnType.Item, ItemSpawnType.LifeStone },
new ItemQuality[2] { ItemQuality.Superior, ItemQuality.None }, new int[2] { 1, 3 }), new ItemQuality[2] { ItemQuality.Superior, ItemQuality.None }, new int[2] { 1, 3 }),
new ItemSpawnInfo(10, new ItemSpawnType[2] { ItemSpawnType.Addon, ItemSpawnType.LifeStone }, new ItemRoomItemInfo(10, new ItemSpawnType[2] { ItemSpawnType.Addon, ItemSpawnType.LifeStone },
new ItemQuality[2] { ItemQuality.Superior, ItemQuality.None }, new int[2] { 1, 3 }) new ItemQuality[2] { ItemQuality.Superior, ItemQuality.None }, new int[2] { 1, 3 })
}); });
ItemRoomInGame.itemRoomInformation[2] = new RoomItemInfo( ItemRoomInGame.itemRoomInformation[2] = new RoomItemInfo<ItemRoomItemInfo>(
new ItemSpawnInfo[4] new ItemRoomItemInfo[4]
{ {
new ItemSpawnInfo(33.5f, new ItemSpawnType[4] { ItemSpawnType.Item, ItemSpawnType.Addon, ItemSpawnType.Item, ItemSpawnType.GoldPotion }, new ItemRoomItemInfo(33.5f, new ItemSpawnType[4] { ItemSpawnType.Item, ItemSpawnType.Addon, ItemSpawnType.Item, ItemSpawnType.GoldPotion },
new ItemQuality[4] { ItemQuality.Superior, ItemQuality.Superior, ItemQuality.Ordinary, ItemQuality.None }, new int[4] { 1, 1, 1, 1 }), new ItemQuality[4] { ItemQuality.Superior, ItemQuality.Superior, ItemQuality.Ordinary, ItemQuality.None }, new int[4] { 1, 1, 1, 1 }),
new ItemSpawnInfo(33.5f, new ItemSpawnType[4] { ItemSpawnType.Item, ItemSpawnType.Addon, ItemSpawnType.Addon, ItemSpawnType.GoldPotion }, new ItemRoomItemInfo(33.5f, new ItemSpawnType[4] { ItemSpawnType.Item, ItemSpawnType.Addon, ItemSpawnType.Addon, ItemSpawnType.GoldPotion },
new ItemQuality[4] { ItemQuality.Superior, ItemQuality.Superior, ItemQuality.Ordinary, ItemQuality.None }, new int[4] { 1, 1, 1, 1 }), new ItemQuality[4] { ItemQuality.Superior, ItemQuality.Superior, ItemQuality.Ordinary, ItemQuality.None }, new int[4] { 1, 1, 1, 1 }),
new ItemSpawnInfo(16.5f, new ItemSpawnType[1] { ItemSpawnType.Item }, new ItemRoomItemInfo(16.5f, new ItemSpawnType[1] { ItemSpawnType.Item },
new ItemQuality[1] { ItemQuality.Masterpiece }, new int[1] { 1 }), new ItemQuality[1] { ItemQuality.Masterpiece }, new int[1] { 1 }),
new ItemSpawnInfo(16.5f, new ItemSpawnType[1] { ItemSpawnType.Addon }, new ItemRoomItemInfo(16.5f, new ItemSpawnType[1] { ItemSpawnType.Addon },
new ItemQuality[1] { ItemQuality.Masterpiece }, new int[1] { 1 }) new ItemQuality[1] { ItemQuality.Masterpiece }, new int[1] { 1 })
}); });
ItemRoomInGame.itemRoomInformation[3] = new RoomItemInfo( ItemRoomInGame.itemRoomInformation[3] = new RoomItemInfo<ItemRoomItemInfo>(
new ItemSpawnInfo[2] new ItemRoomItemInfo[2]
{ {
new ItemSpawnInfo(50, new ItemSpawnType[2] { ItemSpawnType.Item, ItemSpawnType.GoldPotion }, new ItemRoomItemInfo(50, new ItemSpawnType[2] { ItemSpawnType.Item, ItemSpawnType.GoldPotion },
new ItemQuality[2] { ItemQuality.Masterpiece, ItemQuality.None }, new int[2] { 1, 2 }), new ItemQuality[2] { ItemQuality.Masterpiece, ItemQuality.None }, new int[2] { 1, 2 }),
new ItemSpawnInfo(50, new ItemSpawnType[2] { ItemSpawnType.Addon, ItemSpawnType.GoldPotion }, new ItemRoomItemInfo(50, new ItemSpawnType[2] { ItemSpawnType.Addon, ItemSpawnType.GoldPotion },
new ItemQuality[2] { ItemQuality.Masterpiece, ItemQuality.None }, new int[2] { 1, 2 }) new ItemQuality[2] { ItemQuality.Masterpiece, ItemQuality.None }, new int[2] { 1, 2 })
}); });
ItemRoomInGame.itemRoomInformation[4] = new RoomItemInfo( ItemRoomInGame.itemRoomInformation[4] = new RoomItemInfo<ItemRoomItemInfo>(
new ItemSpawnInfo[2] new ItemRoomItemInfo[2]
{ {
new ItemSpawnInfo(50, new ItemSpawnType[3] { ItemSpawnType.Item, ItemSpawnType.LifeStoneFrame, ItemSpawnType.LifeStone }, new ItemRoomItemInfo(50, new ItemSpawnType[3] { ItemSpawnType.Item, ItemSpawnType.LifeStoneFrame, ItemSpawnType.LifeStone },
new ItemQuality[3] { ItemQuality.Masterpiece, ItemQuality.None, ItemQuality.Gold }, new int[3] { 1, 1, 1 }), new ItemQuality[3] { ItemQuality.Masterpiece, ItemQuality.None, ItemQuality.Gold }, new int[3] { 1, 1, 1 }),
new ItemSpawnInfo(50, new ItemSpawnType[3] { ItemSpawnType.Addon, ItemSpawnType.LifeStoneFrame, ItemSpawnType.LifeStone }, new ItemRoomItemInfo(50, new ItemSpawnType[3] { ItemSpawnType.Addon, ItemSpawnType.LifeStoneFrame, ItemSpawnType.LifeStone },
new ItemQuality[3] { ItemQuality.Masterpiece, ItemQuality.None, ItemQuality.Gold }, new int[3] { 1, 1, 1 }) new ItemQuality[3] { ItemQuality.Masterpiece, ItemQuality.None, ItemQuality.Gold }, new int[3] { 1, 1, 1 })
}); });
for (int i = 0; i < tetrisYCoord.Length; i++) for (int i = 0; i < tetrisYCoord.Length; i++)
...@@ -1229,7 +1229,7 @@ public class MapManager : Singleton<MapManager> { ...@@ -1229,7 +1229,7 @@ public class MapManager : Singleton<MapManager> {
if(GameManager.gameState == GameState.Portal) if(GameManager.gameState == GameState.Portal)
PortalControl(); PortalControl();
if (!currentRoom.isRoomCleared && (EnemyManager.Instance.IsClear() || (currentRoom.specialRoomType != RoomType.Normal && currentRoom.specialRoomType != RoomType.Boss))) if (!currentRoom.isRoomCleared && (EnemyManager.Instance.IsClear() || (currentRoom.specialRoomType != RoomType.Normal && currentRoom.specialRoomType != RoomType.Boss)))
currentRoom.ClearRoom(); currentRoom.FinishRoom();
} }
} }
} }
Assets/Scripts/TetrisMap/Room.cs
View file @ 926ba458
...@@ -221,6 +221,19 @@ public class Room : MonoBehaviour ...@@ -221,6 +221,19 @@ public class Room : MonoBehaviour
{ {
portal = roomInGame.transform.Find("portal spot").gameObject; portal = roomInGame.transform.Find("portal spot").gameObject;
portal = Instantiate(MapManager.Instance.portal, portal.transform.position, Quaternion.identity, roomInGame.transform); portal = Instantiate(MapManager.Instance.portal, portal.transform.position, Quaternion.identity, roomInGame.transform);
for (int x = 0; x < MapManager.width; x++)
MapManager.portalDistributedHorizontal[x].Clear();
for (int y = 0; y <= MapManager.realHeight; y++)
MapManager.portalDistributedVertical[y].Clear();
for (int x = 0; x < MapManager.width; x++)
for (int y = 0; y <= MapManager.realHeight; y++)
if (MapManager.mapGrid[x, y] != null && MapManager.mapGrid[x, y].isPortal == true)
{
MapManager.portalGrid[x, y] = true;
MapManager.portalDistributedHorizontal[x].Add(y);
MapManager.portalDistributedVertical[y].Add(x);
}
portalSurface = Instantiate(MapManager.Instance.portalSurface, transform.position + new Vector3(12, 12, 0), Quaternion.identity, transform);
} }
} }
} }
...@@ -366,7 +379,7 @@ public class Room : MonoBehaviour ...@@ -366,7 +379,7 @@ public class Room : MonoBehaviour
/// Clear the cleared room. /// Clear the cleared room.
/// Open all the doors and change fog to cleared fog. /// Open all the doors and change fog to cleared fog.
/// </summary> /// </summary>
public void ClearRoom() public void FinishRoom()
{ {
if(isRoomCleared != true) if(isRoomCleared != true)
{ {
...@@ -375,32 +388,14 @@ public class Room : MonoBehaviour ...@@ -375,32 +388,14 @@ public class Room : MonoBehaviour
OpenDoor("Left"); OpenDoor("Left");
OpenDoor("Right"); OpenDoor("Right");
Vector3 fogPosition = fog.transform.position; Vector3 fogPosition = fog.transform.position;
Destroy(fog);
fog = Instantiate(MapManager.Instance.clearedFog, fogPosition, Quaternion.identity, transform); fog = Instantiate(MapManager.Instance.clearedFog, fogPosition, Quaternion.identity, transform);
fog.GetComponent<SpriteRenderer>().color = new Color(1, 1, 1, 0); fog.GetComponent<SpriteRenderer>().color = new Color(1, 1, 1, 0);
CreatePortal(); CreatePortal();
if (isPortal == true)
{
for (int x = 0; x < MapManager.width; x++)
MapManager.portalDistributedHorizontal[x].Clear();
for (int y = 0; y <= MapManager.realHeight; y++)
MapManager.portalDistributedVertical[y].Clear();
for (int x = 0; x < MapManager.width; x++)
for (int y = 0; y <= MapManager.realHeight; y++)
if (MapManager.mapGrid[x, y] != null && MapManager.mapGrid[x, y].isPortal == true)
{
MapManager.portalGrid[x, y] = true;
MapManager.portalDistributedHorizontal[x].Add(y);
MapManager.portalDistributedVertical[y].Add(x);
}
portalSurface = Instantiate(MapManager.Instance.portalSurface, transform.position + new Vector3(12, 12, 0), Quaternion.identity, transform);
}
isRoomCleared = true; isRoomCleared = true;
MapManager.Instance.clock.clockSpeedStack -= 3; MapManager.Instance.clock.clockSpeedStack -= 3;
if (MapManager.Instance.clock.clockSpeedStack < 0) if (MapManager.Instance.clock.clockSpeedStack < 0)
MapManager.Instance.clock.clockSpeedStack = 0; MapManager.Instance.clock.clockSpeedStack = 0;
if (specialRoomType == RoomType.Boss) roomInGame.RoomClear();
MapManager.currentStage += 1;
} }
//Need to make extra works. //Need to make extra works.
} }
......
Assets/Scripts/TetrisMap/RoomInGame.cs
View file @ 926ba458
...@@ -2,31 +2,14 @@ ...@@ -2,31 +2,14 @@
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
public class ItemSpawnInfo public class RoomItemInfo<T>
{ {
public float probability; public List<T> itemSpawnInfo = new List<T>();
public ItemSpawnType[] itemType; public RoomItemInfo()
public ItemQuality[] itemQuality;
public int[] amount;
public ItemSpawnInfo(float _probability, ItemSpawnType[] _itemType, ItemQuality[] _itemQuality, int[] _amount)
{ {
probability = _probability;
itemType = new ItemSpawnType[_itemType.Length];
itemQuality = new ItemQuality[_itemQuality.Length];
amount = new int[4];
for (int i = 0; i < _itemType.Length; i++)
{
itemType[i] = _itemType[i];
itemQuality[i] = _itemQuality[i];
amount[i] = _amount[i];
}
}
}
public class RoomItemInfo }
{ public RoomItemInfo(T[] _itemSpawnInfo)
public List<ItemSpawnInfo> itemSpawnInfo = new List<ItemSpawnInfo>();
public RoomItemInfo(ItemSpawnInfo[] _itemSpawnInfo)
{ {
for (int i = 0; i < _itemSpawnInfo.Length; i++) for (int i = 0; i < _itemSpawnInfo.Length; i++)
itemSpawnInfo.Add(_itemSpawnInfo[i]); itemSpawnInfo.Add(_itemSpawnInfo[i]);
...@@ -63,4 +46,9 @@ public class RoomInGame : MonoBehaviour { ...@@ -63,4 +46,9 @@ public class RoomInGame : MonoBehaviour {
{ {
} }
public virtual void RoomClear()
{
}
} }
Assets/Scripts/TetrisMap/Rooms/BossRoomInGame.cs
View file @ 926ba458
...@@ -4,14 +4,16 @@ using UnityEngine; ...@@ -4,14 +4,16 @@ using UnityEngine;
public class BossRoomInGame : RoomInGame { public class BossRoomInGame : RoomInGame {
IEnumerator[] phases;
public override void RoomEnter() public override void RoomEnter()
{ {
base.RoomEnter(); base.RoomEnter();
// 보스 소개 //보스 만들어지면 구현할 것
} }
public override void RoomClear()
{
base.RoomClear();
MapManager.currentStage += 1;
}
} }
Assets/Scripts/TetrisMap/Rooms/GoldRoomInGame.cs
View file @ 926ba458
...@@ -2,17 +2,39 @@ ...@@ -2,17 +2,39 @@
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
public class GoldRoomInGame : RoomInGame {
public class GoldRoomItemInfo
{
public ItemSpawnType[] itemType;
public ItemQuality[] itemQuality;
public int[] price;
public GoldRoomItemInfo(ItemSpawnType[] _itemType, ItemQuality[] _itemQuality, int[] _price)
{
itemType = new ItemSpawnType[_itemType.Length];
itemQuality = new ItemQuality[_itemQuality.Length];
price = new int[_price.Length];
for (int i = 0; i < _itemType.Length; i++)
{
itemType[i] = _itemType[i];
itemQuality[i] = _itemQuality[i];
price[i] = _price[i];
}
}
}
public class GoldRoomInGame : RoomInGame {
public static RoomItemInfo<GoldRoomItemInfo>[] goldRoomInformation = new RoomItemInfo<GoldRoomItemInfo>()[];
public override void RoomEnter() public override void RoomEnter()
{ {
base.RoomEnter(); base.RoomEnter();
} }
public override void RoomClear()
{
base.RoomClear();
}
} }
Assets/Scripts/TetrisMap/Rooms/ItemRoomInGame.cs
View file @ 926ba458
...@@ -2,9 +2,30 @@ ...@@ -2,9 +2,30 @@
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
public class ItemRoomItemInfo
{
public float probability;
public ItemSpawnType[] itemType;
public ItemQuality[] itemQuality;
public int[] amount;
public ItemRoomItemInfo(float _probability, ItemSpawnType[] _itemType, ItemQuality[] _itemQuality, int[] _amount)
{
probability = _probability;
itemType = new ItemSpawnType[_itemType.Length];
itemQuality = new ItemQuality[_itemQuality.Length];
amount = new int[_amount.Length];
for (int i = 0; i < _itemType.Length; i++)
{
itemType[i] = _itemType[i];
itemQuality[i] = _itemQuality[i];
amount[i] = _amount[i];
}
}
}
public class ItemRoomInGame : RoomInGame { public class ItemRoomInGame : RoomInGame {
public static RoomItemInfo[] itemRoomInformation = new RoomItemInfo[5]; public static RoomItemInfo<ItemRoomItemInfo>[] itemRoomInformation = new RoomItemInfo<ItemRoomItemInfo>[5];
public void SpawnItem() public void SpawnItem()
{ {
...@@ -21,7 +42,7 @@ public class ItemRoomInGame : RoomInGame { ...@@ -21,7 +42,7 @@ public class ItemRoomInGame : RoomInGame {
itemRoomIndex = 5; itemRoomIndex = 5;
for(int index = 0; index < itemRoomInformation[itemRoomIndex - 1].itemSpawnInfo.Count; index++) for(int index = 0; index < itemRoomInformation[itemRoomIndex - 1].itemSpawnInfo.Count; index++)
{ {
ItemSpawnInfo child = itemRoomInformation[itemRoomIndex - 1].itemSpawnInfo[index]; ItemRoomItemInfo child = itemRoomInformation[itemRoomIndex - 1].itemSpawnInfo[index];
probability -= child.probability; probability -= child.probability;
Debug.Log(probability); Debug.Log(probability);
if (probability <= 0) if (probability <= 0)
...@@ -86,4 +107,10 @@ public class ItemRoomInGame : RoomInGame { ...@@ -86,4 +107,10 @@ public class ItemRoomInGame : RoomInGame {
base.RoomEnter(); base.RoomEnter();
SpawnItem(); SpawnItem();
} }
public override void RoomClear()
{
base.RoomClear();
}
} }
Assets/Scripts/TetrisMap/Rooms/NormalRoomInGame.cs
View file @ 926ba458
...@@ -9,4 +9,10 @@ public class NormalRoomInGame : RoomInGame { ...@@ -9,4 +9,10 @@ public class NormalRoomInGame : RoomInGame {
base.RoomEnter(); base.RoomEnter();
EnemyManager.Instance.SpawnEnemyToMap(); EnemyManager.Instance.SpawnEnemyToMap();
} }
public override void RoomClear()
{
base.RoomClear();
}
} }
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