Commit 08055cf3 authored by 18김상언's avatar 18김상언

인벤토리에서 아이템이랑 애드온 이름 품질 설명 볼 수 있게 만들었음

글꼴이나 간격같은거는 나중에 수정해야할듯

*브랜치 이름 지을때 itemInfo라고 지으려고 했는데 만들고보니 enemyInfo라고 만들어뒀다 ㅅㅂ
parent ba73c3c7
...@@ -10,6 +10,8 @@ public abstract class Addon { ...@@ -10,6 +10,8 @@ public abstract class Addon {
public Sprite sprite; public Sprite sprite;
public Sprite highlight; public Sprite highlight;
public Vector2 sizeInventory; public Vector2 sizeInventory;
public string addonDescription;
public string addonQuality;
public Addon() public Addon()
{ {
...@@ -23,5 +25,7 @@ public abstract class Addon { ...@@ -23,5 +25,7 @@ public abstract class Addon {
sprite = null; sprite = null;
highlight = null; highlight = null;
sizeInventory = new Vector2(0, 0); sizeInventory = new Vector2(0, 0);
addonDescription = null;
addonQuality = null;
} }
} }
...@@ -15,5 +15,7 @@ public class ParchmentPiece : Addon ...@@ -15,5 +15,7 @@ public class ParchmentPiece : Addon
sprite = Resources.Load<Sprite>("Sprites/Addons/parchment piece"); ; sprite = Resources.Load<Sprite>("Sprites/Addons/parchment piece"); ;
highlight = Resources.Load<Sprite>("Sprites/Addons/parchment piece"); ; highlight = Resources.Load<Sprite>("Sprites/Addons/parchment piece"); ;
sizeInventory = new Vector2(80, 80); sizeInventory = new Vector2(80, 80);
addonQuality = "습작";
addonDescription = "쓸모없는 애드온";
} }
} }
\ No newline at end of file
...@@ -25,6 +25,7 @@ public class InventoryManager : MonoBehaviour { ...@@ -25,6 +25,7 @@ public class InventoryManager : MonoBehaviour {
ItemInstantiate("Dagger", player.transform.position, 0f); ItemInstantiate("Dagger", player.transform.position, 0f);
AddonInstantiate("ParchmentPiece", player.transform.position, 0f); AddonInstantiate("ParchmentPiece", player.transform.position, 0f);
ItemInstantiate("Bow", player.transform.position, 0f);
StartCoroutine(TestCoroutine()); StartCoroutine(TestCoroutine());
} }
......
...@@ -103,6 +103,8 @@ public class InventoryUI : MonoBehaviour { ...@@ -103,6 +103,8 @@ public class InventoryUI : MonoBehaviour {
frameObj.transform.Find("ItemSprite").Find("Sprite").gameObject.GetComponent<Image>().sprite = itemList[selectedItem].sprite; 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("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").gameObject.GetComponent<Text>().text = itemList[selectedItem].itemInfo;
frameObj.transform.Find("ItemDescription").Find("ItemQuality").gameObject.GetComponent<Text>().text = itemList[selectedItem].itemQuality;
frameObj.transform.Find("ItemDescription").Find("ItemName").gameObject.GetComponent<Text>().text = itemList[selectedItem].name;
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {
if (i < itemList[selectedItem].skillNum) if (i < itemList[selectedItem].skillNum)
...@@ -145,6 +147,11 @@ public class InventoryUI : MonoBehaviour { ...@@ -145,6 +147,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<Image>().sprite = itemList[selectedItem].addons[i].sprite;
infoAddons[i].transform.Find("Sprite").gameObject.GetComponent<RectTransform>().sizeDelta = itemList[selectedItem].addons[i].sizeInventory; infoAddons[i].transform.Find("Sprite").gameObject.GetComponent<RectTransform>().sizeDelta = itemList[selectedItem].addons[i].sizeInventory;
infoAddons[i].SetActive(true); infoAddons[i].SetActive(true);
infoAddonsFrame[i].transform.Find("Quality").GetComponent<Text>().text = itemList[selectedItem].addons[i].addonQuality;
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 else
{ {
......
...@@ -16,6 +16,7 @@ public abstract class Item { ...@@ -16,6 +16,7 @@ public abstract class Item {
public Vector2 sizeInventory; public Vector2 sizeInventory;
public string itemInfo; public string itemInfo;
public string[] comboName = new string[3]; public string[] comboName = new string[3];
public string itemQuality;
public bool ComboAction(string currentCombo) public bool ComboAction(string currentCombo)
{ {
...@@ -57,6 +58,7 @@ public abstract class Item { ...@@ -57,6 +58,7 @@ public abstract class Item {
sizeInventory = new Vector2(0, 0); sizeInventory = new Vector2(0, 0);
itemInfo = null; itemInfo = null;
comboName = new string[3] { "", "", "" }; comboName = new string[3] { "", "", "" };
itemQuality = null;
} }
protected virtual void PlaySkill1() protected virtual void PlaySkill1()
......
...@@ -22,5 +22,6 @@ public class Dagger : Item ...@@ -22,5 +22,6 @@ public class Dagger : Item
sizeInventory = new Vector2(127.5f, 125); sizeInventory = new Vector2(127.5f, 125);
itemInfo = "옛날 옛적 호랑이 담배 피던 시절부터 존재하던 단검이다."; itemInfo = "옛날 옛적 호랑이 담배 피던 시절부터 존재하던 단검이다.";
comboName = new string[3] { "베기", "찌르기", "" }; comboName = new string[3] { "베기", "찌르기", "" };
itemQuality = "습작";
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment