diff --git a/Gameton-06/Assets/Gameton/Art/Map/Legacy_Adventure_Pack_Grassland/Tiles/Assets/Assets.png.meta b/Gameton-06/Assets/Gameton/Art/Map/Legacy_Adventure_Pack_Grassland/Tiles/Assets/Assets.png.meta index 38a9d0cd..ad2c7106 100644 --- a/Gameton-06/Assets/Gameton/Art/Map/Legacy_Adventure_Pack_Grassland/Tiles/Assets/Assets.png.meta +++ b/Gameton-06/Assets/Gameton/Art/Map/Legacy_Adventure_Pack_Grassland/Tiles/Assets/Assets.png.meta @@ -445,8 +445,9 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: - - - {x: -7, y: 8} - - {x: -7, y: -8} + - - {x: -6, y: 8} + - {x: -8, y: 6} + - {x: -8, y: -8} - {x: 8, y: -8} - {x: 8, y: 8} tessellationDetail: 0 @@ -539,7 +540,8 @@ TextureImporter: physicsShape: - - {x: -8, y: 8} - {x: -8, y: -8} - - {x: 6, y: -8} + - {x: 8, y: -8} + - {x: 8, y: 6} - {x: 6, y: 8} tessellationDetail: 0 bones: [] @@ -903,7 +905,11 @@ TextureImporter: pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: 8} + - {x: -8, y: -8} + - {x: 8, y: -8} + - {x: 8, y: 8} tessellationDetail: 0 bones: [] spriteID: 4670c3a90de62cb488fd521d15b05084 diff --git a/Gameton-06/Assets/Gameton/Scenes/Stage 1.unity b/Gameton-06/Assets/Gameton/Scenes/Stage 1.unity index 6ea3200a..521fbed8 100644 --- a/Gameton-06/Assets/Gameton/Scenes/Stage 1.unity +++ b/Gameton-06/Assets/Gameton/Scenes/Stage 1.unity @@ -58852,7 +58852,7 @@ Transform: m_GameObject: {fileID: 1185367601} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -80.44, y: -38.899998, z: -10.076585} + m_LocalPosition: {x: -95.13507, y: -3.387968, z: -10.076585} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -103433,8 +103433,10 @@ CompositeCollider2D: Y: 10000000 - X: 560000000 Y: 0 - - X: 598750016 + - X: 600000000 Y: 0 + - X: 600000000 + Y: 8750000 - X: 598750016 Y: 10000000 - X: 570000000 @@ -103471,13 +103473,11 @@ CompositeCollider2D: Y: 5000000 - X: 440000000 Y: 0 - - X: 430624992 + - X: 431249984 Y: 0 - - X: 430624992 - Y: -625000 - - X: 440000000 - Y: -625000 - - X: 440000000 + - X: 430000000 + Y: -1250000 + - X: 430000000 Y: -10000000 - X: 450000000 Y: -10000000 @@ -103533,9 +103533,11 @@ CompositeCollider2D: Y: -1875000 - X: 660000000 Y: 0 - - X: 630625024 + - X: 631249984 Y: 0 - - X: 630625024 + - X: 630000000 + Y: -1250000 + - X: 630000000 Y: -10000000 - X: 670000000 Y: -10000000 @@ -103547,13 +103549,17 @@ CompositeCollider2D: Y: -30000000 - X: 710000000 Y: -30000000 - - - X: 358750016 - Y: 0 - - X: 320624992 - Y: 0 - - X: 320624992 - Y: -10000000 + - - X: 360000000 + Y: -1250000 - X: 358750016 + Y: 0 + - X: 321249984 + Y: 0 + - X: 320000000 + Y: -1250000 + - X: 320000000 + Y: -10000000 + - X: 360000000 Y: -10000000 - - X: 2060000000 Y: -20000000 @@ -103567,13 +103573,17 @@ CompositeCollider2D: Y: -28125000 - X: 2060000000 Y: -28125000 - - - X: 408750016 - Y: -20000000 - - X: 370624992 - Y: -20000000 - - X: 370624992 - Y: -30000000 + - - X: 410000000 + Y: -21250000 - X: 408750016 + Y: -20000000 + - X: 371249984 + Y: -20000000 + - X: 370000000 + Y: -21250000 + - X: 370000000 + Y: -30000000 + - X: 410000000 Y: -30000000 - - X: 1030000000 Y: -20000000 @@ -103601,8 +103611,10 @@ CompositeCollider2D: Y: -28125000 - - X: 320000000 Y: -40000000 - - X: 328750016 + - X: 330000000 Y: -40000000 + - X: 330000000 + Y: -31250000 - X: 328750016 Y: -30000000 - X: 260000000 @@ -103673,9 +103685,11 @@ CompositeCollider2D: Y: -58125000 - - X: 790000000 Y: -50000000 - - X: 730625024 + - X: 731249984 Y: -50000000 - - X: 730625024 + - X: 730000000 + Y: -51250000 + - X: 730000000 Y: -60000000 - X: 790000000 Y: -60000000 @@ -103693,13 +103707,17 @@ CompositeCollider2D: Y: -58125000 - - X: 460000000 Y: -70000000 - - X: 478750016 + - X: 480000000 Y: -70000000 + - X: 480000000 + Y: -61250000 - X: 478750016 Y: -60000000 - - X: 380624992 + - X: 381249984 Y: -60000000 - - X: 380624992 + - X: 380000000 + Y: -61250000 + - X: 380000000 Y: -70000000 - X: 390000000 Y: -70000000 @@ -103777,9 +103795,11 @@ CompositeCollider2D: Y: -75000000 - X: 810000000 Y: -80000000 - - X: 790625024 + - X: 791249984 Y: -80000000 - - X: 790625024 + - X: 790000000 + Y: -81250000 + - X: 790000000 Y: -90000000 - X: 800000000 Y: -90000000 @@ -103829,24 +103849,20 @@ CompositeCollider2D: Y: -90000000 - X: 730000000 Y: -80000000 - - X: 600625024 + - X: 601249984 Y: -80000000 - - X: 600625024 - Y: -90000000 - X: 600000000 - Y: -90000000 + Y: -81250000 - X: 600000000 Y: -100000000 - X: 720000000 Y: -100000000 - - X: 550000000 Y: -80000000 - - X: 470624992 + - X: 471249984 Y: -80000000 - - X: 470624992 - Y: -90000000 - X: 470000000 - Y: -90000000 + Y: -81250000 - X: 470000000 Y: -100000000 - X: 550000000 @@ -103917,8 +103933,9 @@ CompositeCollider2D: - {x: 54.000034, y: 1} - {x: 56, y: 0.9999706} - {x: 56.000034, y: 0} - - {x: 59.875004, y: 0.000029300001} - - {x: 59.87497, y: 1} + - {x: 60, y: 0.000029300001} + - {x: 59.999996, y: 0.8750076} + - {x: 59.87499, y: 1} - {x: 56.999992, y: 1.0000023} - {x: 56, y: 1.4375024} - {x: 55.562496, y: 1.8125017} @@ -103936,10 +103953,9 @@ CompositeCollider2D: - {x: 45.4375, y: 0.8124979} - {x: 45, y: 0.4999993} - {x: 43.999992, y: 0} - - {x: 43.0625, y: -0.000029300001} - - {x: 43.062527, y: -0.0625} - - {x: 44, y: -0.0625294} - - {x: 44.00003, y: -1} + - {x: 43.124992, y: -0.0000076} + - {x: 43, y: -0.1250108} + - {x: 43.00003, y: -1} - - {x: 212.375, y: 0.1875} - {x: 212.625, y: 0.2500062} - {x: 213, y: 0.68750954} @@ -103958,10 +103974,6 @@ CompositeCollider2D: - {x: 96.99997, y: 0} - {x: 92, y: -0.000029300001} - {x: 92.00003, y: -0.8125} - - - {x: 35.874973, y: -1} - - {x: 35.874973, y: 0} - - {x: 32.0625, y: -0.000029300001} - - {x: 32.062527, y: -1} - - {x: 70.99997, y: -3} - {x: 70.99997, y: -2} - {x: 69.99999, y: -1.9999979} @@ -103971,12 +103983,25 @@ CompositeCollider2D: - {x: 67, y: -0.5624976} - {x: 66.5625, y: -0.1874985} - {x: 65.99999, y: 0} - - {x: 63.062504, y: -0.000029300001} - - {x: 63.062534, y: -1} + - {x: 63.124992, y: -0.0000076} + - {x: 63, y: -0.1250108} + - {x: 63.000034, y: -1} - {x: 67, y: -1.0000294} - {x: 67.00003, y: -2} - {x: 69, y: -2.0000293} - {x: 69.00003, y: -3} + - - {x: 35.999973, y: -1} + - {x: 35.999992, y: -0.1249924} + - {x: 35.874992, y: 0} + - {x: 32.124992, y: -0.0000076} + - {x: 32, y: -0.1250108} + - {x: 32.00003, y: -1} + - - {x: 40.999973, y: -3} + - {x: 40.999992, y: -2.1249924} + - {x: 40.874992, y: -2} + - {x: 37.124992, y: -2.0000076} + - {x: 37, y: -2.1250107} + - {x: 37.00003, y: -3} - - {x: 205.99997, y: -2.8125} - {x: 205.99997, y: -2} - {x: 203, y: -2.0000293} @@ -103995,10 +104020,6 @@ CompositeCollider2D: - {x: 99.00001, y: -2.3125062} - {x: 99.18751, y: -2.6250033} - {x: 99.50001, y: -2.8125} - - - {x: 40.874973, y: -3} - - {x: 40.874973, y: -2} - - {x: 37.0625, y: -2.0000293} - - {x: 37.062527, y: -3} - - {x: 215.99997, y: -3.8125} - {x: 215.99997, y: -3} - {x: 212, y: -3.0000293} @@ -104013,8 +104034,9 @@ CompositeCollider2D: - {x: 87.50001, y: -3.8125} - - {x: 31.999971, y: -10} - {x: 32.00003, y: -4} - - {x: 32.875004, y: -3.999971} - - {x: 32.874973, y: -3} + - {x: 33, y: -3.999971} + - {x: 32.999992, y: -3.1249924} + - {x: 32.874992, y: -3} - {x: 25.999996, y: -3.0000012} - {x: 25.437498, y: -3.1875021} - {x: 24.999998, y: -3.500001} @@ -104043,8 +104065,19 @@ CompositeCollider2D: - {x: 105.00003, y: -5.8125} - - {x: 78.99997, y: -6} - {x: 78.99997, y: -5} - - {x: 73.0625, y: -5.000029} - - {x: 73.06254, y: -6} + - {x: 73.12499, y: -5.0000076} + - {x: 73, y: -5.125011} + - {x: 73.00003, y: -6} + - - {x: 58.99997, y: -10} + - {x: 59.000034, y: -7} + - {x: 61, y: -6.9999704} + - {x: 60.99997, y: -6} + - {x: 54.062504, y: -6.000029} + - {x: 54.062534, y: -6.0625} + - {x: 55, y: -6.0625296} + - {x: 55.000034, y: -7} + - {x: 56, y: -7.0000296} + - {x: 56.000034, y: -10} - - {x: 115.99998, y: -14} - {x: 116.00003, y: -10} - {x: 163, y: -9.99997} @@ -104071,34 +104104,23 @@ CompositeCollider2D: - {x: 82.4375, y: -7.1875024} - {x: 82, y: -7.500001} - {x: 80.99999, y: -8} - - {x: 79.0625, y: -8.00003} - - {x: 79.06254, y: -9} + - {x: 79.12499, y: -8.000008} + - {x: 79, y: -8.125011} + - {x: 79.00003, y: -9} - {x: 80, y: -9.00003} - {x: 80.00003, y: -10} - {x: 108, y: -10.00003} - {x: 108.00003, y: -14} - - - {x: 58.99997, y: -10} - - {x: 59.000034, y: -7} - - {x: 61, y: -6.9999704} - - {x: 60.99997, y: -6} - - {x: 54.062504, y: -6.000029} - - {x: 54.062534, y: -6.0625} - - {x: 55, y: -6.0625296} - - {x: 55.000034, y: -7} - - {x: 56, y: -7.0000296} - - {x: 56.000034, y: -10} - - {x: 45.999973, y: -10} - {x: 46.00003, y: -7} - - {x: 47.875004, y: -6.9999704} - - {x: 47.874973, y: -6} - - {x: 38.0625, y: -6.000029} - - {x: 38.062527, y: -7} + - {x: 48, y: -6.9999704} + - {x: 47.999992, y: -6.1249924} + - {x: 47.874992, y: -6} + - {x: 38.124992, y: -6.0000076} + - {x: 38, y: -6.125011} + - {x: 38.00003, y: -7} - {x: 39, y: -7.0000296} - {x: 39.00003, y: -10} - - - {x: -15.000029, y: -10} - - {x: -15.000029, y: -8} - - {x: -18, y: -8.00003} - - {x: -17.999971, y: -10} - - {x: 229.99997, y: -10} - {x: 229.99997, y: -8} - {x: 203, y: -8.00003} @@ -104107,28 +104129,30 @@ CompositeCollider2D: - {x: 196.99997, y: -8} - {x: 195, y: -8.00003} - {x: 195.00003, y: -10} - - - {x: 179.99997, y: -10} - - {x: 179.99997, y: -8} - - {x: 175, y: -8.00003} - - {x: 175.00003, y: -10} - - - {x: 54.99997, y: -10} - - {x: 54.99997, y: -8} - - {x: 47.0625, y: -8.00003} - - {x: 47.06247, y: -9} - - {x: 47, y: -9.00003} - - {x: 47.00003, y: -10} - - {x: 71.99997, y: -10} - {x: 72.00003, y: -9} - {x: 73, y: -8.99997} - {x: 72.99997, y: -8} - - {x: 60.062504, y: -8.00003} - - {x: 60.06247, y: -9} - - {x: 60, y: -9.00003} + - {x: 60.124992, y: -8.000008} + - {x: 60, y: -8.125011} - {x: 60.000034, y: -10} + - - {x: 54.99997, y: -10} + - {x: 54.99997, y: -8} + - {x: 47.124992, y: -8.000008} + - {x: 47, y: -8.125011} + - {x: 47.00003, y: -10} + - - {x: 179.99997, y: -10} + - {x: 179.99997, y: -8} + - {x: 175, y: -8.00003} + - {x: 175.00003, y: -10} - - {x: 8.99997, y: -10} - {x: 8.99997, y: -8} - {x: -7, y: -8.00003} - {x: -6.9999704, y: -10} + - - {x: -15.000029, y: -10} + - {x: -15.000029, y: -8} + - {x: -18, y: -8.00003} + - {x: -17.999971, y: -10} - - {x: 115, y: -12.99997} - {x: 109, y: -12.99997} - {x: 109.00008, y: -8.5001545} @@ -109909,8 +109933,8 @@ Tilemap: - first: {x: 43, y: -1, z: 0} second: serializedVersion: 2 - m_TileIndex: 21 - m_TileSpriteIndex: 21 + m_TileIndex: 10 + m_TileSpriteIndex: 10 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -112568,7 +112592,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: b4cb0da638a03824a93556d6bc1d1c72, type: 2} - m_RefCount: 5 m_Data: {fileID: 11400000, guid: 9b663793dffdb9d4698cfdd6084e98d9, type: 2} - - m_RefCount: 8 + - m_RefCount: 9 m_Data: {fileID: 11400000, guid: 3ca234345bb4e9740bf9a84508e3deec, type: 2} - m_RefCount: 0 m_Data: {fileID: 0} @@ -112590,7 +112614,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: c6bc95a57e0b80848b23f7e0e8412b16, type: 2} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 2 + - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 19173b178ede00541a129ddbcc5f5209, type: 2} - m_RefCount: 6 m_Data: {fileID: 11400000, guid: 5834a456e07e0d54fa0b38827a48a378, type: 2} @@ -112683,7 +112707,7 @@ Tilemap: m_Data: {fileID: 170735088, guid: 28a383233ade13e408a2af527bb1c577, type: 3} - m_RefCount: 5 m_Data: {fileID: -1005820898, guid: 28a383233ade13e408a2af527bb1c577, type: 3} - - m_RefCount: 8 + - m_RefCount: 9 m_Data: {fileID: -491406006, guid: 28a383233ade13e408a2af527bb1c577, type: 3} - m_RefCount: 0 m_Data: {fileID: 0} @@ -112705,7 +112729,7 @@ Tilemap: m_Data: {fileID: 254091482, guid: 28a383233ade13e408a2af527bb1c577, type: 3} - m_RefCount: 6 m_Data: {fileID: -588100007, guid: 28a383233ade13e408a2af527bb1c577, type: 3} - - m_RefCount: 2 + - m_RefCount: 1 m_Data: {fileID: -571363403, guid: 28a383233ade13e408a2af527bb1c577, type: 3} - m_RefCount: 6 m_Data: {fileID: -972857971, guid: 28a383233ade13e408a2af527bb1c577, type: 3}