* rename equip to weapon

12 files changed, 124 insertions, 124 deletions

diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs
deleted file mode 100644
index 03ee945..0000000
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class PanelEquipBar : PanelBase
-{
-	public UIEquipWidget m_EquipTemplate;
-
-	public UISimpleGrid m_EquipGrid;
-
-	private List<UIEquipWidget> m_Equips = new List<UIEquipWidget>();
-
-	public override void Set(object param)
-	{
-		m_EquipTemplate.gameObject.SetActive(false);
-
-		for (int i = 0; i < PlayerManager.Instance.equips.Count; ++i)
-		{
-			UIEquipWidget widget = MakeEquipWidget(PlayerManager.Instance.equips[i]);
-			m_Equips.Add(widget);
-		}
-	}
-
-	UIEquipWidget MakeEquipWidget(EquipBase equip)
-	{
-		UIEquipWidget widget = Instantiate<UIEquipWidget>(m_EquipTemplate);
-		widget.transform.SetParent(m_EquipGrid.transform);
-		widget.gameObject.SetActive(true);
-		widget.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0);
-#if UNITY_EDITOR
-		widget.name = "equip (" + equip.name + ")";
-#endif
-
-		UIEquipWidgetParam param = new UIEquipWidgetParam();
-		param.equip = equip;
-		widget.Set(param);
-		return widget;
-	}
-
-}
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs
deleted file mode 100644
index 9099f18..0000000
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-public struct UIEquipWidgetParam
-{
-	public EquipBase equip;
-}
-
-public class UIEquipWidget : UIGridItemBase
-{
-	public Image Image_Icon;
-	public Image Image_CD;
-
-	public EquipBase equip { get { return m_Equip; } }
-	private EquipBase m_Equip;
-
-	public override void Set(object param)
-	{
-		UIEquipWidgetParam info = (UIEquipWidgetParam)param;
-		m_Equip = info.equip;
-
-		Image_Icon.sprite = ResourceManager.Instance.Load<Sprite>(info.equip.iconPath);
-
-		Image_CD.gameObject.SetActive(equip.autoMode == EquipBase.AutoMode.Interval);
-	}
-
-	private void Update()
-	{
-		if(equip.autoMode == EquipBase.AutoMode.Interval)
-		{
-			float countDown = TinyCountDown.Instance.Get(equip.GetHashCode().ToString());
-			float t = countDown / equip.interval;
-			Image_CD.fillAmount = t;
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs
index 2d1e02b..6e91c6b 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs
@@ -4,13 +4,13 @@ using UnityEngine;
 
 public class PanelTopStuffBar : PanelBase
 {
-	public UIEquipBar m_EquipBar;
+	public UIWeaponBar m_WeaponBar;
 	public UIItemBar m_ItemBar;
 	public UIDecorationBar m_DecorationBar;
 
 	public override void Set(object param)
 	{
-		m_EquipBar.Set();
+		m_WeaponBar.Set();
 		m_ItemBar.Set();
 		m_DecorationBar.Set();
 	}
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs
deleted file mode 100644
index d658663..0000000
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class UIEquipBar : MonoBehaviour
-{
-	public UIEquipWidget m_EquipTemplate;
-
-	public UISimpleGrid m_EquipGrid;
-
-	private List<UIEquipWidget> m_Equips = new List<UIEquipWidget>();
-
-	public void Set()
-	{
-		m_EquipTemplate.gameObject.SetActive(false);
-
-		for (int i = 0; i < PlayerManager.Instance.equips.Count; ++i)
-		{
-			UIEquipWidget widget = MakeEquipWidget(PlayerManager.Instance.equips[i]);
-			m_Equips.Add(widget);
-		}
-	}
-
-	UIEquipWidget MakeEquipWidget(EquipBase equip)
-	{
-		UIEquipWidget widget = Instantiate<UIEquipWidget>(m_EquipTemplate);
-		widget.transform.SetParent(m_EquipGrid.transform);
-		widget.gameObject.SetActive(true);
-		widget.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0);
-#if UNITY_EDITOR
-		widget.name = "equip (" + equip.name + ")";
-#endif
-
-		UIEquipWidgetParam param = new UIEquipWidgetParam();
-		param.equip = equip;
-		widget.Set(param);
-		return widget;
-	}
-
-
-}
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs
new file mode 100644
index 0000000..96e6cfd
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs
@@ -0,0 +1,41 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class UIWeaponBar : MonoBehaviour
+{
+	public UIWeaponWidget m_WeaponTemplate;
+
+	public UISimpleGrid m_WeaponGrid;
+
+	private List<UIWeaponWidget> m_Weapons = new List<UIWeaponWidget>();
+
+	public void Set()
+	{
+		m_WeaponTemplate.gameObject.SetActive(false);
+
+		for (int i = 0; i < PlayerManager.Instance.weapons.Count; ++i)
+		{
+			UIWeaponWidget widget = MakeWeaponWidget(PlayerManager.Instance.weapons[i]);
+			m_Weapons.Add(widget);
+		}
+	}
+
+	UIWeaponWidget MakeWeaponWidget(WeaponBase weapon)
+	{
+		UIWeaponWidget widget = Instantiate<UIWeaponWidget>(m_WeaponTemplate);
+		widget.transform.SetParent(m_WeaponGrid.transform);
+		widget.gameObject.SetActive(true);
+		widget.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0);
+#if UNITY_EDITOR
+		widget.name = "weapon (" + weapon.name + ")";
+#endif
+
+		UIWeaponWidgetParam param = new UIWeaponWidgetParam();
+		param.weapon = weapon;
+		widget.Set(param);
+		return widget;
+	}
+
+
+}
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs.meta
index 68bf843..68bf843 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs.meta
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs.meta
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar.meta
index 380d967..380d967 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.meta
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar.meta
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs
new file mode 100644
index 0000000..24c208c
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs
@@ -0,0 +1,40 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PanelWeaponBar : PanelBase
+{
+	public UIWeaponWidget m_WeaponTemplate;
+
+	public UISimpleGrid m_WeaponGrid;
+
+	private List<UIWeaponWidget> m_Weapons = new List<UIWeaponWidget>();
+
+	public override void Set(object param)
+	{
+		m_WeaponTemplate.gameObject.SetActive(false);
+
+		for (int i = 0; i < PlayerManager.Instance.weapons.Count; ++i)
+		{
+			UIWeaponWidget widget = MakeWeaponWidget(PlayerManager.Instance.weapons[i]);
+			m_Weapons.Add(widget);
+		}
+	}
+
+	UIWeaponWidget MakeWeaponWidget(WeaponBase weapon)
+	{
+		UIWeaponWidget widget = Instantiate<UIWeaponWidget>(m_WeaponTemplate);
+		widget.transform.SetParent(m_WeaponGrid.transform);
+		widget.gameObject.SetActive(true);
+		widget.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0);
+#if UNITY_EDITOR
+		widget.name = "weapon (" + weapon.name + ")";
+#endif
+
+		UIWeaponWidgetParam param = new UIWeaponWidgetParam();
+		param.weapon = weapon;
+		widget.Set(param);
+		return widget;
+	}
+
+}
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs.meta
index bf78ef3..bf78ef3 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs.meta
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs.meta
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs
new file mode 100644
index 0000000..f061a3b
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs
@@ -0,0 +1,39 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public struct UIWeaponWidgetParam
+{
+	public WeaponBase weapon;
+}
+
+public class UIWeaponWidget : UIGridItemBase
+{
+	public Image Image_Icon;
+	public Image Image_CD;
+
+	public WeaponBase weapon { get { return m_Weapon; } }
+	private WeaponBase m_Weapon;
+
+	public override void Set(object param)
+	{
+		UIWeaponWidgetParam info = (UIWeaponWidgetParam)param;
+		m_Weapon = info.weapon;
+
+		Image_Icon.sprite = ResourceManager.Instance.Load<Sprite>(info.weapon.iconPath);
+
+		Image_CD.gameObject.SetActive(weapon.autoMode == WeaponBase.AutoMode.Interval);
+	}
+
+	private void Update()
+	{
+		if(weapon.autoMode == WeaponBase.AutoMode.Interval)
+		{
+			float countDown = TinyCountDown.Instance.Get(weapon.GetHashCode().ToString());
+			float t = countDown / weapon.interval;
+			Image_CD.fillAmount = t;
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs.meta
index bad655e..bad655e 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs.meta
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs.meta
diff --git a/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs b/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs
index 02b3a06..649d685 100644
--- a/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs
+++ b/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs
@@ -9,7 +9,7 @@ public enum PanelType
 
 	PanelLevelBar,
 	PanelItemBar,
-	PanelEquipBar,
+	PanelWeaponBar,
 	PanelTopSuffBar,
 	PanelBossHpBar,
 }
@@ -30,7 +30,7 @@ public partial class UIManager : Singleton<UIManager>
 	{
 		AddPanel(PanelType.PanelLevelBar, "PanelLevelBar");
 		AddPanel(PanelType.PanelItemBar, "PanelItemBar");
-		AddPanel(PanelType.PanelEquipBar, "PanelEquipBar");
+		AddPanel(PanelType.PanelWeaponBar, "PanelWeaponBar");
 		AddPanel(PanelType.PanelTopSuffBar, "PanelTopSuffBar");
 		AddPanel(PanelType.PanelBossHpBar, "PanelBossHpBar");
 	}