From 53a6f8c3f14501928ae978a2135902bd47eeed46 Mon Sep 17 00:00:00 2001 From: Darrel Marek Date: Thu, 26 Apr 2018 06:59:29 -0500 Subject: [PATCH] Monsters + inventory working --- .../circle_eye_sprite.png} | Bin .../circle_eye_sprite.png.meta} | 0 .../circle_head_sprite.png} | Bin .../circle_head_sprite.png.meta} | 0 .../crazy_hair_sprite.png} | Bin .../crazy_hair_sprite.png.meta} | 0 .../crown.png => Resources/crown_sprite.png} | Bin .../crown_sprite.png.meta} | 0 .../gap_mouth_sprite.png} | Bin .../gap_mouth_sprite.png.meta} | 0 .../pig_nose_sprite.png} | Bin .../pig_nose_sprite.png.meta} | 0 MoCha/Assets/Scenes/MonsterCreator.unity | Bin 91396 -> 96956 bytes MoCha/Assets/Scripts/DragAndDrop.cs | 5 +- MoCha/Assets/Scripts/Inventory.cs | 86 ++++++++++++++++-- MoCha/Assets/Scripts/ItemSlotBehavior.cs | 34 +++++++ MoCha/Assets/Scripts/ItemSlotBehavior.cs.meta | 13 +++ MoCha/Assets/Scripts/MonsterManager.cs | 20 +++- 18 files changed, 143 insertions(+), 15 deletions(-) rename MoCha/Assets/{Sprites/Monster Parts/circle_eye.png => Resources/circle_eye_sprite.png} (100%) rename MoCha/Assets/{Sprites/Monster Parts/circle_eye.png.meta => Resources/circle_eye_sprite.png.meta} (100%) rename MoCha/Assets/{Sprites/Monster Parts/circle_head.png => Resources/circle_head_sprite.png} (100%) rename MoCha/Assets/{Sprites/Monster Parts/circle_head.png.meta => Resources/circle_head_sprite.png.meta} (100%) rename MoCha/Assets/{Sprites/Monster Parts/crazy_hair.png => Resources/crazy_hair_sprite.png} (100%) rename MoCha/Assets/{Sprites/Monster Parts/crazy_hair.png.meta => Resources/crazy_hair_sprite.png.meta} (100%) rename MoCha/Assets/{Sprites/Monster Parts/crown.png => Resources/crown_sprite.png} (100%) rename MoCha/Assets/{Sprites/Monster Parts/crown.png.meta => Resources/crown_sprite.png.meta} (100%) rename MoCha/Assets/{Sprites/Monster Parts/gap_mouth.png => Resources/gap_mouth_sprite.png} (100%) rename MoCha/Assets/{Sprites/Monster Parts/gap_mouth.png.meta => Resources/gap_mouth_sprite.png.meta} (100%) rename MoCha/Assets/{Sprites/Monster Parts/pig_nose.png => Resources/pig_nose_sprite.png} (100%) rename MoCha/Assets/{Sprites/Monster Parts/pig_nose.png.meta => Resources/pig_nose_sprite.png.meta} (100%) create mode 100644 MoCha/Assets/Scripts/ItemSlotBehavior.cs create mode 100644 MoCha/Assets/Scripts/ItemSlotBehavior.cs.meta diff --git a/MoCha/Assets/Sprites/Monster Parts/circle_eye.png b/MoCha/Assets/Resources/circle_eye_sprite.png similarity index 100% rename from MoCha/Assets/Sprites/Monster Parts/circle_eye.png rename to MoCha/Assets/Resources/circle_eye_sprite.png diff --git a/MoCha/Assets/Sprites/Monster Parts/circle_eye.png.meta b/MoCha/Assets/Resources/circle_eye_sprite.png.meta similarity index 100% rename from MoCha/Assets/Sprites/Monster Parts/circle_eye.png.meta rename to MoCha/Assets/Resources/circle_eye_sprite.png.meta diff --git a/MoCha/Assets/Sprites/Monster Parts/circle_head.png b/MoCha/Assets/Resources/circle_head_sprite.png similarity index 100% rename from MoCha/Assets/Sprites/Monster Parts/circle_head.png rename to MoCha/Assets/Resources/circle_head_sprite.png diff --git a/MoCha/Assets/Sprites/Monster Parts/circle_head.png.meta b/MoCha/Assets/Resources/circle_head_sprite.png.meta similarity index 100% rename from MoCha/Assets/Sprites/Monster Parts/circle_head.png.meta rename to MoCha/Assets/Resources/circle_head_sprite.png.meta diff --git a/MoCha/Assets/Sprites/Monster Parts/crazy_hair.png b/MoCha/Assets/Resources/crazy_hair_sprite.png similarity index 100% rename from MoCha/Assets/Sprites/Monster Parts/crazy_hair.png rename to MoCha/Assets/Resources/crazy_hair_sprite.png diff --git a/MoCha/Assets/Sprites/Monster Parts/crazy_hair.png.meta b/MoCha/Assets/Resources/crazy_hair_sprite.png.meta similarity index 100% rename from MoCha/Assets/Sprites/Monster Parts/crazy_hair.png.meta rename to MoCha/Assets/Resources/crazy_hair_sprite.png.meta diff --git a/MoCha/Assets/Sprites/Monster Parts/crown.png b/MoCha/Assets/Resources/crown_sprite.png similarity index 100% rename from MoCha/Assets/Sprites/Monster Parts/crown.png rename to MoCha/Assets/Resources/crown_sprite.png diff --git a/MoCha/Assets/Sprites/Monster Parts/crown.png.meta b/MoCha/Assets/Resources/crown_sprite.png.meta similarity index 100% rename from MoCha/Assets/Sprites/Monster Parts/crown.png.meta rename to MoCha/Assets/Resources/crown_sprite.png.meta diff --git a/MoCha/Assets/Sprites/Monster Parts/gap_mouth.png b/MoCha/Assets/Resources/gap_mouth_sprite.png similarity index 100% rename from MoCha/Assets/Sprites/Monster Parts/gap_mouth.png rename to MoCha/Assets/Resources/gap_mouth_sprite.png diff --git a/MoCha/Assets/Sprites/Monster Parts/gap_mouth.png.meta b/MoCha/Assets/Resources/gap_mouth_sprite.png.meta similarity index 100% rename from MoCha/Assets/Sprites/Monster Parts/gap_mouth.png.meta rename to MoCha/Assets/Resources/gap_mouth_sprite.png.meta diff --git a/MoCha/Assets/Sprites/Monster Parts/pig_nose.png b/MoCha/Assets/Resources/pig_nose_sprite.png similarity index 100% rename from MoCha/Assets/Sprites/Monster Parts/pig_nose.png rename to MoCha/Assets/Resources/pig_nose_sprite.png diff --git a/MoCha/Assets/Sprites/Monster Parts/pig_nose.png.meta b/MoCha/Assets/Resources/pig_nose_sprite.png.meta similarity index 100% rename from MoCha/Assets/Sprites/Monster Parts/pig_nose.png.meta rename to MoCha/Assets/Resources/pig_nose_sprite.png.meta diff --git a/MoCha/Assets/Scenes/MonsterCreator.unity b/MoCha/Assets/Scenes/MonsterCreator.unity index e8b0f3b986302ac36deef5fbf23ff3b842e97995..5b8f34c695965e1106c17e325cfe6d2a73fd4313 100644 GIT binary patch delta 11945 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 K8x$|6gZ>A9kx-@p diff --git a/MoCha/Assets/Scripts/DragAndDrop.cs b/MoCha/Assets/Scripts/DragAndDrop.cs index 18a988c..c67b20a 100644 --- a/MoCha/Assets/Scripts/DragAndDrop.cs +++ b/MoCha/Assets/Scripts/DragAndDrop.cs @@ -36,9 +36,10 @@ public class DragAndDrop : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndD public void OnEndDrag (PointerEventData eventData) { _offsetToMouse = Vector3.zero; - //Debug.Log (Input.mousePosition.y); - if (Input.mousePosition.y < 75) + if (Input.mousePosition.y < 75) { DraggedInstance.SetActive (false); + inventory.AddItem (DraggedInstance.name); + } DraggedInstance = null; } diff --git a/MoCha/Assets/Scripts/Inventory.cs b/MoCha/Assets/Scripts/Inventory.cs index 9a7ad04..b98ffc1 100644 --- a/MoCha/Assets/Scripts/Inventory.cs +++ b/MoCha/Assets/Scripts/Inventory.cs @@ -1,7 +1,7 @@ using UnityEngine; using System.Collections; using UnityEngine.UI; - +using System.Text; public class Inventory : MonoBehaviour { @@ -9,19 +9,32 @@ public class Inventory : MonoBehaviour public Item[] items = new Item[numItemSlots]; public const int numItemSlots = 25; - private static bool created = false; - void Awake() { - if (!created) + //PlayerPrefs.SetString("inventory", ""); + string savedString = PlayerPrefs.GetString("inventory"); + + string[] itemNames = savedString.Split(' '); + Debug.Log (itemNames [itemNames.Length-1]); + for (int i = 0; i < itemNames.Length - 1; i++) { - DontDestroyOnLoad(this.gameObject); - created = true; + Sprite sprite = (Resources.Load(itemNames[i] + "_sprite")); + Item itm = new Item (); + itm.name = itemNames [i]; + itm.sprite = sprite; + items[i] = itm; + itemImages[i].sprite = itm.sprite; + itemImages[i].enabled = true; } } public void AddItem(Item itemToAdd) { + StringBuilder invList = new StringBuilder (); + invList.Append(PlayerPrefs.GetString ("inventory")); + invList.Append(itemToAdd.name).Append(" "); + PlayerPrefs.SetString ("inventory", invList.ToString()); + for (int i = 0; i < items.Length; i++) { if (items[i] == null) @@ -34,13 +47,42 @@ public class Inventory : MonoBehaviour } } - public void RemoveItem (Item itemToRemove) + public void AddItem(string itemName) { - GameObject instance = (GameObject)Instantiate(Resources.Load(itemToRemove.name)); + StringBuilder invList = new StringBuilder (); + invList.Append(PlayerPrefs.GetString ("inventory")); + invList.Append(itemName).Append(" "); + PlayerPrefs.SetString ("inventory", invList.ToString()); for (int i = 0; i < items.Length; i++) { - if (items[i] == itemToRemove) + if (items[i] == null) + { + Sprite sprite = (Resources.Load(itemName + "_sprite")); + Item itm = new Item (); + itm.name = itemName; + itm.sprite = sprite; + items[i] = itm; + itemImages[i].sprite = itm.sprite; + itemImages[i].enabled = true; + return; + } + } + } + + public void RemoveItem (Item itemToRemove) + { + StringBuilder invList = new StringBuilder (); + invList.Append(PlayerPrefs.GetString ("inventory")); + int index = invList.ToString ().IndexOf (itemToRemove.name + " "); + invList.Remove(index, (itemToRemove.name + " ").Length); + PlayerPrefs.SetString ("inventory", invList.ToString()); + GameObject instance = (GameObject)Instantiate(Resources.Load(itemToRemove.name)); + instance.name = itemToRemove.name; + + for (int i = 0; i < items.Length; i++) + { + if (items[i].name == itemToRemove.name) { items[i] = null; itemImages[i].sprite = null; @@ -49,4 +91,30 @@ public class Inventory : MonoBehaviour } } } + + public void RemoveItem (string itemName) + { + StringBuilder invList = new StringBuilder (); + invList.Append(PlayerPrefs.GetString ("inventory")); + int index = invList.ToString ().IndexOf (itemName + " "); + invList.Remove(index, (itemName + " ").Length); + PlayerPrefs.SetString ("inventory", invList.ToString()); + GameObject instance = (GameObject)Instantiate(Resources.Load(itemName)); + instance.GetComponent ().inventory = this; + instance.name = itemName; + + for (int i = 0; i < items.Length - 1; i++) + { + if (items [i] != null) { + Debug.Log (items [i].name + " == " + itemName); + if (items [i].name == itemName) { + items [i] = null; + itemImages [i].sprite = null; + itemImages [i].enabled = false; + return; + } + } + } + + } } \ No newline at end of file diff --git a/MoCha/Assets/Scripts/ItemSlotBehavior.cs b/MoCha/Assets/Scripts/ItemSlotBehavior.cs new file mode 100644 index 0000000..e160966 --- /dev/null +++ b/MoCha/Assets/Scripts/ItemSlotBehavior.cs @@ -0,0 +1,34 @@ +using UnityEngine; +using UnityEngine.EventSystems; +using Image = UnityEngine.UI.Image; + +public class ItemSlotBehavior : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHandler +{ + public static GameObject DraggedInstance; + public Inventory inventory; + + Vector3 _startPosition; + Vector3 _offsetToMouse; + float _zDistanceToCamera; + + #region Interface Implementations + + public void OnBeginDrag (PointerEventData eventData) + { + DraggedInstance = gameObject; + Debug.Log ("Removing: " + DraggedInstance.GetComponent ().sprite.name.Remove (DraggedInstance.GetComponent ().sprite.name.Length - 7)); + inventory.RemoveItem(DraggedInstance.GetComponent().sprite.name.Remove(DraggedInstance.GetComponent().sprite.name.Length-7)); + } + + public void OnDrag (PointerEventData eventData) + { + + } + + public void OnEndDrag (PointerEventData eventData) + { + + } + + #endregion +} \ No newline at end of file diff --git a/MoCha/Assets/Scripts/ItemSlotBehavior.cs.meta b/MoCha/Assets/Scripts/ItemSlotBehavior.cs.meta new file mode 100644 index 0000000..9c6a6ac --- /dev/null +++ b/MoCha/Assets/Scripts/ItemSlotBehavior.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 062d9f417b017b445bd5b92d657b31d1 +timeCreated: 1524730867 +licenseType: Free +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Scripts/MonsterManager.cs b/MoCha/Assets/Scripts/MonsterManager.cs index 2505c60..fd158a6 100644 --- a/MoCha/Assets/Scripts/MonsterManager.cs +++ b/MoCha/Assets/Scripts/MonsterManager.cs @@ -13,8 +13,7 @@ public class MonsterManager : MonoBehaviour { void Start() { - //inv = FindObjectOfType (); - inv.AddItem (item); + loadMonster(); } public void showItems() @@ -30,13 +29,16 @@ public class MonsterManager : MonoBehaviour { StringBuilder pos = new StringBuilder (); string savedString; + string equippedString = ""; for (int i = 0; i < monsterParts.Length; i++) { pos = new StringBuilder (); pos.Append(GameObject.Find(monsterParts[i].name).transform.position.x).Append(" ").Append(GameObject.Find(monsterParts[i].name).transform.position.y).Append(" ").Append(GameObject.Find(monsterParts[i].name).transform.position.z); + equippedString = equippedString + monsterParts [i].name + " "; savedString = pos.ToString (); PlayerPrefs.SetString(SceneManager.GetActiveScene().name + monsterParts[i].name, savedString); } + PlayerPrefs.SetString ("Equipped", equippedString); /* StringBuilder eyePos = new StringBuilder(); @@ -78,8 +80,18 @@ public class MonsterManager : MonoBehaviour { public void loadMonster () { - string savedString; - string[] values; + + string equippedString = PlayerPrefs.GetString("Equipped"); + string[] equipped = equippedString.Split (' '); + + for (int i = 0; i < equipped.Length - 1; i++) { + string savedString = PlayerPrefs.GetString(SceneManager.GetActiveScene().name + equipped[i]); + string[] values = savedString.Split (); + GameObject instance = (GameObject)Instantiate(Resources.Load(equipped[i])); + instance.name = equipped [i]; + instance.GetComponent ().inventory = inv; + instance.transform.position = new Vector3(float.Parse(values[0]),float.Parse(values[1]),float.Parse(values[2])); + } /* string savedString = PlayerPrefs.GetString(SceneManager.GetActiveScene().name + "eyePosition");