diff --git a/.plastic/plastic.changes b/.plastic/plastic.changes index fc0c2293..88dc8638 100644 Binary files a/.plastic/plastic.changes and b/.plastic/plastic.changes differ diff --git a/.plastic/plastic.wktree b/.plastic/plastic.wktree index 3f1faa26..7662232f 100644 Binary files a/.plastic/plastic.wktree and b/.plastic/plastic.wktree differ diff --git a/Assets/Materials/Element 10.png b/Assets/Materials/Element 10.png deleted file mode 100644 index 1c4fb235..00000000 Binary files a/Assets/Materials/Element 10.png and /dev/null differ diff --git a/Assets/Materials/Element 10.png.meta b/Assets/Materials/Element 10.png.meta deleted file mode 100644 index f514f166..00000000 --- a/Assets/Materials/Element 10.png.meta +++ /dev/null @@ -1,135 +0,0 @@ -fileFormatVersion: 2 -guid: 343f7433f71fea34683593662713e6e7 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - 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 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Element 11.png b/Assets/Materials/Element 11.png deleted file mode 100644 index 15028977..00000000 Binary files a/Assets/Materials/Element 11.png and /dev/null differ diff --git a/Assets/Materials/Element 11.png.meta b/Assets/Materials/Element 11.png.meta deleted file mode 100644 index fa37ffac..00000000 --- a/Assets/Materials/Element 11.png.meta +++ /dev/null @@ -1,135 +0,0 @@ -fileFormatVersion: 2 -guid: a75780b3f1ed4d84ab2f47cdcc67a2c3 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - 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 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Element 13.png b/Assets/Materials/Element 13.png deleted file mode 100644 index 9e03a08d..00000000 Binary files a/Assets/Materials/Element 13.png and /dev/null differ diff --git a/Assets/Materials/Element 13.png.meta b/Assets/Materials/Element 13.png.meta deleted file mode 100644 index 9e2ee0af..00000000 --- a/Assets/Materials/Element 13.png.meta +++ /dev/null @@ -1,135 +0,0 @@ -fileFormatVersion: 2 -guid: 890820d9cb6776d49980bfa830f5d0e1 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - 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 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/block.png.meta b/Assets/Materials/block.png.meta deleted file mode 100644 index 6b603b17..00000000 --- a/Assets/Materials/block.png.meta +++ /dev/null @@ -1,135 +0,0 @@ -fileFormatVersion: 2 -guid: dc58f015e3ddee043899ce6032859f72 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - 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 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/jumppad_1.1.png b/Assets/Materials/jumppad_1.1.png deleted file mode 100644 index 01b4de56..00000000 Binary files a/Assets/Materials/jumppad_1.1.png and /dev/null differ diff --git a/Assets/Materials/jumppad_1.1.png.meta b/Assets/Materials/jumppad_1.1.png.meta deleted file mode 100644 index c5b8c70b..00000000 --- a/Assets/Materials/jumppad_1.1.png.meta +++ /dev/null @@ -1,135 +0,0 @@ -fileFormatVersion: 2 -guid: 8774469666b72e64981b972de94e1cc9 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - 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 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/player.png.meta b/Assets/Materials/player.png.meta deleted file mode 100644 index 69c8efea..00000000 --- a/Assets/Materials/player.png.meta +++ /dev/null @@ -1,135 +0,0 @@ -fileFormatVersion: 2 -guid: 0f2a2a9b9f5fd594fa340ad51423db2a -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - 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 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/5 Decke.prefab b/Assets/Prefabs/5 Decke.prefab index 75d17f68..e8a2c56f 100644 --- a/Assets/Prefabs/5 Decke.prefab +++ b/Assets/Prefabs/5 Decke.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 188096576634750592} - component: {fileID: 188096576634750593} - component: {fileID: 188096576634750594} - m_Layer: 6 + m_Layer: 0 m_Name: Block m_TagString: Untagged m_Icon: {fileID: 0} @@ -26,13 +26,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 188096576634750595} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 3.3, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 253886814976351748} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &188096576634750592 SpriteRenderer: @@ -51,6 +51,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -75,7 +77,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: dc58f015e3ddee043899ce6032859f72, type: 3} + m_Sprite: {fileID: 21300000, guid: fd5aa8d177493854a98db198ef4bd247, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 1 @@ -94,11 +96,32 @@ BoxCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 188096576634750595} m_Enabled: 1 + serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 - m_UsedByComposite: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} @@ -109,7 +132,6 @@ BoxCollider2D: drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - serializedVersion: 2 m_Size: {x: 1.12, y: 1.12} m_EdgeRadius: 0 --- !u!114 &188096576634750594 @@ -127,6 +149,7 @@ MonoBehaviour: moveSpeed: 5 deadZone: -15 player: {fileID: 0} + logic: {fileID: 0} --- !u!1 &1646971217093227587 GameObject: m_ObjectHideFlags: 0 @@ -139,7 +162,7 @@ GameObject: - component: {fileID: 1646971217093227584} - component: {fileID: 1646971217093227585} - component: {fileID: 1646971217093227586} - m_Layer: 6 + m_Layer: 0 m_Name: 'Block ' m_TagString: Untagged m_Icon: {fileID: 0} @@ -153,13 +176,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1646971217093227587} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 4.4, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 253886814976351748} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1646971217093227584 SpriteRenderer: @@ -178,6 +201,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -202,7 +227,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: dc58f015e3ddee043899ce6032859f72, type: 3} + m_Sprite: {fileID: 21300000, guid: fd5aa8d177493854a98db198ef4bd247, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 1 @@ -221,11 +246,32 @@ BoxCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1646971217093227587} m_Enabled: 1 + serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 - m_UsedByComposite: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} @@ -236,7 +282,6 @@ BoxCollider2D: drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - serializedVersion: 2 m_Size: {x: 1.12, y: 1.12} m_EdgeRadius: 0 --- !u!114 &1646971217093227586 @@ -254,6 +299,7 @@ MonoBehaviour: moveSpeed: 5 deadZone: -15 player: {fileID: 0} + logic: {fileID: 0} --- !u!1 &3202402708711837770 GameObject: m_ObjectHideFlags: 0 @@ -266,7 +312,7 @@ GameObject: - component: {fileID: 3202402708711837769} - component: {fileID: 3202402708711837768} - component: {fileID: 3202402708711837771} - m_Layer: 6 + m_Layer: 0 m_Name: 'Block ' m_TagString: Untagged m_Icon: {fileID: 0} @@ -280,13 +326,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3202402708711837770} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2.2, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 253886814976351748} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &3202402708711837769 SpriteRenderer: @@ -305,6 +351,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -329,7 +377,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: dc58f015e3ddee043899ce6032859f72, type: 3} + m_Sprite: {fileID: 21300000, guid: fd5aa8d177493854a98db198ef4bd247, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 1 @@ -348,11 +396,32 @@ BoxCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3202402708711837770} m_Enabled: 1 + serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 - m_UsedByComposite: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} @@ -363,7 +432,6 @@ BoxCollider2D: drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - serializedVersion: 2 m_Size: {x: 1.12, y: 1.12} m_EdgeRadius: 0 --- !u!114 &3202402708711837771 @@ -381,6 +449,7 @@ MonoBehaviour: moveSpeed: 5 deadZone: -15 player: {fileID: 0} + logic: {fileID: 0} --- !u!1 &7721115307406858338 GameObject: m_ObjectHideFlags: 0 @@ -404,6 +473,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7721115307406858338} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 80, y: -4.468984, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -415,7 +485,6 @@ Transform: - {fileID: 188096576634750623} - {fileID: 1646971217093227615} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7788582403621978604 GameObject: @@ -429,7 +498,7 @@ GameObject: - component: {fileID: 7788582403621978607} - component: {fileID: 7788582403621978606} - component: {fileID: 7788582403621978605} - m_Layer: 6 + m_Layer: 0 m_Name: Block m_TagString: Untagged m_Icon: {fileID: 0} @@ -443,13 +512,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7788582403621978604} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1.1, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 253886814976351748} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &7788582403621978607 SpriteRenderer: @@ -468,6 +537,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -492,7 +563,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: dc58f015e3ddee043899ce6032859f72, type: 3} + m_Sprite: {fileID: 21300000, guid: fd5aa8d177493854a98db198ef4bd247, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 1 @@ -511,11 +582,32 @@ BoxCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7788582403621978604} m_Enabled: 1 + serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 - m_UsedByComposite: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} @@ -526,7 +618,6 @@ BoxCollider2D: drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - serializedVersion: 2 m_Size: {x: 1.12, y: 1.12} m_EdgeRadius: 0 --- !u!114 &7788582403621978605 @@ -544,6 +635,7 @@ MonoBehaviour: moveSpeed: 5 deadZone: -15 player: {fileID: 0} + logic: {fileID: 0} --- !u!1 &9194604954146415849 GameObject: m_ObjectHideFlags: 0 @@ -556,7 +648,7 @@ GameObject: - component: {fileID: 9194604954146415850} - component: {fileID: 9194604954146415851} - component: {fileID: 9194604954146415848} - m_Layer: 6 + m_Layer: 0 m_Name: Block m_TagString: Untagged m_Icon: {fileID: 0} @@ -570,13 +662,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9194604954146415849} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 253886814976351748} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &9194604954146415850 SpriteRenderer: @@ -595,6 +687,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -619,7 +713,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: dc58f015e3ddee043899ce6032859f72, type: 3} + m_Sprite: {fileID: 21300000, guid: fd5aa8d177493854a98db198ef4bd247, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 1 @@ -638,11 +732,32 @@ BoxCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9194604954146415849} m_Enabled: 1 + serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 - m_UsedByComposite: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} @@ -653,7 +768,6 @@ BoxCollider2D: drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - serializedVersion: 2 m_Size: {x: 1.12, y: 1.12} m_EdgeRadius: 0 --- !u!114 &9194604954146415848 @@ -671,3 +785,4 @@ MonoBehaviour: moveSpeed: 5 deadZone: -15 player: {fileID: 0} + logic: {fileID: 0} diff --git a/Assets/Prefabs/Big Spike.prefab b/Assets/Prefabs/Big Spike.prefab index 6e41417a..9e756fe5 100644 --- a/Assets/Prefabs/Big Spike.prefab +++ b/Assets/Prefabs/Big Spike.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6535319948051518707} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5116659272103397216 SpriteRenderer: @@ -51,6 +51,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -75,7 +77,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 343f7433f71fea34683593662713e6e7, type: 3} + m_Sprite: {fileID: 21300000, guid: eab98d216c782764ca426220e6d2061b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -94,11 +96,32 @@ PolygonCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6535319948051518707} m_Enabled: 1 + serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 - m_UsedByComposite: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} @@ -114,6 +137,7 @@ PolygonCollider2D: - - {x: 0, y: 0.55} - {x: -0.55, y: -0.55} - {x: 0.55, y: -0.55} + m_UseDelaunayMesh: 0 --- !u!114 &4623191091882228128 MonoBehaviour: m_ObjectHideFlags: 0 @@ -129,3 +153,4 @@ MonoBehaviour: moveSpeed: 5 deadZone: -15 player: {fileID: 0} + logic: {fileID: 0} diff --git a/Assets/Prefabs/Block.prefab b/Assets/Prefabs/Block.prefab index 1c4746e9..0674d577 100644 --- a/Assets/Prefabs/Block.prefab +++ b/Assets/Prefabs/Block.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3997803213758825311} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -4.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &3997803213758825308 SpriteRenderer: @@ -51,6 +51,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -75,7 +77,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: dc58f015e3ddee043899ce6032859f72, type: 3} + m_Sprite: {fileID: 21300000, guid: fd5aa8d177493854a98db198ef4bd247, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -94,11 +96,32 @@ BoxCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3997803213758825311} m_Enabled: 1 + serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 - m_UsedByComposite: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} @@ -109,7 +132,6 @@ BoxCollider2D: drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - serializedVersion: 2 m_Size: {x: 1.12, y: 1.12} m_EdgeRadius: 0 --- !u!114 &3997803213758825310 @@ -126,3 +148,5 @@ MonoBehaviour: m_EditorClassIdentifier: moveSpeed: 5 deadZone: -15 + player: {fileID: 0} + logic: {fileID: 0} diff --git a/Assets/Prefabs/Jumppad_klein.prefab b/Assets/Prefabs/Jumppad_klein.prefab index 84346ae0..b44238f4 100644 --- a/Assets/Prefabs/Jumppad_klein.prefab +++ b/Assets/Prefabs/Jumppad_klein.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2275177074160335910} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 52.32, y: -0.38, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &2275177074160335909 SpriteRenderer: @@ -51,6 +51,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -75,7 +77,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 8774469666b72e64981b972de94e1cc9, type: 3} + m_Sprite: {fileID: 21300000, guid: 364c7eab89ca8994a83f0059d91be513, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -94,11 +96,32 @@ CapsuleCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2275177074160335910} m_Enabled: 1 + serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 - m_UsedByComposite: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 m_Offset: {x: 0.000000004410893, y: -0.2129988} m_Size: {x: 0.80201894, y: 0.72402406} m_Direction: 1 @@ -121,3 +144,4 @@ MonoBehaviour: m_SpriteB: {fileID: 21300000, guid: 8774469666b72e64981b972de94e1cc9, type: 3} duration: 2 m_SR: {fileID: 0} + logic: {fileID: 0} diff --git a/Assets/Prefabs/Oben_Block.prefab b/Assets/Prefabs/Oben_Block.prefab index dd99ea94..ec21d893 100644 --- a/Assets/Prefabs/Oben_Block.prefab +++ b/Assets/Prefabs/Oben_Block.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 6357224603657217963} - component: {fileID: 6357224603657217962} - component: {fileID: 6357224603657217961} - m_Layer: 6 + m_Layer: 0 m_Name: Oben_Block m_TagString: Untagged m_Icon: {fileID: 0} @@ -26,13 +26,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6357224603657217960} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -4.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &6357224603657217963 SpriteRenderer: @@ -51,6 +51,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -75,7 +77,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: dc58f015e3ddee043899ce6032859f72, type: 3} + m_Sprite: {fileID: 21300000, guid: fd5aa8d177493854a98db198ef4bd247, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 1 @@ -94,11 +96,32 @@ BoxCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6357224603657217960} m_Enabled: 1 + serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 - m_UsedByComposite: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} @@ -109,7 +132,6 @@ BoxCollider2D: drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - serializedVersion: 2 m_Size: {x: 1.12, y: 1.12} m_EdgeRadius: 0 --- !u!114 &6357224603657217961 @@ -127,3 +149,4 @@ MonoBehaviour: moveSpeed: 5 deadZone: -15 player: {fileID: 0} + logic: {fileID: 0} diff --git a/Assets/Resources/Player.prefab b/Assets/Prefabs/Player.prefab similarity index 84% rename from Assets/Resources/Player.prefab rename to Assets/Prefabs/Player.prefab index 57ebf928..da60de56 100644 --- a/Assets/Resources/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -29,6 +29,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 920496236070625688} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -4.468984, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} @@ -39,7 +40,6 @@ Transform: - {fileID: 920496236368403203} - {fileID: 920496236888346278} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &920496236070625684 SpriteRenderer: @@ -58,6 +58,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -82,7 +84,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 0f2a2a9b9f5fd594fa340ad51423db2a, type: 3} + m_Sprite: {fileID: 21300000, guid: 16457efa9d9327b42af5a5153c644385, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -110,6 +112,12 @@ Rigidbody2D: m_AngularDrag: 0.05 m_GravityScale: 2 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 @@ -122,11 +130,32 @@ BoxCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 920496236070625688} m_Enabled: 1 + serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 - m_UsedByComposite: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} @@ -137,7 +166,6 @@ BoxCollider2D: drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - serializedVersion: 2 m_Size: {x: 1.12, y: 1.11} m_EdgeRadius: 0 --- !u!114 &920496236070625689 @@ -152,6 +180,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8d22c78c60bdea6438f36bf3f862344a, type: 3} m_Name: m_EditorClassIdentifier: + velocity: {x: 0, y: 0} myRigidbody: {fileID: 920496236070625687} blockStrength: 10 IsAlive: 1 @@ -161,6 +190,7 @@ MonoBehaviour: IsFlying: 0 JumpSound: {fileID: 920496236070625682} DieSound: {fileID: 920496236070625683} + constraints: 0 --- !u!82 &920496236070625682 AudioSource: m_ObjectHideFlags: 0 @@ -172,6 +202,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 29bde6326b4c34ad8a12da475f79b50a, type: 3} + m_Resource: {fileID: 8300000, guid: 29bde6326b4c34ad8a12da475f79b50a, type: 3} m_PlayOnAwake: 0 m_Volume: 0.2 m_Pitch: 1 @@ -268,6 +299,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: cabfae866cab347928b74b7d0ca6bfa9, type: 3} + m_Resource: {fileID: 8300000, guid: cabfae866cab347928b74b7d0ca6bfa9, type: 3} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -378,13 +410,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 920496236368403202} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.52, y: -0.508, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 920496236070625685} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &920496236368403200 BoxCollider2D: @@ -394,11 +426,32 @@ BoxCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 920496236368403202} m_Enabled: 1 + serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 - m_UsedByComposite: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} @@ -409,7 +462,6 @@ BoxCollider2D: drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - serializedVersion: 2 m_Size: {x: 0.1, y: 0.1} m_EdgeRadius: 0 --- !u!114 &920496236368403201 @@ -450,13 +502,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 920496236446786419} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.52, y: 0.509, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 920496236070625685} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &920496236446786417 BoxCollider2D: @@ -466,11 +518,32 @@ BoxCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 920496236446786419} m_Enabled: 1 + serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 - m_UsedByComposite: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} @@ -481,7 +554,6 @@ BoxCollider2D: drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - serializedVersion: 2 m_Size: {x: 0.1, y: 0.1} m_EdgeRadius: 0 --- !u!114 &920496236446786382 @@ -522,13 +594,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 920496236888346281} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.518, y: -0.508, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 920496236070625685} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &920496236888346279 BoxCollider2D: @@ -538,11 +610,32 @@ BoxCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 920496236888346281} m_Enabled: 1 + serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 - m_UsedByComposite: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} @@ -553,7 +646,6 @@ BoxCollider2D: drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - serializedVersion: 2 m_Size: {x: 0.1, y: 0.1} m_EdgeRadius: 0 --- !u!114 &920496236888346276 @@ -594,13 +686,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 920496237342652537} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.518, y: 0.509, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 920496236070625685} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &920496237342652532 BoxCollider2D: @@ -610,11 +702,32 @@ BoxCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 920496237342652537} m_Enabled: 1 + serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 - m_UsedByComposite: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} @@ -625,7 +738,6 @@ BoxCollider2D: drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - serializedVersion: 2 m_Size: {x: 0.1, y: 0.1} m_EdgeRadius: 0 --- !u!114 &920496237342652535 diff --git a/Assets/Resources/Player.prefab.meta b/Assets/Prefabs/Player.prefab.meta similarity index 100% rename from Assets/Resources/Player.prefab.meta rename to Assets/Prefabs/Player.prefab.meta diff --git a/Assets/Prefabs/Small Spike.prefab b/Assets/Prefabs/Small Spike.prefab index e719bf64..d1dc4264 100644 --- a/Assets/Prefabs/Small Spike.prefab +++ b/Assets/Prefabs/Small Spike.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 202007960980360046} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2.327764, y: -1.2751312, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8424874910683569296 SpriteRenderer: @@ -51,6 +51,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -75,7 +77,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: a75780b3f1ed4d84ab2f47cdcc67a2c3, type: 3} + m_Sprite: {fileID: 21300000, guid: 83663f58b08a1ec4e871481083cc7beb, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -94,11 +96,32 @@ PolygonCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 202007960980360046} m_Enabled: 1 + serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 - m_UsedByComposite: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} @@ -114,6 +137,7 @@ PolygonCollider2D: - - {x: 0, y: 0.28} - {x: 0.56, y: -0.28} - {x: -0.56, y: -0.28} + m_UseDelaunayMesh: 0 --- !u!114 &5964270886034100113 MonoBehaviour: m_ObjectHideFlags: 0 @@ -128,3 +152,5 @@ MonoBehaviour: m_EditorClassIdentifier: moveSpeed: 5 deadZone: -15 + player: {fileID: 0} + logic: {fileID: 0} diff --git a/Assets/Element 10.png b/Assets/Resources/Element 10.png similarity index 100% rename from Assets/Element 10.png rename to Assets/Resources/Element 10.png diff --git a/Assets/Element 10.png.meta b/Assets/Resources/Element 10.png.meta similarity index 81% rename from Assets/Element 10.png.meta rename to Assets/Resources/Element 10.png.meta index 04773102..2f74dff2 100644 --- a/Assets/Element 10.png.meta +++ b/Assets/Resources/Element 10.png.meta @@ -3,7 +3,7 @@ guid: eab98d216c782764ca426220e6d2061b TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -20,11 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -63,9 +64,10 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -75,9 +77,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -87,9 +90,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Server maxTextureSize: 2048 resizeAlgorithm: 0 @@ -99,9 +103,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 @@ -111,6 +116,20 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + 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: @@ -127,9 +146,8 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Element 11.png b/Assets/Resources/Element 11.png similarity index 100% rename from Assets/Element 11.png rename to Assets/Resources/Element 11.png diff --git a/Assets/Element 11.png.meta b/Assets/Resources/Element 11.png.meta similarity index 81% rename from Assets/Element 11.png.meta rename to Assets/Resources/Element 11.png.meta index 4aed75f1..82b540f7 100644 --- a/Assets/Element 11.png.meta +++ b/Assets/Resources/Element 11.png.meta @@ -3,7 +3,7 @@ guid: 83663f58b08a1ec4e871481083cc7beb TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -20,11 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -63,9 +64,10 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -75,9 +77,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -87,9 +90,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Server maxTextureSize: 2048 resizeAlgorithm: 0 @@ -99,9 +103,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 @@ -111,6 +116,20 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + 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: @@ -127,9 +146,8 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Materials/Element 12.png b/Assets/Resources/Element 14.png similarity index 100% rename from Assets/Materials/Element 12.png rename to Assets/Resources/Element 14.png diff --git a/Assets/Materials/Element 12.png.meta b/Assets/Resources/Element 14.png.meta similarity index 81% rename from Assets/Materials/Element 12.png.meta rename to Assets/Resources/Element 14.png.meta index 879bd092..9faf39c2 100644 --- a/Assets/Materials/Element 12.png.meta +++ b/Assets/Resources/Element 14.png.meta @@ -3,7 +3,7 @@ guid: 703cea753b75d7240b3d4ec518997518 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -20,11 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -63,9 +64,10 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -75,9 +77,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -87,9 +90,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Server maxTextureSize: 2048 resizeAlgorithm: 0 @@ -99,9 +103,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 @@ -111,6 +116,20 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + 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: @@ -127,9 +146,8 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Materials/Kette.png b/Assets/Resources/Kette.png similarity index 100% rename from Assets/Materials/Kette.png rename to Assets/Resources/Kette.png diff --git a/Assets/Materials/Kette.png.meta b/Assets/Resources/Kette.png.meta similarity index 81% rename from Assets/Materials/Kette.png.meta rename to Assets/Resources/Kette.png.meta index c12310b9..9b52adcf 100644 --- a/Assets/Materials/Kette.png.meta +++ b/Assets/Resources/Kette.png.meta @@ -3,7 +3,7 @@ guid: 5a8dc519345f4674f898287992f00db6 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -20,11 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -63,9 +64,10 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -75,9 +77,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -87,9 +90,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Server maxTextureSize: 2048 resizeAlgorithm: 0 @@ -99,9 +103,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 @@ -111,6 +116,20 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + 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: @@ -127,9 +146,8 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Kette_1.png b/Assets/Resources/Kette_1.png similarity index 100% rename from Assets/Kette_1.png rename to Assets/Resources/Kette_1.png diff --git a/Assets/Kette_1.png.meta b/Assets/Resources/Kette_1.png.meta similarity index 100% rename from Assets/Kette_1.png.meta rename to Assets/Resources/Kette_1.png.meta diff --git a/Assets/Materials/block.png b/Assets/Resources/block.png similarity index 100% rename from Assets/Materials/block.png rename to Assets/Resources/block.png diff --git a/Assets/block.png.meta b/Assets/Resources/block.png.meta similarity index 81% rename from Assets/block.png.meta rename to Assets/Resources/block.png.meta index 3ce879e3..0e7f19f1 100644 --- a/Assets/block.png.meta +++ b/Assets/Resources/block.png.meta @@ -3,7 +3,7 @@ guid: fd5aa8d177493854a98db198ef4bd247 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -20,11 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -63,9 +64,10 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -75,9 +77,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -87,9 +90,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Server maxTextureSize: 2048 resizeAlgorithm: 0 @@ -99,9 +103,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 @@ -111,6 +116,20 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + 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: @@ -127,9 +146,8 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Materials/jumppad_1.png b/Assets/Resources/jumppad_1.png similarity index 100% rename from Assets/Materials/jumppad_1.png rename to Assets/Resources/jumppad_1.png diff --git a/Assets/Materials/jumppad_1.png.meta b/Assets/Resources/jumppad_1.png.meta similarity index 81% rename from Assets/Materials/jumppad_1.png.meta rename to Assets/Resources/jumppad_1.png.meta index 458e4c9c..f2037852 100644 --- a/Assets/Materials/jumppad_1.png.meta +++ b/Assets/Resources/jumppad_1.png.meta @@ -3,7 +3,7 @@ guid: 364c7eab89ca8994a83f0059d91be513 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -20,11 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -63,9 +64,10 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -75,9 +77,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -87,9 +90,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Server maxTextureSize: 2048 resizeAlgorithm: 0 @@ -99,9 +103,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 @@ -111,6 +116,20 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + 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: @@ -127,9 +146,8 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Materials/player.png b/Assets/Resources/player.png similarity index 100% rename from Assets/Materials/player.png rename to Assets/Resources/player.png diff --git a/Assets/player.png.meta b/Assets/Resources/player.png.meta similarity index 81% rename from Assets/player.png.meta rename to Assets/Resources/player.png.meta index 41fb4654..9f942b9c 100644 --- a/Assets/player.png.meta +++ b/Assets/Resources/player.png.meta @@ -3,7 +3,7 @@ guid: 16457efa9d9327b42af5a5153c644385 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -20,11 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -63,9 +64,10 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -75,9 +77,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -87,9 +90,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Server maxTextureSize: 2048 resizeAlgorithm: 0 @@ -99,9 +103,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 @@ -111,6 +116,20 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + 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: @@ -127,9 +146,8 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity index 1fa011b0..64909c01 100644 --- a/Assets/Scenes/Level_01.unity +++ b/Assets/Scenes/Level_01.unity @@ -240,6 +240,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 253886814976351748, guid: 6b331f30b65d48c4c8970c1f43de3c6f, type: 3} m_PrefabInstance: {fileID: 134310862} m_PrefabAsset: {fileID: 0} +--- !u!1001 &149777944 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 731530037} + m_Modifications: + - target: {fileID: 3473640140341286912, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_Name + value: 5 Boden (2) + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalPosition.x + value: 97.8 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalPosition.y + value: 1.1 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} +--- !u!4 &149777945 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + m_PrefabInstance: {fileID: 149777944} + m_PrefabAsset: {fileID: 0} --- !u!1001 &173651189 PrefabInstance: m_ObjectHideFlags: 0 @@ -421,7 +483,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 8774469666b72e64981b972de94e1cc9, type: 3} + m_Sprite: {fileID: 21300000, guid: 364c7eab89ca8994a83f0059d91be513, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -563,7 +625,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} @@ -593,7 +655,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 213441796} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 389416770} + m_TargetAssemblyTypeName: PauseMenu, Assembly-CSharp + m_MethodName: ClosePauseMenu + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &213441796 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1221,6 +1295,68 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 1} +--- !u!1001 &429440496 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 731530037} + m_Modifications: + - target: {fileID: 3473640140341286912, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_Name + value: 5 Boden (5) + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalPosition.x + value: 102.1 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalPosition.y + value: 2.2 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} +--- !u!4 &429440497 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + m_PrefabInstance: {fileID: 429440496} + m_PrefabAsset: {fileID: 0} --- !u!1001 &442071272 PrefabInstance: m_ObjectHideFlags: 0 @@ -1415,6 +1551,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 5243541839655249381, guid: 984dea28b56d17e468db386de44f1cef, type: 3} m_PrefabInstance: {fileID: 539480319} m_PrefabAsset: {fileID: 0} +--- !u!1001 &606925697 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 731530037} + m_Modifications: + - target: {fileID: 3473640140341286912, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_Name + value: 5 Boden (3) + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalPosition.x + value: 95.6 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalPosition.y + value: 2.2 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} +--- !u!4 &606925698 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + m_PrefabInstance: {fileID: 606925697} + m_PrefabAsset: {fileID: 0} --- !u!1 &629075519 GameObject: m_ObjectHideFlags: 0 @@ -1556,6 +1754,130 @@ Transform: m_CorrespondingSourceObject: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} m_PrefabInstance: {fileID: 643504587} m_PrefabAsset: {fileID: 0} +--- !u!1001 &679064528 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 731530037} + m_Modifications: + - target: {fileID: 3473640140341286912, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_Name + value: 5 Boden + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalPosition.x + value: 92.3 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalPosition.y + value: 1.1 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} +--- !u!4 &679064529 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + m_PrefabInstance: {fileID: 679064528} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &683093607 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 731530037} + m_Modifications: + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalPosition.x + value: 105.5 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalPosition.y + value: 1.1 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825311, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_Name + value: Block (11) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} +--- !u!4 &683093608 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + m_PrefabInstance: {fileID: 683093607} + m_PrefabAsset: {fileID: 0} --- !u!1001 &721830292 PrefabInstance: m_ObjectHideFlags: 0 @@ -1679,6 +2001,18 @@ Transform: - {fileID: 531910521} - {fileID: 1326935299} - {fileID: 1849830574} + - {fileID: 1795882406} + - {fileID: 679064529} + - {fileID: 1422276041} + - {fileID: 149777945} + - {fileID: 606925698} + - {fileID: 897132384} + - {fileID: 429440497} + - {fileID: 1506714745} + - {fileID: 683093608} + - {fileID: 1416561753} + - {fileID: 2046241846} + - {fileID: 1454700431} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &735571742 @@ -1844,6 +2178,68 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 767835140} m_CullTransparentMesh: 1 +--- !u!1001 &897132383 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 731530037} + m_Modifications: + - target: {fileID: 3473640140341286912, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_Name + value: 5 Boden (4) + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalPosition.x + value: 101 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} +--- !u!4 &897132384 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + m_PrefabInstance: {fileID: 897132383} + m_PrefabAsset: {fileID: 0} --- !u!1001 &901055792 PrefabInstance: m_ObjectHideFlags: 0 @@ -2194,7 +2590,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1063872206} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 389416770} + m_TargetAssemblyTypeName: PauseMenu, Assembly-CSharp + m_MethodName: ExitGame + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1063872206 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2675,11 +3083,135 @@ Transform: m_CorrespondingSourceObject: {fileID: 5243541839655249381, guid: 984dea28b56d17e468db386de44f1cef, type: 3} m_PrefabInstance: {fileID: 1005611165} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1416561752 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 731530037} + m_Modifications: + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalPosition.x + value: 106.6 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalPosition.y + value: 1.1 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825311, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_Name + value: Block (12) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} +--- !u!4 &1416561753 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + m_PrefabInstance: {fileID: 1416561752} + m_PrefabAsset: {fileID: 0} --- !u!4 &1417273488 stripped Transform: m_CorrespondingSourceObject: {fileID: 5243541839655249381, guid: 984dea28b56d17e468db386de44f1cef, type: 3} m_PrefabInstance: {fileID: 1297465331} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1422276040 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 731530037} + m_Modifications: + - target: {fileID: 3473640140341286912, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_Name + value: 5 Boden (1) + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalPosition.x + value: 94.5 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} +--- !u!4 &1422276041 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + m_PrefabInstance: {fileID: 1422276040} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1426714392 PrefabInstance: m_ObjectHideFlags: 0 @@ -2742,6 +3274,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} m_PrefabInstance: {fileID: 1426714392} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1454700430 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 731530037} + m_Modifications: + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalPosition.x + value: 107.6 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825311, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_Name + value: Block (14) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} +--- !u!4 &1454700431 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + m_PrefabInstance: {fileID: 1454700430} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1470396842 PrefabInstance: m_ObjectHideFlags: 0 @@ -2926,6 +3520,68 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 90, y: -180, z: 0} +--- !u!1001 &1506714744 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 731530037} + m_Modifications: + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalPosition.x + value: 104.4 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalPosition.y + value: 1.1 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825311, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_Name + value: Block (10) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} +--- !u!4 &1506714745 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + m_PrefabInstance: {fileID: 1506714744} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1515954542 PrefabInstance: m_ObjectHideFlags: 0 @@ -3451,6 +4107,68 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1795037933} m_CullTransparentMesh: 1 +--- !u!1001 &1795882405 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 731530037} + m_Modifications: + - target: {fileID: 3473640140341286912, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_Name + value: 5 Boden + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalPosition.x + value: 89 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} +--- !u!4 &1795882406 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6383795905041505894, guid: 9bc2405467d10be46ab50bf9be34ef32, type: 3} + m_PrefabInstance: {fileID: 1795882405} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1811441063 PrefabInstance: m_ObjectHideFlags: 0 @@ -4712,6 +5430,68 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 984dea28b56d17e468db386de44f1cef, type: 3} +--- !u!1001 &2046241845 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 731530037} + m_Modifications: + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalPosition.x + value: 107.6 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalPosition.y + value: 1.1 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3997803213758825311, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + propertyPath: m_Name + value: Block (13) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} +--- !u!4 &2046241846 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3997803213758825283, guid: 79e87b5d9c9f6c042b850a3e1177f046, type: 3} + m_PrefabInstance: {fileID: 2046241845} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2071321291 PrefabInstance: m_ObjectHideFlags: 0 @@ -5532,7 +6312,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 0f2a2a9b9f5fd594fa340ad51423db2a, type: 3} + m_Sprite: {fileID: 21300000, guid: 16457efa9d9327b42af5a5153c644385, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -5555,7 +6335,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: cabfae866cab347928b74b7d0ca6bfa9, type: 3} m_Resource: {fileID: 8300000, guid: cabfae866cab347928b74b7d0ca6bfa9, type: 3} - m_PlayOnAwake: 1 + m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 Loop: 0 @@ -5759,6 +6539,7 @@ MonoBehaviour: IsFlying: 0 JumpSound: {fileID: 565933370275705093} DieSound: {fileID: 565933370275705092} + constraints: 0 --- !u!1 &565933370275705103 GameObject: m_ObjectHideFlags: 0 @@ -5878,7 +6659,7 @@ SpriteRenderer: m_Size: {x: 1.12, y: 1.12} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!1 &3997803212941429610 @@ -6063,7 +6844,7 @@ SpriteRenderer: m_Size: {x: 1.12, y: 1.12} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &3997803213657427996 diff --git a/Assets/Scenes/Pause_Menu.unity b/Assets/Scenes/Pause_Menu.unity deleted file mode 100644 index f6ee9ae2..00000000 --- a/Assets/Scenes/Pause_Menu.unity +++ /dev/null @@ -1,125 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 10 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 3 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 0 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 12 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 0} ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 3 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - buildHeightMesh: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1660057539 &9223372036854775807 -SceneRoots: - m_ObjectHideFlags: 0 - m_Roots: [] diff --git a/Assets/Scenes/Pause_Menu.unity.meta b/Assets/Scenes/Pause_Menu.unity.meta deleted file mode 100644 index 696c5db0..00000000 --- a/Assets/Scenes/Pause_Menu.unity.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 87ca1619e6402204c9432061705dd240 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/BlockScript.cs b/Assets/Scripts/BlockScript.cs index aa758c1d..dab4d967 100644 --- a/Assets/Scripts/BlockScript.cs +++ b/Assets/Scripts/BlockScript.cs @@ -16,6 +16,7 @@ public class BlockScript : MonoBehaviour public bool IsFlying = false; [SerializeField] private AudioSource JumpSound; [SerializeField] private AudioSource DieSound; + public UnityEngine.RigidbodyConstraints2D constraints; // Start is called before the first frame update @@ -27,7 +28,11 @@ public class BlockScript : MonoBehaviour // Update is called once per frame void Update() { - + if (!logic.IsFreezed) { + myRigidbody.gravityScale = 2; + myRigidbody.constraints = RigidbodyConstraints2D.None; + } + if (IsFlying && !logic.IsFreezed) { rotation = Vector3.back; transform.Rotate(rotation * speed * Time.deltaTime); @@ -44,6 +49,7 @@ public class BlockScript : MonoBehaviour velocity = myRigidbody.velocity; myRigidbody.velocity = Vector2.zero; myRigidbody.gravityScale = 0; + myRigidbody.constraints = RigidbodyConstraints2D.FreezeRotation; } } diff --git a/Assets/Scripts/ConnectToServer.cs b/Assets/Scripts/ConnectToServer.cs deleted file mode 100644 index 7292c786..00000000 --- a/Assets/Scripts/ConnectToServer.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using Photon.Pun; -using UnityEngine.SceneManagement; - -public class ConnectToServer : MonoBehaviourPunCallbacks -{ - // Start is called before the first frame update - void Start() - { - PhotonNetwork.ConnectUsingSettings(); - } - - public override void OnConnectedToMaster() - { - PhotonNetwork.JoinLobby(); - } - - public override void OnJoinedLobby() - { - SceneManager.LoadScene("Lobby"); - } - - -} diff --git a/Assets/Scripts/ConnectToServer.cs.meta b/Assets/Scripts/ConnectToServer.cs.meta deleted file mode 100644 index 026b5b88..00000000 --- a/Assets/Scripts/ConnectToServer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5d93ed45bf1c3d14391a3885160ba5ae -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/CreateAndJoinLevel.cs b/Assets/Scripts/CreateAndJoinLevel.cs index 23376d27..3dacbc13 100644 --- a/Assets/Scripts/CreateAndJoinLevel.cs +++ b/Assets/Scripts/CreateAndJoinLevel.cs @@ -14,7 +14,7 @@ public class CreateAndJoinLevel : MonoBehaviour } public void JoinRoom() { - SceneManager.LoadScene(scroller.i + 3); + SceneManager.LoadScene(scroller.i + 2); } } diff --git a/Assets/Scripts/EndPauseMenuScript.cs b/Assets/Scripts/EndPauseMenuScript.cs new file mode 100644 index 00000000..613f2701 --- /dev/null +++ b/Assets/Scripts/EndPauseMenuScript.cs @@ -0,0 +1,29 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.SceneManagement; + +public class EndPauseMenuScript : MonoBehaviour +{ + public GameObject pauseMenu; + public AudioSource BG_Music; + public BackgroundScroller bgscript; + + public LogicScript logic; + + void Start() + { + bgscript = GameObject.FindGameObjectWithTag("Background").GetComponent(); + logic = GetComponent(); + } + public void ClosePauseMenu(){ + pauseMenu.SetActive(false); + BG_Music.Play(); + bgscript.ScrollSpeed = 0.5f; + } + + public void ExitGame() { + pauseMenu.SetActive(false); + SceneManager.LoadScene(1); + } +} diff --git a/Assets/Scripts/EndPauseMenuScript.cs.meta b/Assets/Scripts/EndPauseMenuScript.cs.meta new file mode 100644 index 00000000..86791943 --- /dev/null +++ b/Assets/Scripts/EndPauseMenuScript.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: c973e36edacbad745be546656dbf9e74 \ No newline at end of file diff --git a/Assets/Scripts/LevelScoller.cs b/Assets/Scripts/LevelScoller.cs index 0d6d634f..84bed622 100644 --- a/Assets/Scripts/LevelScoller.cs +++ b/Assets/Scripts/LevelScoller.cs @@ -5,7 +5,7 @@ using UnityEngine; public class LevelScoller : MonoBehaviour { RectTransform myRectTransform; - public int i; + public int i = 0; private void Start() { @@ -13,13 +13,19 @@ public class LevelScoller : MonoBehaviour } public void LeftClick() { - myRectTransform.localPosition += Vector3.right * 1500; - i -= 1; + if (i==0) {} + else { + myRectTransform.localPosition += Vector3.right * 1500; + i -= 1; + } } public void RightClick() { - myRectTransform.localPosition += Vector3.left * 1500; - i += 1; + if (i==2) {} + else{ + myRectTransform.localPosition += Vector3.left * 1500; + i += 1; + } } } diff --git a/Assets/Scripts/PauseMenu.cs b/Assets/Scripts/PauseMenu.cs index b6c18b93..05cd7a35 100644 --- a/Assets/Scripts/PauseMenu.cs +++ b/Assets/Scripts/PauseMenu.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.SceneManagement; public class PauseMenu : MonoBehaviour { @@ -11,7 +12,18 @@ public class PauseMenu : MonoBehaviour public LogicScript logic; + public void ClosePauseMenu(){ + pauseMenu.SetActive(false); + BG_Music.Play(); + bgscript.ScrollSpeed = 1f; + logic.IsFreezed = false; + } + public void ExitGame() { + pauseMenu.SetActive(false); + SceneManager.LoadScene(1); + } + void Start() { bgscript = GameObject.FindGameObjectWithTag("Background").GetComponent(); @@ -24,6 +36,8 @@ public class PauseMenu : MonoBehaviour pauseMenu.SetActive(true); BG_Music.Stop(); bgscript.ScrollSpeed = 0f; - } + } } + + } diff --git a/Assets/Scripts/SpawnPlayers.cs b/Assets/Scripts/SpawnPlayers.cs deleted file mode 100644 index 0cf33dfa..00000000 --- a/Assets/Scripts/SpawnPlayers.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using Photon.Pun; - -public class SpawnPlayers : MonoBehaviour -{ - public GameObject playerPrefab; - - public int x; - public int y; - - private void Start() - { - Vector2 startPosition = new Vector2(x, y); - PhotonNetwork.Instantiate(playerPrefab.name, startPosition, Quaternion.identity); - } -} diff --git a/Assets/Scripts/SpawnPlayers.cs.meta b/Assets/Scripts/SpawnPlayers.cs.meta deleted file mode 100644 index a0be39f6..00000000 --- a/Assets/Scripts/SpawnPlayers.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 85a58a3c02a4c704bac27c095e959c6c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/block.png b/Assets/block.png deleted file mode 100644 index 081a6e7a..00000000 Binary files a/Assets/block.png and /dev/null differ diff --git a/Assets/player.png b/Assets/player.png deleted file mode 100644 index c647cafb..00000000 Binary files a/Assets/player.png and /dev/null differ diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 184febd0..ff74f65b 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -8,15 +8,15 @@ EditorBuildSettings: - enabled: 0 path: Assets/Scenes/Loading_Screen.unity guid: 6491cb6d9680e214e9404ef479e07b42 + - enabled: 0 + path: Assets/Scenes/Pause_Menu.unity + guid: 87ca1619e6402204c9432061705dd240 - enabled: 1 path: Assets/Scenes/Start Menu.unity guid: 2cda990e2423bbf4892e6590ba056729 - enabled: 1 path: Assets/Scenes/Lobby.unity guid: 8240615bc55e9ac4a84999a9b6359255 - - enabled: 1 - path: Assets/Scenes/Pause_Menu.unity - guid: 87ca1619e6402204c9432061705dd240 - enabled: 1 path: Assets/Scenes/Level_01.unity guid: f31bc3f5439bc684194182ee640e22fa diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 51f7b87c..1f7f5fff 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -12,8 +12,8 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: DefaultCompany - productName: My project + companyName: Kingjuulian + productName: Square Dash defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -81,7 +81,7 @@ PlayerSettings: androidPredictiveBackSupport: 0 defaultIsNativeResolution: 1 macRetinaSupport: 1 - runInBackground: 0 + runInBackground: 1 captureSingleScreen: 0 muteOtherAudioSources: 0 Prepare IOS For Recording: 0 @@ -94,7 +94,7 @@ PlayerSettings: bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 - resizableWindow: 0 + resizableWindow: 1 useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 0 @@ -106,7 +106,7 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 1 allowFullscreenSwitch: 1 - fullscreenMode: 1 + fullscreenMode: 0 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 @@ -138,7 +138,7 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 1.0 + bundleVersion: 1.1 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0