diff --git a/MoCha/Assets/Materials/Background Shade.mat b/MoCha/Assets/Materials/Background Shade.mat new file mode 100644 index 0000000..24b147b Binary files /dev/null and b/MoCha/Assets/Materials/Background Shade.mat differ diff --git a/MoCha/Assets/Materials/Background Shade.mat.meta b/MoCha/Assets/Materials/Background Shade.mat.meta new file mode 100644 index 0000000..7666bb2 --- /dev/null +++ b/MoCha/Assets/Materials/Background Shade.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7e4171ffe0585c3409bef19495623c68 +timeCreated: 1524661558 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Materials/Button Material.mat b/MoCha/Assets/Materials/Button Material.mat new file mode 100644 index 0000000..850df5f Binary files /dev/null and b/MoCha/Assets/Materials/Button Material.mat differ diff --git a/MoCha/Assets/Materials/Button Material.mat.meta b/MoCha/Assets/Materials/Button Material.mat.meta new file mode 100644 index 0000000..9265a9d --- /dev/null +++ b/MoCha/Assets/Materials/Button Material.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 68f91164cf1cf4148aac9679f1515d5b +timeCreated: 1524661640 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Materials/Leaderboard Buttons.mat b/MoCha/Assets/Materials/Leaderboard Buttons.mat new file mode 100644 index 0000000..16d0e6a Binary files /dev/null and b/MoCha/Assets/Materials/Leaderboard Buttons.mat differ diff --git a/MoCha/Assets/Materials/Leaderboard Buttons.mat.meta b/MoCha/Assets/Materials/Leaderboard Buttons.mat.meta new file mode 100644 index 0000000..0f80d20 --- /dev/null +++ b/MoCha/Assets/Materials/Leaderboard Buttons.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7e3e9df74a462a64a8f5645e5ae99365 +timeCreated: 1524679511 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Materials/Leaderboard.mat b/MoCha/Assets/Materials/Leaderboard.mat new file mode 100644 index 0000000..d34ad68 Binary files /dev/null and b/MoCha/Assets/Materials/Leaderboard.mat differ diff --git a/MoCha/Assets/Materials/Leaderboard.mat.meta b/MoCha/Assets/Materials/Leaderboard.mat.meta new file mode 100644 index 0000000..b89219c --- /dev/null +++ b/MoCha/Assets/Materials/Leaderboard.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 1e2657f5a0590d3439166e06762eee0f +timeCreated: 1524679360 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Materials/Paper Display Material.mat b/MoCha/Assets/Materials/Paper Display Material.mat new file mode 100644 index 0000000..bd628a3 Binary files /dev/null and b/MoCha/Assets/Materials/Paper Display Material.mat differ diff --git a/MoCha/Assets/Materials/Paper Display Material.mat.meta b/MoCha/Assets/Materials/Paper Display Material.mat.meta new file mode 100644 index 0000000..5e1eb53 --- /dev/null +++ b/MoCha/Assets/Materials/Paper Display Material.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4a6fde4526aff69419c41fbffb2dc2d3 +timeCreated: 1524661720 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Prefabs 1.meta b/MoCha/Assets/Prefabs 1.meta new file mode 100644 index 0000000..2e0f9dc --- /dev/null +++ b/MoCha/Assets/Prefabs 1.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: fa408530e9193f04a89413db536ecad6 +folderAsset: yes +timeCreated: 1523381747 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Prefabs 1/Base Canvas.prefab b/MoCha/Assets/Prefabs 1/Base Canvas.prefab new file mode 100644 index 0000000..e9760d9 Binary files /dev/null and b/MoCha/Assets/Prefabs 1/Base Canvas.prefab differ diff --git a/MoCha/Assets/Prefabs 1/Base Canvas.prefab.meta b/MoCha/Assets/Prefabs 1/Base Canvas.prefab.meta new file mode 100644 index 0000000..e351690 --- /dev/null +++ b/MoCha/Assets/Prefabs 1/Base Canvas.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2ff4eb0700f8b12488930f0e38c76712 +timeCreated: 1523557265 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Prefabs 1/Cube.prefab b/MoCha/Assets/Prefabs 1/Cube.prefab new file mode 100644 index 0000000..1ee1982 Binary files /dev/null and b/MoCha/Assets/Prefabs 1/Cube.prefab differ diff --git a/MoCha/Assets/Prefabs 1/Cube.prefab.meta b/MoCha/Assets/Prefabs 1/Cube.prefab.meta new file mode 100644 index 0000000..5495692 --- /dev/null +++ b/MoCha/Assets/Prefabs 1/Cube.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e51ca5c9f429b994b809de4f27b07ef8 +timeCreated: 1523381771 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Prefabs 1/Home Button.prefab b/MoCha/Assets/Prefabs 1/Home Button.prefab new file mode 100644 index 0000000..f34f2c0 Binary files /dev/null and b/MoCha/Assets/Prefabs 1/Home Button.prefab differ diff --git a/MoCha/Assets/Prefabs 1/Home Button.prefab.meta b/MoCha/Assets/Prefabs 1/Home Button.prefab.meta new file mode 100644 index 0000000..6b87914 --- /dev/null +++ b/MoCha/Assets/Prefabs 1/Home Button.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 5e931df1f395ce34593d0c8d743fb7bc +timeCreated: 1523381756 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Prefabs 1/ItemSlot.prefab b/MoCha/Assets/Prefabs 1/ItemSlot.prefab new file mode 100644 index 0000000..0c05dbf Binary files /dev/null and b/MoCha/Assets/Prefabs 1/ItemSlot.prefab differ diff --git a/MoCha/Assets/Prefabs 1/ItemSlot.prefab.meta b/MoCha/Assets/Prefabs 1/ItemSlot.prefab.meta new file mode 100644 index 0000000..3278214 --- /dev/null +++ b/MoCha/Assets/Prefabs 1/ItemSlot.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 47cdeeb9927ccbc428e5e853529cabdd +timeCreated: 1524162403 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Prefabs 1/Main Camera.prefab b/MoCha/Assets/Prefabs 1/Main Camera.prefab new file mode 100644 index 0000000..b4a07d8 Binary files /dev/null and b/MoCha/Assets/Prefabs 1/Main Camera.prefab differ diff --git a/MoCha/Assets/Prefabs 1/Main Camera.prefab.meta b/MoCha/Assets/Prefabs 1/Main Camera.prefab.meta new file mode 100644 index 0000000..78bcca4 --- /dev/null +++ b/MoCha/Assets/Prefabs 1/Main Camera.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b43a02c13753e5d4085147253e07502c +timeCreated: 1523382230 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Prefabs 1/Run Button.prefab b/MoCha/Assets/Prefabs 1/Run Button.prefab new file mode 100644 index 0000000..2e34aff Binary files /dev/null and b/MoCha/Assets/Prefabs 1/Run Button.prefab differ diff --git a/MoCha/Assets/Prefabs 1/Run Button.prefab.meta b/MoCha/Assets/Prefabs 1/Run Button.prefab.meta new file mode 100644 index 0000000..70b48db --- /dev/null +++ b/MoCha/Assets/Prefabs 1/Run Button.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: fbf6aa2e9f888374b950a720d0d4a1c7 +timeCreated: 1523381760 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Prefabs 1/Stats Button.prefab b/MoCha/Assets/Prefabs 1/Stats Button.prefab new file mode 100644 index 0000000..20c5220 Binary files /dev/null and b/MoCha/Assets/Prefabs 1/Stats Button.prefab differ diff --git a/MoCha/Assets/Prefabs 1/Stats Button.prefab.meta b/MoCha/Assets/Prefabs 1/Stats Button.prefab.meta new file mode 100644 index 0000000..7e17407 --- /dev/null +++ b/MoCha/Assets/Prefabs 1/Stats Button.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 37f0b1e2cab100b45b13105c713988a1 +timeCreated: 1523381758 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Prefabs 1/Title.prefab b/MoCha/Assets/Prefabs 1/Title.prefab new file mode 100644 index 0000000..2ebe5cf Binary files /dev/null and b/MoCha/Assets/Prefabs 1/Title.prefab differ diff --git a/MoCha/Assets/Prefabs 1/Title.prefab.meta b/MoCha/Assets/Prefabs 1/Title.prefab.meta new file mode 100644 index 0000000..ac799c3 --- /dev/null +++ b/MoCha/Assets/Prefabs 1/Title.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 6f1ad5af631524940bf3e10e7792b9b8 +timeCreated: 1524663319 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Prefabs/Navigation.prefab b/MoCha/Assets/Prefabs/Navigation.prefab new file mode 100644 index 0000000..5ae202c Binary files /dev/null and b/MoCha/Assets/Prefabs/Navigation.prefab differ diff --git a/MoCha/Assets/Prefabs/Navigation.prefab.meta b/MoCha/Assets/Prefabs/Navigation.prefab.meta new file mode 100644 index 0000000..a619c74 --- /dev/null +++ b/MoCha/Assets/Prefabs/Navigation.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 326b00dfcab7e8c4da45c990cef3c9b6 +timeCreated: 1524679668 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Prefabs/Title.prefab b/MoCha/Assets/Prefabs/Title.prefab new file mode 100644 index 0000000..2ebe5cf Binary files /dev/null and b/MoCha/Assets/Prefabs/Title.prefab differ diff --git a/MoCha/Assets/Prefabs/Title.prefab.meta b/MoCha/Assets/Prefabs/Title.prefab.meta new file mode 100644 index 0000000..e83ee84 --- /dev/null +++ b/MoCha/Assets/Prefabs/Title.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: fbc8ddd3bdf15d344ad49c52e1e55dde +timeCreated: 1524663319 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Scenes/Credits.unity b/MoCha/Assets/Scenes/Credits.unity index 5945b03..60dd317 100644 Binary files a/MoCha/Assets/Scenes/Credits.unity and b/MoCha/Assets/Scenes/Credits.unity differ diff --git a/MoCha/Assets/Scenes/Home.unity b/MoCha/Assets/Scenes/Home.unity index 0e132cf..3751dd5 100644 Binary files a/MoCha/Assets/Scenes/Home.unity and b/MoCha/Assets/Scenes/Home.unity differ diff --git a/MoCha/Assets/Scenes/Leaderboard.unity b/MoCha/Assets/Scenes/Leaderboard.unity index 1d962b2..60fd14a 100644 Binary files a/MoCha/Assets/Scenes/Leaderboard.unity and b/MoCha/Assets/Scenes/Leaderboard.unity differ diff --git a/MoCha/Assets/Scenes/Main.unity b/MoCha/Assets/Scenes/Main.unity index db014fc..4653ae1 100644 Binary files a/MoCha/Assets/Scenes/Main.unity and b/MoCha/Assets/Scenes/Main.unity differ diff --git a/MoCha/Assets/Scenes/Stats.unity b/MoCha/Assets/Scenes/Stats.unity index a36d882..a926d33 100644 Binary files a/MoCha/Assets/Scenes/Stats.unity and b/MoCha/Assets/Scenes/Stats.unity differ diff --git a/MoCha/Assets/Scripts/LeaderboardManager.cs b/MoCha/Assets/Scripts/LeaderboardManager.cs index 7c9c9d2..607e811 100644 --- a/MoCha/Assets/Scripts/LeaderboardManager.cs +++ b/MoCha/Assets/Scripts/LeaderboardManager.cs @@ -14,7 +14,7 @@ public class LeaderboardManager : MonoBehaviour void Start() { - // Eventually get data on start. + CallGetData(); } public void CallGetData() diff --git a/MoCha/Assets/Scripts/TitleManager.cs b/MoCha/Assets/Scripts/TitleManager.cs new file mode 100644 index 0000000..b98cc06 --- /dev/null +++ b/MoCha/Assets/Scripts/TitleManager.cs @@ -0,0 +1,48 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +using UnityEngine.SceneManagement; + +public class TitleManager : MonoBehaviour +{ + private Scene scene; + private Text title; + private string correctedtitle = ""; + + private void Start () + { + scene = SceneManager.GetActiveScene (); + title = GetComponentInChildren (); + + correctedtitle = correctTitleName (); + title.text = correctedtitle; + } + + private string correctTitleName() + { + string scenename = scene.name; + + switch (scenename) + { + case "StepCounter": + return "Current Run"; + case "Stats": + return "Profile"; + case "MonsterCreator": + return "Monster Editor"; + default: + return scenename; + } + } + + public Text getTitle() + { + return title; + } + + public string getCorrectedTitle() + { + return correctedtitle; + } +} diff --git a/MoCha/Assets/Scripts/TitleManager.cs.meta b/MoCha/Assets/Scripts/TitleManager.cs.meta new file mode 100644 index 0000000..15be327 --- /dev/null +++ b/MoCha/Assets/Scripts/TitleManager.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: ead5b1f95798ac94aaf99fade3c3baac +timeCreated: 1524662121 +licenseType: Free +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Sprites/Materials.meta b/MoCha/Assets/Sprites/Materials.meta new file mode 100644 index 0000000..bf82b18 --- /dev/null +++ b/MoCha/Assets/Sprites/Materials.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4422d2fe141f1654ebf8a513f122b02f +folderAsset: yes +timeCreated: 1524663915 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Sprites/Materials/i3ej3emhaoy26.mat b/MoCha/Assets/Sprites/Materials/i3ej3emhaoy26.mat new file mode 100644 index 0000000..c4906bc Binary files /dev/null and b/MoCha/Assets/Sprites/Materials/i3ej3emhaoy26.mat differ diff --git a/MoCha/Assets/Sprites/Materials/i3ej3emhaoy26.mat.meta b/MoCha/Assets/Sprites/Materials/i3ej3emhaoy26.mat.meta new file mode 100644 index 0000000..f40ea3d --- /dev/null +++ b/MoCha/Assets/Sprites/Materials/i3ej3emhaoy26.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ae43b4f6e5664aa4aa49db99dbbde2eb +timeCreated: 1524663916 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Sprites/i3ej3emhaoy26.jpg b/MoCha/Assets/Sprites/i3ej3emhaoy26.jpg new file mode 100644 index 0000000..f0d3019 Binary files /dev/null and b/MoCha/Assets/Sprites/i3ej3emhaoy26.jpg differ diff --git a/MoCha/Assets/Sprites/i3ej3emhaoy26.jpg.meta b/MoCha/Assets/Sprites/i3ej3emhaoy26.jpg.meta new file mode 100644 index 0000000..2d04fc3 --- /dev/null +++ b/MoCha/Assets/Sprites/i3ej3emhaoy26.jpg.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: 13cf0d1396634834caec351ff4dddd0b +timeCreated: 1524659799 +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: 0 + wrapV: 0 + wrapW: 0 + 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 + - 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/menu.png b/MoCha/Assets/Sprites/menu.png new file mode 100644 index 0000000..d50aac6 Binary files /dev/null and b/MoCha/Assets/Sprites/menu.png differ diff --git a/MoCha/Assets/Sprites/menu.png.meta b/MoCha/Assets/Sprites/menu.png.meta new file mode 100644 index 0000000..7c42865 --- /dev/null +++ b/MoCha/Assets/Sprites/menu.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: 65bca31dcb9604c4ab65513d3e098d74 +timeCreated: 1524668220 +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 + - 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/paper.png b/MoCha/Assets/Sprites/paper.png new file mode 100644 index 0000000..92884f6 Binary files /dev/null and b/MoCha/Assets/Sprites/paper.png differ diff --git a/MoCha/Assets/Sprites/paper.png.meta b/MoCha/Assets/Sprites/paper.png.meta new file mode 100644 index 0000000..d7c42f2 --- /dev/null +++ b/MoCha/Assets/Sprites/paper.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: 08c41d6ff94cbda4ba1f916a736cd7df +timeCreated: 1524660040 +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 + - 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/ProjectSettings/ProjectVersion.txt b/MoCha/ProjectSettings/ProjectVersion.txt index ac7d214..ddc29c5 100644 --- a/MoCha/ProjectSettings/ProjectVersion.txt +++ b/MoCha/ProjectSettings/ProjectVersion.txt @@ -1 +1,5 @@ +<<<<<<< HEAD m_EditorVersion: 2017.4.0f1 +======= +m_EditorVersion: 2017.3.1f1 +>>>>>>> alex