Skip to content

tetra-tower
tetra-tower
Commit b0dbe771 authored by 18김상언's avatar 18김상언
Browse files
Options

너모너모 똥같은 문짝 주위 프리펩 고치기 하는 중 

일단 스크립트를 통해서 전체 타일 다른 타일로 일대일 매칭시키는 부분은 SwapTile.cs 안에 윗부분에 있음
SwapTile.cs 안에 FillEmptyDoor 함수는 개쓰레기 똥이니 보지도 말고 쓰지도 마시오 계속 고민하면서 수정해야할듯
parent d6928363
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 421 additions and 173 deletions
Assets/Images/Tiles/Forest Ruin/OuterWall/Up_Door_Left1.asset.meta deleted 100644 → 0
View file @ d6928363
fileFormatVersion: 2
guid: 601364380115f9d4f9d60741f1044aa1
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Rooms/NormalRoom/Room 9(FR).prefab
View file @ b0dbe771
...@@ -638,9 +638,119 @@ CompositeCollider2D: ...@@ -638,9 +638,119 @@ 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: 2113883504275735784}
m_ColliderPaths:
- - X: 130000000
Y: 210000000
- X: 110000000
Y: 210000000
- X: 110000000
Y: 206406256
- X: 130000000
Y: 206406256
- - X: 120000000
Y: 180000000
- X: 110000000
Y: 180000000
- X: 110000000
Y: 176406256
- X: 120000000
Y: 176406256
- - X: 20000000
Y: 170000000
- X: 10000000
Y: 170000000
- X: 10000000
Y: 166406256
- X: 20000000
Y: 166406256
- - X: 230000000
Y: 170000000
- X: 220000000
Y: 170000000
- X: 220000000
Y: 166406256
- X: 230000000
Y: 166406256
- - X: 50000000
Y: 150000000
- X: 30000000
Y: 150000000
- X: 30000000
Y: 146406256
- X: 50000000
Y: 146406256
- - X: 30000000
Y: 110000000
- X: 20000000
Y: 110000000
- X: 20000000
Y: 106406248
- X: 30000000
Y: 106406248
- - X: 210000000
Y: 90000000
- X: 200000000
Y: 90000000
- X: 200000000
Y: 86406248
- X: 210000000
Y: 86406248
- - X: 100000000
Y: 70000000
- X: 90000000
Y: 70000000
- X: 90000000
Y: 66406248
- X: 100000000
Y: 66406248
- - X: 130000000
Y: 1718750
- X: 110000000
Y: 1718750
- X: 110000000
Y: -2187500
- X: 130000000
Y: -2187500
m_CompositePaths: m_CompositePaths:
m_Paths: [] m_Paths:
- - {x: 13, y: 21}
- {x: 11, y: 21}
- {x: 11, y: 20.640625}
- {x: 13, y: 20.640625}
- - {x: 12, y: 18}
- {x: 11, y: 18}
- {x: 11, y: 17.640625}
- {x: 12, y: 17.640625}
- - {x: 2, y: 17}
- {x: 1, y: 17}
- {x: 1, y: 16.640625}
- {x: 2, y: 16.640625}
- - {x: 23, y: 17}
- {x: 22, y: 17}
- {x: 22, y: 16.640625}
- {x: 23, y: 16.640625}
- - {x: 5, y: 15}
- {x: 3, y: 15}
- {x: 3, y: 14.640626}
- {x: 5, y: 14.640626}
- - {x: 3, y: 11}
- {x: 2, y: 11}
- {x: 2, y: 10.640625}
- {x: 3, y: 10.640625}
- - {x: 21, y: 9}
- {x: 20, y: 9}
- {x: 20, y: 8.640625}
- {x: 21, y: 8.640625}
- - {x: 10, y: 7}
- {x: 9, y: 7}
- {x: 9, y: 6.640625}
- {x: 10, y: 6.640625}
- - {x: 13, y: 0.171875}
- {x: 11, y: 0.171875}
- {x: 11, y: -0.21875}
- {x: 13, y: -0.21875}
m_VertexDistance: 0.0005 m_VertexDistance: 0.0005
--- !u!66 &66763079715791502 --- !u!66 &66763079715791502
CompositeCollider2D: CompositeCollider2D:
...@@ -3465,8 +3575,8 @@ Tilemap: ...@@ -3465,8 +3575,8 @@ Tilemap:
m_ColliderType: 1 m_ColliderType: 1
- first: {x: 23, y: 6, z: 0} - first: {x: 23, y: 6, z: 0}
second: second:
m_TileIndex: 21 m_TileIndex: 22
m_TileSpriteIndex: 21 m_TileSpriteIndex: 22
m_TileMatrixIndex: 0 m_TileMatrixIndex: 0
m_TileColorIndex: 0 m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0} m_ObjectToInstantiate: {fileID: 0}
...@@ -3966,9 +4076,9 @@ Tilemap: ...@@ -3966,9 +4076,9 @@ Tilemap:
m_Data: {fileID: 11400000, guid: 2967ea61b7da1db4c82ad335fabe0a79, type: 2} m_Data: {fileID: 11400000, guid: 2967ea61b7da1db4c82ad335fabe0a79, type: 2}
- m_RefCount: 4 - m_RefCount: 4
m_Data: {fileID: 11400000, guid: d54e80b6b48e4b84e82dc89fab2eec4c, type: 2} m_Data: {fileID: 11400000, guid: d54e80b6b48e4b84e82dc89fab2eec4c, type: 2}
- m_RefCount: 9 - m_RefCount: 8
m_Data: {fileID: 11400000, guid: 658696c04dfc5c4438eb2f0306e10f12, type: 2} m_Data: {fileID: 11400000, guid: 658696c04dfc5c4438eb2f0306e10f12, type: 2}
- m_RefCount: 1 - m_RefCount: 2
m_Data: {fileID: 11400000, guid: 78b3f2e87b92cee4e88fe15a5aabef92, type: 2} m_Data: {fileID: 11400000, guid: 78b3f2e87b92cee4e88fe15a5aabef92, type: 2}
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 11400000, guid: 81155fc6fe2288340bb0248e49de6fd4, type: 2} m_Data: {fileID: 11400000, guid: 81155fc6fe2288340bb0248e49de6fd4, type: 2}
...@@ -4015,9 +4125,9 @@ Tilemap: ...@@ -4015,9 +4125,9 @@ Tilemap:
m_Data: {fileID: 21300000, guid: d93a920ae642b2241b3cc429e7c534a4, type: 3} m_Data: {fileID: 21300000, guid: d93a920ae642b2241b3cc429e7c534a4, type: 3}
- m_RefCount: 4 - m_RefCount: 4
m_Data: {fileID: 21300000, guid: c63279f051b1b4e48bfb0e43ad31c196, type: 3} m_Data: {fileID: 21300000, guid: c63279f051b1b4e48bfb0e43ad31c196, type: 3}
- m_RefCount: 9 - m_RefCount: 8
m_Data: {fileID: 21300000, guid: 5d7bd4761dfd8e64c815bbd19358c4ff, type: 3} m_Data: {fileID: 21300000, guid: 5d7bd4761dfd8e64c815bbd19358c4ff, type: 3}
- m_RefCount: 1 - m_RefCount: 2
m_Data: {fileID: 21300000, guid: 971af024b3ec5db448d166a30a8ed037, type: 3} m_Data: {fileID: 21300000, guid: 971af024b3ec5db448d166a30a8ed037, type: 3}
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 21300000, guid: e396c3138529f3c45879540d36bd53eb, type: 3} m_Data: {fileID: 21300000, guid: e396c3138529f3c45879540d36bd53eb, type: 3}
......
Assets/Prefabs/Rooms/NormalRoom/Room 9.prefab
View file @ b0dbe771
...@@ -304,9 +304,119 @@ CompositeCollider2D: ...@@ -304,9 +304,119 @@ 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: 2113883507228558470}
m_ColliderPaths:
- - X: 130000000
Y: 210000000
- X: 110000000
Y: 210000000
- X: 110000000
Y: 206406256
- X: 130000000
Y: 206406256
- - X: 120000000
Y: 180000000
- X: 110000000
Y: 180000000
- X: 110000000
Y: 176406256
- X: 120000000
Y: 176406256
- - X: 20000000
Y: 170000000
- X: 10000000
Y: 170000000
- X: 10000000
Y: 166406256
- X: 20000000
Y: 166406256
- - X: 230000000
Y: 170000000
- X: 220000000
Y: 170000000
- X: 220000000
Y: 166406256
- X: 230000000
Y: 166406256
- - X: 50000000
Y: 150000000
- X: 30000000
Y: 150000000
- X: 30000000
Y: 146406256
- X: 50000000
Y: 146406256
- - X: 30000000
Y: 110000000
- X: 20000000
Y: 110000000
- X: 20000000
Y: 106406248
- X: 30000000
Y: 106406248
- - X: 210000000
Y: 90000000
- X: 200000000
Y: 90000000
- X: 200000000
Y: 86406248
- X: 210000000
Y: 86406248
- - X: 100000000
Y: 70000000
- X: 90000000
Y: 70000000
- X: 90000000
Y: 66406248
- X: 100000000
Y: 66406248
- - X: 130000000
Y: 1718750
- X: 110000000
Y: 1718750
- X: 110000000
Y: -2187500
- X: 130000000
Y: -2187500
m_CompositePaths: m_CompositePaths:
m_Paths: [] m_Paths:
- - {x: 13, y: 21}
- {x: 11, y: 21}
- {x: 11, y: 20.640625}
- {x: 13, y: 20.640625}
- - {x: 12, y: 18}
- {x: 11, y: 18}
- {x: 11, y: 17.640625}
- {x: 12, y: 17.640625}
- - {x: 2, y: 17}
- {x: 1, y: 17}
- {x: 1, y: 16.640625}
- {x: 2, y: 16.640625}
- - {x: 23, y: 17}
- {x: 22, y: 17}
- {x: 22, y: 16.640625}
- {x: 23, y: 16.640625}
- - {x: 5, y: 15}
- {x: 3, y: 15}
- {x: 3, y: 14.640626}
- {x: 5, y: 14.640626}
- - {x: 3, y: 11}
- {x: 2, y: 11}
- {x: 2, y: 10.640625}
- {x: 3, y: 10.640625}
- - {x: 21, y: 9}
- {x: 20, y: 9}
- {x: 20, y: 8.640625}
- {x: 21, y: 8.640625}
- - {x: 10, y: 7}
- {x: 9, y: 7}
- {x: 9, y: 6.640625}
- {x: 10, y: 6.640625}
- - {x: 13, y: 0.171875}
- {x: 11, y: 0.171875}
- {x: 11, y: -0.21875}
- {x: 13, y: -0.21875}
m_VertexDistance: 0.0005 m_VertexDistance: 0.0005
--- !u!66 &66467322663966308 --- !u!66 &66467322663966308
CompositeCollider2D: CompositeCollider2D:
...@@ -439,14 +549,6 @@ CompositeCollider2D: ...@@ -439,14 +549,6 @@ CompositeCollider2D:
Y: 50000000 Y: 50000000
- X: 20000000 - X: 20000000
Y: 50000000 Y: 50000000
- - X: 90000000
Y: 110000000
- X: 70000000
Y: 110000000
- X: 70000000
Y: 30000000
- X: 90000000
Y: 30000000
- - X: 200000000 - - X: 200000000
Y: 110000000 Y: 110000000
- X: 180000000 - X: 180000000
...@@ -455,14 +557,14 @@ CompositeCollider2D: ...@@ -455,14 +557,14 @@ CompositeCollider2D:
Y: 30000000 Y: 30000000
- X: 200000000 - X: 200000000
Y: 30000000 Y: 30000000
- - X: 50000000 - - X: 90000000
Y: 90000000 Y: 110000000
- X: 30000000 - X: 70000000
Y: 90000000 Y: 110000000
- X: 30000000 - X: 70000000
Y: 10000000 Y: 30000000
- X: 50000000 - X: 90000000
Y: 10000000 Y: 30000000
- - X: 150000000 - - X: 150000000
Y: 90000000 Y: 90000000
- X: 130000000 - X: 130000000
...@@ -471,6 +573,14 @@ CompositeCollider2D: ...@@ -471,6 +573,14 @@ CompositeCollider2D:
Y: 10000000 Y: 10000000
- X: 150000000 - X: 150000000
Y: 10000000 Y: 10000000
- - X: 50000000
Y: 90000000
- X: 30000000
Y: 90000000
- X: 30000000
Y: 10000000
- X: 50000000
Y: 10000000
m_CompositePaths: m_CompositePaths:
m_Paths: m_Paths:
- - {x: 15, y: 21} - - {x: 15, y: 21}
...@@ -529,22 +639,22 @@ CompositeCollider2D: ...@@ -529,22 +639,22 @@ CompositeCollider2D:
- {x: 1, y: 13} - {x: 1, y: 13}
- {x: 1, y: 5} - {x: 1, y: 5}
- {x: 2, y: 5} - {x: 2, y: 5}
- - {x: 9, y: 11}
- {x: 7, y: 11}
- {x: 7, y: 3}
- {x: 9, y: 3}
- - {x: 20, y: 11} - - {x: 20, y: 11}
- {x: 18, y: 11} - {x: 18, y: 11}
- {x: 18, y: 3} - {x: 18, y: 3}
- {x: 20, y: 3} - {x: 20, y: 3}
- - {x: 5, y: 9} - - {x: 9, y: 11}
- {x: 3, y: 9} - {x: 7, y: 11}
- {x: 3, y: 1} - {x: 7, y: 3}
- {x: 5, y: 1} - {x: 9, y: 3}
- - {x: 15, y: 9} - - {x: 15, y: 9}
- {x: 13, y: 9} - {x: 13, y: 9}
- {x: 13, y: 1} - {x: 13, y: 1}
- {x: 15, y: 1} - {x: 15, y: 1}
- - {x: 5, y: 9}
- {x: 3, y: 9}
- {x: 3, y: 1}
- {x: 5, y: 1}
m_VertexDistance: 0.0005 m_VertexDistance: 0.0005
--- !u!66 &66779662859196158 --- !u!66 &66779662859196158
CompositeCollider2D: CompositeCollider2D:
...@@ -565,20 +675,6 @@ CompositeCollider2D: ...@@ -565,20 +675,6 @@ CompositeCollider2D:
m_ColliderPaths: m_ColliderPaths:
- m_Collider: {fileID: 2113883505427433984} - m_Collider: {fileID: 2113883505427433984}
m_ColliderPaths: m_ColliderPaths:
- - X: 240000000
Y: 239843744
- X: 239843744
Y: 240000000
- X: 130000000
Y: 240000000
- X: 130000000
Y: 230000000
- X: 230000000
Y: 230000000
- X: 230000000
Y: 190000000
- X: 240000000
Y: 190000000
- - X: 10000000 - - X: 10000000
Y: 230000000 Y: 230000000
- X: 110000000 - X: 110000000
...@@ -593,16 +689,20 @@ CompositeCollider2D: ...@@ -593,16 +689,20 @@ CompositeCollider2D:
Y: 190000000 Y: 190000000
- X: 10000000 - X: 10000000
Y: 190000000 Y: 190000000
- - X: 10000000 - - X: 240000000
Y: 169843744 Y: 239843744
- X: 9843750 - X: 239843744
Y: 170000000 Y: 240000000
- X: 0 - X: 130000000
Y: 170000000 Y: 240000000
- X: 0 - X: 130000000
Y: 30000000 Y: 230000000
- X: 10000000 - X: 230000000
Y: 30000000 Y: 230000000
- X: 230000000
Y: 190000000
- X: 240000000
Y: 190000000
- - X: 240000000 - - X: 240000000
Y: 169843744 Y: 169843744
- X: 239843744 - X: 239843744
...@@ -613,16 +713,16 @@ CompositeCollider2D: ...@@ -613,16 +713,16 @@ CompositeCollider2D:
Y: 30000000 Y: 30000000
- X: 240000000 - X: 240000000
Y: 30000000 Y: 30000000
- - X: 240000000 - - X: 10000000
Y: 9843750 Y: 169843744
- X: 239843744 - X: 9843750
Y: 10000000 Y: 170000000
- X: 130000000 - X: 0
Y: 10000000 Y: 170000000
- X: 130000000 - X: 0
Y: 0 Y: 30000000
- X: 240000000 - X: 10000000
Y: 0 Y: 30000000
- - X: 110000000 - - X: 110000000
Y: 9843750 Y: 9843750
- X: 109843752 - X: 109843752
...@@ -633,15 +733,18 @@ CompositeCollider2D: ...@@ -633,15 +733,18 @@ CompositeCollider2D:
Y: 0 Y: 0
- X: 110000000 - X: 110000000
Y: 0 Y: 0
- - X: 240000000
Y: 9843750
- X: 239843744
Y: 10000000
- X: 130000000
Y: 10000000
- X: 130000000
Y: 0
- X: 240000000
Y: 0
m_CompositePaths: m_CompositePaths:
m_Paths: m_Paths:
- - {x: 24, y: 23.984375}
- {x: 23.984375, y: 24}
- {x: 13, y: 24}
- {x: 13, y: 23}
- {x: 23, y: 23}
- {x: 23, y: 19}
- {x: 24, y: 19}
- - {x: 1, y: 23} - - {x: 1, y: 23}
- {x: 11, y: 23} - {x: 11, y: 23}
- {x: 11, y: 23.984375} - {x: 11, y: 23.984375}
...@@ -649,26 +752,33 @@ CompositeCollider2D: ...@@ -649,26 +752,33 @@ CompositeCollider2D:
- {x: 0, y: 24} - {x: 0, y: 24}
- {x: 0, y: 19} - {x: 0, y: 19}
- {x: 1, y: 19} - {x: 1, y: 19}
- - {x: 1, y: 16.984375} - - {x: 24, y: 23.984375}
- {x: 0.984375, y: 17} - {x: 23.984375, y: 24}
- {x: 0, y: 17} - {x: 13, y: 24}
- {x: 0, y: 3} - {x: 13, y: 23}
- {x: 1, y: 3} - {x: 23, y: 23}
- {x: 23, y: 19}
- {x: 24, y: 19}
- - {x: 24, y: 16.984375} - - {x: 24, y: 16.984375}
- {x: 23.984375, y: 17} - {x: 23.984375, y: 17}
- {x: 23, y: 17} - {x: 23, y: 17}
- {x: 23, y: 3} - {x: 23, y: 3}
- {x: 24, y: 3} - {x: 24, y: 3}
- - {x: 24, y: 0.984375} - - {x: 1, y: 16.984375}
- {x: 23.984375, y: 1} - {x: 0.984375, y: 17}
- {x: 13, y: 1} - {x: 0, y: 17}
- {x: 13, y: 0} - {x: 0, y: 3}
- {x: 24, y: 0} - {x: 1, y: 3}
- - {x: 11, y: 0.984375} - - {x: 11, y: 0.984375}
- {x: 10.984375, y: 1} - {x: 10.984375, y: 1}
- {x: 0, y: 1} - {x: 0, y: 1}
- {x: 0, y: 0} - {x: 0, y: 0}
- {x: 11, y: 0} - {x: 11, y: 0}
- - {x: 24, y: 0.984375}
- {x: 23.984375, y: 1}
- {x: 13, y: 1}
- {x: 13, y: 0}
- {x: 24, y: 0}
m_VertexDistance: 0.0005 m_VertexDistance: 0.0005
--- !u!66 &66856536747254948 --- !u!66 &66856536747254948
CompositeCollider2D: CompositeCollider2D:
...@@ -3109,8 +3219,8 @@ Tilemap: ...@@ -3109,8 +3219,8 @@ Tilemap:
m_ColliderType: 1 m_ColliderType: 1
- first: {x: 23, y: 6, z: 0} - first: {x: 23, y: 6, z: 0}
second: second:
m_TileIndex: 21 m_TileIndex: 22
m_TileSpriteIndex: 21 m_TileSpriteIndex: 22
m_TileMatrixIndex: 0 m_TileMatrixIndex: 0
m_TileColorIndex: 0 m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0} m_ObjectToInstantiate: {fileID: 0}
...@@ -3610,9 +3720,9 @@ Tilemap: ...@@ -3610,9 +3720,9 @@ Tilemap:
m_Data: {fileID: 11400000, guid: 2967ea61b7da1db4c82ad335fabe0a79, type: 2} m_Data: {fileID: 11400000, guid: 2967ea61b7da1db4c82ad335fabe0a79, type: 2}
- m_RefCount: 4 - m_RefCount: 4
m_Data: {fileID: 11400000, guid: d54e80b6b48e4b84e82dc89fab2eec4c, type: 2} m_Data: {fileID: 11400000, guid: d54e80b6b48e4b84e82dc89fab2eec4c, type: 2}
- m_RefCount: 9 - m_RefCount: 8
m_Data: {fileID: 11400000, guid: 658696c04dfc5c4438eb2f0306e10f12, type: 2} m_Data: {fileID: 11400000, guid: 658696c04dfc5c4438eb2f0306e10f12, type: 2}
- m_RefCount: 1 - m_RefCount: 2
m_Data: {fileID: 11400000, guid: 78b3f2e87b92cee4e88fe15a5aabef92, type: 2} m_Data: {fileID: 11400000, guid: 78b3f2e87b92cee4e88fe15a5aabef92, type: 2}
m_TileSpriteArray: m_TileSpriteArray:
- m_RefCount: 1 - m_RefCount: 1
...@@ -3657,9 +3767,9 @@ Tilemap: ...@@ -3657,9 +3767,9 @@ Tilemap:
m_Data: {fileID: 21300000, guid: d93a920ae642b2241b3cc429e7c534a4, type: 3} m_Data: {fileID: 21300000, guid: d93a920ae642b2241b3cc429e7c534a4, type: 3}
- m_RefCount: 4 - m_RefCount: 4
m_Data: {fileID: 21300000, guid: c63279f051b1b4e48bfb0e43ad31c196, type: 3} m_Data: {fileID: 21300000, guid: c63279f051b1b4e48bfb0e43ad31c196, type: 3}
- m_RefCount: 9 - m_RefCount: 8
m_Data: {fileID: 21300000, guid: 5d7bd4761dfd8e64c815bbd19358c4ff, type: 3} m_Data: {fileID: 21300000, guid: 5d7bd4761dfd8e64c815bbd19358c4ff, type: 3}
- m_RefCount: 1 - m_RefCount: 2
m_Data: {fileID: 21300000, guid: 971af024b3ec5db448d166a30a8ed037, type: 3} m_Data: {fileID: 21300000, guid: 971af024b3ec5db448d166a30a8ed037, type: 3}
m_TileMatrixArray: m_TileMatrixArray:
- m_RefCount: 80 - m_RefCount: 80
......
Assets/Scripts/ChangePlatformTile.cs deleted 100644 → 0
View file @ d6928363
This diff is collapsed.
Assets/Scripts/SwapTile.cs 0 → 100644
View file @ b0dbe771
This diff is collapsed.
Assets/Tiles/Forest Ruin/OuterWall/Up_Door_Left1.asset deleted 100644 → 0
View file @ d6928363
This diff is collapsed.
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