diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Story Background/intro_background_2.png.meta b/Gameton-06/Assets/Gameton/Resources/UI/Story Background/intro_background_2.png.meta index 6f38ecc2..2aeee114 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Story Background/intro_background_2.png.meta +++ b/Gameton-06/Assets/Gameton/Resources/UI/Story Background/intro_background_2.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 870d6f97417ebb5468e640844a9ecdeb +guid: 83c8b3cf3f540774485268b3b2202376 TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 + wrapU: 0 + wrapV: 0 wrapW: 0 - nPOTScale: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -52,9 +52,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 8 + textureType: 0 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -93,26 +93,13 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: internalID: 0 vertices: [] indices: diff --git a/Gameton-06/Assets/Gameton/Scenes/Stage 4.unity b/Gameton-06/Assets/Gameton/Scenes/Stage 4.unity index eb8d4708..2f40b9e7 100644 --- a/Gameton-06/Assets/Gameton/Scenes/Stage 4.unity +++ b/Gameton-06/Assets/Gameton/Scenes/Stage 4.unity @@ -20162,7 +20162,7 @@ Transform: m_GameObject: {fileID: 1185367601} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.72371674, y: -1.5063705, z: -10.076585} + m_LocalPosition: {x: -0.72366333, y: -1.5159607, z: -10.076585} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -22494,39 +22494,7 @@ CompositeCollider2D: Y: 91875000 - X: -171875008 Y: 91875000 - - - X: -90000000 - Y: -30000000 - - X: -80000000 - Y: -30000000 - - X: -80000000 - Y: -40000000 - - X: -60000000 - Y: -40000000 - - X: -60000000 - Y: -30000000 - - X: -70000000 - Y: -30000000 - - X: -70000000 - Y: -20000000 - - X: -100000000 - Y: -20000000 - - X: -100000000 - Y: -30000000 - - X: -110000000 - Y: -30000000 - - X: -110000000 - Y: -40000000 - - X: -90000000 - Y: -40000000 - - - X: 30000000 - Y: -30000000 - - X: 50000000 - Y: -30000000 - - X: 50000000 - Y: -40000000 - - X: 70000000 - Y: -40000000 - - X: 70000000 + - - X: 70000000 Y: -30000000 - X: 60000000 Y: -30000000 @@ -22540,7 +22508,23 @@ CompositeCollider2D: Y: -30000000 - X: 10000000 Y: -40000000 - - X: 30000000 + - X: 70000000 + Y: -40000000 + - - X: -60000000 + Y: -30000000 + - X: -70000000 + Y: -30000000 + - X: -70000000 + Y: -20000000 + - X: -100000000 + Y: -20000000 + - X: -100000000 + Y: -30000000 + - X: -110000000 + Y: -30000000 + - X: -110000000 + Y: -40000000 + - X: -60000000 Y: -40000000 - - X: 180000000 Y: -60000000 @@ -22698,11 +22682,7 @@ CompositeCollider2D: - {x: -18, y: 9.99997} - {x: -17.999998, y: 9.624995} - {x: -17.81248, y: 9.1875} - - - {x: 2.999971, y: -4} - - {x: 3.0000293, y: -3} - - {x: 5, y: -3.0000293} - - {x: 5.000029, y: -4} - - {x: 7, y: -3.999971} + - - {x: 6.9999704, y: -4} - {x: 6.9999704, y: -3} - {x: 6, y: -2.9999707} - {x: 5.999971, y: -2} @@ -22710,11 +22690,7 @@ CompositeCollider2D: - {x: 1.9999707, y: -3} - {x: 1, y: -3.0000293} - {x: 1.0000293, y: -4} - - - {x: -9.00003, y: -4} - - {x: -8.99997, y: -3} - - {x: -8, y: -3.0000293} - - {x: -7.9999704, y: -4} - - {x: -6, y: -3.999971} + - - {x: -6.000029, y: -4} - {x: -6.000029, y: -3} - {x: -7, y: -2.9999707} - {x: -7.0000296, y: -2} @@ -23231,6 +23207,16 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -9, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 11 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 0 + m_TileColorIndex: 1 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -8, y: -4, z: 0} second: serializedVersion: 2 @@ -23271,6 +23257,26 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: 3, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 11 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 0 + m_TileColorIndex: 1 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 4, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 11 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 0 + m_TileColorIndex: 1 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: 5, y: -4, z: 0} second: serializedVersion: 2 @@ -23745,7 +23751,7 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 36 m_Data: {fileID: 11400000, guid: 89c5f7db927a60d48ba7fc2a83ec0347, type: 2} - - m_RefCount: 15 + - m_RefCount: 18 m_Data: {fileID: 11400000, guid: ab765d45b22d3b24b9ab2d6708700bc9, type: 2} - m_RefCount: 0 m_Data: {fileID: 0} @@ -23776,7 +23782,7 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 36 m_Data: {fileID: -417555791, guid: 77d60e915f04b1e468c7c8ed3ea0aebd, type: 3} - - m_RefCount: 15 + - m_RefCount: 18 m_Data: {fileID: -1151269850, guid: 77d60e915f04b1e468c7c8ed3ea0aebd, type: 3} - m_RefCount: 0 m_Data: {fileID: 0} @@ -23785,7 +23791,7 @@ Tilemap: - m_RefCount: 36 m_Data: {fileID: 807894001, guid: 76fa8be48da57814ea137aeb42116019, type: 3} m_TileMatrixArray: - - m_RefCount: 87 + - m_RefCount: 90 m_Data: e00: 1 e01: 0 @@ -23860,7 +23866,7 @@ Tilemap: m_TileColorArray: - m_RefCount: 0 m_Data: {r: 9.517e-41, g: 9.517e-41, b: 9.517e-41, a: 9.517e-41} - - m_RefCount: 87 + - m_RefCount: 90 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1