diff --git a/MoCha/Assets/Resources/circle_eye_image.prefab b/MoCha/Assets/Resources/circle_eye_image.prefab new file mode 100644 index 0000000..0062bf3 Binary files /dev/null and b/MoCha/Assets/Resources/circle_eye_image.prefab differ diff --git a/MoCha/Assets/Resources/circle_eye_image.prefab.meta b/MoCha/Assets/Resources/circle_eye_image.prefab.meta new file mode 100644 index 0000000..9b7fcac --- /dev/null +++ b/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: diff --git a/MoCha/Assets/Resources/circle_head_image.prefab b/MoCha/Assets/Resources/circle_head_image.prefab new file mode 100644 index 0000000..08ed52b Binary files /dev/null and b/MoCha/Assets/Resources/circle_head_image.prefab differ diff --git a/MoCha/Assets/Resources/circle_head_image.prefab.meta b/MoCha/Assets/Resources/circle_head_image.prefab.meta new file mode 100644 index 0000000..d58d271 --- /dev/null +++ b/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: diff --git a/MoCha/Assets/Resources/crazy_hair_image.prefab b/MoCha/Assets/Resources/crazy_hair_image.prefab new file mode 100644 index 0000000..96f6cdd Binary files /dev/null and b/MoCha/Assets/Resources/crazy_hair_image.prefab differ diff --git a/MoCha/Assets/Resources/crazy_hair_image.prefab.meta b/MoCha/Assets/Resources/crazy_hair_image.prefab.meta new file mode 100644 index 0000000..4ab6657 --- /dev/null +++ b/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: diff --git a/MoCha/Assets/Resources/crown_image.prefab b/MoCha/Assets/Resources/crown_image.prefab new file mode 100644 index 0000000..813d27c Binary files /dev/null and b/MoCha/Assets/Resources/crown_image.prefab differ diff --git a/MoCha/Assets/Resources/crown_image.prefab.meta b/MoCha/Assets/Resources/crown_image.prefab.meta new file mode 100644 index 0000000..2f437b2 --- /dev/null +++ b/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: diff --git a/MoCha/Assets/Resources/gap_mouth_image.prefab b/MoCha/Assets/Resources/gap_mouth_image.prefab new file mode 100644 index 0000000..7097d09 Binary files /dev/null and b/MoCha/Assets/Resources/gap_mouth_image.prefab differ diff --git a/MoCha/Assets/Resources/gap_mouth_image.prefab.meta b/MoCha/Assets/Resources/gap_mouth_image.prefab.meta new file mode 100644 index 0000000..01916f3 --- /dev/null +++ b/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: diff --git a/MoCha/Assets/Resources/pig_nose_image.prefab b/MoCha/Assets/Resources/pig_nose_image.prefab new file mode 100644 index 0000000..8085f65 Binary files /dev/null and b/MoCha/Assets/Resources/pig_nose_image.prefab differ diff --git a/MoCha/Assets/Resources/pig_nose_image.prefab.meta b/MoCha/Assets/Resources/pig_nose_image.prefab.meta new file mode 100644 index 0000000..6858611 --- /dev/null +++ b/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: diff --git a/MoCha/Assets/Scenes/MonsterCreator.unity b/MoCha/Assets/Scenes/MonsterCreator.unity index d0e451a..becd2aa 100644 Binary files a/MoCha/Assets/Scenes/MonsterCreator.unity and b/MoCha/Assets/Scenes/MonsterCreator.unity differ diff --git a/MoCha/Assets/Scripts/MonsterDraw.cs b/MoCha/Assets/Scripts/MonsterDraw.cs index e6aab2a..6e9dc54 100644 --- a/MoCha/Assets/Scripts/MonsterDraw.cs +++ b/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 ().inventory = inv; instance.transform.position = new Vector2(float.Parse(values[0]), float.Parse(values[1])); diff --git a/MoCha/ProjectSettings/ProjectSettings.asset b/MoCha/ProjectSettings/ProjectSettings.asset index f93fdd1..34db7e5 100644 Binary files a/MoCha/ProjectSettings/ProjectSettings.asset and b/MoCha/ProjectSettings/ProjectSettings.asset differ