ada/mochapine64backup
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'alex' into darrel

Browse source
This commit is contained in:
Darrel Marek 2018-04-26 07:25:00 -05:00
commit 0596bac28b
49 changed files with 555 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
MoCha/Assets/Materials/Background Shade.mat Normal file
View file

Binary file not shown.

10
MoCha/Assets/Materials/Background Shade.mat.meta Normal file
View file

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 7e4171ffe0585c3409bef19495623c68
timeCreated: 1524661558
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

BIN
MoCha/Assets/Materials/Button Material.mat Normal file
View file

Binary file not shown.

10
MoCha/Assets/Materials/Button Material.mat.meta Normal file
View file

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 68f91164cf1cf4148aac9679f1515d5b
timeCreated: 1524661640
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

BIN
MoCha/Assets/Materials/Leaderboard Buttons.mat Normal file
View file

Binary file not shown.

10
MoCha/Assets/Materials/Leaderboard Buttons.mat.meta Normal file
View file

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 7e3e9df74a462a64a8f5645e5ae99365
timeCreated: 1524679511
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

BIN
MoCha/Assets/Materials/Leaderboard.mat Normal file
View file

Binary file not shown.

10
MoCha/Assets/Materials/Leaderboard.mat.meta Normal file
View file

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 1e2657f5a0590d3439166e06762eee0f
timeCreated: 1524679360
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

BIN
MoCha/Assets/Materials/Paper Display Material.mat Normal file
View file

Binary file not shown.

10
MoCha/Assets/Materials/Paper Display Material.mat.meta Normal file
View file

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 4a6fde4526aff69419c41fbffb2dc2d3
timeCreated: 1524661720
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

10
MoCha/Assets/Prefabs 1.meta Normal file
View file

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: fa408530e9193f04a89413db536ecad6
folderAsset: yes
timeCreated: 1523381747
licenseType: Free
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
MoCha/Assets/Prefabs 1/Base Canvas.prefab Normal file
View file

Binary file not shown.

10
MoCha/Assets/Prefabs 1/Base Canvas.prefab.meta Normal file
View file

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 2ff4eb0700f8b12488930f0e38c76712
timeCreated: 1523557265
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

BIN
MoCha/Assets/Prefabs 1/Cube.prefab Normal file
View file

Binary file not shown.

10
MoCha/Assets/Prefabs 1/Cube.prefab.meta Normal file
View file

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: e51ca5c9f429b994b809de4f27b07ef8
timeCreated: 1523381771
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

BIN
MoCha/Assets/Prefabs 1/Home Button.prefab Normal file
View file

Binary file not shown.

10
MoCha/Assets/Prefabs 1/Home Button.prefab.meta Normal file
View file

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 5e931df1f395ce34593d0c8d743fb7bc
timeCreated: 1523381756
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

BIN
MoCha/Assets/Prefabs 1/ItemSlot.prefab Normal file
View file

Binary file not shown.

10
MoCha/Assets/Prefabs 1/ItemSlot.prefab.meta Normal file
View file

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 47cdeeb9927ccbc428e5e853529cabdd
timeCreated: 1524162403
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

BIN
MoCha/Assets/Prefabs 1/Main Camera.prefab Normal file
View file

Binary file not shown.

10
MoCha/Assets/Prefabs 1/Main Camera.prefab.meta Normal file
View file

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: b43a02c13753e5d4085147253e07502c
timeCreated: 1523382230
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

BIN
MoCha/Assets/Prefabs 1/Run Button.prefab Normal file
View file

Binary file not shown.

10
MoCha/Assets/Prefabs 1/Run Button.prefab.meta Normal file
View file

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: fbf6aa2e9f888374b950a720d0d4a1c7
timeCreated: 1523381760
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

BIN
MoCha/Assets/Prefabs 1/Stats Button.prefab Normal file
View file

Binary file not shown.

10
MoCha/Assets/Prefabs 1/Stats Button.prefab.meta Normal file
View file

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 37f0b1e2cab100b45b13105c713988a1
timeCreated: 1523381758
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

BIN
MoCha/Assets/Prefabs 1/Title.prefab Normal file
View file

Binary file not shown.

10
MoCha/Assets/Prefabs 1/Title.prefab.meta Normal file
View file

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 6f1ad5af631524940bf3e10e7792b9b8
timeCreated: 1524663319
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

BIN
MoCha/Assets/Prefabs/Navigation.prefab Normal file
View file

Binary file not shown.

10
MoCha/Assets/Prefabs/Navigation.prefab.meta Normal file
View file

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 326b00dfcab7e8c4da45c990cef3c9b6
timeCreated: 1524679668
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

BIN
MoCha/Assets/Prefabs/Title.prefab Normal file
View file

Binary file not shown.

10
MoCha/Assets/Prefabs/Title.prefab.meta Normal file
View file

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: fbc8ddd3bdf15d344ad49c52e1e55dde
timeCreated: 1524663319
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

BIN
MoCha/Assets/Scenes/Credits.unity
View file

Binary file not shown.

BIN
MoCha/Assets/Scenes/Home.unity
View file

Binary file not shown.

BIN
MoCha/Assets/Scenes/Leaderboard.unity
View file

Binary file not shown.

BIN
MoCha/Assets/Scenes/Main.unity
View file

Binary file not shown.

BIN
MoCha/Assets/Scenes/Stats.unity
View file

Binary file not shown.

2
MoCha/Assets/Scripts/LeaderboardManager.cs
View file

@ -14,7 +14,7 @@ public class LeaderboardManager : MonoBehaviour
void Start()
{
// Eventually get data on start.
CallGetData();
}
public void CallGetData()

48
MoCha/Assets/Scripts/TitleManager.cs Normal file
View file

@ -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<Text> ();
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;
}
}

13
MoCha/Assets/Scripts/TitleManager.cs.meta Normal file
View file

@ -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:

10
MoCha/Assets/Sprites/Materials.meta Normal file
View file

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 4422d2fe141f1654ebf8a513f122b02f
folderAsset: yes
timeCreated: 1524663915
licenseType: Free
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
MoCha/Assets/Sprites/Materials/i3ej3emhaoy26.mat Normal file
View file

Binary file not shown.

10
MoCha/Assets/Sprites/Materials/i3ej3emhaoy26.mat.meta Normal file
View file

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: ae43b4f6e5664aa4aa49db99dbbde2eb
timeCreated: 1524663916
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

BIN
MoCha/Assets/Sprites/i3ej3emhaoy26.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 143 KiB

103
MoCha/Assets/Sprites/i3ej3emhaoy26.jpg.meta Normal file
View file

@ -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:

BIN
MoCha/Assets/Sprites/menu.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.4 KiB

103
MoCha/Assets/Sprites/menu.png.meta Normal file
View file

@ -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:

BIN
MoCha/Assets/Sprites/paper.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 64 KiB

103
MoCha/Assets/Sprites/paper.png.meta Normal file
View file

@ -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:

4
MoCha/ProjectSettings/ProjectVersion.txt
View file

@ -1 +1,5 @@
<<<<<<< HEAD
m_EditorVersion: 2017.4.0f1
=======
m_EditorVersion: 2017.3.1f1
>>>>>>> alex