diff --git a/MoCha/Assets/Scenes/Leaderboard.unity b/MoCha/Assets/Scenes/Leaderboard.unity index 3577974..c2e0be0 100644 Binary files a/MoCha/Assets/Scenes/Leaderboard.unity and b/MoCha/Assets/Scenes/Leaderboard.unity differ diff --git a/MoCha/Assets/Scenes/MonsterCreator.unity b/MoCha/Assets/Scenes/MonsterCreator.unity index 71beae0..4412e5c 100644 Binary files a/MoCha/Assets/Scenes/MonsterCreator.unity and b/MoCha/Assets/Scenes/MonsterCreator.unity differ diff --git a/MoCha/Assets/Scripts/GetLeaderboard.cs b/MoCha/Assets/Scripts/GetLeaderboard.cs index 843b5c8..81d21a4 100644 --- a/MoCha/Assets/Scripts/GetLeaderboard.cs +++ b/MoCha/Assets/Scripts/GetLeaderboard.cs @@ -16,7 +16,6 @@ using UnityEngine.UI; public class GetLeaderboard : MonoBehaviour { public Button thisbutton; - public Text PlayerIDs; public Text Usernames; public Text Scores; @@ -29,13 +28,13 @@ public class GetLeaderboard : MonoBehaviour public void CallGetData() { - DisplayAllSeparated(request, PlayerIDs, Usernames, Scores); + DisplayAllSeparated(request, Usernames, Scores); } - public void DisplayAllSeparated(string request, Text PlayerIDs, Text Usernames, Text Scores) + public void DisplayAllSeparated(string request, Text Usernames, Text Scores) { MochaParser parser = new MochaParser (); - StartCoroutine (parser.DisplayOutputSeparated(request, PlayerIDs, Usernames, Scores)); + StartCoroutine (parser.DisplayOutputSeparated(request, Usernames, Scores)); } } diff --git a/MoCha/Assets/Scripts/MochaParser.cs b/MoCha/Assets/Scripts/MochaParser.cs index f3a0a48..1458ef6 100644 --- a/MoCha/Assets/Scripts/MochaParser.cs +++ b/MoCha/Assets/Scripts/MochaParser.cs @@ -171,38 +171,12 @@ public class MochaParser t.text = OutputInfo (); } - public IEnumerator DisplayOutputSeparated(string request, Text playerids, Text usernames, Text scores) + public IEnumerator DisplayOutputSeparated(string request, Text usernames, Text scores) { yield return MakeRequest (request); - // Remove later. - SortLeaderboard (); - - playerids.text = OutputIds (); usernames.text = OutputUsernames (); scores.text = OutputScores (); } - - /* - * Get rid of this later. - * */ - public void SortLeaderboard() - { - PlayerInfo s; - - for(int o = 0; o < players.Count - 1; ++o) - { - for (int i = o + 1; i < players.Count; ++i) - { - Debug.Log (i + " " + o + " " + players.Count); - if (players [o].score < players[i].score) - { - s = players [i]; - players [i] = players [o]; - players [o] = s; - } - } - } - } } diff --git a/MoCha/Assets/Textures/mocha_logo.png b/MoCha/Assets/Textures/mocha_logo.png new file mode 100644 index 0000000..48faa16 Binary files /dev/null and b/MoCha/Assets/Textures/mocha_logo.png differ diff --git a/MoCha/Assets/Textures/mocha_logo.png.meta b/MoCha/Assets/Textures/mocha_logo.png.meta new file mode 100644 index 0000000..cd416d5 --- /dev/null +++ b/MoCha/Assets/Textures/mocha_logo.png.meta @@ -0,0 +1,107 @@ +fileFormatVersion: 2 +guid: a60c205cd59c229408f2c2a53fd376c2 +timeCreated: 1524160117 +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_clean_white.png b/MoCha/Assets/Textures/mocha_logo_clean_white.png new file mode 100644 index 0000000..dbb8ca0 Binary files /dev/null and b/MoCha/Assets/Textures/mocha_logo_clean_white.png differ diff --git a/MoCha/Assets/Textures/mocha_logo_clean_white.png.meta b/MoCha/Assets/Textures/mocha_logo_clean_white.png.meta new file mode 100644 index 0000000..52cf6c3 --- /dev/null +++ b/MoCha/Assets/Textures/mocha_logo_clean_white.png.meta @@ -0,0 +1,107 @@ +fileFormatVersion: 2 +guid: 7571f0a70f98a244d842db014e752cdd +timeCreated: 1524158981 +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/ProjectSettings/ProjectSettings.asset b/MoCha/ProjectSettings/ProjectSettings.asset index 689b861..7c42a65 100644 Binary files a/MoCha/ProjectSettings/ProjectSettings.asset and b/MoCha/ProjectSettings/ProjectSettings.asset differ