Merge remote-tracking branch 'origin/enemyInfo' into item 머지하고 조금 수정

# Conflicts:
#	Assets/Scripts/Item/Addons/ParchmentPiece.cs

Assets/Scripts/Item/Addon.cs

@@ -10,6 +10,7 @@ public abstract class Addon {
     public Sprite sprite;
     public Sprite highlight;
     public Vector2 sizeInventory;
+    public string addonDescription;
 
     public Addon()
     {
@@ -23,6 +24,7 @@ public abstract class Addon {
         sprite = null;
         highlight = null;
         sizeInventory = new Vector2(0, 0);
+        addonDescription = null;
     }
     public virtual float DamageAdder(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)
     {

Assets/Scripts/Item/AddonDrag.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.EventSystems;
 
-public class AddonDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHandler
+public class AddonDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHandler, IPointerClickHandler
 {
     public int num;
     InventoryUI ui;
@@ -56,6 +56,23 @@ public class AddonDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDra
         }
         manager.SetOnPosition();
     }
+
+    public void OnPointerClick(PointerEventData eventData)
+    {
+        if (num < 9)
+        {
+            int type = (int)manager.addonList[num].type;
+            if (ui.selectedItem != -1 && manager.itemList[ui.selectedItem].attachable[type])
+            {
+                if (manager.itemList[ui.selectedItem].addons[type] != null)
+                    manager.DetachAddon(ui.selectedItem, (AddonType)type);
+                manager.AttachAddon(ui.selectedItem, num);
+            }
+        }
+        else
+            manager.DetachAddon(ui.selectedItem, (AddonType)(num - 9));
+        manager.SetOnPosition();
+    }
     bool CheckBetween(Vector3 mouse, Vector3 center, Vector2 size)
     {
         return Mathf.Abs(mouse.x - center.x) <= size.x / 2f && Mathf.Abs(mouse.y - center.y) <= size.y / 2f;

Assets/Scripts/Item/Addons/ParchmentPiece.cs

@@ -15,6 +15,7 @@ public class ParchmentPiece : Addon
         sprite = Resources.Load<Sprite>("Sprites/Addons/parchment piece"); ;
         highlight = Resources.Load<Sprite>("Sprites/Addons/parchment piece_border"); ;
         sizeInventory = new Vector2(70, 77.5f);
+        addonDescription = "쓸모없는 애드온";
     }
     public override float DamageMultiplier(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)
     {

Assets/Scripts/Item/InventoryManager.cs

@@ -23,6 +23,8 @@ public class InventoryManager : Singleton<InventoryManager> {
 
         SetPool();
         ItemInstantiate("Dagger", player.transform.position, 0f);
+        AddonInstantiate("ParchmentPiece", player.transform.position, 0f);
+        ItemInstantiate("Bow", player.transform.position, 0f);
 
         StartCoroutine(TestCoroutine());
     }

Assets/Scripts/Item/InventoryUI.cs

@@ -30,10 +30,12 @@ public class InventoryUI : MonoBehaviour {
     public GameObject[] infoAddonsFrame;
     public GameObject[] comboStringFrame;
     public GameObject[] comboCharPrefab;
+    public GameObject[] comboNameFrame;
     public float pixelBetweenChar;
     GameObject[,] comboChars = new GameObject[3, 8];
     GameObject[] infoAddons;
     public int selectedItem = -1;
+    string[] qualityString = new string[4] { "습작", "범작", "수작", "걸작" };
 
 	void Start () {
         items = new GameObject[9];
@@ -65,6 +67,7 @@ public class InventoryUI : MonoBehaviour {
                 comboChars[i, j].SetActive(false);
             }
             comboStringFrame[i].SetActive(false);
+            comboNameFrame[i].SetActive(false);
         }
         
         infoSpace.transform.Find("Frame").gameObject.SetActive(false);
@@ -100,11 +103,15 @@ public class InventoryUI : MonoBehaviour {
             frameObj.transform.Find("ItemSprite").gameObject.GetComponent<Image>().sprite = itemFrameQuality[(int)itemList[selectedItem].quality];
             frameObj.transform.Find("ItemSprite").Find("Sprite").gameObject.GetComponent<Image>().sprite = itemList[selectedItem].sprite;
             frameObj.transform.Find("ItemSprite").Find("Sprite").gameObject.GetComponent<RectTransform>().sizeDelta = itemList[selectedItem].sizeInventory;
+            frameObj.transform.Find("ItemDescription").gameObject.GetComponent<Text>().text = itemList[selectedItem].itemInfo;
+            frameObj.transform.Find("ItemDescription").Find("ItemQuality").gameObject.GetComponent<Text>().text = qualityString[(int)itemList[selectedItem].quality];
+            frameObj.transform.Find("ItemDescription").Find("ItemName").gameObject.GetComponent<Text>().text = itemList[selectedItem].name;
             for (int i = 0; i < 3; i++)
             {
                 if (i < itemList[selectedItem].skillNum)
                 {
                     comboStringFrame[i].SetActive(true);
+                    comboNameFrame[i].SetActive(true);
                     float tmpx = 0;
                     for (int j = 0; j < 8; j++)
                     {
@@ -115,6 +122,7 @@ public class InventoryUI : MonoBehaviour {
                             comboChars[i, j].GetComponent<RectTransform>().sizeDelta = comboCharPrefab[itemList[selectedItem].combo[i][j] - 'A'].GetComponent<RectTransform>().sizeDelta;
                             comboChars[i, j].GetComponent<RectTransform>().localPosition = new Vector3(tmpx, 0, 0);
                             tmpx = comboChars[i, j].GetComponent<RectTransform>().sizeDelta.x + pixelBetweenChar;
+                            comboNameFrame[i].GetComponent<Text>().text = itemList[selectedItem].comboName[i];
                         }
                         else
                         {
@@ -140,6 +148,11 @@ public class InventoryUI : MonoBehaviour {
                     infoAddons[i].transform.Find("Sprite").gameObject.GetComponent<Image>().sprite = itemList[selectedItem].addons[i].sprite;
                     infoAddons[i].transform.Find("Sprite").gameObject.GetComponent<RectTransform>().sizeDelta = itemList[selectedItem].addons[i].sizeInventory;
                     infoAddons[i].SetActive(true);
+                    infoAddonsFrame[i].transform.Find("Quality").GetComponent<Text>().text = qualityString[(int)itemList[selectedItem].addons[i].quality];
+                    infoAddonsFrame[i].transform.Find("Name").GetComponent<Text>().text = itemList[selectedItem].addons[i].name;
+                    infoAddonsFrame[i].transform.Find("Description").GetComponent<Text>().text = itemList[selectedItem].addons[i].addonDescription;
+
+
                 }
                 else
                 {

Assets/Scripts/Item/Item.cs

@@ -14,6 +14,8 @@ public abstract class Item {
     public Sprite sprite;
     public Sprite highlight;
     public Vector2 sizeInventory;
+    public string itemInfo;
+    public string[] comboName = new string[3];
 
     public bool ComboAction(string currentCombo)
     {
@@ -63,6 +65,9 @@ public abstract class Item {
         animation[1] = null;
         animation[2] = null;
         sizeInventory = new Vector2(0, 0);
+        itemInfo = null;
+        comboName = new string[3] { "", "", "" };
+
     }
     protected virtual void PlaySkill1()
     {

Assets/Scripts/Item/Items/Dagger.cs

@@ -20,5 +20,7 @@ public class Dagger : Item
         animation[1] = Resources.Load<AnimationClip>("Animations/daggerAttack2");
         animation[2] = null;
         sizeInventory = new Vector2(127.5f, 125);
+        itemInfo = "옛날 옛적 호랑이 담배 피던 시절부터 존재하던 단검이다.";
+        comboName = new string[3] { "베기", "찌르기", "" };
     }
 }