*rename item to prop

12 files changed, 207 insertions, 207 deletions

diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelDecorationBar/UIDecorationWidget.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelDecorationBar/UIDecorationWidget.cs
index 57a4071..c9d9312 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelDecorationBar/UIDecorationWidget.cs
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelDecorationBar/UIDecorationWidget.cs
@@ -8,7 +8,7 @@ public struct UIDecorationWidgetParam
 	public DecorationBase decoration;
 }
 
-public class UIDecorationWidget : UIGridItemBase
+public class UIDecorationWidget : UIGridPropBase
 {
 	public Image Image_Icon;
 
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs
deleted file mode 100644
index 9ca1220..0000000
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-public class PanelItemBar : PanelBase
-{
-	public ItemWidget m_ItemTempalte;
-
-	public UISimpleGrid m_ItemGrid;
-
-	public Text m_TextName;
-
-	private List<ItemWidget> m_Items = new List<ItemWidget>();
-
-	private int m_CurrentIndex = 0;
-
-	public override void Set(object param)
-	{
-		for(int i = 0; i < PlayerManager.Instance.items.Count; ++i)
-		{
-			ItemWidget widget = MakeItemWidget(PlayerManager.Instance.items[i]);
-			m_Items.Add(widget);
-		}
-
-		SelectItemWidget(0);
-	}
-
-	bool SwitchToLeft()
-	{
-		return Input.GetButtonDown("LeftItem");
-	}
-
-	bool SwitchToRight()
-	{
-		return Input.GetButtonDown("RightItem");
-	}
-
-	bool UseItem()
-	{
-		return Input.GetButtonDown("Fire3");
-	}
-
-	ItemWidget MakeItemWidget(ItemBase item)
-	{
-		ItemWidget widget = Instantiate<ItemWidget>(m_ItemTempalte);
-		widget.transform.SetParent(m_ItemGrid.transform);
-		widget.gameObject.SetActive(true);
-		widget.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0);
-#if UNITY_EDITOR
-		widget.name = "item (" + item.name + ")";
-#endif
-
-		ItemWidgetParam param = new ItemWidgetParam();
-		//param.onSelected = OnSelectItemWidget;
-		param.item = item;
-		widget.Set(param);
-		return widget;
-	}
-
-	protected override void Update()
-	{
-		if (SwitchToLeft())
-		{
-			int newIndex = Mathf.Clamp(m_CurrentIndex - 1, 0, m_Items.Count - 1);
-			SelectItemWidget(newIndex);
-		}
-		if (SwitchToRight())
-		{
-			int newIndex = Mathf.Clamp(m_CurrentIndex + 1, 0, m_Items.Count - 1);
-			SelectItemWidget(newIndex);
-		}
-		if (UseItem())
-		{
-			m_Items[m_CurrentIndex].OnUseCallback();
-			PlayerManager.Instance.UseItem(m_Items[m_CurrentIndex].item);
-		}
-	}
-
-	void SelectItemWidget(int index)
-	{
-		if(index < 0 || index > m_Items.Count - 1)
-		{
-			return ;
-		}
-		m_Items[m_CurrentIndex].OnDeselectCallback();
-		m_Items[index].OnSelectCallback();
-
-		m_TextName.text = m_Items[index].item.name;
-		m_TextName.gameObject.SetActive(false);
-
-		m_CurrentIndex = index;
-	}
-
-}
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelPropBar.meta
index 4d64c73..4d64c73 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.meta
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelPropBar.meta
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelPropBar/PanelPropBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelPropBar/PanelPropBar.cs
new file mode 100644
index 0000000..99a2c58
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelPropBar/PanelPropBar.cs
@@ -0,0 +1,95 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class PanelPropBar : PanelBase
+{
+	public PropWidget m_PropTempalte;
+
+	public UISimpleGrid m_PropGrid;
+
+	public Text m_TextName;
+
+	private List<PropWidget> m_Props = new List<PropWidget>();
+
+	private int m_CurrentIndex = 0;
+
+	public override void Set(object param)
+	{
+		for(int i = 0; i < PlayerManager.Instance.props.Count; ++i)
+		{
+			PropWidget widget = MakePropWidget(PlayerManager.Instance.props[i]);
+			m_Props.Add(widget);
+		}
+
+		SelectPropWidget(0);
+	}
+
+	bool SwitchToLeft()
+	{
+		return Input.GetButtonDown("LeftProp");
+	}
+
+	bool SwitchToRight()
+	{
+		return Input.GetButtonDown("RightProp");
+	}
+
+	bool UseProp()
+	{
+		return Input.GetButtonDown("Fire3");
+	}
+
+	PropWidget MakePropWidget(PropBase prop)
+	{
+		PropWidget widget = Instantiate<PropWidget>(m_PropTempalte);
+		widget.transform.SetParent(m_PropGrid.transform);
+		widget.gameObject.SetActive(true);
+		widget.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0);
+#if UNITY_EDITOR
+		widget.name = "prop (" + prop.name + ")";
+#endif
+
+		PropWidgetParam param = new PropWidgetParam();
+		//param.onSelected = OnSelectPropWidget;
+		param.prop = prop;
+		widget.Set(param);
+		return widget;
+	}
+
+	protected override void Update()
+	{
+		if (SwitchToLeft())
+		{
+			int newIndex = Mathf.Clamp(m_CurrentIndex - 1, 0, m_Props.Count - 1);
+			SelectPropWidget(newIndex);
+		}
+		if (SwitchToRight())
+		{
+			int newIndex = Mathf.Clamp(m_CurrentIndex + 1, 0, m_Props.Count - 1);
+			SelectPropWidget(newIndex);
+		}
+		if (UseProp())
+		{
+			m_Props[m_CurrentIndex].OnUseCallback();
+			PlayerManager.Instance.UseProp(m_Props[m_CurrentIndex].prop);
+		}
+	}
+
+	void SelectPropWidget(int index)
+	{
+		if(index < 0 || index > m_Props.Count - 1)
+		{
+			return ;
+		}
+		m_Props[m_CurrentIndex].OnDeselectCallback();
+		m_Props[index].OnSelectCallback();
+
+		m_TextName.text = m_Props[index].prop.name;
+		m_TextName.gameObject.SetActive(false);
+
+		m_CurrentIndex = index;
+	}
+
+}
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelPropBar/PanelPropBar.cs.meta
index 3925db5..3925db5 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs.meta
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelPropBar/PanelPropBar.cs.meta
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/ItemWidget.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelPropBar/PropWidget.cs
index 3227bd8..863e89e 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/ItemWidget.cs
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelPropBar/PropWidget.cs
@@ -3,24 +3,24 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 
-public struct ItemWidgetParam
+public struct PropWidgetParam
 {
 	// Ö÷¶¯µã»÷
-	public System.Action<ItemWidget> onSelected;
-	public ItemBase item;
+	public System.Action<PropWidget> onSelected;
+	public PropBase prop;
 }
 
