Skip to content

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

가시 타일 인식되는 방식 수정함. 이제 플레이어가 몇개의 방을 더 클리어해야 보스룸이 나오는지 표시함.

parent 0e37ba9f
Show whitespace changes
Inline Side-by-side
Showing with 28806 additions and 1229 deletions
Assets/Palettes/1-1.prefab
View file @ c3d030f7
......@@ -130,7 +130,7 @@ TilemapRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_ChunkSize: {x: 32, y: 32, z: 32}
m_ChunkCullingBounds: {x: 0.5, y: 0, z: 0}
m_ChunkCullingBounds: {x: 0.5, y: 0.5, z: 0}
m_MaxChunkCount: 16
m_MaxFrameAge: 16
m_SortOrder: 0
......@@ -156,7 +156,7 @@ Tilemap:
- first: {x: -2, y: 0, z: 0}
second:
m_TileIndex: 6
m_TileSpriteIndex: 6
m_TileSpriteIndex: 2
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -173,8 +173,8 @@ Tilemap:
m_ColliderType: 1
- first: {x: -2, y: 1, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 5
m_TileIndex: 2
m_TileSpriteIndex: 6
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -182,8 +182,8 @@ Tilemap:
m_ColliderType: 1
- first: {x: -3, y: 2, z: 0}
second:
m_TileIndex: 4
m_TileSpriteIndex: 4
m_TileIndex: 8
m_TileSpriteIndex: 5
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -192,7 +192,7 @@ Tilemap:
- first: {x: -2, y: 2, z: 0}
second:
m_TileIndex: 0
m_TileSpriteIndex: 1
m_TileSpriteIndex: 4
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -218,8 +218,8 @@ Tilemap:
m_ColliderType: 1
- first: {x: -2, y: 3, z: 0}
second:
m_TileIndex: 6
m_TileSpriteIndex: 2
m_TileIndex: 4
m_TileSpriteIndex: 12
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -234,6 +234,15 @@ Tilemap:
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: -1, y: 4, z: 0}
second:
m_TileIndex: 6
m_TileSpriteIndex: 2
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: -2, y: 5, z: 0}
second:
m_TileIndex: 11
......@@ -247,22 +256,22 @@ Tilemap:
m_TileAssetArray:
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: b020cda901d4db14ca4935cd00d3243b, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: f411e29431b787c4ab84b5ff59ca5e6e, type: 2}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 7dbb7c55a3417f54fbd38fafb369478e, type: 2}
m_Data: {fileID: 11400000, guid: 0278fb79c70975e47a7a1ae5ab779cc2, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 85440e0dd81e48840947ce485614bab6, type: 2}
m_Data: {fileID: 11400000, guid: 4c5c5e5534e976b42bbac32a1280fa6f, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: faca42f78d4fa7e4cb168ca7d28c9199, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: e5b4dc13ffaec264c9f11c6ffce59822, type: 2}
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: 3c532ce77a13dca448f232a5f07b30b0, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: d997dfdb0cb62384d8353109397daee0, type: 2}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 6fde75b5d77ef254188a9fdef3bc03c3, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 2ed3c67619ea80944a928c56b3709b9b, type: 2}
- m_RefCount: 1
......@@ -272,18 +281,18 @@ Tilemap:
m_TileSpriteArray:
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: 8d51b9bc567a640429923a2c09665640, type: 3}
- m_RefCount: 1
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 2
m_Data: {fileID: 21300000, guid: 1c9498957ccbd8d4088e7ebb6c8c9bb7, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: ae1d646541c9b9647af41abd213aaaa2, type: 3}
m_Data: {fileID: 21300000, guid: 1d0855b6581f12e45bde764091314baf, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: 59bbc71eb892afa47b6fc1e759d4fc7c, type: 3}
m_Data: {fileID: 21300000, guid: 8d51b9bc567a640429923a2c09665640, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: d17f08c78e4eeee4d9720ba726b4944a, type: 3}
m_Data: {fileID: 21300000, guid: 4915fd587eb121342b1c70dc7f3773df, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: 57dcdd6fd2364b24ea278d98c99953f8, type: 3}
m_Data: {fileID: 21300000, guid: e90594de7f760a34394f0a786a779ad9, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: db578da6fc6e200489330b72213b3118, type: 3}
- m_RefCount: 1
......@@ -294,8 +303,10 @@ Tilemap:
m_Data: {fileID: 21300000, guid: e2417369ef525c045ad1a3996233d222, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: bb639819b3fdf1a45b4cb0e1eb39dd7c, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: 1cf0fa6989016be47b8d1be7215a7bb8, type: 3}
m_TileMatrixArray:
- m_RefCount: 11
- m_RefCount: 12
m_Data:
e00: 1
e01: 0
......@@ -314,7 +325,7 @@ Tilemap:
e32: 0
e33: 1
m_TileColorArray:
- m_RefCount: 11
- m_RefCount: 12
m_Data: {r: 1, g: 1, b: 1, a: 1}
- m_RefCount: 0
m_Data: {r: NaN, g: NaN, b: NaN, a: NaN}
......@@ -322,8 +333,8 @@ Tilemap:
m_Data: {r: NaN, g: NaN, b: NaN, a: NaN}
m_AnimationFrameRate: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Origin: {x: -4, y: -2, z: 0}
m_Size: {x: 4, y: 8, z: 1}
m_Origin: {x: -7, y: -2, z: 0}
m_Size: {x: 18, y: 9, z: 1}
m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
m_TileOrientation: 0
m_TileOrientationMatrix:
......
Assets/Prefabs/MapManager.prefab
View file @ c3d030f7
......@@ -57,14 +57,13 @@ MonoBehaviour:
initialFallSpeed: -0.1
gravity: 0.98
collapseTime: 10
spawnBossTetrimino: 0
clearedRoomCount: 0
stageClearCondition: 0a0000000a0000000a0000000a0000000a000000
tetriminoCost: 1
fog: {fileID: 1100171732424598, guid: b8ab69a93ba618c47b27cc04eb431b3f, type: 2}
clearedFog: {fileID: 1767033925555920, guid: df8687fe46befb34eaf9d4d63938d946, type: 2}
portal: {fileID: 1285471223282336, guid: 93ba58b5e24488741a018d983b59c580, type: 2}
press: {fileID: 114990664041074520, guid: 8e750fd197a05d84c9fb8557eb95c666, type: 2}
leftDoor: {fileID: 1309596820948456, guid: 80ed5bfe62ba3034592296b6e27526bc, type: 2}
rightDoor: {fileID: 1614071394812404, guid: ac9e1e28c8413e54f939bc255268fabd, type: 2}
inGameDoorUp: {fileID: 1011110161276626, guid: 30d1850ce96755d4ea7675c706899cfb,
type: 2}
inGameDoorDown: {fileID: 1488439045129830, guid: 98de1e842c22aa048bde2ae464f9c601,
......@@ -99,6 +98,12 @@ MonoBehaviour:
- {fileID: 114244835555513196, guid: 478354a3449548a44ba40d516d1cc3cd, type: 2}
- {fileID: 114294378205009276, guid: 5d9d617a37ddce4448c92cca0946ab18, type: 2}
- {fileID: 114410341130824760, guid: bfa57985877d23b46929238f077b40df, type: 2}
- {fileID: 114410341130824760, guid: bfa57985877d23b46929238f077b40df, type: 2}
- {fileID: 114546668803764404, guid: 6b6c92d6e866a894b81c6d9b98f8c4aa, type: 2}
- {fileID: 114838560965976026, guid: da6e94048cb88f4449375f3e5ab9b6ae, type: 2}
- {fileID: 114250106650677324, guid: 530e72844aa405942a7f99d26c7da727, type: 2}
- {fileID: 114475536472279828, guid: 12fa736e7364cfc4993adcabbd273c10, type: 2}
- {fileID: 114633610401043244, guid: 07a14b0ab56e0d441ace33941b2165e8, type: 2}
specialRoomList1:
- {fileID: 114330503780891850, guid: 7da800d1a4355fd4aa02e3518cd9e1fb, type: 2}
- {fileID: 114788631920660382, guid: 2514de8c1d17b734592b5fe2cdc74560, type: 2}
......
Assets/Prefabs/Rooms/NormalRoom/Room 1.prefab
View file @ c3d030f7
......@@ -480,9 +480,117 @@ CompositeCollider2D:
m_EdgeRadius: 0
m_ColliderPaths:
- m_Collider: {fileID: 2113883505235840134}
m_ColliderPaths: []
m_ColliderPaths:
- - X: 140000000
Y: 149218752
- X: 140624992
Y: 146875008
- X: 149375008
Y: 146875008
- X: 150000000
Y: 149218752
- X: 150000000
Y: 150000000
- X: 150781248
Y: 150000000
- X: 153124992
Y: 150624992
- X: 153124992
Y: 159375008
- X: 150781248
Y: 160000000
- X: 153124992
Y: 160624992
- X: 153124992
Y: 169375008
- X: 150781248
Y: 170000000
- X: 150000000
Y: 170000000
- X: 150000000
Y: 170624992
- X: 149375008
Y: 173124992
- X: 140624992
Y: 173124992
- X: 140000000
Y: 170624992
- X: 139375008
Y: 173124992
- X: 130625000
Y: 173124992
- X: 130000000
Y: 170624992
- X: 130000000
Y: 170000000
- X: 129375000
Y: 170000000
- X: 126875000
Y: 169375008
- X: 126875000
Y: 160624992
- X: 129375000
Y: 160000000
- X: 126875000
Y: 159375008
- X: 126875000
Y: 150624992
- X: 129375000
Y: 150000000
- X: 130000000
Y: 150000000
- X: 130000000
Y: 149218752
- X: 130625000
Y: 146875008
- X: 139375008
Y: 146875008
- - X: 131718752
Y: 151718752
- X: 131718752
Y: 168281248
- X: 148281248
Y: 168281248
- X: 148281248
Y: 151718752
m_CompositePaths:
m_Paths: []
m_Paths:
- - {x: 14, y: 14.921875}
- {x: 14.062499, y: 14.687501}
- {x: 14.937501, y: 14.687501}
- {x: 15, y: 14.921875}
- {x: 15, y: 15}
- {x: 15.078125, y: 15}
- {x: 15.312499, y: 15.062499}
- {x: 15.312499, y: 15.937501}
- {x: 15.078125, y: 16}
- {x: 15.312499, y: 16.0625}
- {x: 15.312499, y: 16.937502}
- {x: 15.078125, y: 17}
- {x: 15, y: 17}
- {x: 15, y: 17.0625}
- {x: 14.937501, y: 17.3125}
- {x: 14.062499, y: 17.3125}
- {x: 14, y: 17.0625}
- {x: 13.937501, y: 17.3125}
- {x: 13.0625, y: 17.3125}
- {x: 13, y: 17.0625}
- {x: 13, y: 17}
- {x: 12.9375, y: 17}
- {x: 12.6875, y: 16.937502}
- {x: 12.6875, y: 16.0625}
- {x: 12.9375, y: 16}
- {x: 12.6875, y: 15.937501}
- {x: 12.6875, y: 15.062499}
- {x: 12.9375, y: 15}
- {x: 13, y: 15}
- {x: 13, y: 14.921875}
- {x: 13.0625, y: 14.687501}
- {x: 13.937501, y: 14.687501}
- - {x: 13.171875, y: 15.171875}
- {x: 13.171875, y: 16.828125}
- {x: 14.828125, y: 16.828125}
- {x: 14.828125, y: 15.171875}
m_VertexDistance: 0.0005
--- !u!66 &66737421748299182
CompositeCollider2D:
......@@ -820,8 +928,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
roomSize: {x: 24, y: 24}
leftDoorInfo: 010100
rightDoorInfo: 010001
leftDoorInfo: 010001
rightDoorInfo: 010100
concept: 01010001
--- !u!114 &114924180447888386
MonoBehaviour:
......@@ -1114,7 +1222,7 @@ TilemapRenderer:
m_SortingLayer: 3
m_SortingOrder: 0
m_ChunkSize: {x: 32, y: 32, z: 32}
m_ChunkCullingBounds: {x: 0, y: 0, z: 0}
m_ChunkCullingBounds: {x: 0.5, y: 0.5, z: 0}
m_MaxChunkCount: 16
m_MaxFrameAge: 16
m_SortOrder: 0
......@@ -1342,8 +1450,8 @@ Tilemap:
m_Tiles:
- first: {x: 13, y: 14, z: 0}
second:
m_TileIndex: 0
m_TileSpriteIndex: 0
m_TileIndex: 3
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -1351,8 +1459,8 @@ Tilemap:
m_ColliderType: 1
- first: {x: 14, y: 14, z: 0}
second:
m_TileIndex: 0
m_TileSpriteIndex: 0
m_TileIndex: 3
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -1360,7 +1468,7 @@ Tilemap:
m_ColliderType: 1
- first: {x: 12, y: 15, z: 0}
second:
m_TileIndex: 0
m_TileIndex: 2
m_TileSpriteIndex: 0
m_TileMatrixIndex: 0
m_TileColorIndex: 0
......@@ -1370,7 +1478,7 @@ Tilemap:
- first: {x: 15, y: 15, z: 0}
second:
m_TileIndex: 0
m_TileSpriteIndex: 0
m_TileSpriteIndex: 2
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -1378,7 +1486,7 @@ Tilemap:
m_ColliderType: 1
- first: {x: 12, y: 16, z: 0}
second:
m_TileIndex: 0
m_TileIndex: 2
m_TileSpriteIndex: 0
m_TileMatrixIndex: 0
m_TileColorIndex: 0
......@@ -1388,7 +1496,7 @@ Tilemap:
- first: {x: 15, y: 16, z: 0}
second:
m_TileIndex: 0
m_TileSpriteIndex: 0
m_TileSpriteIndex: 2
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -1396,8 +1504,8 @@ Tilemap:
m_ColliderType: 1
- first: {x: 13, y: 17, z: 0}
second:
m_TileIndex: 0
m_TileSpriteIndex: 0
m_TileIndex: 4
m_TileSpriteIndex: 3
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -1405,8 +1513,8 @@ Tilemap:
m_ColliderType: 1
- first: {x: 14, y: 17, z: 0}
second:
m_TileIndex: 0
m_TileSpriteIndex: 0
m_TileIndex: 4
m_TileSpriteIndex: 3
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -1414,23 +1522,25 @@ Tilemap:
m_ColliderType: 1
m_AnimatedTiles: {}
m_TileAssetArray:
- m_RefCount: 8
m_Data: {fileID: 11400000, guid: 7f2c5cb43ad7207499b22fb5e0acd41a, type: 2}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: 4c5c5e5534e976b42bbac32a1280fa6f, type: 2}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: 6fde75b5d77ef254188a9fdef3bc03c3, type: 2}
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: 0278fb79c70975e47a7a1ae5ab779cc2, type: 2}
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: faca42f78d4fa7e4cb168ca7d28c9199, type: 2}
m_TileSpriteArray:
- m_RefCount: 8
m_Data: {fileID: 21300000, guid: 7ee765cc5330a444db118a031abd5b9e, type: 3}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 2
m_Data: {fileID: 21300000, guid: 4915fd587eb121342b1c70dc7f3773df, type: 3}
- m_RefCount: 2
m_Data: {fileID: 21300000, guid: e90594de7f760a34394f0a786a779ad9, type: 3}
- m_RefCount: 2
m_Data: {fileID: 21300000, guid: 1d0855b6581f12e45bde764091314baf, type: 3}
- m_RefCount: 2
m_Data: {fileID: 21300000, guid: 1cf0fa6989016be47b8d1be7215a7bb8, type: 3}
m_TileMatrixArray:
- m_RefCount: 8
m_Data:
......@@ -1456,7 +1566,7 @@ Tilemap:
m_AnimationFrameRate: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Origin: {x: 0, y: 0, z: 0}
m_Size: {x: 16, y: 18, z: 1}
m_Size: {x: 18, y: 18, z: 1}
m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
m_TileOrientation: 0
m_TileOrientationMatrix:
......
Assets/Prefabs/Rooms/NormalRoom/Room 10.prefab
View file @ c3d030f7
......@@ -600,9 +600,54 @@ CompositeCollider2D:
m_EdgeRadius: 0
m_ColliderPaths:
- m_Collider: {fileID: 2113883504065565164}
m_ColliderPaths: []
m_ColliderPaths:
- - X: 150000000
Y: 140624992
- X: 149375008
Y: 143124992
- X: 140624992
Y: 143124992
- X: 140000000
Y: 140624992
- X: 139375008
Y: 143124992
- X: 130625000
Y: 143124992
- X: 130000000
Y: 140624992
- X: 130000000
Y: 138281248
- X: 150000000
Y: 138281248
- - X: 80000000
Y: 109218752
- X: 80000000
Y: 111718752
- X: 70000000
Y: 111718752
- X: 70000000
Y: 109218752
- X: 70625000
Y: 106875000
- X: 79375000
Y: 106875000
m_CompositePaths:
m_Paths: []
m_Paths:
- - {x: 15, y: 14.062499}
- {x: 14.937501, y: 14.312499}
- {x: 14.062499, y: 14.312499}
- {x: 14, y: 14.062499}
- {x: 13.937501, y: 14.312499}
- {x: 13.0625, y: 14.312499}
- {x: 13, y: 14.062499}
- {x: 13, y: 13.828125}
- {x: 15, y: 13.828125}
- - {x: 8, y: 10.921875}
- {x: 8, y: 11.171875}
- {x: 7, y: 11.171875}
- {x: 7, y: 10.921875}
- {x: 7.0625, y: 10.6875}
- {x: 7.9375, y: 10.6875}
m_VertexDistance: 0.0005
--- !u!66 &66499936753627384
CompositeCollider2D:
......@@ -954,7 +999,7 @@ TilemapRenderer:
m_SortingLayer: 3
m_SortingOrder: 0
m_ChunkSize: {x: 32, y: 32, z: 32}
m_ChunkCullingBounds: {x: 0, y: 0, z: 0}
m_ChunkCullingBounds: {x: 0, y: 0.5, z: 0}
m_MaxChunkCount: 16
m_MaxFrameAge: 16
m_SortOrder: 0
......@@ -4403,7 +4448,7 @@ Tilemap:
m_Tiles:
- first: {x: 7, y: 10, z: 0}
second:
m_TileIndex: 1
m_TileIndex: 2
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
......@@ -4413,7 +4458,7 @@ Tilemap:
- first: {x: 13, y: 14, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileSpriteIndex: 2
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -4422,7 +4467,7 @@ Tilemap:
- first: {x: 14, y: 14, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileSpriteIndex: 2
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -4432,17 +4477,17 @@ Tilemap:
m_TileAssetArray:
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 3
m_Data: {fileID: 11400000, guid: 7f2c5cb43ad7207499b22fb5e0acd41a, type: 2}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: faca42f78d4fa7e4cb168ca7d28c9199, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 0278fb79c70975e47a7a1ae5ab779cc2, type: 2}
m_TileSpriteArray:
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 3
m_Data: {fileID: 21300000, guid: 7ee765cc5330a444db118a031abd5b9e, type: 3}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: e90594de7f760a34394f0a786a779ad9, type: 3}
- m_RefCount: 2
m_Data: {fileID: 21300000, guid: 1cf0fa6989016be47b8d1be7215a7bb8, type: 3}
m_TileMatrixArray:
- m_RefCount: 3
m_Data:
......
Assets/Prefabs/Rooms/NormalRoom/Room 11.prefab
View file @ c3d030f7
......@@ -716,9 +716,63 @@ CompositeCollider2D:
m_EdgeRadius: 0
m_ColliderPaths:
- m_Collider: {fileID: 2113883505876875174}
m_ColliderPaths: []
m_ColliderPaths:
- - X: 100000000
Y: 10625000
- X: 99375000
Y: 13125000
- X: 90625000
Y: 13125000
- X: 90000000
Y: 10625000
- X: 89375000
Y: 13125000
- X: 80625000
Y: 13125000
- X: 80000000
Y: 10625000
- X: 80000000
Y: 8281250
- X: 100000000
Y: 8281250
- - X: 160000000
Y: 10625000
- X: 159375008
Y: 13125000
- X: 150624992
Y: 13125000
- X: 150000000
Y: 10625000
- X: 149375008
Y: 13125000
- X: 140624992
Y: 13125000
- X: 140000000
Y: 10625000
- X: 140000000
Y: 8281250
- X: 160000000
Y: 8281250
m_CompositePaths:
m_Paths: []
m_Paths:
- - {x: 10, y: 1.0625}
- {x: 9.9375, y: 1.3125}
- {x: 9.0625, y: 1.3125}
- {x: 9, y: 1.0625}
- {x: 8.9375, y: 1.3125}
- {x: 8.0625, y: 1.3125}
- {x: 8, y: 1.0625}
- {x: 8, y: 0.828125}
- {x: 10, y: 0.828125}
- - {x: 16, y: 1.0625}
- {x: 15.937501, y: 1.3125}
- {x: 15.062499, y: 1.3125}
- {x: 15, y: 1.0625}
- {x: 14.937501, y: 1.3125}
- {x: 14.062499, y: 1.3125}
- {x: 14, y: 1.0625}
- {x: 14, y: 0.828125}
- {x: 16, y: 0.828125}
m_VertexDistance: 0.0005
--- !u!66 &66951144269047676
CompositeCollider2D:
......@@ -1066,7 +1120,7 @@ TilemapRenderer:
m_SortingLayer: 3
m_SortingOrder: 0
m_ChunkSize: {x: 32, y: 32, z: 32}
m_ChunkCullingBounds: {x: 0, y: 0, z: 0}
m_ChunkCullingBounds: {x: 0, y: 0.5, z: 0}
m_MaxChunkCount: 16
m_MaxFrameAge: 16
m_SortOrder: 0
......@@ -3965,8 +4019,8 @@ Tilemap:
m_Tiles:
- first: {x: 8, y: 1, z: 0}
second:
m_TileIndex: 0
m_TileSpriteIndex: 0
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -3974,8 +4028,8 @@ Tilemap:
m_ColliderType: 1
- first: {x: 9, y: 1, z: 0}
second:
m_TileIndex: 0
m_TileSpriteIndex: 0
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -3983,8 +4037,8 @@ Tilemap:
m_ColliderType: 1
- first: {x: 14, y: 1, z: 0}
second:
m_TileIndex: 0
m_TileSpriteIndex: 0
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -3992,8 +4046,8 @@ Tilemap:
m_ColliderType: 1
- first: {x: 15, y: 1, z: 0}
second:
m_TileIndex: 0
m_TileSpriteIndex: 0
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -4001,15 +4055,15 @@ Tilemap:
m_ColliderType: 1
m_AnimatedTiles: {}
m_TileAssetArray:
- m_RefCount: 4
m_Data: {fileID: 11400000, guid: 7f2c5cb43ad7207499b22fb5e0acd41a, type: 2}
- m_RefCount: 0
m_Data: {fileID: 0}
m_TileSpriteArray:
- m_RefCount: 4
m_Data: {fileID: 21300000, guid: 7ee765cc5330a444db118a031abd5b9e, type: 3}
m_Data: {fileID: 11400000, guid: faca42f78d4fa7e4cb168ca7d28c9199, type: 2}
m_TileSpriteArray:
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 4
m_Data: {fileID: 21300000, guid: 1cf0fa6989016be47b8d1be7215a7bb8, type: 3}
m_TileMatrixArray:
- m_RefCount: 4
m_Data:
......
Assets/Prefabs/Rooms/NormalRoom/Room 12.prefab
View file @ c3d030f7
......@@ -468,9 +468,81 @@ CompositeCollider2D:
m_EdgeRadius: 0
m_ColliderPaths:
- m_Collider: {fileID: 2113883505394685654}
m_ColliderPaths: []
m_ColliderPaths:
- - X: 70000000
Y: 169218752
- X: 70625000
Y: 166875008
- X: 79375000
Y: 166875008
- X: 80000000
Y: 169218752
- X: 80625000
Y: 166875008
- X: 89375000
Y: 166875008
- X: 90000000
Y: 169218752
- X: 90000000
Y: 171718752
- X: 60000000
Y: 171718752
- X: 60000000
Y: 169218752
- X: 60625000
Y: 166875008
- X: 69375000
Y: 166875008
- - X: 160000000
Y: 169218752
- X: 160624992
Y: 166875008
- X: 169375008
Y: 166875008
- X: 170000000
Y: 169218752
- X: 170624992
Y: 166875008
- X: 179375008
Y: 166875008
- X: 180000000
Y: 169218752
- X: 180000000
Y: 171718752
- X: 150000000
Y: 171718752
- X: 150000000
Y: 169218752
- X: 150624992
Y: 166875008
- X: 159375008
Y: 166875008
m_CompositePaths:
m_Paths: []
m_Paths:
- - {x: 7, y: 16.921875}
- {x: 7.0625, y: 16.687502}
- {x: 7.9375, y: 16.687502}
- {x: 8, y: 16.921875}
- {x: 8.0625, y: 16.687502}
- {x: 8.9375, y: 16.687502}
- {x: 9, y: 16.921875}
- {x: 9, y: 17.171875}
- {x: 6, y: 17.171875}
- {x: 6, y: 16.921875}
- {x: 6.0625, y: 16.687502}
- {x: 6.9375, y: 16.687502}
- - {x: 16, y: 16.921875}
- {x: 16.0625, y: 16.687502}
- {x: 16.937502, y: 16.687502}
- {x: 17, y: 16.921875}
- {x: 17.0625, y: 16.687502}
- {x: 17.937502, y: 16.687502}
- {x: 18, y: 16.921875}
- {x: 18, y: 17.171875}
- {x: 15, y: 17.171875}
- {x: 15, y: 16.921875}
- {x: 15.062499, y: 16.687502}
- {x: 15.937501, y: 16.687502}
m_VertexDistance: 0.0005
--- !u!66 &66575228221949484
CompositeCollider2D:
......@@ -990,7 +1062,7 @@ TilemapRenderer:
m_SortingLayer: 3
m_SortingOrder: 0
m_ChunkSize: {x: 32, y: 32, z: 32}
m_ChunkCullingBounds: {x: 0, y: 0, z: 0}
m_ChunkCullingBounds: {x: 0, y: 0.5, z: 0}
m_MaxChunkCount: 16
m_MaxFrameAge: 16
m_SortOrder: 0
......@@ -1145,12 +1217,12 @@ Tilemap:
m_AnimatedTiles: {}
m_TileAssetArray:
- m_RefCount: 6
m_Data: {fileID: 11400000, guid: 7f2c5cb43ad7207499b22fb5e0acd41a, type: 2}
m_Data: {fileID: 11400000, guid: 0278fb79c70975e47a7a1ae5ab779cc2, type: 2}
- m_RefCount: 0
m_Data: {fileID: 0}
m_TileSpriteArray:
- m_RefCount: 6
m_Data: {fileID: 21300000, guid: 7ee765cc5330a444db118a031abd5b9e, type: 3}
m_Data: {fileID: 21300000, guid: e90594de7f760a34394f0a786a779ad9, type: 3}
- m_RefCount: 0
m_Data: {fileID: 0}
m_TileMatrixArray:
......
Assets/Prefabs/Rooms/NormalRoom/Room 15.prefab
View file @ c3d030f7
......@@ -530,9 +530,270 @@ CompositeCollider2D:
m_EdgeRadius: 0
m_ColliderPaths:
- m_Collider: {fileID: 2113883505107628124}
m_ColliderPaths: []
m_ColliderPaths:
- - X: 110000000
Y: 159218752
- X: 110625000
Y: 156875008
- X: 119375000
Y: 156875008
- X: 120000000
Y: 159218752
- X: 120625000
Y: 156875008
- X: 129375000
Y: 156875008
- X: 130000000
Y: 159218752
- X: 130625000
Y: 156875008
- X: 139375008
Y: 156875008
- X: 140000000
Y: 159218752
- X: 140000000
Y: 161718752
- X: 100000000
Y: 161718752
- X: 100000000
Y: 159218752
- X: 100625000
Y: 156875008
- X: 109375000
Y: 156875008
- - X: 100000000
Y: 149218752
- X: 100000000
Y: 151718752
- X: 90000000
Y: 151718752
- X: 90000000
Y: 149218752
- X: 90625000
Y: 146875008
- X: 99375000
Y: 146875008
- - X: 150000000
Y: 149218752
- X: 150000000
Y: 151718752
- X: 140000000
Y: 151718752
- X: 140000000
Y: 149218752
- X: 140624992
Y: 146875008
- X: 149375008
Y: 146875008
- - X: 90000000
Y: 139218752
- X: 90000000
Y: 141718752
- X: 80000000
Y: 141718752
- X: 80000000
Y: 139218752
- X: 80625000
Y: 136875008
- X: 89375000
Y: 136875008
- - X: 160000000
Y: 139218752
- X: 160000000
Y: 141718752
- X: 150000000
Y: 141718752
- X: 150000000
Y: 139218752
- X: 150624992
Y: 136875008
- X: 159375008
Y: 136875008
- - X: 80000000
Y: 129218752
- X: 80000000
Y: 131718752
- X: 70000000
Y: 131718752
- X: 70000000
Y: 129218752
- X: 70625000
Y: 126875000
- X: 79375000
Y: 126875000
- - X: 170000000
Y: 129218752
- X: 170000000
Y: 131718752
- X: 160000000
Y: 131718752
- X: 160000000
Y: 129218752
- X: 160624992
Y: 126875000
- X: 169375008
Y: 126875000
- - X: 70000000
Y: 119218752
- X: 70000000
Y: 121718752
- X: 60000000
Y: 121718752
- X: 60000000
Y: 119218752
- X: 60625000
Y: 116875000
- X: 69375000
Y: 116875000
- - X: 180000000
Y: 119218752
- X: 180000000
Y: 121718752
- X: 170000000
Y: 121718752
- X: 170000000
Y: 119218752
- X: 170624992
Y: 116875000
- X: 179375008
Y: 116875000
- - X: 60000000
Y: 99218752
- X: 60000000
Y: 101718752
- X: 50000000
Y: 101718752
- X: 50000000
Y: 99218752
- X: 50625000
Y: 96875000
- X: 59375000
Y: 96875000
- - X: 190000000
Y: 99218752
- X: 190000000
Y: 101718752
- X: 180000000
Y: 101718752
- X: 180000000
Y: 99218752
- X: 180624992
Y: 96875000
- X: 189375008
Y: 96875000
- - X: 50000000
Y: 79218752
- X: 50000000
Y: 81718752
- X: 40000000
Y: 81718752
- X: 40000000
Y: 79218752
- X: 40625000
Y: 76875000
- X: 49375000
Y: 76875000
- - X: 200000000
Y: 79218752
- X: 200000000
Y: 81718752
- X: 190000000
Y: 81718752
- X: 190000000
Y: 79218752
- X: 190624992
Y: 76875000
- X: 199375008
Y: 76875000
m_CompositePaths:
m_Paths: []
m_Paths:
- - {x: 11, y: 15.921875}
- {x: 11.0625, y: 15.687501}
- {x: 11.9375, y: 15.687501}
- {x: 12, y: 15.921875}
- {x: 12.0625, y: 15.687501}
- {x: 12.9375, y: 15.687501}
- {x: 13, y: 15.921875}
- {x: 13.0625, y: 15.687501}
- {x: 13.937501, y: 15.687501}
- {x: 14, y: 15.921875}
- {x: 14, y: 16.171875}
- {x: 10, y: 16.171875}
- {x: 10, y: 15.921875}
- {x: 10.0625, y: 15.687501}
- {x: 10.9375, y: 15.687501}
- - {x: 10, y: 14.921875}
- {x: 10, y: 15.171875}
- {x: 9, y: 15.171875}
- {x: 9, y: 14.921875}
- {x: 9.0625, y: 14.687501}
- {x: 9.9375, y: 14.687501}
- - {x: 15, y: 14.921875}
- {x: 15, y: 15.171875}
- {x: 14, y: 15.171875}
- {x: 14, y: 14.921875}
- {x: 14.062499, y: 14.687501}
- {x: 14.937501, y: 14.687501}
- - {x: 9, y: 13.921875}
- {x: 9, y: 14.171875}
- {x: 8, y: 14.171875}
- {x: 8, y: 13.921875}
- {x: 8.0625, y: 13.687501}
- {x: 8.9375, y: 13.687501}
- - {x: 16, y: 13.921875}
- {x: 16, y: 14.171875}
- {x: 15, y: 14.171875}
- {x: 15, y: 13.921875}
- {x: 15.062499, y: 13.687501}
- {x: 15.937501, y: 13.687501}
- - {x: 8, y: 12.921875}
- {x: 8, y: 13.171875}
- {x: 7, y: 13.171875}
- {x: 7, y: 12.921875}
- {x: 7.0625, y: 12.6875}
- {x: 7.9375, y: 12.6875}
- - {x: 17, y: 12.921875}
- {x: 17, y: 13.171875}
- {x: 16, y: 13.171875}
- {x: 16, y: 12.921875}
- {x: 16.0625, y: 12.6875}
- {x: 16.937502, y: 12.6875}
- - {x: 7, y: 11.921875}
- {x: 7, y: 12.171875}
- {x: 6, y: 12.171875}
- {x: 6, y: 11.921875}
- {x: 6.0625, y: 11.6875}
- {x: 6.9375, y: 11.6875}
- - {x: 18, y: 11.921875}
- {x: 18, y: 12.171875}
- {x: 17, y: 12.171875}
- {x: 17, y: 11.921875}
- {x: 17.0625, y: 11.6875}
- {x: 17.937502, y: 11.6875}
- - {x: 6, y: 9.921875}
- {x: 6, y: 10.171875}
- {x: 5, y: 10.171875}
- {x: 5, y: 9.921875}
- {x: 5.0625, y: 9.6875}
- {x: 5.9375, y: 9.6875}
- - {x: 19, y: 9.921875}
- {x: 19, y: 10.171875}
- {x: 18, y: 10.171875}
- {x: 18, y: 9.921875}
- {x: 18.0625, y: 9.6875}
- {x: 18.937502, y: 9.6875}
- - {x: 5, y: 7.9218755}
- {x: 5, y: 8.171875}
- {x: 4, y: 8.171875}
- {x: 4, y: 7.9218755}
- {x: 4.0625, y: 7.6875}
- {x: 4.9375, y: 7.6875}
- - {x: 20, y: 7.9218755}
- {x: 20, y: 8.171875}
- {x: 19, y: 8.171875}
- {x: 19, y: 7.9218755}
- {x: 19.0625, y: 7.6875}
- {x: 19.937502, y: 7.6875}
m_VertexDistance: 0.0005
--- !u!66 &66922505557611044
CompositeCollider2D:
......@@ -1166,7 +1427,7 @@ TilemapRenderer:
m_SortingLayer: 3
m_SortingOrder: 0
m_ChunkSize: {x: 32, y: 32, z: 32}
m_ChunkCullingBounds: {x: 0, y: 0, z: 0}
m_ChunkCullingBounds: {x: 0, y: 0.5, z: 0}
m_MaxChunkCount: 16
m_MaxFrameAge: 16
m_SortOrder: 0
......@@ -3391,12 +3652,12 @@ Tilemap:
m_AnimatedTiles: {}
m_TileAssetArray:
- m_RefCount: 16
m_Data: {fileID: 11400000, guid: 7f2c5cb43ad7207499b22fb5e0acd41a, type: 2}
m_Data: {fileID: 11400000, guid: 0278fb79c70975e47a7a1ae5ab779cc2, type: 2}
- m_RefCount: 0
m_Data: {fileID: 0}
m_TileSpriteArray:
- m_RefCount: 16
m_Data: {fileID: 21300000, guid: 7ee765cc5330a444db118a031abd5b9e, type: 3}
m_Data: {fileID: 21300000, guid: e90594de7f760a34394f0a786a779ad9, type: 3}
- m_RefCount: 0
m_Data: {fileID: 0}
m_TileMatrixArray:
......
Assets/Prefabs/Rooms/NormalRoom/Room 17.prefab
View file @ c3d030f7
......@@ -305,9 +305,267 @@ CompositeCollider2D:
m_EdgeRadius: 0
m_ColliderPaths:
- m_Collider: {fileID: 2113883504423125490}
m_ColliderPaths: []
m_ColliderPaths:
- - X: 41718752
Y: 170000000
- X: 39375000
Y: 170000000
- X: 36875000
Y: 169375008
- X: 36875000
Y: 160624992
- X: 39375000
Y: 160000000
- X: 41718752
Y: 160000000
- - X: 203124992
Y: 160624992
- X: 203124992
Y: 169375008
- X: 200781248
Y: 170000000
- X: 198281248
Y: 170000000
- X: 198281248
Y: 160000000
- X: 200781248
Y: 160000000
- - X: 31718750
Y: 160000000
- X: 29375000
Y: 160000000
- X: 26875000
Y: 159375008
- X: 26875000
Y: 150624992
- X: 29375000
Y: 150000000
- X: 26875000
Y: 149375008
- X: 26875000
Y: 140624992
- X: 29375000
Y: 140000000
- X: 31718750
Y: 140000000
- - X: 213124992
Y: 140624992
- X: 213124992
Y: 149375008
- X: 210781248
Y: 150000000
- X: 213124992
Y: 150624992
- X: 213124992
Y: 159375008
- X: 210781248
Y: 160000000
- X: 208281248
Y: 160000000
- X: 208281248
Y: 140000000
- X: 210781248
Y: 140000000
- - X: 41718752
Y: 140000000
- X: 39375000
Y: 140000000
- X: 36875000
Y: 139375008
- X: 36875000
Y: 130625000
- X: 39375000
Y: 130000000
- X: 41718752
Y: 130000000
- - X: 203124992
Y: 130625000
- X: 203124992
Y: 139375008
- X: 200781248
Y: 140000000
- X: 198281248
Y: 140000000
- X: 198281248
Y: 130000000
- X: 200781248
Y: 130000000
- - X: 41718752
Y: 90000000
- X: 39375000
Y: 90000000
- X: 36875000
Y: 89375000
- X: 36875000
Y: 80625000
- X: 39375000
Y: 80000000
- X: 41718752
Y: 80000000
- - X: 203124992
Y: 80625000
- X: 203124992
Y: 89375000
- X: 200781248
Y: 90000000
- X: 198281248
Y: 90000000
- X: 198281248
Y: 80000000
- X: 200781248
Y: 80000000
- - X: 31718750
Y: 80000000
- X: 29375000
Y: 80000000
- X: 26875000
Y: 79375000
- X: 26875000
Y: 70625000
- X: 29375000
Y: 70000000
- X: 26875000
Y: 69375000
- X: 26875000
Y: 60625000
- X: 29375000
Y: 60000000
- X: 31718750
Y: 60000000
- - X: 213124992
Y: 60625000
- X: 213124992
Y: 69375000
- X: 210781248
Y: 70000000
- X: 213124992
Y: 70625000
- X: 213124992
Y: 79375000
- X: 210781248
Y: 80000000
- X: 208281248
Y: 80000000
- X: 208281248
Y: 61718752
- X: 210000000
Y: 61718752
- X: 210000000
Y: 60000000
- X: 210781248
Y: 60000000
- - X: 41718752
Y: 60000000
- X: 39375000
Y: 60000000
- X: 36875000
Y: 59375000
- X: 36875000
Y: 50625000
- X: 39375000
Y: 50000000
- X: 41718752
Y: 50000000
- - X: 203124992
Y: 50625000
- X: 203124992
Y: 59375000
- X: 200781248
Y: 60000000
- X: 198281248
Y: 60000000
- X: 198281248
Y: 50000000
- X: 200781248
Y: 50000000
m_CompositePaths:
m_Paths: []
m_Paths:
- - {x: 4.1718755, y: 17}
- {x: 3.9375, y: 17}
- {x: 3.6875, y: 16.937502}
- {x: 3.6875, y: 16.0625}
- {x: 3.9375, y: 16}
- {x: 4.1718755, y: 16}
- - {x: 20.3125, y: 16.0625}
- {x: 20.3125, y: 16.937502}
- {x: 20.078125, y: 17}
- {x: 19.828125, y: 17}
- {x: 19.828125, y: 16}
- {x: 20.078125, y: 16}
- - {x: 3.171875, y: 16}
- {x: 2.9375, y: 16}
- {x: 2.6875, y: 15.937501}
- {x: 2.6875, y: 15.062499}
- {x: 2.9375, y: 15}
- {x: 2.6875, y: 14.937501}
- {x: 2.6875, y: 14.062499}
- {x: 2.9375, y: 14}
- {x: 3.171875, y: 14}
- - {x: 21.3125, y: 14.062499}
- {x: 21.3125, y: 14.937501}
- {x: 21.078125, y: 15}
- {x: 21.3125, y: 15.062499}
- {x: 21.3125, y: 15.937501}
- {x: 21.078125, y: 16}
- {x: 20.828125, y: 16}
- {x: 20.828125, y: 14}
- {x: 21.078125, y: 14}
- - {x: 4.1718755, y: 14}
- {x: 3.9375, y: 14}
- {x: 3.6875, y: 13.937501}
- {x: 3.6875, y: 13.0625}
- {x: 3.9375, y: 13}
- {x: 4.1718755, y: 13}
- - {x: 20.3125, y: 13.0625}
- {x: 20.3125, y: 13.937501}
- {x: 20.078125, y: 14}
- {x: 19.828125, y: 14}
- {x: 19.828125, y: 13}
- {x: 20.078125, y: 13}
- - {x: 4.1718755, y: 9}
- {x: 3.9375, y: 9}
- {x: 3.6875, y: 8.9375}
- {x: 3.6875, y: 8.0625}
- {x: 3.9375, y: 8}
- {x: 4.1718755, y: 8}
- - {x: 20.3125, y: 8.0625}
- {x: 20.3125, y: 8.9375}
- {x: 20.078125, y: 9}
- {x: 19.828125, y: 9}
- {x: 19.828125, y: 8}
- {x: 20.078125, y: 8}
- - {x: 3.171875, y: 8}
- {x: 2.9375, y: 8}
- {x: 2.6875, y: 7.9375}
- {x: 2.6875, y: 7.0625}
- {x: 2.9375, y: 7}
- {x: 2.6875, y: 6.9375}
- {x: 2.6875, y: 6.0625}
- {x: 2.9375, y: 6}
- {x: 3.171875, y: 6}
- - {x: 21.3125, y: 6.0625}
- {x: 21.3125, y: 6.9375}
- {x: 21.078125, y: 7}
- {x: 21.3125, y: 7.0625}
- {x: 21.3125, y: 7.9375}
- {x: 21.078125, y: 8}
- {x: 20.828125, y: 8}
- {x: 20.828125, y: 6.1718755}
- {x: 21, y: 6.1718755}
- {x: 21, y: 6}
- {x: 21.078125, y: 6}
- - {x: 4.1718755, y: 6}
- {x: 3.9375, y: 6}
- {x: 3.6875, y: 5.9375}
- {x: 3.6875, y: 5.0625}
- {x: 3.9375, y: 5}
- {x: 4.1718755, y: 5}
- - {x: 20.3125, y: 5.0625}
- {x: 20.3125, y: 5.9375}
- {x: 20.078125, y: 6}
- {x: 19.828125, y: 6}
- {x: 19.828125, y: 5}
- {x: 20.078125, y: 5}
m_VertexDistance: 0.0005
--- !u!66 &66626588118681888
CompositeCollider2D:
......@@ -848,7 +1106,7 @@ TilemapRenderer:
m_SortingLayer: 3
m_SortingOrder: 0
m_ChunkSize: {x: 32, y: 32, z: 32}
m_ChunkCullingBounds: {x: 0, y: 0, z: 0}
m_ChunkCullingBounds: {x: 0.5, y: 0, z: 0}
m_MaxChunkCount: 16
m_MaxFrameAge: 16
m_SortOrder: 0
......@@ -948,8 +1206,8 @@ Tilemap:
m_Tiles:
- first: {x: 3, y: 5, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileIndex: 2
m_TileSpriteIndex: 0
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -966,8 +1224,8 @@ Tilemap:
m_ColliderType: 1
- first: {x: 2, y: 6, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileIndex: 2
m_TileSpriteIndex: 0
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -984,8 +1242,8 @@ Tilemap:
m_ColliderType: 1
- first: {x: 2, y: 7, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileIndex: 2
m_TileSpriteIndex: 0
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -1002,8 +1260,8 @@ Tilemap:
m_ColliderType: 1
- first: {x: 3, y: 8, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileIndex: 2
m_TileSpriteIndex: 0
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -1020,8 +1278,8 @@ Tilemap:
m_ColliderType: 1
- first: {x: 3, y: 13, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileIndex: 2
m_TileSpriteIndex: 0
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -1038,8 +1296,8 @@ Tilemap:
m_ColliderType: 1
- first: {x: 2, y: 14, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileIndex: 2
m_TileSpriteIndex: 0
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -1056,8 +1314,8 @@ Tilemap:
m_ColliderType: 1
- first: {x: 2, y: 15, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileIndex: 2
m_TileSpriteIndex: 0
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -1074,8 +1332,8 @@ Tilemap:
m_ColliderType: 1
- first: {x: 3, y: 16, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileIndex: 2
m_TileSpriteIndex: 0
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -1094,15 +1352,15 @@ Tilemap:
m_TileAssetArray:
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 16
m_Data: {fileID: 11400000, guid: 7f2c5cb43ad7207499b22fb5e0acd41a, type: 2}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 8
m_Data: {fileID: 11400000, guid: 4c5c5e5534e976b42bbac32a1280fa6f, type: 2}
- m_RefCount: 8
m_Data: {fileID: 11400000, guid: 6fde75b5d77ef254188a9fdef3bc03c3, type: 2}
m_TileSpriteArray:
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 16
m_Data: {fileID: 21300000, guid: 7ee765cc5330a444db118a031abd5b9e, type: 3}
- m_RefCount: 8
m_Data: {fileID: 21300000, guid: 4915fd587eb121342b1c70dc7f3773df, type: 3}
- m_RefCount: 8
m_Data: {fileID: 21300000, guid: 1d0855b6581f12e45bde764091314baf, type: 3}
- m_RefCount: 0
m_Data: {fileID: 0}
m_TileMatrixArray:
......
Assets/Prefabs/Rooms/NormalRoom/Room 2.prefab
View file @ c3d030f7
......@@ -734,9 +734,81 @@ CompositeCollider2D:
m_EdgeRadius: 0
m_ColliderPaths:
- m_Collider: {fileID: 2113883507057806096}
m_ColliderPaths: []
m_ColliderPaths:
- - X: 163124992
Y: 120625000
- X: 163124992
Y: 129375000
- X: 160781248
Y: 130000000
- X: 163124992
Y: 130625000
- X: 163124992
Y: 139375008
- X: 160781248
Y: 140000000
- X: 163124992
Y: 140624992
- X: 163124992
Y: 149375008
- X: 160781248
Y: 150000000
- X: 158281248
Y: 150000000
- X: 158281248
Y: 120000000
- X: 160781248
Y: 120000000
- - X: 193124992
Y: 60625000
- X: 193124992
Y: 69375000
- X: 190781248
Y: 70000000
- X: 193124992
Y: 70625000
- X: 193124992
Y: 79375000
- X: 190781248
Y: 80000000
- X: 193124992
Y: 80625000
- X: 193124992
Y: 89375000
- X: 190781248
Y: 90000000
- X: 188281248
Y: 90000000
- X: 188281248
Y: 60000000
- X: 190781248
Y: 60000000
m_CompositePaths:
m_Paths: []
m_Paths:
- - {x: 16.3125, y: 12.0625}
- {x: 16.3125, y: 12.9375}
- {x: 16.078125, y: 13}
- {x: 16.3125, y: 13.0625}
- {x: 16.3125, y: 13.937501}
- {x: 16.078125, y: 14}
- {x: 16.3125, y: 14.062499}
- {x: 16.3125, y: 14.937501}
- {x: 16.078125, y: 15}
- {x: 15.828125, y: 15}
- {x: 15.828125, y: 12}
- {x: 16.078125, y: 12}
- - {x: 19.3125, y: 6.0625}
- {x: 19.3125, y: 6.9375}
- {x: 19.078125, y: 7}
- {x: 19.3125, y: 7.0625}
- {x: 19.3125, y: 7.9375}
- {x: 19.078125, y: 8}
- {x: 19.3125, y: 8.0625}
- {x: 19.3125, y: 8.9375}
- {x: 19.078125, y: 9}
- {x: 18.828125, y: 9}
- {x: 18.828125, y: 6}
- {x: 19.078125, y: 6}
m_VertexDistance: 0.0005
--- !u!114 &114374344217682936
MonoBehaviour:
......@@ -918,7 +990,7 @@ TilemapRenderer:
m_SortingLayer: 3
m_SortingOrder: 0
m_ChunkSize: {x: 32, y: 32, z: 32}
m_ChunkCullingBounds: {x: 0, y: 0, z: 0}
m_ChunkCullingBounds: {x: 0.5, y: 0, z: 0}
m_MaxChunkCount: 16
m_MaxFrameAge: 16
m_SortOrder: 0
......@@ -3562,12 +3634,12 @@ Tilemap:
m_AnimatedTiles: {}
m_TileAssetArray:
- m_RefCount: 6
m_Data: {fileID: 11400000, guid: 7f2c5cb43ad7207499b22fb5e0acd41a, type: 2}
m_Data: {fileID: 11400000, guid: 4c5c5e5534e976b42bbac32a1280fa6f, type: 2}
- m_RefCount: 0
m_Data: {fileID: 0}
m_TileSpriteArray:
- m_RefCount: 6
m_Data: {fileID: 21300000, guid: 7ee765cc5330a444db118a031abd5b9e, type: 3}
m_Data: {fileID: 21300000, guid: 1d0855b6581f12e45bde764091314baf, type: 3}
- m_RefCount: 0
m_Data: {fileID: 0}
m_TileMatrixArray:
......
Assets/Prefabs/Rooms/NormalRoom/Room 20.prefab
View file @ c3d030f7
This source diff could not be displayed because it is too large. You can view the blob instead.
Assets/Prefabs/Rooms/NormalRoom/Room 20.prefab.meta
View file @ c3d030f7
fileFormatVersion: 2
guid: bfa57985877d23b46929238f077b40df
guid: c1f2739b098b9cb4eb98897f7e465726
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
......
Assets/Prefabs/Rooms/NormalRoom/Room 21.prefab 0 → 100644
View file @ c3d030f7
This source diff could not be displayed because it is too large. You can view the blob instead.
Assets/Prefabs/Rooms/NormalRoom/Room 21.prefab.meta 0 → 100644
View file @ c3d030f7
fileFormatVersion: 2
guid: bfa57985877d23b46929238f077b40df
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Rooms/NormalRoom/Room 22.prefab 0 → 100644
View file @ c3d030f7
This source diff could not be displayed because it is too large. You can view the blob instead.
Assets/Prefabs/Rooms/NormalRoom/Room 22.prefab.meta 0 → 100644
View file @ c3d030f7
fileFormatVersion: 2
guid: 6b6c92d6e866a894b81c6d9b98f8c4aa
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Rooms/NormalRoom/Room 23.prefab 0 → 100644
View file @ c3d030f7
This source diff could not be displayed because it is too large. You can view the blob instead.
Assets/Prefabs/Rooms/NormalRoom/Room 23.prefab.meta 0 → 100644
View file @ c3d030f7
fileFormatVersion: 2
guid: da6e94048cb88f4449375f3e5ab9b6ae
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Rooms/NormalRoom/Room 24.prefab 0 → 100644
View file @ c3d030f7
This source diff could not be displayed because it is too large. You can view the blob instead.
Assets/Prefabs/Rooms/NormalRoom/Room 24.prefab.meta 0 → 100644
View file @ c3d030f7
fileFormatVersion: 2
guid: 530e72844aa405942a7f99d26c7da727
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Rooms/NormalRoom/Room 25.prefab 0 → 100644
View file @ c3d030f7
This source diff could not be displayed because it is too large. You can view the blob instead.
Assets/Prefabs/Rooms/NormalRoom/Room 25.prefab.meta 0 → 100644
View file @ c3d030f7
fileFormatVersion: 2
guid: 12fa736e7364cfc4993adcabbd273c10
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Rooms/NormalRoom/Room 26.prefab 0 → 100644
View file @ c3d030f7
This source diff could not be displayed because it is too large. You can view the blob instead.
Assets/Prefabs/Rooms/NormalRoom/Room 26.prefab.meta 0 → 100644
View file @ c3d030f7
fileFormatVersion: 2
guid: 07a14b0ab56e0d441ace33941b2165e8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Rooms/NormalRoom/Room 3.prefab
View file @ c3d030f7
......@@ -505,9 +505,171 @@ CompositeCollider2D:
m_EdgeRadius: 0
m_ColliderPaths:
- m_Collider: {fileID: 2113883504141584446}
m_ColliderPaths: []
m_ColliderPaths:
- - X: 101718752
Y: 150000000
- X: 99375000
Y: 150000000
- X: 96875000
Y: 149375008
- X: 96875000
Y: 140624992
- X: 99375000
Y: 140000000
- X: 96875000
Y: 139375008
- X: 96875000
Y: 130625000
- X: 99375000
Y: 130000000
- X: 101718752
Y: 130000000
- - X: 143124992
Y: 130625000
- X: 143124992
Y: 139375008
- X: 140781248
Y: 140000000
- X: 143124992
Y: 140624992
- X: 143124992
Y: 149375008
- X: 140781248
Y: 150000000
- X: 138281248
Y: 150000000
- X: 138281248
Y: 130000000
- X: 140781248
Y: 130000000
- - X: 71718752
Y: 130000000
- X: 69375000
Y: 130000000
- X: 66875000
Y: 129375000
- X: 66875000
Y: 120625000
- X: 69375000
Y: 120000000
- X: 66875000
Y: 119375000
- X: 66875000
Y: 110625000
- X: 69375000
Y: 110000000
- X: 71718752
Y: 110000000
- - X: 173124992
Y: 110625000
- X: 173124992
Y: 119375000
- X: 170781248
Y: 120000000
- X: 173124992
Y: 120625000
- X: 173124992
Y: 129375000
- X: 170781248
Y: 130000000
- X: 168281248
Y: 130000000
- X: 168281248
Y: 110000000
- X: 170781248
Y: 110000000
- - X: 41718752
Y: 110000000
- X: 39375000
Y: 110000000
- X: 36875000
Y: 109375000
- X: 36875000
Y: 100625000
- X: 39375000
Y: 100000000
- X: 36875000
Y: 99375000
- X: 36875000
Y: 90625000
- X: 39375000
Y: 90000000
- X: 41718752
Y: 90000000
- - X: 203124992
Y: 90625000
- X: 203124992
Y: 99375000
- X: 200781248
Y: 100000000
- X: 203124992
Y: 100625000
- X: 203124992
Y: 109375000
- X: 200781248
Y: 110000000
- X: 198281248
Y: 110000000
- X: 198281248
Y: 90000000
- X: 200781248
Y: 90000000
m_CompositePaths:
m_Paths: []
m_Paths:
- - {x: 10.171875, y: 15}
- {x: 9.9375, y: 15}
- {x: 9.6875, y: 14.937501}
- {x: 9.6875, y: 14.062499}
- {x: 9.9375, y: 14}
- {x: 9.6875, y: 13.937501}
- {x: 9.6875, y: 13.0625}
- {x: 9.9375, y: 13}
- {x: 10.171875, y: 13}
- - {x: 14.312499, y: 13.0625}
- {x: 14.312499, y: 13.937501}
- {x: 14.078125, y: 14}
- {x: 14.312499, y: 14.062499}
- {x: 14.312499, y: 14.937501}
- {x: 14.078125, y: 15}
- {x: 13.828125, y: 15}
- {x: 13.828125, y: 13}
- {x: 14.078125, y: 13}
- - {x: 7.1718755, y: 13}
- {x: 6.9375, y: 13}
- {x: 6.6875, y: 12.9375}
- {x: 6.6875, y: 12.0625}
- {x: 6.9375, y: 12}
- {x: 6.6875, y: 11.9375}
- {x: 6.6875, y: 11.0625}
- {x: 6.9375, y: 11}
- {x: 7.1718755, y: 11}
- - {x: 17.3125, y: 11.0625}
- {x: 17.3125, y: 11.9375}
- {x: 17.078125, y: 12}
- {x: 17.3125, y: 12.0625}
- {x: 17.3125, y: 12.9375}
- {x: 17.078125, y: 13}
- {x: 16.828125, y: 13}
- {x: 16.828125, y: 11}
- {x: 17.078125, y: 11}
- - {x: 4.1718755, y: 11}
- {x: 3.9375, y: 11}
- {x: 3.6875, y: 10.9375}
- {x: 3.6875, y: 10.0625}
- {x: 3.9375, y: 10}
- {x: 3.6875, y: 9.9375}
- {x: 3.6875, y: 9.0625}
- {x: 3.9375, y: 9}
- {x: 4.1718755, y: 9}
- - {x: 20.3125, y: 9.0625}
- {x: 20.3125, y: 9.9375}
- {x: 20.078125, y: 10}
- {x: 20.3125, y: 10.0625}
- {x: 20.3125, y: 10.9375}
- {x: 20.078125, y: 11}
- {x: 19.828125, y: 11}
- {x: 19.828125, y: 9}
- {x: 20.078125, y: 9}
m_VertexDistance: 0.0005
--- !u!66 &66909162776386404
CompositeCollider2D:
......@@ -788,7 +950,7 @@ TilemapRenderer:
m_SortingLayer: 3
m_SortingOrder: 0
m_ChunkSize: {x: 32, y: 32, z: 32}
m_ChunkCullingBounds: {x: 0, y: 0, z: 0}
m_ChunkCullingBounds: {x: 0.5, y: 0, z: 0}
m_MaxChunkCount: 16
m_MaxFrameAge: 16
m_SortOrder: 0
......@@ -4208,7 +4370,7 @@ Tilemap:
m_Tiles:
- first: {x: 3, y: 9, z: 0}
second:
m_TileIndex: 1
m_TileIndex: 2
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
......@@ -4217,8 +4379,8 @@ Tilemap:
m_ColliderType: 1
- first: {x: 20, y: 9, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileIndex: 0
m_TileSpriteIndex: 0
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -4226,7 +4388,7 @@ Tilemap:
m_ColliderType: 1
- first: {x: 3, y: 10, z: 0}
second:
m_TileIndex: 1
m_TileIndex: 2
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
......@@ -4235,8 +4397,8 @@ Tilemap:
m_ColliderType: 1
- first: {x: 20, y: 10, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileIndex: 0
m_TileSpriteIndex: 0
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -4244,7 +4406,7 @@ Tilemap:
m_ColliderType: 1
- first: {x: 6, y: 11, z: 0}
second:
m_TileIndex: 1
m_TileIndex: 2
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
......@@ -4253,8 +4415,8 @@ Tilemap:
m_ColliderType: 1
- first: {x: 17, y: 11, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileIndex: 0
m_TileSpriteIndex: 0
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -4262,7 +4424,7 @@ Tilemap:
m_ColliderType: 1
- first: {x: 6, y: 12, z: 0}
second:
m_TileIndex: 1
m_TileIndex: 2
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
......@@ -4271,8 +4433,8 @@ Tilemap:
m_ColliderType: 1
- first: {x: 17, y: 12, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileIndex: 0
m_TileSpriteIndex: 0
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -4280,7 +4442,7 @@ Tilemap:
m_ColliderType: 1
- first: {x: 9, y: 13, z: 0}
second:
m_TileIndex: 1
m_TileIndex: 2
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
......@@ -4289,8 +4451,8 @@ Tilemap:
m_ColliderType: 1
- first: {x: 14, y: 13, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileIndex: 0
m_TileSpriteIndex: 0
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -4298,7 +4460,7 @@ Tilemap:
m_ColliderType: 1
- first: {x: 9, y: 14, z: 0}
second:
m_TileIndex: 1
m_TileIndex: 2
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
......@@ -4307,8 +4469,8 @@ Tilemap:
m_ColliderType: 1
- first: {x: 14, y: 14, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileIndex: 0
m_TileSpriteIndex: 0
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -4316,17 +4478,17 @@ Tilemap:
m_ColliderType: 1
m_AnimatedTiles: {}
m_TileAssetArray:
- m_RefCount: 6
m_Data: {fileID: 11400000, guid: 4c5c5e5534e976b42bbac32a1280fa6f, type: 2}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 12
m_Data: {fileID: 11400000, guid: 7f2c5cb43ad7207499b22fb5e0acd41a, type: 2}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 6
m_Data: {fileID: 11400000, guid: 6fde75b5d77ef254188a9fdef3bc03c3, type: 2}
m_TileSpriteArray:
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 12
m_Data: {fileID: 21300000, guid: 7ee765cc5330a444db118a031abd5b9e, type: 3}
- m_RefCount: 6
m_Data: {fileID: 21300000, guid: 1d0855b6581f12e45bde764091314baf, type: 3}
- m_RefCount: 6
m_Data: {fileID: 21300000, guid: 4915fd587eb121342b1c70dc7f3773df, type: 3}
- m_RefCount: 0
m_Data: {fileID: 0}
m_TileMatrixArray:
......
Assets/Prefabs/Rooms/NormalRoom/Room 4.prefab
View file @ c3d030f7
......@@ -1321,106 +1321,7 @@ Tilemap:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1687661689682920}
m_Enabled: 1
m_Tiles:
- first: {x: 16, y: 5, z: 0}
second:
m_TileIndex: 3
m_TileSpriteIndex: 3
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 9, y: 7, z: 0}
second:
m_TileIndex: 3
m_TileSpriteIndex: 3
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 6, y: 8, z: 0}
second:
m_TileIndex: 3
m_TileSpriteIndex: 3
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 6, y: 9, z: 0}
second:
m_TileIndex: 3
m_TileSpriteIndex: 3
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 9, y: 10, z: 0}
second:
m_TileIndex: 3
m_TileSpriteIndex: 3
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 10, y: 10, z: 0}
second:
m_TileIndex: 3
m_TileSpriteIndex: 3
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 15, y: 10, z: 0}
second:
m_TileIndex: 3
m_TileSpriteIndex: 3
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 10, y: 13, z: 0}
second:
m_TileIndex: 3
m_TileSpriteIndex: 3
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 8, y: 16, z: 0}
second:
m_TileIndex: 3
m_TileSpriteIndex: 3
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 13, y: 16, z: 0}
second:
m_TileIndex: 3
m_TileSpriteIndex: 3
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 16, y: 16, z: 0}
second:
m_TileIndex: 3
m_TileSpriteIndex: 3
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
m_Tiles: {}
m_AnimatedTiles: {}
m_TileAssetArray:
- m_RefCount: 0
......@@ -1429,8 +1330,8 @@ Tilemap:
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 11
m_Data: {fileID: 11400000, guid: 7f2c5cb43ad7207499b22fb5e0acd41a, type: 2}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
m_TileSpriteArray:
......@@ -1440,32 +1341,32 @@ Tilemap:
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 11
m_Data: {fileID: 21300000, guid: 7ee765cc5330a444db118a031abd5b9e, type: 3}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
m_TileMatrixArray:
- m_RefCount: 11
- m_RefCount: 0
m_Data:
e00: 1
e01: 0
e02: 0
e00: 0
e01: 16.00178
e02: NaN
e03: 0
e10: 0
e11: 1
e12: 0
e11: 5.466614
e12: NaN
e13: 0
e20: 0
e21: 0
e22: 1
e22: 0.99975586
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
e32: Infinity
e33: NaN
m_TileColorArray:
- m_RefCount: 11
m_Data: {r: 1, g: 1, b: 1, a: 1}
- m_RefCount: 0
m_Data: {r: 2.2e-44, g: 2.2e-44, b: 2.2e-44, a: 2.2e-44}
- m_RefCount: 0
m_Data: {r: 9.2e-44, g: 9.2e-44, b: 9.2e-44, a: 9.2e-44}
m_AnimationFrameRate: 1
......
Assets/Prefabs/Rooms/NormalRoom/Room 7.prefab
View file @ c3d030f7
......@@ -480,9 +480,36 @@ CompositeCollider2D:
m_EdgeRadius: 0
m_ColliderPaths:
- m_Collider: {fileID: 2113883506198219690}
m_ColliderPaths: []
m_ColliderPaths:
- - X: 10625000
Y: 143124992
- X: 10000000
Y: 140624992
- X: 10000000
Y: 138281248
- X: 30000000
Y: 138281248
- X: 30000000
Y: 140624992
- X: 29375000
Y: 143124992
- X: 20625000
Y: 143124992
- X: 20000000
Y: 140624992
- X: 19375000
Y: 143124992
m_CompositePaths:
m_Paths: []
m_Paths:
- - {x: 3, y: 14.062499}
- {x: 2.9375, y: 14.312499}
- {x: 2.0625, y: 14.312499}
- {x: 2, y: 14.062499}
- {x: 1.9375, y: 14.312499}
- {x: 1.0625, y: 14.312499}
- {x: 1, y: 14.062499}
- {x: 1, y: 13.828125}
- {x: 3, y: 13.828125}
m_VertexDistance: 0.0005
--- !u!66 &66126908559386904
CompositeCollider2D:
......@@ -1180,7 +1207,7 @@ TilemapRenderer:
m_SortingLayer: 3
m_SortingOrder: 0
m_ChunkSize: {x: 32, y: 32, z: 32}
m_ChunkCullingBounds: {x: 0, y: 0, z: 0}
m_ChunkCullingBounds: {x: 0, y: 0.5, z: 0}
m_MaxChunkCount: 16
m_MaxFrameAge: 16
m_SortOrder: 0
......@@ -1660,8 +1687,8 @@ Tilemap:
m_Tiles:
- first: {x: 1, y: 14, z: 0}
second:
m_TileIndex: 0
m_TileSpriteIndex: 0
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -1669,8 +1696,8 @@ Tilemap:
m_ColliderType: 1
- first: {x: 2, y: 14, z: 0}
second:
m_TileIndex: 0
m_TileSpriteIndex: 0
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -1678,15 +1705,15 @@ Tilemap:
m_ColliderType: 1
m_AnimatedTiles: {}
m_TileAssetArray:
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: 7f2c5cb43ad7207499b22fb5e0acd41a, type: 2}
- m_RefCount: 0
m_Data: {fileID: 0}
m_TileSpriteArray:
- m_RefCount: 2
m_Data: {fileID: 21300000, guid: 7ee765cc5330a444db118a031abd5b9e, type: 3}
m_Data: {fileID: 11400000, guid: faca42f78d4fa7e4cb168ca7d28c9199, type: 2}
m_TileSpriteArray:
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 2
m_Data: {fileID: 21300000, guid: 1cf0fa6989016be47b8d1be7215a7bb8, type: 3}
m_TileMatrixArray:
- m_RefCount: 2
m_Data:
......
Assets/Prefabs/Rooms/SpecialRoom/Room Start 1-1.prefab
View file @ c3d030f7
......@@ -2708,11 +2708,19 @@ Tilemap:
m_Tiles: {}
m_AnimatedTiles: {}
m_TileAssetArray:
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
m_TileSpriteArray:
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
......@@ -2720,31 +2728,31 @@ Tilemap:
m_TileMatrixArray:
- m_RefCount: 0
m_Data:
e00: 6e-45
e01: 2.842185e-14
e00: 0
e01: 0
e02: NaN
e03: 2.842185e-14
e03: 0
e10: 0
e11: 0
e12: NaN
e13: 0
e20: 0
e21: 1.3157386e+9
e22: 1.3182505e+9
e23: -7.6062124e-29
e21: 0
e22: 0
e23: 0
e30: 0
e31: 0
e32: 0
e33: 4.5916e-41
e33: 0
m_TileColorArray:
- m_RefCount: 0
m_Data: {r: 1.6829938e+12, g: 1.6829938e+12, b: 1.6829938e+12, a: 1.6829938e+12}
- m_RefCount: 0
m_Data: {r: 2e-44, g: 2e-44, b: 2e-44, a: 2e-44}
m_Data: {r: 1.4e-44, g: 1.4e-44, b: 1.4e-44, a: 1.4e-44}
m_AnimationFrameRate: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Origin: {x: 0, y: 0, z: 0}
m_Size: {x: 16, y: 14, z: 1}
m_Size: {x: 17, y: 14, z: 1}
m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
m_TileOrientation: 0
m_TileOrientationMatrix:
......
Assets/Prefabs/TetrisMap/TestTools.prefab
View file @ c3d030f7
......@@ -424,7 +424,7 @@ GameObject:
- component: {fileID: 222679740248868544}
- component: {fileID: 114454426474737934}
m_Layer: 5
m_Name: Timer
m_Name: clear room
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......@@ -603,6 +603,23 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1688612133854782
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 224767961223780784}
- component: {fileID: 222278265322067466}
- component: {fileID: 114133158625676202}
m_Layer: 5
m_Name: Timer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1705307735279526
GameObject:
m_ObjectHideFlags: 1
......@@ -1194,6 +1211,39 @@ MonoBehaviour:
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!114 &114133158625676202
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1688612133854782}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.15886325, g: 0.6132076, b: 0.118592024, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: New Text
--- !u!114 &114135211069317992
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -1499,9 +1549,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4f70662cea9642244afe9d8a44fa3211, type: 3}
m_Name:
m_EditorClassIdentifier:
timer: {fileID: 114454426474737934}
timer: {fileID: 114133158625676202}
testUI: {fileID: 1338177859763764}
lifeStoneTestUI: {fileID: 1770998091236782}
clearedRoom: {fileID: 114454426474737934}
--- !u!114 &114270351453926414
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -1966,7 +2017,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: New Text
m_Text: 'Cleared room : '
--- !u!114 &114464547489623710
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -3512,6 +3563,13 @@ CanvasRenderer:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1719364274564944}
m_CullTransparentMesh: 0
--- !u!222 &222278265322067466
CanvasRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1688612133854782}
m_CullTransparentMesh: 0
--- !u!222 &222298441220531140
CanvasRenderer:
m_ObjectHideFlags: 1
......@@ -3824,17 +3882,17 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1461524426287956}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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: 224395958577644168}
m_RootOrder: 6
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 571, y: -55}
m_SizeDelta: {x: 160, y: 50}
m_AnchoredPosition: {x: 350, y: -55}
m_SizeDelta: {x: 320, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224059870163267832
RectTransform:
......@@ -4124,6 +4182,7 @@ RectTransform:
- {fileID: 224612213790397690}
- {fileID: 224071041299093070}
- {fileID: 224804297962416264}
- {fileID: 224767961223780784}
- {fileID: 224008356030171754}
m_Father: {fileID: 4884929250924374}
m_RootOrder: 1
......@@ -4560,6 +4619,24 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: -0.5}
m_SizeDelta: {x: -20, y: -13}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224767961223780784
RectTransform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1688612133854782}
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: 224395958577644168}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 571, y: -55}
m_SizeDelta: {x: 160, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224804297962416264
RectTransform:
m_ObjectHideFlags: 1
......
Assets/Resources/Tiles/ForestRuin/Rope/11ropeo.asset
View file @ c3d030f7
......@@ -11,7 +11,7 @@ MonoBehaviour:
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: 11ropeo
m_EditorClassIdentifier:
m_Sprite: {fileID: 21300000, guid: 8efd8713b16e89e49b60bfbe9d3c6792, type: 3}
m_Sprite: {fileID: 21300000, guid: eb4a0053d820b7e4cafc6883f1423a90, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1
......
Assets/Resources/Tiles/spiked.asset 0 → 100644
View file @ c3d030f7
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: spiked
m_EditorClassIdentifier:
m_Sprite: {fileID: 21300000, guid: e90594de7f760a34394f0a786a779ad9, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_InstancedGameObject: {fileID: 0}
m_Flags: 1
m_ColliderType: 1
Assets/Resources/Tiles/spiked.asset.meta 0 → 100644
View file @ c3d030f7
fileFormatVersion: 2
guid: 0278fb79c70975e47a7a1ae5ab779cc2
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/Tiles/spikel.asset 0 → 100644
View file @ c3d030f7
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: spikel
m_EditorClassIdentifier:
m_Sprite: {fileID: 21300000, guid: 4915fd587eb121342b1c70dc7f3773df, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_InstancedGameObject: {fileID: 0}
m_Flags: 1
m_ColliderType: 1
Assets/Resources/Tiles/spikel.asset.meta 0 → 100644
View file @ c3d030f7
fileFormatVersion: 2
guid: 6fde75b5d77ef254188a9fdef3bc03c3
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/Tiles/spiker.asset 0 → 100644
View file @ c3d030f7
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: spiker
m_EditorClassIdentifier:
m_Sprite: {fileID: 21300000, guid: 1d0855b6581f12e45bde764091314baf, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_InstancedGameObject: {fileID: 0}
m_Flags: 1
m_ColliderType: 1
Assets/Resources/Tiles/spiker.asset.meta 0 → 100644
View file @ c3d030f7
fileFormatVersion: 2
guid: 4c5c5e5534e976b42bbac32a1280fa6f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/Tiles/spikeu.asset 0 → 100644
View file @ c3d030f7
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: spikeu
m_EditorClassIdentifier:
m_Sprite: {fileID: 21300000, guid: 1cf0fa6989016be47b8d1be7215a7bb8, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_InstancedGameObject: {fileID: 0}
m_Flags: 1
m_ColliderType: 1
Assets/Resources/Tiles/spikeu.asset.meta 0 → 100644
View file @ c3d030f7
fileFormatVersion: 2
guid: faca42f78d4fa7e4cb168ca7d28c9199
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/Enumerators.cs
View file @ c3d030f7
......@@ -77,3 +77,8 @@ public enum RoomType { Start, Item, BothSide, Gold, Amethyst, Boss, Normal }
/// Enum for room's sprite types.
/// </summary>
public enum RoomSpriteType { Item, BothSide, Gold, Amethyst, Boss, Normal1, Normal2, Nomal3, Normal4 }
/// <summary>
/// Enum for tetriminno types.
/// </summary>
public enum TetriminoType { I, O, T, J, L, S, Z, Boss };
\ No newline at end of file
Assets/Scripts/TetrisMap/MapManager.cs
View file @ c3d030f7
......@@ -82,10 +82,6 @@ public class MapManager : Singleton<MapManager> {
/// </summary>
private Press[] presses = new Press[realHeight];
/// <summary>
/// Choose to make a boss tetrimino or not.
/// </summary>
public bool spawnBossTetrimino = false;
/// <summary>
/// Queue that saves rooms waiting for upgrade tetrimino.
/// </summary>
public Queue<RoomType> roomsWaiting = new Queue<RoomType>();
......@@ -111,6 +107,14 @@ public class MapManager : Singleton<MapManager> {
/// </summary>
public static int currentStage;
/// <summary>
/// Count cleared rooms of current stage.
/// </summary>
public int clearedRoomCount;
/// <summary>
/// The stage clear condition.
/// </summary>
public int[] stageClearCondition = new int[5] { 10, 10, 10, 10, 10 };
/// <summary>
/// Gold need to control tetrimino.
/// </summary>
public int tetriminoCost = 1;
......@@ -644,8 +648,9 @@ public class MapManager : Singleton<MapManager> {
CreateRoom(te);
DeleteFullRows();
Destroy(currentGhost.gameObject);
if(clock.clockSpeedStack < 12)
if(clock.clockSpeedStack < 18)
clock.clockSpeedStack += 1;
if (te.tetriminoType != TetriminoType.Boss)
StartCoroutine(MakeNextTetrimino());
}
/// <summary>
......
Assets/Scripts/TetrisMap/Room.cs
View file @ c3d030f7
......@@ -365,8 +365,6 @@ public class Room : MonoBehaviour
}
}
/// <summary>
/// Clear the cleared room.
/// Open all the doors and change fog to cleared fog.
......
Assets/Scripts/TetrisMap/Rooms/BossRoomInGame.cs
View file @ c3d030f7
......@@ -96,5 +96,6 @@ public class BossRoomInGame : RoomInGame {
{
base.RoomClear();
MapManager.currentStage += 1;
StartCoroutine(MapManager.Instance.MakeNextTetrimino());
}
}
Assets/Scripts/TetrisMap/Rooms/NormalRoomInGame.cs
View file @ c3d030f7
......@@ -13,6 +13,6 @@ public class NormalRoomInGame : RoomInGame {
public override void RoomClear()
{
base.RoomClear();
MapManager.Instance.clearedRoomCount++;
}
}
Assets/Scripts/TetrisMap/Test.cs
View file @ c3d030f7
......@@ -11,6 +11,7 @@ public class Test : MonoBehaviour {
public GameObject testUI;
public GameObject lifeStoneTestUI;
bool isTestUiActive = true;
public Text clearedRoom;
public void ChangeTetrimino()
{
......@@ -20,7 +21,7 @@ public class Test : MonoBehaviour {
}
public void SpawnBossTetrimino()
{
MapManager.Instance.spawnBossTetrimino = true;
MapManager.Instance.clearedRoomCount = MapManager.Instance.stageClearCondition[MapManager.currentStage];
}
public void UpgradeStage()
{
......@@ -59,6 +60,10 @@ public class Test : MonoBehaviour {
{
EnemyManager.Instance.SpawnEnemyToMap_forTest();
}
public void ClearedRoom()
{
clearedRoom.text = MapManager.Instance.clearedRoomCount.ToString();
}
private void Awake()
......@@ -93,5 +98,6 @@ public class Test : MonoBehaviour {
}
if (!MapManager.isTetriminoFalling)
Timer();
ClearedRoom();
}
}
Assets/Scripts/TetrisMap/Tetrimino.cs
View file @ c3d030f7
......@@ -25,10 +25,6 @@ public class Tetrimino : MonoBehaviour {
/// </summary>
public bool isBossTetrimino = false;
/// <summary>
/// Enum for tetriminno types.
/// </summary>
public enum TetriminoType { I, O, T, J, L, S, Z, Boss };
/// <summary>
/// Tetrimino types.
/// </summary>
public TetriminoType tetriminoType;
......
Assets/Scripts/TetrisMap/TetriminoSpawner.cs
View file @ c3d030f7
......@@ -36,10 +36,10 @@ public class TetriminoSpawner : Singleton<TetriminoSpawner> {
{
int randomPosition = Random.Range(0, MapManager.width);
int randomTetrimino;
if (MapManager.Instance.spawnBossTetrimino)
if (MapManager.Instance.clearedRoomCount >= MapManager.Instance.stageClearCondition[MapManager.currentStage])
{
randomTetrimino = 7;
MapManager.Instance.spawnBossTetrimino = false;
MapManager.Instance.clearedRoomCount = 0;
}
else
randomTetrimino = TetriminoRandomizer();
......
Assets/Scripts/TileManager.cs
View file @ c3d030f7
......@@ -136,14 +136,15 @@ public class TileManager : MonoBehaviour {
}
public char CheckSpikeTile(RoomInGame roomInGame, Vector2Int originPos)
{
if (roomInGame.wallTileInfo[originPos.x + 1, originPos.y])
return 'l';
else if (roomInGame.wallTileInfo[originPos.x - 1, originPos.y])
return 'r';
else if (roomInGame.wallTileInfo[originPos.x, originPos.y + 1])
Tilemap spikeTileMap = roomInGame.transform.Find("spike").GetComponent<Tilemap>();
if (spikeTileMap.GetTile(new Vector3Int(originPos.x, originPos.y, 0)).name.Equals("spikeu"))
return 'u';
else if (spikeTileMap.GetTile(new Vector3Int(originPos.x, originPos.y, 0)).name.Equals("spiked"))
return 'd';
else if (spikeTileMap.GetTile(new Vector3Int(originPos.x, originPos.y, 0)).name.Equals("spikel"))
return 'l';
else
return 'u';
return 'r';
}
/// <summary>
/// Check if it is out of the room or not.
......
Assets/Scripts/UI/In-game UI/Timer.cs
View file @ c3d030f7
......@@ -38,6 +38,7 @@ public class Timer : MonoBehaviour {
/// Each stack would decrease time to fall tetrimino 3 seconds.
/// </summary>
public int clockSpeedStack = 0;
int clockPenalty = 2;
/// <summary>
/// Resets the clock.
......@@ -54,7 +55,7 @@ public class Timer : MonoBehaviour {
clockHand.transform.eulerAngles = new Vector3(0, 0, previousZRotation - previousZRotation * (Time.time - startTime) / (endTime - startTime));
}
clockHand.transform.eulerAngles = Vector3.zero;
timeToFallTetrimino = initialTimeToFallTetrimino - 3 * clockSpeedStack;
timeToFallTetrimino = initialTimeToFallTetrimino - clockPenalty * clockSpeedStack;
clockFrame.GetComponent<Image>().color = new Color(1, 1 - (float)20 * clockSpeedStack / 256, 1 - (float)20 * clockSpeedStack / 256);
tetriminoWaitedTime = 0;
}
......
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