diff --git a/Gameton-06/Assets/Gameton/Scenes/Stage 1.unity b/Gameton-06/Assets/Gameton/Scenes/Stage 1.unity index 9b407b30..d233653c 100644 --- a/Gameton-06/Assets/Gameton/Scenes/Stage 1.unity +++ b/Gameton-06/Assets/Gameton/Scenes/Stage 1.unity @@ -94897,30 +94897,30 @@ CompositeCollider2D: Y: 10000000 - X: 530000000 Y: 10000000 - - X: 530000000 - Y: 20000000 - - X: 490000000 - Y: 20000000 - - X: 490000000 - Y: 10000000 - - X: 470000000 - Y: 10000000 - - X: 470000000 - Y: 0 - - X: 460000000 - Y: 0 - - X: 460000000 - Y: -10000000 - - X: 480000000 - Y: -10000000 - - - X: 560000000 - Y: 10000000 - - X: 530000000 - Y: 10000000 - X: 530000000 Y: 0 - X: 560000000 Y: 0 + - X: 560000000 + Y: 10000000 + - X: 540000000 + Y: 10000000 + - X: 540000000 + Y: 20000000 + - X: 490000000 + Y: 20000000 + - X: 490000000 + Y: 10000000 + - X: 470000000 + Y: 10000000 + - X: 470000000 + Y: 0 + - X: 450000000 + Y: 0 + - X: 450000000 + Y: -10000000 + - X: 480000000 + Y: -10000000 - - X: 2126249984 Y: 2500000 - X: 2130000000 @@ -95109,7 +95109,19 @@ CompositeCollider2D: - {x: -15.000029, y: 11} - {x: -18, y: 10.99997} - {x: -17.999971, y: 10} - - - {x: 79, y: -12.99997} + - - {x: 115, y: -12.99997} + - {x: 109, y: -12.99997} + - {x: 108.99998, y: -9} + - {x: 97, y: -8.99997} + - {x: 96.99997, y: -8} + - {x: 95, y: -7.9999704} + - {x: 94.99997, y: -7} + - {x: 84, y: -7.0000296} + - {x: 83.99997, y: -8} + - {x: 82, y: -8.00003} + - {x: 81.99997, y: -9} + - {x: 79, y: -9.00003} + - {x: 78.99997, y: -13} - {x: 73, y: -12.99997} - {x: 72.99997, y: -9} - {x: 60, y: -8.99997} @@ -95151,44 +95163,32 @@ CompositeCollider2D: - {x: 120, y: -8.00003} - {x: 119.99998, y: -9} - {x: 115, y: -9.00003} - - {x: 114.99998, y: -13} - - {x: 109, y: -12.99997} - - {x: 108.99998, y: -9} - - {x: 97, y: -8.99997} - - {x: 96.99997, y: -8} - - {x: 95, y: -7.9999704} - - {x: 94.99997, y: -7} - - {x: 84, y: -7.0000296} - - {x: 83.99997, y: -8} - - {x: 82, y: -8.00003} - - {x: 81.99997, y: -9} - - {x: 79, y: -9.00003} - - - {x: 205.99997, y: 3.1875} - - {x: 205.99997, y: 4} - - {x: 203, y: 3.999971} - - {x: 203.00003, y: 3.1875} - - {x: 221.375, y: 3.1875} - {x: 221.62502, y: 3.2500062} - {x: 222, y: 3.6875095} - {x: 221.99997, y: 4} - {x: 218, y: 3.999971} - {x: 218.00003, y: 3.1875} + - - {x: 205.99997, y: 3.1875} + - {x: 205.99997, y: 4} + - {x: 203, y: 3.999971} + - {x: 203.00003, y: 3.1875} - - {x: 47.999973, y: -1} - {x: 48.00003, y: 0} - {x: 50, y: 0.000029300001} - {x: 50.00003, y: 1} - - {x: 53, y: 1.0000293} - - {x: 52.999973, y: 2} + - {x: 53, y: 0.9999706} + - {x: 53.00003, y: 0} + - {x: 56, y: 0.000029300001} + - {x: 55.99997, y: 1} + - {x: 54, y: 1.0000294} + - {x: 53.99997, y: 2} - {x: 49, y: 1.9999708} - {x: 48.999973, y: 1} - {x: 47, y: 0.99997073} - {x: 46.999973, y: 0} - - {x: 46, y: -0.000029300001} - - {x: 46.00003, y: -1} - - - {x: 55.99997, y: 0} - - {x: 55.99997, y: 1} - - {x: 53, y: 0.99997073} - - {x: 53.00003, y: 0} + - {x: 45, y: -0.000029300001} + - {x: 45.00003, y: -1} - - {x: 212.375, y: 0.1875} - {x: 212.625, y: 0.2500062} - {x: 213, y: 0.68750954} @@ -95228,18 +95228,18 @@ CompositeCollider2D: - {x: 203, y: -2.3125062} - {x: 203.1875, y: -2.6250033} - {x: 203.50002, y: -2.8125} - - - {x: 40.562492, y: -4} - - {x: 41, y: -3.812482} - - {x: 40.999973, y: -3} - - {x: 37.0625, y: -3.0000293} - - {x: 37.062508, y: -3.562508} - - {x: 37.625008, y: -4} - - {x: 215.99997, y: -3.8125} - {x: 215.99997, y: -3} - {x: 212, y: -3.0000293} - {x: 212, y: -3.3125062} - {x: 212.1875, y: -3.6250033} - {x: 212.50002, y: -3.8125} + - - {x: 40.562492, y: -4} + - {x: 41, y: -3.812482} + - {x: 40.999973, y: -3} + - {x: 37.0625, y: -3.0000293} + - {x: 37.062508, y: -3.562508} + - {x: 37.625008, y: -4} - - {x: 220.37498, y: -5.8125} - {x: 220.625, y: -5.749994} - {x: 220.99998, y: -5.3124905} @@ -95252,10 +95252,6 @@ CompositeCollider2D: - {x: 73.0625, y: -6.000029} - {x: 73.062515, y: -6.562508} - {x: 73.62501, y: -7} - - - {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} @@ -95268,6 +95264,10 @@ CompositeCollider2D: - {x: 179.99997, y: -8} - {x: 175, y: -8.00003} - {x: 175.00003, y: -10} + - - {x: -15.000029, y: -10} + - {x: -15.000029, y: -8} + - {x: -18, y: -8.00003} + - {x: -17.999971, y: -10} m_VertexDistance: 0.0005 m_OffsetDistance: 0.00005 m_UseDelaunayMesh: 0 @@ -98457,7 +98457,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 44 - m_TileSpriteIndex: 44 + m_TileSpriteIndex: 56 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -98747,7 +98747,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 7 - m_TileSpriteIndex: 7 + m_TileSpriteIndex: 54 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -100083,6 +100083,16 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: 45, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 27 + m_TileSpriteIndex: 27 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: 46, y: -1, z: 0} second: serializedVersion: 2 @@ -100333,6 +100343,16 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: 53, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 27 + m_TileSpriteIndex: 27 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: 162, y: 1, z: 0} second: serializedVersion: 2 @@ -102799,7 +102819,7 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 6 m_Data: {fileID: 11400000, guid: 9e520076aa413a646a75559601cdfbb0, type: 2} - - m_RefCount: 3 + - m_RefCount: 5 m_Data: {fileID: 11400000, guid: 41be357a5b2e9964a825727152291995, type: 2} - m_RefCount: 0 m_Data: {fileID: 0} @@ -102874,8 +102894,8 @@ Tilemap: m_Data: {fileID: -1494591132, guid: 28a383233ade13e408a2af527bb1c577, type: 3} - m_RefCount: 13 m_Data: {fileID: 189600541, guid: 28a383233ade13e408a2af527bb1c577, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 1149762207, guid: 28a383233ade13e408a2af527bb1c577, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - m_RefCount: 0 @@ -102914,7 +102934,7 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 6 m_Data: {fileID: -373469659, guid: 28a383233ade13e408a2af527bb1c577, type: 3} - - m_RefCount: 3 + - m_RefCount: 5 m_Data: {fileID: -1842226808, guid: 28a383233ade13e408a2af527bb1c577, type: 3} - m_RefCount: 2 m_Data: {fileID: -1890040751, guid: 28a383233ade13e408a2af527bb1c577, type: 3} @@ -102948,8 +102968,8 @@ Tilemap: m_Data: {fileID: 1930707001, guid: 77d60e915f04b1e468c7c8ed3ea0aebd, type: 3} - m_RefCount: 46 m_Data: {fileID: -188576354, guid: 28a383233ade13e408a2af527bb1c577, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 1662728085, guid: 77d60e915f04b1e468c7c8ed3ea0aebd, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 2 m_Data: {fileID: -417555791, guid: 77d60e915f04b1e468c7c8ed3ea0aebd, type: 3} - m_RefCount: 25 @@ -102968,14 +102988,14 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 1149762207, guid: 28a383233ade13e408a2af527bb1c577, type: 3} - m_RefCount: 1 m_Data: {fileID: -845746671, guid: 28a383233ade13e408a2af527bb1c577, type: 3} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 1662728085, guid: 77d60e915f04b1e468c7c8ed3ea0aebd, type: 3} m_TileMatrixArray: - - m_RefCount: 735 + - m_RefCount: 737 m_Data: e00: 1 e01: 0 @@ -103012,7 +103032,7 @@ Tilemap: e32: 7.1e-43 e33: 7.15e-43 m_TileColorArray: - - m_RefCount: 735 + - m_RefCount: 737 m_Data: {r: 1, g: 1, b: 1, a: 1} - m_RefCount: 0 m_Data: {r: 4.4029e-41, g: 4.4029e-41, b: 4.4029e-41, a: 4.4029e-41} diff --git a/Gameton-06/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta b/Gameton-06/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta deleted file mode 100644 index 1eadf09a..00000000 --- a/Gameton-06/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f597f19f656ba56eae4f6a3a7cc528f4 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Gameton-06/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta b/Gameton-06/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta deleted file mode 100644 index f073d2ab..00000000 --- a/Gameton-06/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 48e08dc33330d11e9d4a1b246c52e4f6 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Gameton-06/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta b/Gameton-06/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta deleted file mode 100644 index 130722af..00000000 --- a/Gameton-06/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ed09910c0094cb27be8f3ca264680da3 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Gameton-06/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta b/Gameton-06/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta deleted file mode 100644 index f9b8ed82..00000000 --- a/Gameton-06/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: cc355dd4cf1e6173beaeb22c2858cbe1 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: