diff --git a/MoCha/Assets/Sprites/mocha-logo-all-things-pink.png b/MoCha/Assets/Sprites/mocha-logo-all-things-pink.png new file mode 100644 index 0000000..5921071 Binary files /dev/null and b/MoCha/Assets/Sprites/mocha-logo-all-things-pink.png differ diff --git a/MoCha/Assets/Sprites/mocha-logo-all-things-pink.png.meta b/MoCha/Assets/Sprites/mocha-logo-all-things-pink.png.meta new file mode 100644 index 0000000..7e4df53 --- /dev/null +++ b/MoCha/Assets/Sprites/mocha-logo-all-things-pink.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: 96774eb034f7bed4f8faa78342a2147b +timeCreated: 1524529395 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Sprites/mocha-logo-chocolate-covered-raindrops.png b/MoCha/Assets/Sprites/mocha-logo-chocolate-covered-raindrops.png new file mode 100644 index 0000000..498c62b Binary files /dev/null and b/MoCha/Assets/Sprites/mocha-logo-chocolate-covered-raindrops.png differ diff --git a/MoCha/Assets/Sprites/mocha-logo-chocolate-covered-raindrops.png.meta b/MoCha/Assets/Sprites/mocha-logo-chocolate-covered-raindrops.png.meta new file mode 100644 index 0000000..49e6390 --- /dev/null +++ b/MoCha/Assets/Sprites/mocha-logo-chocolate-covered-raindrops.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: 30977eca2a12d9e45842ac30504e9ac5 +timeCreated: 1524529446 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Sprites/mocha-logo-saucer.png b/MoCha/Assets/Sprites/mocha-logo-saucer.png new file mode 100644 index 0000000..4a79ba4 Binary files /dev/null and b/MoCha/Assets/Sprites/mocha-logo-saucer.png differ diff --git a/MoCha/Assets/Sprites/mocha-logo-saucer.png.meta b/MoCha/Assets/Sprites/mocha-logo-saucer.png.meta new file mode 100644 index 0000000..3284c8f --- /dev/null +++ b/MoCha/Assets/Sprites/mocha-logo-saucer.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: ba64073e934e949409e6c290182bfdbd +timeCreated: 1524529396 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Sprites/mocha-logo-test-2.png b/MoCha/Assets/Sprites/mocha-logo-test-2.png new file mode 100644 index 0000000..92f3586 Binary files /dev/null and b/MoCha/Assets/Sprites/mocha-logo-test-2.png differ diff --git a/MoCha/Assets/Sprites/mocha-logo-test-2.png.meta b/MoCha/Assets/Sprites/mocha-logo-test-2.png.meta new file mode 100644 index 0000000..4d120b8 --- /dev/null +++ b/MoCha/Assets/Sprites/mocha-logo-test-2.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: 41d0edc0200e2d24cb5d73b627201a44 +timeCreated: 1524528845 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Sprites/mocha-logo-test.png b/MoCha/Assets/Sprites/mocha-logo-test.png new file mode 100644 index 0000000..a814213 Binary files /dev/null and b/MoCha/Assets/Sprites/mocha-logo-test.png differ diff --git a/MoCha/Assets/Sprites/mocha-logo-test.png.meta b/MoCha/Assets/Sprites/mocha-logo-test.png.meta new file mode 100644 index 0000000..cd59c65 --- /dev/null +++ b/MoCha/Assets/Sprites/mocha-logo-test.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: 8e84c5bb3339c934caf5149ac51d89ea +timeCreated: 1524528658 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Sprites/mocha_logo_clean_white.png.meta b/MoCha/Assets/Sprites/mocha_logo_clean_white.png.meta index 52cf6c3..a8c1af1 100644 --- a/MoCha/Assets/Sprites/mocha_logo_clean_white.png.meta +++ b/MoCha/Assets/Sprites/mocha_logo_clean_white.png.meta @@ -1,9 +1,10 @@ fileFormatVersion: 2 guid: 7571f0a70f98a244d842db014e752cdd -timeCreated: 1524158981 +timeCreated: 1524528245 licenseType: Free TextureImporter: - fileIDToRecycleName: {} + fileIDToRecycleName: + 21300000: mocha_logo_clean_white_0 externalObjects: {} serializedVersion: 4 mipmaps: @@ -42,11 +43,11 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 + spritePixelsToUnits: 300 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -65,7 +66,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -75,7 +75,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -85,7 +84,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 @@ -95,12 +93,112 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] + sprites: + - serializedVersion: 2 + name: mocha_logo_clean_white_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 246 + height: 353 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + outline: + - - {x: -95, y: -160.5} + - {x: -97, y: -161.5} + - {x: -97, y: -176.5} + - {x: 15, y: -176.5} + - {x: 16, y: -175.5} + - {x: 16, y: -162.5} + - {x: 15, y: -160.5} + - - {x: -112, y: 34.5} + - {x: -112, y: 7.5} + - {x: -99, y: -153.5} + - {x: -95, y: -156.5} + - {x: 17, y: -156.5} + - {x: 21, y: -147.5} + - {x: 41, y: 11.5} + - {x: 41, y: 34.5} + - - {x: 117, y: 175.5} + - {x: 104, y: 176.5} + - {x: 23, y: 176.5} + - {x: -15, y: 157.5} + - {x: -103, y: 83.5} + - {x: -123, y: 68.5} + - {x: -123, y: 44.5} + - {x: 53, y: 44.5} + - {x: 62, y: 50.5} + - {x: 123, y: 99.5} + - {x: 123, y: 152.5} + physicsShape: + - - {x: -95, y: -160.5} + - {x: -97, y: -161.5} + - {x: -97, y: -176.5} + - {x: 15, y: -176.5} + - {x: 16, y: -175.5} + - {x: 16, y: -162.5} + - {x: 15, y: -160.5} + - - {x: 41, y: 28.5} + - {x: 41, y: 33.5} + - {x: 39, y: 34.5} + - {x: -110, y: 34.5} + - {x: -112, y: 32.5} + - {x: -112, y: 19.5} + - {x: -107, y: -41.5} + - {x: -105, y: -65.5} + - {x: -104, y: -78.5} + - {x: -103, y: -90.5} + - {x: -102, y: -103.5} + - {x: -100, y: -127.5} + - {x: -98, y: -152.5} + - {x: -95, y: -156.5} + - {x: 16, y: -156.5} + - {x: 18, y: -154.5} + - {x: 19, y: -146.5} + - {x: 38, y: 6.5} + - - {x: 51, y: 44.5} + - {x: 54, y: 51.5} + - {x: 55, y: 61.5} + - {x: 42, y: 65.5} + - {x: 41, y: 77.5} + - {x: 48, y: 101.5} + - {x: 70, y: 97.5} + - {x: 95, y: 98.5} + - {x: 111, y: 103.5} + - {x: 118, y: 109.5} + - {x: 116, y: 113.5} + - {x: 91, y: 113.5} + - {x: 65, y: 129.5} + - {x: 92, y: 143.5} + - {x: 123, y: 133.5} + - {x: 123, y: 146.5} + - {x: 118, y: 155.5} + - {x: 91, y: 176.5} + - {x: 31, y: 176.5} + - {x: 21, y: 173.5} + - {x: 3, y: 162.5} + - {x: -16, y: 142.5} + - {x: -40, y: 98.5} + - {x: -68, y: 82.5} + - {x: -102, y: 80.5} + - {x: -108, y: 75.5} + - {x: -123, y: 61.5} + - {x: -123, y: 46.5} + - {x: -121, y: 44.5} + - {x: -115, y: 44.5} + - {x: 40, y: 45.5} + - {x: 41, y: 44.5} + - - {x: 42, y: 155.5} + - {x: 49, y: 152.5} + - {x: 48, y: 153.5} + - {x: 47, y: 152.5} spritePackingTag: userData: assetBundleName: diff --git a/MoCha/ProjectSettings/ProjectSettings.asset b/MoCha/ProjectSettings/ProjectSettings.asset index 97232a9..f93fdd1 100644 Binary files a/MoCha/ProjectSettings/ProjectSettings.asset and b/MoCha/ProjectSettings/ProjectSettings.asset differ diff --git a/MoCha/ProjectSettings/ProjectVersion.txt b/MoCha/ProjectSettings/ProjectVersion.txt index 27997c5..2576b78 100644 --- a/MoCha/ProjectSettings/ProjectVersion.txt +++ b/MoCha/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2017.3.1f1 +m_EditorVersion: 2017.2.1f1