-public class ItemWidget : UIGridItemBase
+public class PropWidget : UIGridPropBase
 {
 	public Image Image_Icon;
 	public Image Image_SelectBg;
 
 	public Image Image_Use;
 
-	private System.Action<ItemWidget> onSelected;
+	private System.Action<PropWidget> onSelected;
 
-	public ItemBase item { get { return m_Item; } }
-	private ItemBase m_Item;
+	public PropBase prop { get { return m_Prop; } }
+	private PropBase m_Prop;
 
 	private Coroutine m_CoUse;
 
@@ -33,11 +33,11 @@ public class ItemWidget : UIGridItemBase
 
 	public override void Set(object param)
 	{
-		ItemWidgetParam info = (ItemWidgetParam)param;
+		PropWidgetParam info = (PropWidgetParam)param;
 		onSelected = info.onSelected;
-		m_Item = info.item;
+		m_Prop = info.prop;
 
-		Image_Icon.sprite = ResourceManager.Instance.Load<Sprite>(info.item.iconPath);
+		Image_Icon.sprite = ResourceManager.Instance.Load<Sprite>(info.prop.iconPath);
 
 		SetSelectBg(false);
 
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/ItemWidget.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelPropBar/PropWidget.cs.meta
index 29d8747..f9f85a3 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/ItemWidget.cs.meta
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelPropBar/PropWidget.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 677576640bb11e34e961b72e3c139f6a
+guid: 4ccf65ebe78138644a8bc5283d21ae1a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs
index 6e91c6b..98ff288 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs
@@ -5,13 +5,13 @@ using UnityEngine;
 public class PanelTopStuffBar : PanelBase
 {
 	public UIWeaponBar m_WeaponBar;
-	public UIItemBar m_ItemBar;
+	public UIPropBar m_PropBar;
 	public UIDecorationBar m_DecorationBar;
 
 	public override void Set(object param)
 	{
 		m_WeaponBar.Set();
-		m_ItemBar.Set();
+		m_PropBar.Set();
 		m_DecorationBar.Set();
 	}
 }
\ No newline at end of file
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIItemBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIItemBar.cs
deleted file mode 100644
index 9025984..0000000
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIItemBar.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-public class UIItemBar : MonoBehaviour
-{
-	public ItemWidget m_ItemTempalte;
-
-	public UISimpleGrid m_ItemGrid;
-
-	public Text m_TextName;
-
-	private List<ItemWidget> m_Items = new List<ItemWidget>();
-
-	private int m_CurrentIndex = 0;
-
-	public void Set()
-	{
-		m_ItemTempalte.gameObject.SetActive(false);
-
-		for (int i = 0; i < PlayerManager.Instance.items.Count; ++i)
-		{
-			ItemWidget widget = MakeItemWidget(PlayerManager.Instance.items[i]);
-			m_Items.Add(widget);
-		}
-
-		SelectItemWidget(0);
-	}
-
-	bool SwitchToLeft()
-	{
-		return Input.GetButtonDown("LeftItem");
-	}
-
-	bool SwitchToRight()
-	{
-		return Input.GetButtonDown("RightItem");
-	}
-
-	bool UseItem()
-	{
-		return Input.GetButtonDown("Fire3");
-	}
-
-	ItemWidget MakeItemWidget(ItemBase item)
-	{
-		ItemWidget widget = Instantiate<ItemWidget>(m_ItemTempalte);
-		widget.transform.SetParent(m_ItemGrid.transform);
-		widget.gameObject.SetActive(true);
-		widget.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0);
-#if UNITY_EDITOR
-		widget.name = "item (" + item.name + ")";
-#endif
-
-		ItemWidgetParam param = new ItemWidgetParam();
-		//param.onSelected = OnSelectItemWidget;
-		param.item = item;
-		widget.Set(param);
-		return widget;
-	}
-
-	protected void Update()
-	{
-		if (SwitchToLeft())
-		{
-			int newIndex = Mathf.Clamp(m_CurrentIndex - 1, 0, m_Items.Count - 1);
-			SelectItemWidget(newIndex);
-		}
-		if (SwitchToRight())
-		{
-			int newIndex = Mathf.Clamp(m_CurrentIndex + 1, 0, m_Items.Count - 1);
-			SelectItemWidget(newIndex);
-		}
-		if (UseItem())
-		{
-			m_Items[m_CurrentIndex].OnUseCallback();
-			PlayerManager.Instance.UseItem(m_Items[m_CurrentIndex].item);
-		}
-	}
-
-	void SelectItemWidget(int index)
-	{
-		if (index < 0 || index > m_Items.Count - 1)
-		{
-			return;
-		}
-		m_Items[m_CurrentIndex].OnDeselectCallback();
-		m_Items[index].OnSelectCallback();
-
-		m_TextName.text = m_Items[index].item.name;
-		m_TextName.gameObject.SetActive(false);
-
-		m_CurrentIndex = index;
-	}
-
-}
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIPropBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIPropBar.cs
new file mode 100644
index 0000000..d50aed1
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIPropBar.cs
@@ -0,0 +1,97 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class UIPropBar : MonoBehaviour
+{
+	public PropWidget m_PropTempalte;
+
+	public UISimpleGrid m_PropGrid;
+
+	public Text m_TextName;
+
+	private List<PropWidget> m_Props = new List<PropWidget>();
+
+	private int m_CurrentIndex = 0;
+
+	public void Set()
+	{
+		m_PropTempalte.gameObject.SetActive(false);
+
+		for (int i = 0; i < PlayerManager.Instance.props.Count; ++i)
+		{
+			PropWidget widget = MakePropWidget(PlayerManager.Instance.props[i]);
+			m_Props.Add(widget);
+		}
+
+		SelectPropWidget(0);
+	}
+
+	bool SwitchToLeft()
+	{
+		return Input.GetButtonDown("LeftProp");
+	}
+
+	bool SwitchToRight()
+	{
+		return Input.GetButtonDown("RightProp");
+	}
+
+	bool UseProp()
+	{
+		return Input.GetButtonDown("Fire3");
+	}
+
+	PropWidget MakePropWidget(PropBase prop)
+	{
+		PropWidget widget = Instantiate<PropWidget>(m_PropTempalte);
+		widget.transform.SetParent(m_PropGrid.transform);
+		widget.gameObject.SetActive(true);
+		widget.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0);
+#if UNITY_EDITOR
+		widget.name = "prop (" + prop.name + ")";
+#endif
+
+		PropWidgetParam param = new PropWidgetParam();
+		//param.onSelected = OnSelectPropWidget;
+		param.prop = prop;
+		widget.Set(param);
+		return widget;
+	}
+
+	protected void Update()
+	{
+		if (SwitchToLeft())
+		{
+			int newIndex = Mathf.Clamp(m_CurrentIndex - 1, 0, m_Props.Count - 1);
+			SelectPropWidget(newIndex);
+		}
+		if (SwitchToRight())
+		{
+			int newIndex = Mathf.Clamp(m_CurrentIndex + 1, 0, m_Props.Count - 1);
+			SelectPropWidget(newIndex);
+		}
+		if (UseProp())
+		{
+			m_Props[m_CurrentIndex].OnUseCallback();
+			PlayerManager.Instance.UseProp(m_Props[m_CurrentIndex].prop);
+		}
+	}
+
+	void SelectPropWidget(int index)
+	{
+		if (index < 0 || index > m_Props.Count - 1)
+		{
+			return;
+		}
+		m_Props[m_CurrentIndex].OnDeselectCallback();
+		m_Props[index].OnSelectCallback();
+
+		m_TextName.text = m_Props[index].prop.name;
+		m_TextName.gameObject.SetActive(false);
+
+		m_CurrentIndex = index;
+	}
+
+}
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIItemBar.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIPropBar.cs.meta
index 0e07369..0e07369 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIItemBar.cs.meta
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIPropBar.cs.meta
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs
index f061a3b..baac0d2 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs
@@ -8,7 +8,7 @@ public struct UIWeaponWidgetParam
 	public WeaponBase weapon;
 }
 
-public class UIWeaponWidget : UIGridItemBase
+public class UIWeaponWidget : UIGridPropBase
 {
 	public Image Image_Icon;
 	public Image Image_CD;