diff --git a/.gitignore b/.gitignore index 6ef3f94..4b71db8 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ **/[Bb]uild/ **/[Bb]uilds/ **/Assets/AssetStoreTools* +**/Assets/Plugins/* # Autogenerated VS/MD solution and project files **/.vs/ @@ -30,3 +31,5 @@ **/*.apk **/*.unitypackage **/UnityPackageManager/ +MoCha/Assets/Plugins/Android.meta +MoCha/ProjectSettings/ProjectVersion.txt diff --git a/MoCha/Assets/Plugins/Android.meta b/MoCha/Assets/Fonts.meta similarity index 70% rename from MoCha/Assets/Plugins/Android.meta rename to MoCha/Assets/Fonts.meta index b46881b..f2de13d 100644 --- a/MoCha/Assets/Plugins/Android.meta +++ b/MoCha/Assets/Fonts.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 8cd453422b2e32245b54c76a62e2a81e +guid: b4e3c483abcceef40b7ecaf5f6e6a97a folderAsset: yes -timeCreated: 1523387294 +timeCreated: 1523555905 licenseType: Free DefaultImporter: externalObjects: {} diff --git a/MoCha/Assets/Fonts/All Things Pink Skinny.ttf b/MoCha/Assets/Fonts/All Things Pink Skinny.ttf new file mode 100644 index 0000000..54ffba4 Binary files /dev/null and b/MoCha/Assets/Fonts/All Things Pink Skinny.ttf differ diff --git a/MoCha/Assets/Fonts/All Things Pink Skinny.ttf.meta b/MoCha/Assets/Fonts/All Things Pink Skinny.ttf.meta new file mode 100644 index 0000000..c6af790 --- /dev/null +++ b/MoCha/Assets/Fonts/All Things Pink Skinny.ttf.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 16fa5742d5f3a4e4f888e6ee59fd53c8 +timeCreated: 1523556714 +licenseType: Free +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: All Things Pink Skinny + fontNames: + - All Things Pink Skinny + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Fonts/All Things Pink.ttf b/MoCha/Assets/Fonts/All Things Pink.ttf new file mode 100644 index 0000000..c90899d Binary files /dev/null and b/MoCha/Assets/Fonts/All Things Pink.ttf differ diff --git a/MoCha/Assets/Fonts/All Things Pink.ttf.meta b/MoCha/Assets/Fonts/All Things Pink.ttf.meta new file mode 100644 index 0000000..7a93de0 --- /dev/null +++ b/MoCha/Assets/Fonts/All Things Pink.ttf.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: d38f3d0f1045b2f4cb509995afa5c861 +timeCreated: 1523556709 +licenseType: Free +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: All Things Pink + fontNames: + - All Things Pink + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Fonts/Chocolate Covered Raindrops BOLD.ttf b/MoCha/Assets/Fonts/Chocolate Covered Raindrops BOLD.ttf new file mode 100644 index 0000000..a54ab5d Binary files /dev/null and b/MoCha/Assets/Fonts/Chocolate Covered Raindrops BOLD.ttf differ diff --git a/MoCha/Assets/Fonts/Chocolate Covered Raindrops BOLD.ttf.meta b/MoCha/Assets/Fonts/Chocolate Covered Raindrops BOLD.ttf.meta new file mode 100644 index 0000000..71f8383 --- /dev/null +++ b/MoCha/Assets/Fonts/Chocolate Covered Raindrops BOLD.ttf.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 2400d4713aa74ce4ca7dc368886d7857 +timeCreated: 1523556729 +licenseType: Free +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: Chocolate Covered Raindrops Bol + fontNames: + - Chocolate Covered Raindrops Bol + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Fonts/Chocolate Covered Raindrops Hollow.ttf b/MoCha/Assets/Fonts/Chocolate Covered Raindrops Hollow.ttf new file mode 100644 index 0000000..a2bb3f0 Binary files /dev/null and b/MoCha/Assets/Fonts/Chocolate Covered Raindrops Hollow.ttf differ diff --git a/MoCha/Assets/Fonts/Chocolate Covered Raindrops Hollow.ttf.meta b/MoCha/Assets/Fonts/Chocolate Covered Raindrops Hollow.ttf.meta new file mode 100644 index 0000000..f7779dc --- /dev/null +++ b/MoCha/Assets/Fonts/Chocolate Covered Raindrops Hollow.ttf.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 678bbcb4b61bb804995ce113a087c7dd +timeCreated: 1523556729 +licenseType: Free +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: Chocolate Covered Raindrops Hol + fontNames: + - Chocolate Covered Raindrops Hol + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Fonts/Chocolate Covered Raindrops.ttf b/MoCha/Assets/Fonts/Chocolate Covered Raindrops.ttf new file mode 100644 index 0000000..1591ac3 Binary files /dev/null and b/MoCha/Assets/Fonts/Chocolate Covered Raindrops.ttf differ diff --git a/MoCha/Assets/Fonts/Chocolate Covered Raindrops.ttf.meta b/MoCha/Assets/Fonts/Chocolate Covered Raindrops.ttf.meta new file mode 100644 index 0000000..84f2ed2 --- /dev/null +++ b/MoCha/Assets/Fonts/Chocolate Covered Raindrops.ttf.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 797901ead3866484b9fd79273ffe70b8 +timeCreated: 1523556724 +licenseType: Free +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: Chocolate Covered Raindrops + fontNames: + - Chocolate Covered Raindrops + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Fonts/SaucerBB.ttf b/MoCha/Assets/Fonts/SaucerBB.ttf new file mode 100644 index 0000000..cae9879 Binary files /dev/null and b/MoCha/Assets/Fonts/SaucerBB.ttf differ diff --git a/MoCha/Assets/Fonts/SaucerBB.ttf.meta b/MoCha/Assets/Fonts/SaucerBB.ttf.meta new file mode 100644 index 0000000..42b069e --- /dev/null +++ b/MoCha/Assets/Fonts/SaucerBB.ttf.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 885e0ce5c093c1a4990f87656db90876 +timeCreated: 1523555966 +licenseType: Free +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: Saucer BB + fontNames: + - Saucer BB + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Items.meta b/MoCha/Assets/Items.meta new file mode 100644 index 0000000..8a326d8 --- /dev/null +++ b/MoCha/Assets/Items.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 49f84355758f7f74bbe780ac2fd1e574 +folderAsset: yes +timeCreated: 1524164591 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Items/circle_eye.asset b/MoCha/Assets/Items/circle_eye.asset new file mode 100644 index 0000000..19fb32f Binary files /dev/null and b/MoCha/Assets/Items/circle_eye.asset differ diff --git a/MoCha/Assets/Items/circle_eye.asset.meta b/MoCha/Assets/Items/circle_eye.asset.meta new file mode 100644 index 0000000..b484390 --- /dev/null +++ b/MoCha/Assets/Items/circle_eye.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 239bd48fa71b8fb44b79bb456aaf0807 +timeCreated: 1524164723 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Items/circle_head.asset b/MoCha/Assets/Items/circle_head.asset new file mode 100644 index 0000000..0777c27 Binary files /dev/null and b/MoCha/Assets/Items/circle_head.asset differ diff --git a/MoCha/Assets/Items/circle_head.asset.meta b/MoCha/Assets/Items/circle_head.asset.meta new file mode 100644 index 0000000..b0717b6 --- /dev/null +++ b/MoCha/Assets/Items/circle_head.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a921d1e60d69f1a498ba263cdfde04c7 +timeCreated: 1524164686 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Items/crazy_hair.asset b/MoCha/Assets/Items/crazy_hair.asset new file mode 100644 index 0000000..9e3ed70 Binary files /dev/null and b/MoCha/Assets/Items/crazy_hair.asset differ diff --git a/MoCha/Assets/Items/crazy_hair.asset.meta b/MoCha/Assets/Items/crazy_hair.asset.meta new file mode 100644 index 0000000..4cf3065 --- /dev/null +++ b/MoCha/Assets/Items/crazy_hair.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 642e995dbaf120642aeb269ce5c6c476 +timeCreated: 1524164615 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Items/crown.asset b/MoCha/Assets/Items/crown.asset new file mode 100644 index 0000000..52585e3 Binary files /dev/null and b/MoCha/Assets/Items/crown.asset differ diff --git a/MoCha/Assets/Items/crown.asset.meta b/MoCha/Assets/Items/crown.asset.meta new file mode 100644 index 0000000..4268a6f --- /dev/null +++ b/MoCha/Assets/Items/crown.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e10fc574df6c4744cbee17e84374f524 +timeCreated: 1524164707 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Items/gap_mouth.asset b/MoCha/Assets/Items/gap_mouth.asset new file mode 100644 index 0000000..e48c075 Binary files /dev/null and b/MoCha/Assets/Items/gap_mouth.asset differ diff --git a/MoCha/Assets/Items/gap_mouth.asset.meta b/MoCha/Assets/Items/gap_mouth.asset.meta new file mode 100644 index 0000000..321cdb3 --- /dev/null +++ b/MoCha/Assets/Items/gap_mouth.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e59e525161ea38242a90fd6ef67f4b63 +timeCreated: 1524164715 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Items/pig_nose.asset b/MoCha/Assets/Items/pig_nose.asset new file mode 100644 index 0000000..ae49169 Binary files /dev/null and b/MoCha/Assets/Items/pig_nose.asset differ diff --git a/MoCha/Assets/Items/pig_nose.asset.meta b/MoCha/Assets/Items/pig_nose.asset.meta new file mode 100644 index 0000000..55b7adc --- /dev/null +++ b/MoCha/Assets/Items/pig_nose.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9c001483399829349bae2c3bf3743bc0 +timeCreated: 1524164756 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Materials/Monster.mat b/MoCha/Assets/Materials/Monster.mat new file mode 100644 index 0000000..e9a4979 Binary files /dev/null and b/MoCha/Assets/Materials/Monster.mat differ diff --git a/MoCha/Assets/Materials/Monster.mat.meta b/MoCha/Assets/Materials/Monster.mat.meta new file mode 100644 index 0000000..b5c38fe --- /dev/null +++ b/MoCha/Assets/Materials/Monster.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7f5b45f167ce0c74a94cde52fb5c09e7 +timeCreated: 1523987555 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Materials/Running Man.mat b/MoCha/Assets/Materials/Running Man.mat new file mode 100644 index 0000000..f6e341d Binary files /dev/null and b/MoCha/Assets/Materials/Running Man.mat differ diff --git a/MoCha/Assets/Materials/Running Man.mat.meta b/MoCha/Assets/Materials/Running Man.mat.meta new file mode 100644 index 0000000..c248843 --- /dev/null +++ b/MoCha/Assets/Materials/Running Man.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2c8009114361c9045a3d3f8fb310c3ec +timeCreated: 1523987549 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Objects.meta b/MoCha/Assets/Objects.meta new file mode 100644 index 0000000..095ca5e --- /dev/null +++ b/MoCha/Assets/Objects.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3e0c77c4ccbbf0748a00791544349672 +folderAsset: yes +timeCreated: 1523559432 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Objects/Tyranitar_lowpoly_pokemon_new_5.fbx b/MoCha/Assets/Objects/Tyranitar_lowpoly_pokemon_new_5.fbx new file mode 100644 index 0000000..9baeefb Binary files /dev/null and b/MoCha/Assets/Objects/Tyranitar_lowpoly_pokemon_new_5.fbx differ diff --git a/MoCha/Assets/Objects/Tyranitar_lowpoly_pokemon_new_5.fbx.meta b/MoCha/Assets/Objects/Tyranitar_lowpoly_pokemon_new_5.fbx.meta new file mode 100644 index 0000000..b1ede66 --- /dev/null +++ b/MoCha/Assets/Objects/Tyranitar_lowpoly_pokemon_new_5.fbx.meta @@ -0,0 +1,95 @@ +fileFormatVersion: 2 +guid: 7e89565ff9cf0374bb64026197d14561 +timeCreated: 1523559837 +licenseType: Free +ModelImporter: + serializedVersion: 22 + fileIDToRecycleName: + 100000: node_id3 + 100002: //RootNode + 400000: node_id3 + 400002: //RootNode + 2100000: Material_53 + 2300000: node_id3 + 3300000: node_id3 + 4300000: node_id3 + externalObjects: {} + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 10 + meshCompression: 0 + addColliders: 0 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + preserveHierarchy: 0 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + serializedVersion: 2 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: + rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 0 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Objects/running_man.fbx b/MoCha/Assets/Objects/running_man.fbx new file mode 100644 index 0000000..4287520 Binary files /dev/null and b/MoCha/Assets/Objects/running_man.fbx differ diff --git a/MoCha/Assets/Objects/running_man.fbx.meta b/MoCha/Assets/Objects/running_man.fbx.meta new file mode 100644 index 0000000..2e43358 --- /dev/null +++ b/MoCha/Assets/Objects/running_man.fbx.meta @@ -0,0 +1,95 @@ +fileFormatVersion: 2 +guid: c60d37a70064cec47b89518256491de4 +timeCreated: 1523987201 +licenseType: Free +ModelImporter: + serializedVersion: 22 + fileIDToRecycleName: + 100000: node_id3 + 100002: //RootNode + 400000: node_id3 + 400002: //RootNode + 2100000: Material_53 + 2300000: node_id3 + 3300000: node_id3 + 4300000: node_id3 + externalObjects: {} + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + preserveHierarchy: 0 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + serializedVersion: 2 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: + rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 0 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Plugins.meta b/MoCha/Assets/Plugins.meta index e14a271..c2bfce5 100644 --- a/MoCha/Assets/Plugins.meta +++ b/MoCha/Assets/Plugins.meta @@ -1,7 +1,13 @@ fileFormatVersion: 2 -guid: d1b9653de3517ee44b7ee6517ee9e8c6 +<<<<<<< HEAD +guid: c0d1cd17861ddfa469b8a67ce9249897 folderAsset: yes -timeCreated: 1523387294 +timeCreated: 1523557753 +======= +guid: eba9d66c763b541cfbbd65c831b9bdd0 +folderAsset: yes +timeCreated: 1523992298 +>>>>>>> darrel licenseType: Free DefaultImporter: externalObjects: {} diff --git a/MoCha/Assets/Prefabs/Canvas.prefab b/MoCha/Assets/Prefabs/Base Canvas.prefab similarity index 65% rename from MoCha/Assets/Prefabs/Canvas.prefab rename to MoCha/Assets/Prefabs/Base Canvas.prefab index 4ca3c1c..e9760d9 100644 Binary files a/MoCha/Assets/Prefabs/Canvas.prefab and b/MoCha/Assets/Prefabs/Base Canvas.prefab differ diff --git a/MoCha/Assets/Prefabs/Canvas.prefab.meta b/MoCha/Assets/Prefabs/Base Canvas.prefab.meta similarity index 72% rename from MoCha/Assets/Prefabs/Canvas.prefab.meta rename to MoCha/Assets/Prefabs/Base Canvas.prefab.meta index 5000506..192a4b1 100644 --- a/MoCha/Assets/Prefabs/Canvas.prefab.meta +++ b/MoCha/Assets/Prefabs/Base Canvas.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 43ffee412d195f7439561e503c0cb541 -timeCreated: 1523382322 +guid: 7d0f216d6d3858a479598e82060a4c1e +timeCreated: 1523557265 licenseType: Free NativeFormatImporter: externalObjects: {} diff --git a/MoCha/Assets/Prefabs/ItemSlot.prefab b/MoCha/Assets/Prefabs/ItemSlot.prefab new file mode 100644 index 0000000..0c05dbf Binary files /dev/null and b/MoCha/Assets/Prefabs/ItemSlot.prefab differ diff --git a/MoCha/Assets/Prefabs/ItemSlot.prefab.meta b/MoCha/Assets/Prefabs/ItemSlot.prefab.meta new file mode 100644 index 0000000..2e52d9b --- /dev/null +++ b/MoCha/Assets/Prefabs/ItemSlot.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ffb3a2b5c7f8d144f83ef1f1166b178f +timeCreated: 1524162403 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Scenes/Leaderboard.unity b/MoCha/Assets/Scenes/Leaderboard.unity new file mode 100644 index 0000000..3577974 Binary files /dev/null and b/MoCha/Assets/Scenes/Leaderboard.unity differ diff --git a/MoCha/Assets/Scenes/Leaderboard.unity.meta b/MoCha/Assets/Scenes/Leaderboard.unity.meta new file mode 100644 index 0000000..f7db7a5 --- /dev/null +++ b/MoCha/Assets/Scenes/Leaderboard.unity.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: b6e77f2ba4a9de64fa14948947b5767e +timeCreated: 1524106311 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Scenes/Main.unity b/MoCha/Assets/Scenes/Main.unity index 3c1da1a..dfea7e8 100644 Binary files a/MoCha/Assets/Scenes/Main.unity and b/MoCha/Assets/Scenes/Main.unity differ diff --git a/MoCha/Assets/Scenes/MonsterCreator.unity b/MoCha/Assets/Scenes/MonsterCreator.unity index 6f007e6..71beae0 100644 Binary files a/MoCha/Assets/Scenes/MonsterCreator.unity and b/MoCha/Assets/Scenes/MonsterCreator.unity differ diff --git a/MoCha/Assets/Scenes/Social.unity b/MoCha/Assets/Scenes/Social.unity index dfa6750..dba2543 100644 Binary files a/MoCha/Assets/Scenes/Social.unity and b/MoCha/Assets/Scenes/Social.unity differ diff --git a/MoCha/Assets/Scenes/Stats.unity b/MoCha/Assets/Scenes/Stats.unity index 040d036..fad3fc1 100644 Binary files a/MoCha/Assets/Scenes/Stats.unity and b/MoCha/Assets/Scenes/Stats.unity differ diff --git a/MoCha/Assets/Scenes/StepCounter.unity b/MoCha/Assets/Scenes/StepCounter.unity index 28fa610..95f0dfa 100644 Binary files a/MoCha/Assets/Scenes/StepCounter.unity and b/MoCha/Assets/Scenes/StepCounter.unity differ diff --git a/MoCha/Assets/Scripts/GetData.cs b/MoCha/Assets/Scripts/GetData.cs new file mode 100644 index 0000000..f0b58a2 --- /dev/null +++ b/MoCha/Assets/Scripts/GetData.cs @@ -0,0 +1,29 @@ +using UnityEngine; +using System.Collections; +using UnityEngine.UI; + +public class GetData : MonoBehaviour +{ + public Button thisbutton; + public Text objectText; + + public string request = "http://corder.tech/mocha/users/*"; + + void Start() + { + thisbutton = GetComponent