Skip to content

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

아이템방 아이템 생성 방식 뜯어고침, 이제 1칸짜리 플랫폼이 존재함

parent a933f47b
Hide whitespace changes
Inline Side-by-side
Showing with 254 additions and 308 deletions
Assets/Prefabs/MapManager.prefab
View file @ 7d7e1792
...@@ -123,9 +123,9 @@ MonoBehaviour: ...@@ -123,9 +123,9 @@ MonoBehaviour:
- {fileID: 21300000, guid: 8044a9fe8c979f141a047ee76dc5a4b3, type: 3} - {fileID: 21300000, guid: 8044a9fe8c979f141a047ee76dc5a4b3, type: 3}
roomBackgroundSprite1: roomBackgroundSprite1:
- {fileID: 21300000, guid: c2e87589a128b824c8f621c5a34bfe5e, type: 3} - {fileID: 21300000, guid: c2e87589a128b824c8f621c5a34bfe5e, type: 3}
- {fileID: 21300000, guid: 7d94542039acd6a4b932cf9219b71799, type: 3}
- {fileID: 21300000, guid: c2e87589a128b824c8f621c5a34bfe5e, type: 3} - {fileID: 21300000, guid: c2e87589a128b824c8f621c5a34bfe5e, type: 3}
- {fileID: 21300000, guid: c2e87589a128b824c8f621c5a34bfe5e, type: 3} - {fileID: 21300000, guid: 7d94542039acd6a4b932cf9219b71799, type: 3}
- {fileID: 21300000, guid: c2e87589a128b824c8f621c5a34bfe5e, type: 3}
--- !u!114 &114476419532778440 --- !u!114 &114476419532778440
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -325,9 +325,11 @@ MonoBehaviour: ...@@ -325,9 +325,11 @@ MonoBehaviour:
allPlatformTiles: allPlatformTiles:
- {fileID: 11400000, guid: c25a20f570a6e474bb000881122106f7, type: 2} - {fileID: 11400000, guid: c25a20f570a6e474bb000881122106f7, type: 2}
- {fileID: 11400000, guid: 60035ce64a779ae4a9eeaaafe33f87e1, type: 2} - {fileID: 11400000, guid: 60035ce64a779ae4a9eeaaafe33f87e1, type: 2}
- {fileID: 11400000, guid: 7906a96d103925441b49f86f01c3d598, type: 2}
- {fileID: 11400000, guid: 9e0a3a715e976bb489ec8bedeeb2ab32, type: 2} - {fileID: 11400000, guid: 9e0a3a715e976bb489ec8bedeeb2ab32, type: 2}
- {fileID: 11400000, guid: 3d63c558a17627b4c8a6eff233ae9aff, type: 2} - {fileID: 11400000, guid: 3d63c558a17627b4c8a6eff233ae9aff, type: 2}
- {fileID: 11400000, guid: 0aa25d9458a285146be0f80438fbcac8, type: 2} - {fileID: 11400000, guid: 0aa25d9458a285146be0f80438fbcac8, type: 2}
- {fileID: 11400000, guid: f8b56dbf06889ba4d8678ff5675e7170, type: 2}
- {fileID: 11400000, guid: 8e289c63850dcb34a94a8cc69a245ed7, type: 2} - {fileID: 11400000, guid: 8e289c63850dcb34a94a8cc69a245ed7, type: 2}
allRopeTiles: allRopeTiles:
- {fileID: 11400000, guid: 7fcb9c110fd1807479e950e97e3a09e4, type: 2} - {fileID: 11400000, guid: 7fcb9c110fd1807479e950e97e3a09e4, type: 2}
......
Assets/Prefabs/Rooms/NormalRoom/Room 2.prefab
View file @ 7d7e1792
...@@ -469,14 +469,6 @@ CompositeCollider2D: ...@@ -469,14 +469,6 @@ CompositeCollider2D:
m_ColliderPaths: m_ColliderPaths:
- m_Collider: {fileID: 2113883505513573348} - m_Collider: {fileID: 2113883505513573348}
m_ColliderPaths: m_ColliderPaths:
- - X: 130000000
Y: 240000000
- X: 110000000
Y: 240000000
- X: 110000000
Y: 237968752
- X: 130000000
Y: 237968752
- - X: 160000000 - - X: 160000000
Y: 210000000 Y: 210000000
- X: 120000000 - X: 120000000
...@@ -519,10 +511,6 @@ CompositeCollider2D: ...@@ -519,10 +511,6 @@ CompositeCollider2D:
Y: 0 Y: 0
m_CompositePaths: m_CompositePaths:
m_Paths: m_Paths:
- - {x: 13, y: 24}
- {x: 11, y: 24}
- {x: 11, y: 23.796875}
- {x: 13, y: 23.796875}
- - {x: 16, y: 21} - - {x: 16, y: 21}
- {x: 12, y: 21} - {x: 12, y: 21}
- {x: 12, y: 20.640625} - {x: 12, y: 20.640625}
...@@ -613,9 +601,9 @@ CompositeCollider2D: ...@@ -613,9 +601,9 @@ CompositeCollider2D:
Y: 110000000 Y: 110000000
- X: 150000000 - X: 150000000
Y: 120000000 Y: 120000000
- X: 190000000 - X: 160000000
Y: 120000000 Y: 120000000
- X: 190000000 - X: 160000000
Y: 150000000 Y: 150000000
- X: 30000000 - X: 30000000
Y: 150000000 Y: 150000000
...@@ -698,8 +686,8 @@ CompositeCollider2D: ...@@ -698,8 +686,8 @@ CompositeCollider2D:
- {x: 14, y: 11} - {x: 14, y: 11}
- {x: 15, y: 11} - {x: 15, y: 11}
- {x: 15, y: 12} - {x: 15, y: 12}
- {x: 19, y: 12} - {x: 16, y: 12}
- {x: 19, y: 15} - {x: 16, y: 15}
- {x: 3, y: 15} - {x: 3, y: 15}
- {x: 3, y: 16} - {x: 3, y: 16}
- {x: 2, y: 16} - {x: 2, y: 16}
...@@ -747,29 +735,29 @@ CompositeCollider2D: ...@@ -747,29 +735,29 @@ CompositeCollider2D:
m_ColliderPaths: m_ColliderPaths:
- m_Collider: {fileID: 2113883507057806096} - m_Collider: {fileID: 2113883507057806096}
m_ColliderPaths: m_ColliderPaths:
- - X: 200000000 - - X: 170000000
Y: 143437504 Y: 143437504
- X: 190000000 - X: 160000000
Y: 143437504 Y: 143437504
- X: 190000000 - X: 160000000
Y: 140000000 Y: 140000000
- X: 200000000 - X: 170000000
Y: 140000000 Y: 140000000
- - X: 200000000 - - X: 170000000
Y: 133437504 Y: 133437504
- X: 190000000 - X: 160000000
Y: 133437504 Y: 133437504
- X: 190000000 - X: 160000000
Y: 130000000 Y: 130000000
- X: 200000000 - X: 170000000
Y: 130000000 Y: 130000000
- - X: 200000000 - - X: 170000000
Y: 123437504 Y: 123437504
- X: 190000000 - X: 160000000
Y: 123437504 Y: 123437504
- X: 190000000 - X: 160000000
Y: 120000000 Y: 120000000
- X: 200000000 - X: 170000000
Y: 120000000 Y: 120000000
- - X: 200000000 - - X: 200000000
Y: 83437504 Y: 83437504
...@@ -797,18 +785,18 @@ CompositeCollider2D: ...@@ -797,18 +785,18 @@ CompositeCollider2D:
Y: 60000000 Y: 60000000
m_CompositePaths: m_CompositePaths:
m_Paths: m_Paths:
- - {x: 20, y: 14.343751} - - {x: 17, y: 14.343751}
- {x: 19, y: 14.343751} - {x: 16, y: 14.343751}
- {x: 19, y: 14} - {x: 16, y: 14}
- {x: 20, y: 14} - {x: 17, y: 14}
- - {x: 20, y: 13.343751} - - {x: 17, y: 13.343751}
- {x: 19, y: 13.343751} - {x: 16, y: 13.343751}
- {x: 19, y: 13} - {x: 16, y: 13}
- {x: 20, y: 13} - {x: 17, y: 13}
- - {x: 20, y: 12.343751} - - {x: 17, y: 12.343751}
- {x: 19, y: 12.343751} - {x: 16, y: 12.343751}
- {x: 19, y: 12} - {x: 16, y: 12}
- {x: 20, y: 12} - {x: 17, y: 12}
- - {x: 20, y: 8.343751} - - {x: 20, y: 8.343751}
- {x: 19, y: 8.343751} - {x: 19, y: 8.343751}
- {x: 19, y: 8} - {x: 19, y: 8}
...@@ -2837,33 +2825,6 @@ Tilemap: ...@@ -2837,33 +2825,6 @@ Tilemap:
m_ObjectToInstantiate: {fileID: 0} m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1 m_TileFlags: 1
m_ColliderType: 1 m_ColliderType: 1
- first: {x: 16, y: 12, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 17, y: 12, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 18, y: 12, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 23, y: 12, z: 0} - first: {x: 23, y: 12, z: 0}
second: second:
m_TileIndex: 1 m_TileIndex: 1
...@@ -3017,33 +2978,6 @@ Tilemap: ...@@ -3017,33 +2978,6 @@ Tilemap:
m_ObjectToInstantiate: {fileID: 0} m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1 m_TileFlags: 1
m_ColliderType: 1 m_ColliderType: 1
- first: {x: 16, y: 13, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 17, y: 13, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 18, y: 13, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 23, y: 13, z: 0} - first: {x: 23, y: 13, z: 0}
second: second:
m_TileIndex: 1 m_TileIndex: 1
...@@ -3197,33 +3131,6 @@ Tilemap: ...@@ -3197,33 +3131,6 @@ Tilemap:
m_ObjectToInstantiate: {fileID: 0} m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1 m_TileFlags: 1
m_ColliderType: 1 m_ColliderType: 1
- first: {x: 16, y: 14, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 17, y: 14, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 18, y: 14, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 23, y: 14, z: 0} - first: {x: 23, y: 14, z: 0}
second: second:
m_TileIndex: 1 m_TileIndex: 1
...@@ -3570,7 +3477,7 @@ Tilemap: ...@@ -3570,7 +3477,7 @@ Tilemap:
m_TileAssetArray: m_TileAssetArray:
- m_RefCount: 0 - m_RefCount: 0
m_Data: {fileID: 0} m_Data: {fileID: 0}
- m_RefCount: 248 - m_RefCount: 239
m_Data: {fileID: 11400000, guid: b020cda901d4db14ca4935cd00d3243b, type: 2} m_Data: {fileID: 11400000, guid: b020cda901d4db14ca4935cd00d3243b, type: 2}
- m_RefCount: 0 - m_RefCount: 0
m_Data: {fileID: 0} m_Data: {fileID: 0}
...@@ -3595,7 +3502,7 @@ Tilemap: ...@@ -3595,7 +3502,7 @@ Tilemap:
m_TileSpriteArray: m_TileSpriteArray:
- m_RefCount: 0 - m_RefCount: 0
m_Data: {fileID: 0} m_Data: {fileID: 0}
- m_RefCount: 248 - m_RefCount: 239
m_Data: {fileID: 21300000, guid: 8d51b9bc567a640429923a2c09665640, type: 3} m_Data: {fileID: 21300000, guid: 8d51b9bc567a640429923a2c09665640, type: 3}
- m_RefCount: 0 - m_RefCount: 0
m_Data: {fileID: 0} m_Data: {fileID: 0}
...@@ -3618,7 +3525,7 @@ Tilemap: ...@@ -3618,7 +3525,7 @@ Tilemap:
- m_RefCount: 0 - m_RefCount: 0
m_Data: {fileID: 0} m_Data: {fileID: 0}
m_TileMatrixArray: m_TileMatrixArray:
- m_RefCount: 248 - m_RefCount: 239
m_Data: m_Data:
e00: 1 e00: 1
e01: 0 e01: 0
...@@ -3637,7 +3544,7 @@ Tilemap: ...@@ -3637,7 +3544,7 @@ Tilemap:
e32: 0 e32: 0
e33: 1 e33: 1
m_TileColorArray: m_TileColorArray:
- m_RefCount: 248 - m_RefCount: 239
m_Data: {r: 1, g: 1, b: 1, a: 1} m_Data: {r: 1, g: 1, b: 1, a: 1}
m_AnimationFrameRate: 1 m_AnimationFrameRate: 1
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
...@@ -3697,7 +3604,7 @@ Tilemap: ...@@ -3697,7 +3604,7 @@ Tilemap:
m_ObjectToInstantiate: {fileID: 0} m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1 m_TileFlags: 1
m_ColliderType: 1 m_ColliderType: 1
- first: {x: 19, y: 12, z: 0} - first: {x: 16, y: 12, z: 0}
second: second:
m_TileIndex: 0 m_TileIndex: 0
m_TileSpriteIndex: 0 m_TileSpriteIndex: 0
...@@ -3706,7 +3613,7 @@ Tilemap: ...@@ -3706,7 +3613,7 @@ Tilemap:
m_ObjectToInstantiate: {fileID: 0} m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1 m_TileFlags: 1
m_ColliderType: 1 m_ColliderType: 1
- first: {x: 19, y: 13, z: 0} - first: {x: 16, y: 13, z: 0}
second: second:
m_TileIndex: 0 m_TileIndex: 0
m_TileSpriteIndex: 0 m_TileSpriteIndex: 0
...@@ -3715,7 +3622,7 @@ Tilemap: ...@@ -3715,7 +3622,7 @@ Tilemap:
m_ObjectToInstantiate: {fileID: 0} m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1 m_TileFlags: 1
m_ColliderType: 1 m_ColliderType: 1
- first: {x: 19, y: 14, z: 0} - first: {x: 16, y: 14, z: 0}
second: second:
m_TileIndex: 0 m_TileIndex: 0
m_TileSpriteIndex: 0 m_TileSpriteIndex: 0
......
Assets/Prefabs/Rooms/SpecialRoom/Room Start 1-1.prefab
View file @ 7d7e1792
...@@ -648,14 +648,6 @@ CompositeCollider2D: ...@@ -648,14 +648,6 @@ CompositeCollider2D:
m_ColliderPaths: m_ColliderPaths:
- m_Collider: {fileID: 2113883507301556278} - m_Collider: {fileID: 2113883507301556278}
m_ColliderPaths: m_ColliderPaths:
- - X: 130000000
Y: 240000000
- X: 110000000
Y: 240000000
- X: 110000000
Y: 237968752
- X: 130000000
Y: 237968752
- - X: 170000000 - - X: 170000000
Y: 210000000 Y: 210000000
- X: 70000000 - X: 70000000
...@@ -690,10 +682,6 @@ CompositeCollider2D: ...@@ -690,10 +682,6 @@ CompositeCollider2D:
Y: 0 Y: 0
m_CompositePaths: m_CompositePaths:
m_Paths: m_Paths:
- - {x: 13, y: 24}
- {x: 11, y: 24}
- {x: 11, y: 23.796875}
- {x: 13, y: 23.796875}
- - {x: 17, y: 21} - - {x: 17, y: 21}
- {x: 7, y: 21} - {x: 7, y: 21}
- {x: 7, y: 20.640625} - {x: 7, y: 20.640625}
......
Assets/Prefabs/TetrisMap/Tetrimino/Room Tutorial.prefab
View file @ 7d7e1792
...@@ -42,7 +42,7 @@ GameObject: ...@@ -42,7 +42,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!1 &1462807162955286 --- !u!1 &1462807162955286
GameObject: GameObject:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -420,25 +420,7 @@ CompositeCollider2D: ...@@ -420,25 +420,7 @@ CompositeCollider2D:
m_GeometryType: 0 m_GeometryType: 0
m_GenerationType: 0 m_GenerationType: 0
m_EdgeRadius: 0 m_EdgeRadius: 0
m_ColliderPaths: m_ColliderPaths: []
- m_Collider: {fileID: 2113883504865271124}
m_ColliderPaths:
- - X: 480000000
Y: 100000000
- X: 0
Y: 100000000
- X: 0
Y: 0
- X: 480000000
Y: 0
- - X: 10000000
Y: 10000000
- X: 10000000
Y: 90000000
- X: 470000000
Y: 90000000
- X: 470000000
Y: 10000000
m_CompositePaths: m_CompositePaths:
m_Paths: m_Paths:
- - {x: 48, y: 10} - - {x: 48, y: 10}
...@@ -466,9 +448,7 @@ CompositeCollider2D: ...@@ -466,9 +448,7 @@ CompositeCollider2D:
m_GeometryType: 0 m_GeometryType: 0
m_GenerationType: 0 m_GenerationType: 0
m_EdgeRadius: 0 m_EdgeRadius: 0
m_ColliderPaths: m_ColliderPaths: []
- m_Collider: {fileID: 2113883505577540150}
m_ColliderPaths: []
m_CompositePaths: m_CompositePaths:
m_Paths: [] m_Paths: []
m_VertexDistance: 0.0005 m_VertexDistance: 0.0005
...@@ -488,9 +468,7 @@ CompositeCollider2D: ...@@ -488,9 +468,7 @@ CompositeCollider2D:
m_GeometryType: 0 m_GeometryType: 0
m_GenerationType: 0 m_GenerationType: 0
m_EdgeRadius: 0 m_EdgeRadius: 0
m_ColliderPaths: m_ColliderPaths: []
- m_Collider: {fileID: 2113883505987626316}
m_ColliderPaths: []
m_CompositePaths: m_CompositePaths:
m_Paths: [] m_Paths: []
m_VertexDistance: 0.0005 m_VertexDistance: 0.0005
...@@ -510,9 +488,7 @@ CompositeCollider2D: ...@@ -510,9 +488,7 @@ CompositeCollider2D:
m_GeometryType: 0 m_GeometryType: 0
m_GenerationType: 0 m_GenerationType: 0
m_EdgeRadius: 0 m_EdgeRadius: 0
m_ColliderPaths: m_ColliderPaths: []
- m_Collider: {fileID: 2113883505389363492}
m_ColliderPaths: []
m_CompositePaths: m_CompositePaths:
m_Paths: [] m_Paths: []
m_VertexDistance: 0.0005 m_VertexDistance: 0.0005
......
Assets/Resources/Tiles/ForestRuin/Platform/11platformo.asset 0 → 100644
View file @ 7d7e1792
%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: 11platformo
m_EditorClassIdentifier:
m_Sprite: {fileID: 21300000, guid: f790a048c59a0dd419c432e0afa9d857, 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/ForestRuin/Platform/11platformo.asset.meta 0 → 100644
View file @ 7d7e1792
fileFormatVersion: 2
guid: 7906a96d103925441b49f86f01c3d598
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/Tiles/IceTemple/Platform/12platformc.asset
View file @ 7d7e1792
...@@ -11,7 +11,7 @@ MonoBehaviour: ...@@ -11,7 +11,7 @@ MonoBehaviour:
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: 12platformc m_Name: 12platformc
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Sprite: {fileID: 21300000, guid: f29465d502250714a9f25df6aaaeab1d, type: 3} m_Sprite: {fileID: 21300000, guid: 4af5d36db826cf645adec0f44fd42c76, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform: m_Transform:
e00: 1 e00: 1
......
Assets/Resources/Tiles/IceTemple/Platform/12platforml.asset
View file @ 7d7e1792
...@@ -11,7 +11,7 @@ MonoBehaviour: ...@@ -11,7 +11,7 @@ MonoBehaviour:
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: 12platforml m_Name: 12platforml
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Sprite: {fileID: 21300000, guid: 1be7ce8972ae2fb4a84717e42243e5b4, type: 3} m_Sprite: {fileID: 21300000, guid: 2f5006f3307bd394b8b33a5d72dee3f7, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform: m_Transform:
e00: 1 e00: 1
......
Assets/Resources/Tiles/IceTemple/Platform/12platformo.asset 0 → 100644
View file @ 7d7e1792
%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: 12platformo
m_EditorClassIdentifier:
m_Sprite: {fileID: 21300000, guid: 80a509e9a8fb7274e92d57040073fe6b, 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/IceTemple/Platform/12platformo.asset.meta 0 → 100644
View file @ 7d7e1792
fileFormatVersion: 2
guid: f8b56dbf06889ba4d8678ff5675e7170
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/Tiles/IceTemple/Platform/12platformr.asset
View file @ 7d7e1792
...@@ -11,7 +11,7 @@ MonoBehaviour: ...@@ -11,7 +11,7 @@ MonoBehaviour:
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: 12platformr m_Name: 12platformr
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Sprite: {fileID: 21300000, guid: 304a5c9639335dc419e62424768222f4, type: 3} m_Sprite: {fileID: 21300000, guid: 578482a5994be9047a8ea49564d0b511, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform: m_Transform:
e00: 1 e00: 1
......
Assets/Scripts/MenuManager.cs
View file @ 7d7e1792
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.SceneManagement; using UnityEngine.SceneManagement;
using UnityEngine.UI;
public class MenuManager : MonoBehaviour { public class MenuManager : MonoBehaviour {
...@@ -10,13 +11,26 @@ public class MenuManager : MonoBehaviour { ...@@ -10,13 +11,26 @@ public class MenuManager : MonoBehaviour {
SceneManager.LoadScene("PlayScene"); SceneManager.LoadScene("PlayScene");
} }
IEnumerator RandomColor()
{
while (true)
{
yield return new WaitForSeconds(1);
Camera.main.backgroundColor = new Color(Random.Range(0, 1), Random.Range(0, 1), Random.Range(0, 1));
}
}
// Use this for initialization // Use this for initialization
void Start () { void Start () {
} }
// Update is called once per frame // Update is called once per frame
void Update () { void Update ()
{
Camera.main.backgroundColor = new Color(Random.Range(0f, 1f), Random.Range(0f, 1f), Random.Range(0f, 1f));
GameObject.Find("Text").GetComponent<Text>().color = new Color(Random.Range(0f, 1f), Random.Range(0f, 1f), Random.Range(0f, 1f));
GameObject.Find("Title").GetComponent<Text>().color = new Color(Random.Range(0f, 1f), Random.Range(0f, 1f), Random.Range(0f, 1f));
GameObject.Find("Button").GetComponent<Button>().image.color = new Color(Random.Range(0f, 1f), Random.Range(0f, 1f), Random.Range(0f, 1f));
} }
} }
Assets/Scripts/TetrisMap/RoomInGame.cs
View file @ 7d7e1792
...@@ -11,8 +11,8 @@ public class ItemSpawnInfo ...@@ -11,8 +11,8 @@ public class ItemSpawnInfo
public ItemSpawnInfo(float _probability, ItemSpawnType[] _itemType, ItemQuality[] _itemQuality, int[] _amount) public ItemSpawnInfo(float _probability, ItemSpawnType[] _itemType, ItemQuality[] _itemQuality, int[] _amount)
{ {
probability = _probability; probability = _probability;
itemType = new ItemSpawnType[4]; itemType = new ItemSpawnType[_itemType.Length];
itemQuality = new ItemQuality[4]; itemQuality = new ItemQuality[_itemQuality.Length];
amount = new int[4]; amount = new int[4];
for (int i = 0; i < _itemType.Length; i++) for (int i = 0; i < _itemType.Length; i++)
{ {
...@@ -26,16 +26,10 @@ public class ItemSpawnInfo ...@@ -26,16 +26,10 @@ public class ItemSpawnInfo
public class RoomItemInfo public class RoomItemInfo
{ {
public List<ItemSpawnInfo> itemSpawnInfo = new List<ItemSpawnInfo>(); public List<ItemSpawnInfo> itemSpawnInfo = new List<ItemSpawnInfo>();
public RoomItemInfo()
{
}
public RoomItemInfo(ItemSpawnInfo[] _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]);
}
} }
} }
......
Assets/Scripts/TetrisMap/Rooms/ItemRoomInGame.cs
View file @ 7d7e1792
...@@ -16,12 +16,17 @@ public class ItemRoomInGame : RoomInGame { ...@@ -16,12 +16,17 @@ public class ItemRoomInGame : RoomInGame {
int j = 0; int j = 0;
foreach (Transform child in transform.Find("item spot")) foreach (Transform child in transform.Find("item spot"))
itemPosition[j++] = child.transform.position; itemPosition[j++] = child.transform.position;
int itemRoomType = room.itemRoomType; int itemRoomIndex = room.itemRoomType;
foreach(ItemSpawnInfo child in itemRoomInformation[itemRoomType - 1].itemSpawnInfo) if (itemRoomIndex > 5)
itemRoomIndex = 5;
for(int index = 0; index < itemRoomInformation[itemRoomIndex - 1].itemSpawnInfo.Count; index++)
{ {
ItemSpawnInfo child = itemRoomInformation[itemRoomIndex - 1].itemSpawnInfo[index];
probability -= child.probability; probability -= child.probability;
if(probability <= 0) Debug.Log(probability);
if (probability <= 0)
{ {
Debug.Log("Item Spawn");
int itemCount = 0; int itemCount = 0;
for(int i = 0; i < child.itemType.Length; i++) for(int i = 0; i < child.itemType.Length; i++)
{ {
...@@ -45,7 +50,7 @@ public class ItemRoomInGame : RoomInGame { ...@@ -45,7 +50,7 @@ public class ItemRoomInGame : RoomInGame {
} }
else if (child.itemType[i] == ItemSpawnType.LifeStone) else if (child.itemType[i] == ItemSpawnType.LifeStone)
{ {
if(room.itemRoomType <= 4) if(room.itemRoomType < 4)
for (int _amount = 0; _amount < child.amount[i]; _amount++) for (int _amount = 0; _amount < child.amount[i]; _amount++)
{ {
if(child.itemQuality[i] == ItemQuality.Gold) if(child.itemQuality[i] == ItemQuality.Gold)
...@@ -62,11 +67,14 @@ public class ItemRoomInGame : RoomInGame { ...@@ -62,11 +67,14 @@ public class ItemRoomInGame : RoomInGame {
else else
{ {
Debug.Log("type" + child.itemType[i] + " quality" + child.itemQuality[i] + " amount" + child.amount[i]); Debug.Log("type" + child.itemType[i] + " quality" + child.itemQuality[i] + " amount" + child.amount[i]);
lifeStoneManager.InstantiateDroppedLifeStone(3 * room.itemRoomType - 4, 1, 0, itemPosition[itemCount++], 1); lifeStoneManager.InstantiateDroppedLifeStone(3 * (room.itemRoomType - 4), 1, 0, itemPosition[itemCount++], 1);
} }
} }
else if (child.itemType[i] == ItemSpawnType.LifeStoneFrame) else if (child.itemType[i] == ItemSpawnType.LifeStoneFrame)
{
Debug.Log("type" + child.itemType[i] + " quality" + child.itemQuality[i] + " amount" + child.amount[i]);
lifeStoneManager.ExpandRow(room.itemRoomType - 4); lifeStoneManager.ExpandRow(room.itemRoomType - 4);
}
} }
return; return;
} }
...@@ -77,120 +85,5 @@ public class ItemRoomInGame : RoomInGame { ...@@ -77,120 +85,5 @@ public class ItemRoomInGame : RoomInGame {
{ {
base.RoomEnter(); base.RoomEnter();
SpawnItem(); SpawnItem();
/*switch (room.itemRoomType)
{
case 1:
if (probability < 25)
{
if (probability % 2 == 0)
inventoryManager.ItemInstantiate(ItemQuality.Ordinary, itemPosition[0], 1);
else
inventoryManager.AddonInstantiate(ItemQuality.Ordinary, itemPosition[0], 1);
lifeStoneManager.InstantiatePotion(itemPosition[1], 1);
lifeStoneManager.InstantiatePotion(itemPosition[2], 1);
}
else if (25 <= probability && probability < 50)
{
if (probability % 2 == 0)
inventoryManager.ItemInstantiate(ItemQuality.Ordinary, itemPosition[0], 1);
else
inventoryManager.AddonInstantiate(ItemQuality.Ordinary, itemPosition[0], 1);
lifeStoneManager.InstantiateDroppedLifeStone(4, 1, 0, itemPosition[1], 1);
}
else if (50 <= probability && probability < 67)
{
inventoryManager.ItemInstantiate(ItemQuality.Ordinary, itemPosition[0], 1);
inventoryManager.AddonInstantiate(ItemQuality.Ordinary, itemPosition[1], 1);
}
else if (67 <= probability && probability < 92)
{
inventoryManager.ItemInstantiate(ItemQuality.Ordinary, itemPosition[0], 1);
inventoryManager.AddonInstantiate(ItemQuality.Study, itemPosition[1], 1);
}
else
{
if (probability % 2 == 0)
inventoryManager.ItemInstantiate(ItemQuality.Superior, itemPosition[0], 1);
else
inventoryManager.AddonInstantiate(ItemQuality.Superior, itemPosition[0], 1);
}
break;
case 2:
if (probability % 5 == 0)
{
if (probability % 2 == 0)
inventoryManager.ItemInstantiate(ItemQuality.Superior, itemPosition[0], 1);
else
inventoryManager.AddonInstantiate(ItemQuality.Superior, itemPosition[0], 1);
lifeStoneManager.InstantiatePotion(itemPosition[1], 1);
lifeStoneManager.InstantiatePotion(itemPosition[2], 1);
lifeStoneManager.InstantiatePotion(itemPosition[3], 1);
}
else if (probability % 5 == 1)
{
inventoryManager.AddonInstantiate(ItemQuality.Superior, itemPosition[0], 1);
inventoryManager.AddonInstantiate(ItemQuality.Ordinary, itemPosition[1], 1);
inventoryManager.AddonInstantiate(ItemQuality.Study, itemPosition[2], 1);
}
else if (probability % 5 == 2)
{
inventoryManager.ItemInstantiate(ItemQuality.Superior, itemPosition[0], 1);
inventoryManager.AddonInstantiate(ItemQuality.Study, itemPosition[1], 1);
inventoryManager.AddonInstantiate(ItemQuality.Study, itemPosition[2], 1);
}
else if (probability % 5 == 3)
{
inventoryManager.ItemInstantiate(ItemQuality.Superior, itemPosition[0], 1);
inventoryManager.AddonInstantiate(ItemQuality.Ordinary, itemPosition[1], 1);
lifeStoneManager.InstantiateDroppedLifeStone(3, 0, 0, itemPosition[2], 1);
}
else if (probability % 5 == 4)
{
if (probability % 2 == 0)
inventoryManager.ItemInstantiate(ItemQuality.Superior, itemPosition[0], 1);
else
inventoryManager.AddonInstantiate(ItemQuality.Superior, itemPosition[0], 1);
lifeStoneManager.InstantiateDroppedLifeStone(3, 0, 0, itemPosition[1], 1);
lifeStoneManager.InstantiateDroppedLifeStone(3, 0, 0, itemPosition[2], 1);
lifeStoneManager.InstantiateDroppedLifeStone(3, 0, 0, itemPosition[3], 1);
}
break;
case 3:
if (probability < 67)
{
if (probability % 2 == 0)
inventoryManager.ItemInstantiate(ItemQuality.Ordinary, itemPosition[0], 1);
else
inventoryManager.AddonInstantiate(ItemQuality.Ordinary, itemPosition[0], 1);
inventoryManager.ItemInstantiate(ItemQuality.Superior, itemPosition[1], 1);
inventoryManager.AddonInstantiate(ItemQuality.Superior, itemPosition[2], 1);
lifeStoneManager.InstantiatePotion(itemPosition[3], 1);
}
else
{
if (probability % 2 == 0)
inventoryManager.ItemInstantiate(ItemQuality.Masterpiece, itemPosition[0], 1);
else
inventoryManager.AddonInstantiate(ItemQuality.Masterpiece, itemPosition[0], 1);
}
break;
case 4:
if (probability % 2 == 0)
inventoryManager.ItemInstantiate(ItemQuality.Masterpiece, itemPosition[0], 1);
else
inventoryManager.AddonInstantiate(ItemQuality.Masterpiece, itemPosition[0], 1);
lifeStoneManager.InstantiatePotion(itemPosition[1], 1);
lifeStoneManager.InstantiatePotion(itemPosition[2], 1);
break;
default:
if (probability % 2 == 0)
inventoryManager.ItemInstantiate(ItemQuality.Masterpiece, itemPosition[0], 1);
else
inventoryManager.AddonInstantiate(ItemQuality.Masterpiece, itemPosition[0], 1);
lifeStoneManager.InstantiateDroppedLifeStone(3 * room.itemRoomType - 4, 0, 0, itemPosition[1], 1);
lifeStoneManager.ExpandRow(room.itemRoomType - 4);
break;
}*/
} }
} }
Assets/Scripts/TileManager.cs
View file @ 7d7e1792
...@@ -105,9 +105,9 @@ public class TileManager : MonoBehaviour { ...@@ -105,9 +105,9 @@ public class TileManager : MonoBehaviour {
public char CheckPlatformTile(RoomInGame roomInGame, Vector2Int originPos) public char CheckPlatformTile(RoomInGame roomInGame, Vector2Int originPos)
{ {
bool left = false, right = false; bool left = false, right = false;
if(roomInGame.platformTileInfo[originPos.x + 1, originPos.y]) if(roomInGame.platformTileInfo[originPos.x + 1, originPos.y] || roomInGame.wallTileInfo[originPos.x + 1, originPos.y])
right = true; right = true;
if (roomInGame.platformTileInfo[originPos.x - 1, originPos.y]) if (roomInGame.platformTileInfo[originPos.x - 1, originPos.y] || roomInGame.wallTileInfo[originPos.x - 1, originPos.y])
left = true; left = true;
if (left && right) if (left && right)
return 'c'; return 'c';
...@@ -116,7 +116,7 @@ public class TileManager : MonoBehaviour { ...@@ -116,7 +116,7 @@ public class TileManager : MonoBehaviour {
else if(right) else if(right)
return 'l'; return 'l';
else else
return 'c'; return 'o';
} }
public char CheckRopeTile(RoomInGame roomInGame, Vector2Int originPos) public char CheckRopeTile(RoomInGame roomInGame, Vector2Int originPos)
{ {
......
Assets/Sprites/Rooms/Background/12Background.png.meta 0 → 100644
View file @ 7d7e1792
fileFormatVersion: 2
guid: 7d94542039acd6a4b932cf9219b71799
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 6
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: b98e692dc5213c947b38b96607256ef8
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
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