Merge branch 'darrel' of https://github.tamu.edu/shadow8t4/MoChaApp into darrel

MoCha/Assets/Resources/circle_eye_image.prefab.meta

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

MoCha/Assets/Resources/circle_head_image.prefab.meta

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

MoCha/Assets/Resources/crazy_hair_image.prefab.meta

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

MoCha/Assets/Resources/crown_image.prefab.meta

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

MoCha/Assets/Resources/gap_mouth_image.prefab.meta

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

MoCha/Assets/Resources/pig_nose_image.prefab.meta

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

MoCha/Assets/Scripts/MonsterDraw.cs

@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.UI;
 
 public class MonsterDraw : MonoBehaviour {
 	
@@ -24,6 +25,7 @@ public class MonsterDraw : MonoBehaviour {
 			string savedString = PlayerPrefs.GetString(equipped[i]);
 			string[] values = savedString.Split ();
 			GameObject instance = (GameObject)Instantiate(Resources.Load(equipped[i]));
+			//instance.rectTransform.anchoredPosition = new Vector2(float.Parse(values[0]), float.Parse(values[1]));
 			instance.name = equipped [i];
 			//instance.GetComponent<DragAndDrop> ().inventory = inv;
 			instance.transform.position = new Vector2(float.Parse(values[0]), float.Parse(values[1]));