diff --git a/MoCha/Assets/Items/circle_eye.asset b/MoCha/Assets/Items/circle_eye.asset index 19fb32f..4ea5fe0 100644 Binary files a/MoCha/Assets/Items/circle_eye.asset and b/MoCha/Assets/Items/circle_eye.asset differ diff --git a/MoCha/Assets/Items/circle_head.asset b/MoCha/Assets/Items/circle_head.asset index 0777c27..66aa65a 100644 Binary files a/MoCha/Assets/Items/circle_head.asset and b/MoCha/Assets/Items/circle_head.asset differ diff --git a/MoCha/Assets/Items/crazy_hair.asset b/MoCha/Assets/Items/crazy_hair.asset index 9e3ed70..5826077 100644 Binary files a/MoCha/Assets/Items/crazy_hair.asset and b/MoCha/Assets/Items/crazy_hair.asset differ diff --git a/MoCha/Assets/Items/crown.asset b/MoCha/Assets/Items/crown.asset index 52585e3..15c5c9d 100644 Binary files a/MoCha/Assets/Items/crown.asset and b/MoCha/Assets/Items/crown.asset differ diff --git a/MoCha/Assets/Items/gap_mouth.asset b/MoCha/Assets/Items/gap_mouth.asset index e48c075..6422dd1 100644 Binary files a/MoCha/Assets/Items/gap_mouth.asset and b/MoCha/Assets/Items/gap_mouth.asset differ diff --git a/MoCha/Assets/Items/pig_nose.asset b/MoCha/Assets/Items/pig_nose.asset index ae49169..0521d17 100644 Binary files a/MoCha/Assets/Items/pig_nose.asset and b/MoCha/Assets/Items/pig_nose.asset differ diff --git a/MoCha/Assets/Resources.meta b/MoCha/Assets/Resources.meta new file mode 100644 index 0000000..3212a57 --- /dev/null +++ b/MoCha/Assets/Resources.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 00e35244fddf9aa4fa427e547aec158d +folderAsset: yes +timeCreated: 1524683565 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Resources/circle_eye.prefab b/MoCha/Assets/Resources/circle_eye.prefab new file mode 100644 index 0000000..86c4533 Binary files /dev/null and b/MoCha/Assets/Resources/circle_eye.prefab differ diff --git a/MoCha/Assets/Resources/circle_eye.prefab.meta b/MoCha/Assets/Resources/circle_eye.prefab.meta new file mode 100644 index 0000000..32099f7 --- /dev/null +++ b/MoCha/Assets/Resources/circle_eye.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 49942256293e57045bbb9b1a407a1667 +timeCreated: 1524683726 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Resources/circle_head.prefab b/MoCha/Assets/Resources/circle_head.prefab new file mode 100644 index 0000000..bba6d8a Binary files /dev/null and b/MoCha/Assets/Resources/circle_head.prefab differ diff --git a/MoCha/Assets/Resources/circle_head.prefab.meta b/MoCha/Assets/Resources/circle_head.prefab.meta new file mode 100644 index 0000000..02a2678 --- /dev/null +++ b/MoCha/Assets/Resources/circle_head.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 645789e883e1d3c40aabb865a433d896 +timeCreated: 1524683718 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Resources/crazy_hair.prefab b/MoCha/Assets/Resources/crazy_hair.prefab new file mode 100644 index 0000000..1d82be8 Binary files /dev/null and b/MoCha/Assets/Resources/crazy_hair.prefab differ diff --git a/MoCha/Assets/Resources/crazy_hair.prefab.meta b/MoCha/Assets/Resources/crazy_hair.prefab.meta new file mode 100644 index 0000000..d2527e4 --- /dev/null +++ b/MoCha/Assets/Resources/crazy_hair.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 6bca5c058cbd15c41815ef2924191049 +timeCreated: 1524683721 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Resources/crown.prefab b/MoCha/Assets/Resources/crown.prefab new file mode 100644 index 0000000..3b0dcae Binary files /dev/null and b/MoCha/Assets/Resources/crown.prefab differ diff --git a/MoCha/Assets/Resources/crown.prefab.meta b/MoCha/Assets/Resources/crown.prefab.meta new file mode 100644 index 0000000..482b0a3 --- /dev/null +++ b/MoCha/Assets/Resources/crown.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 6d657f3d9cb80c94d86fed7d0acbcdd7 +timeCreated: 1524683723 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Resources/gap_mouth.prefab b/MoCha/Assets/Resources/gap_mouth.prefab new file mode 100644 index 0000000..ca77759 Binary files /dev/null and b/MoCha/Assets/Resources/gap_mouth.prefab differ diff --git a/MoCha/Assets/Resources/gap_mouth.prefab.meta b/MoCha/Assets/Resources/gap_mouth.prefab.meta new file mode 100644 index 0000000..44271fd --- /dev/null +++ b/MoCha/Assets/Resources/gap_mouth.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 07c92442f33cfbb448eff50b204aaefa +timeCreated: 1524683727 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Resources/pig_nose.prefab b/MoCha/Assets/Resources/pig_nose.prefab new file mode 100644 index 0000000..c910047 Binary files /dev/null and b/MoCha/Assets/Resources/pig_nose.prefab differ diff --git a/MoCha/Assets/Resources/pig_nose.prefab.meta b/MoCha/Assets/Resources/pig_nose.prefab.meta new file mode 100644 index 0000000..0169296 --- /dev/null +++ b/MoCha/Assets/Resources/pig_nose.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 5bb017abc66da2e4bb908eb3c97d29b4 +timeCreated: 1524683729 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Scenes/MonsterCreator.unity b/MoCha/Assets/Scenes/MonsterCreator.unity index 5f1c504..68a3b20 100644 Binary files a/MoCha/Assets/Scenes/MonsterCreator.unity and b/MoCha/Assets/Scenes/MonsterCreator.unity differ diff --git a/MoCha/Assets/Scripts/DragAndDrop.cs b/MoCha/Assets/Scripts/DragAndDrop.cs index e9ad180..18a988c 100644 --- a/MoCha/Assets/Scripts/DragAndDrop.cs +++ b/MoCha/Assets/Scripts/DragAndDrop.cs @@ -4,6 +4,7 @@ using UnityEngine.EventSystems; public class DragAndDrop : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHandler { public static GameObject DraggedInstance; + public Inventory inventory; Vector3 _startPosition; Vector3 _offsetToMouse; @@ -34,8 +35,11 @@ public class DragAndDrop : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndD public void OnEndDrag (PointerEventData eventData) { - DraggedInstance = null; _offsetToMouse = Vector3.zero; + //Debug.Log (Input.mousePosition.y); + if (Input.mousePosition.y < 75) + DraggedInstance.SetActive (false); + DraggedInstance = null; } #endregion diff --git a/MoCha/Assets/Scripts/Inventory.cs b/MoCha/Assets/Scripts/Inventory.cs index 15a3126..9a7ad04 100644 --- a/MoCha/Assets/Scripts/Inventory.cs +++ b/MoCha/Assets/Scripts/Inventory.cs @@ -8,6 +8,18 @@ public class Inventory : MonoBehaviour public Image[] itemImages = new Image[numItemSlots]; public Item[] items = new Item[numItemSlots]; public const int numItemSlots = 25; + + private static bool created = false; + + void Awake() + { + if (!created) + { + DontDestroyOnLoad(this.gameObject); + created = true; + } + } + public void AddItem(Item itemToAdd) { for (int i = 0; i < items.Length; i++) @@ -21,8 +33,11 @@ public class Inventory : MonoBehaviour } } } + public void RemoveItem (Item itemToRemove) { + GameObject instance = (GameObject)Instantiate(Resources.Load(itemToRemove.name)); + for (int i = 0; i < items.Length; i++) { if (items[i] == itemToRemove) diff --git a/MoCha/Assets/Scripts/Item.cs b/MoCha/Assets/Scripts/Item.cs index 0dd481b..329438d 100644 --- a/MoCha/Assets/Scripts/Item.cs +++ b/MoCha/Assets/Scripts/Item.cs @@ -4,4 +4,6 @@ public class Item : ScriptableObject { public Sprite sprite; + + public string name; } diff --git a/MoCha/ProjectSettings/ProjectVersion.txt b/MoCha/ProjectSettings/ProjectVersion.txt index 2576b78..27997c5 100644 --- a/MoCha/ProjectSettings/ProjectVersion.txt +++ b/MoCha/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2017.2.1f1 +m_EditorVersion: 2017.3.1f1