Commit a7668b1f authored by 18류지석's avatar 18류지석

애드온 설명 창 비정상적으로 작동하는 버그 수정

parent 344809c4
...@@ -72,7 +72,6 @@ GameObject: ...@@ -72,7 +72,6 @@ GameObject:
- component: {fileID: 224196055372618916} - component: {fileID: 224196055372618916}
- component: {fileID: 222335990524814540} - component: {fileID: 222335990524814540}
- component: {fileID: 114900435719581162} - component: {fileID: 114900435719581162}
- component: {fileID: 114583230027247736}
m_Layer: 5 m_Layer: 5
m_Name: AddonPrefab m_Name: AddonPrefab
m_TagString: Untagged m_TagString: Untagged
...@@ -257,18 +256,6 @@ MonoBehaviour: ...@@ -257,18 +256,6 @@ MonoBehaviour:
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: m_Text:
--- !u!114 &114583230027247736
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1379401480617648}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a124b15eafc6d1847979588fabbb0756, type: 3}
m_Name:
m_EditorClassIdentifier:
num: 0
--- !u!114 &114896825415534854 --- !u!114 &114896825415534854
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
......
...@@ -90,6 +90,7 @@ public class GameManager : Singleton<GameManager> { ...@@ -90,6 +90,7 @@ public class GameManager : Singleton<GameManager> {
else if(gameState == GameState.Inventory) else if(gameState == GameState.Inventory)
{ {
inventoryCanvas.gameObject.SetActive(false); inventoryCanvas.gameObject.SetActive(false);
InventoryManager.Instance.SetOnPosition();
gameState = GameState.Ingame; gameState = GameState.Ingame;
} }
} }
......
...@@ -70,6 +70,7 @@ public class AddonDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDra ...@@ -70,6 +70,7 @@ public class AddonDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDra
{ {
if (eventData.button == PointerEventData.InputButton.Right) if (eventData.button == PointerEventData.InputButton.Right)
{ {
ui.SetAddonInfo();
if (num < 9) if (num < 9)
{ {
int type = (int)manager.addonList[num].type; int type = (int)manager.addonList[num].type;
...@@ -82,7 +83,6 @@ public class AddonDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDra ...@@ -82,7 +83,6 @@ public class AddonDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDra
} }
else else
manager.DetachAddon(ui.selectedItem, (AddonType)(num - 9)); manager.DetachAddon(ui.selectedItem, (AddonType)(num - 9));
manager.SetOnPosition();
} }
} }
......
...@@ -111,6 +111,7 @@ public class InventoryUI : MonoBehaviour { ...@@ -111,6 +111,7 @@ public class InventoryUI : MonoBehaviour {
public void SetOnPosition(List<Item> itemList, List<Addon> addonList) public void SetOnPosition(List<Item> itemList, List<Addon> addonList)
{ {
SetAddonInfo();
for(int i=0; i<itemList.Count; i++) for(int i=0; i<itemList.Count; i++)
{ {
items[i].transform.position = itemCell[i].transform.position; items[i].transform.position = itemCell[i].transform.position;
......
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