*equip

8 files changed, 90 insertions, 15 deletions

diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.cs
deleted file mode 100644
index dbec362..0000000
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class PanelEquipBar : PanelBase
-{
-	public override void Set(object param)
-	{
-	}
-}
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.meta
new file mode 100644
index 0000000..380d967
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 26efe0e32407015498a94f7fe8930a70
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs
new file mode 100644
index 0000000..1a7dae8
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs
@@ -0,0 +1,38 @@
+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)
+	{
+		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.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs.meta
index 8ef34db..bf78ef3 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.cs.meta
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 19d70a7fc1ff38c4cb6ae04cf1530b7b
+guid: f1382539f3296aa47b7e2d7f269f9007
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs
new file mode 100644
index 0000000..bccd322
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs
@@ -0,0 +1,26 @@
+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 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);
+
+	}
+}
\ No newline at end of file
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs.meta
new file mode 100644
index 0000000..bad655e
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 83ab90093bb5312428311a589a4fe90f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs
index 74f90c3..d426b84 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs
@@ -11,7 +11,6 @@ public class PanelItemBar : PanelBase
 
 	public Text m_TextName;
 
-	// 当前持有的Items
 	private List<ItemWidget> m_Items = new List<ItemWidget>();
 
 	private int m_CurrentIndex = 0;
@@ -48,6 +47,9 @@ public class PanelItemBar : PanelBase
 		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;
@@ -71,7 +73,7 @@ public class PanelItemBar : PanelBase
 		if (UseItem())
 		{
 			m_Items[m_CurrentIndex].OnUseCallback();
-			PlayerManager.Instance.UseCurrentItem();
+			PlayerManager.Instance.UseItem(m_Items[m_CurrentIndex].item);
 		}
 	}
 
@@ -87,8 +89,6 @@ public class PanelItemBar : PanelBase
 		m_TextName.text = m_Items[index].item.name;
 
 		m_CurrentIndex = index;
-
-		PlayerManager.Instance.SetCurrentItem(m_Items[index].item);
 	}
 
 }
diff --git a/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs b/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs
index d29c24a..bf2ada4 100644
--- a/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs
+++ b/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs
@@ -9,6 +9,7 @@ public enum PanelType
 
 	PanelLevelBar,
 	PanelItemBar,
+	PanelEquipBar,
 }
 
 public partial class UIManager : Singleton<UIManager>
@@ -27,6 +28,7 @@ public partial class UIManager : Singleton<UIManager>
 	{
 		AddPanel(PanelType.PanelLevelBar, "PanelLevelBar");
 		AddPanel(PanelType.PanelItemBar, "PanelItemBar");
+		AddPanel(PanelType.PanelEquipBar, "PanelEquipBar");
 	}
 
 	void AddPanel(PanelType type, string path)