diff --git a/MoCha/Assets/Scenes/Credits.unity b/MoCha/Assets/Scenes/Credits.unity new file mode 100644 index 0000000..290be87 Binary files /dev/null and b/MoCha/Assets/Scenes/Credits.unity differ diff --git a/MoCha/Assets/Textures.meta b/MoCha/Assets/Scenes/Credits.unity.meta similarity index 62% rename from MoCha/Assets/Textures.meta rename to MoCha/Assets/Scenes/Credits.unity.meta index 1c3dae5..7d2d94a 100644 --- a/MoCha/Assets/Textures.meta +++ b/MoCha/Assets/Scenes/Credits.unity.meta @@ -1,7 +1,6 @@ fileFormatVersion: 2 -guid: 1d9308229aec87640961f9f8432fe00d -folderAsset: yes -timeCreated: 1523384874 +guid: 3d7b4f58895768148971ef704b30bf50 +timeCreated: 1524502524 licenseType: Free DefaultImporter: externalObjects: {} diff --git a/MoCha/Assets/Scenes/Home.unity b/MoCha/Assets/Scenes/Home.unity index 47ec860..7d08eee 100644 Binary files a/MoCha/Assets/Scenes/Home.unity and b/MoCha/Assets/Scenes/Home.unity differ diff --git a/MoCha/Assets/Textures/cardboardmaterial.png b/MoCha/Assets/Sprites/cardboardmaterial.png similarity index 100% rename from MoCha/Assets/Textures/cardboardmaterial.png rename to MoCha/Assets/Sprites/cardboardmaterial.png diff --git a/MoCha/Assets/Textures/cardboardmaterial.png.meta b/MoCha/Assets/Sprites/cardboardmaterial.png.meta similarity index 100% rename from MoCha/Assets/Textures/cardboardmaterial.png.meta rename to MoCha/Assets/Sprites/cardboardmaterial.png.meta diff --git a/MoCha/Assets/Sprites/icon.png b/MoCha/Assets/Sprites/icon.png new file mode 100644 index 0000000..6fe30ac Binary files /dev/null and b/MoCha/Assets/Sprites/icon.png differ diff --git a/MoCha/Assets/Sprites/icon.png.meta b/MoCha/Assets/Sprites/icon.png.meta new file mode 100644 index 0000000..d96ea7b --- /dev/null +++ b/MoCha/Assets/Sprites/icon.png.meta @@ -0,0 +1,107 @@ +fileFormatVersion: 2 +guid: 0a164f353bc25c346b7453cd94f8670b +timeCreated: 1524506888 +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: 1 + 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 + androidETC2FallbackOverride: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Sprites/info.png b/MoCha/Assets/Sprites/info.png new file mode 100644 index 0000000..c678b32 Binary files /dev/null and b/MoCha/Assets/Sprites/info.png differ diff --git a/MoCha/Assets/Sprites/info.png.meta b/MoCha/Assets/Sprites/info.png.meta new file mode 100644 index 0000000..6ed59fa --- /dev/null +++ b/MoCha/Assets/Sprites/info.png.meta @@ -0,0 +1,107 @@ +fileFormatVersion: 2 +guid: 4e2af3759e0b2fa4e9cdd2eb873d160e +timeCreated: 1524502980 +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: 1 + 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 + androidETC2FallbackOverride: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Textures/mocha_logo.png b/MoCha/Assets/Sprites/mocha_logo.png similarity index 100% rename from MoCha/Assets/Textures/mocha_logo.png rename to MoCha/Assets/Sprites/mocha_logo.png diff --git a/MoCha/Assets/Textures/mocha_logo.png.meta b/MoCha/Assets/Sprites/mocha_logo.png.meta similarity index 100% rename from MoCha/Assets/Textures/mocha_logo.png.meta rename to MoCha/Assets/Sprites/mocha_logo.png.meta diff --git a/MoCha/Assets/Textures/mocha_logo_clean_white.png b/MoCha/Assets/Sprites/mocha_logo_clean_white.png similarity index 100% rename from MoCha/Assets/Textures/mocha_logo_clean_white.png rename to MoCha/Assets/Sprites/mocha_logo_clean_white.png diff --git a/MoCha/Assets/Textures/mocha_logo_clean_white.png.meta b/MoCha/Assets/Sprites/mocha_logo_clean_white.png.meta similarity index 100% rename from MoCha/Assets/Textures/mocha_logo_clean_white.png.meta rename to MoCha/Assets/Sprites/mocha_logo_clean_white.png.meta diff --git a/MoCha/ProjectSettings/EditorBuildSettings.asset b/MoCha/ProjectSettings/EditorBuildSettings.asset index f4fdcb4..2fef5ca 100644 Binary files a/MoCha/ProjectSettings/EditorBuildSettings.asset and b/MoCha/ProjectSettings/EditorBuildSettings.asset differ diff --git a/MoCha/ProjectSettings/ProjectVersion.txt b/MoCha/ProjectSettings/ProjectVersion.txt index 2576b78..27997c5 100644 --- a/MoCha/ProjectSettings/ProjectVersion.txt +++ b/MoCha/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2017.2.1f1 +m_EditorVersion: 2017.3.1f1