Commit 8c7056b5 authored by 18류지석's avatar 18류지석

실수로 애드온은 안튀어나옴. 이제 튀어나온다

parent 2395cbda
...@@ -158,11 +158,11 @@ public class InventoryManager : MonoBehaviour { ...@@ -158,11 +158,11 @@ public class InventoryManager : MonoBehaviour {
/// </summary> /// </summary>
/// <param name="quality"></param> /// <param name="quality"></param>
/// <param name="pos"></param> /// <param name="pos"></param>
public void AddonInstantiate(ItemQuality quality, Vector3 pos) public void AddonInstantiate(ItemQuality quality, Vector3 pos, float popoutStrength)
{ {
if (addonPool[(int)quality].Count > 0) if (addonPool[(int)quality].Count > 0)
{ {
AddonInstantiate(addonPool[(int)quality][0], pos); AddonInstantiate(addonPool[(int)quality][0], pos, popoutStrength);
addonPool[(int)quality].RemoveAt(0); addonPool[(int)quality].RemoveAt(0);
} }
} }
...@@ -171,20 +171,22 @@ public class InventoryManager : MonoBehaviour { ...@@ -171,20 +171,22 @@ public class InventoryManager : MonoBehaviour {
/// </summary> /// </summary>
/// <param name="str"></param> /// <param name="str"></param>
/// <param name="pos"></param> /// <param name="pos"></param>
public void AddonInstantiate(string str, Vector3 pos) public void AddonInstantiate(string str, Vector3 pos, float popoutStrength)
{ {
GameObject tmpItem = Instantiate(droppedPrefab); GameObject tmpItem = Instantiate(droppedPrefab);
tmpItem.GetComponent<DroppedItem>().Init((Addon)System.Activator.CreateInstance(System.Type.GetType(str)), pos); tmpItem.GetComponent<DroppedItem>().Init((Addon)System.Activator.CreateInstance(System.Type.GetType(str)), pos);
PopoutGenerator(tmpItem, popoutStrength);
} }
/// <summary> /// <summary>
/// Instantiate addon by Addon Instance on pos /// Instantiate addon by Addon Instance on pos
/// </summary> /// </summary>
/// <param name="item"></param> /// <param name="item"></param>
/// <param name="pos"></param> /// <param name="pos"></param>
public void AddonInstantiate(Addon addon, Vector3 pos) public void AddonInstantiate(Addon addon, Vector3 pos, float popoutStrength)
{ {
GameObject tmpItem = Instantiate(droppedPrefab); GameObject tmpItem = Instantiate(droppedPrefab);
tmpItem.GetComponent<DroppedItem>().Init(addon, pos); tmpItem.GetComponent<DroppedItem>().Init(addon, pos);
PopoutGenerator(tmpItem, popoutStrength);
} }
/// <summary> /// <summary>
...@@ -259,7 +261,7 @@ public class InventoryManager : MonoBehaviour { ...@@ -259,7 +261,7 @@ public class InventoryManager : MonoBehaviour {
{ {
if (addonList.Count > index) if (addonList.Count > index)
{ {
AddonInstantiate(addonList[index], player.transform.position); AddonInstantiate(addonList[index], player.transform.position, 1f);
addonList.RemoveAt(index); addonList.RemoveAt(index);
} }
ui.SetOnPosition(itemList, addonList); ui.SetOnPosition(itemList, addonList);
...@@ -273,7 +275,7 @@ public class InventoryManager : MonoBehaviour { ...@@ -273,7 +275,7 @@ public class InventoryManager : MonoBehaviour {
{ {
if (itemList[itemIndex].addons[(int)addonType] != null) if (itemList[itemIndex].addons[(int)addonType] != null)
{ {
AddonInstantiate(itemList[itemIndex].addons[(int)addonType], player.transform.position); AddonInstantiate(itemList[itemIndex].addons[(int)addonType], player.transform.position, 1f);
itemList[itemIndex].addons[(int)addonType] = null; itemList[itemIndex].addons[(int)addonType] = null;
} }
ui.SetOnPosition(itemList, addonList); ui.SetOnPosition(itemList, addonList);
......
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