summaryrefslogtreecommitdiff
path: root/SurvivalTest/Assets/Scripts/UI
diff options
context:
space:
mode:
Diffstat (limited to 'SurvivalTest/Assets/Scripts/UI')
-rw-r--r--SurvivalTest/Assets/Scripts/UI/Panel/PanelBase.cs3
-rw-r--r--SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.meta8
-rw-r--r--SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/ItemWidget.cs (renamed from SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.cs)5
-rw-r--r--SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/ItemWidget.cs.meta11
-rw-r--r--SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs32
-rw-r--r--SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs.meta (renamed from SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.cs.meta)0
-rw-r--r--SurvivalTest/Assets/Scripts/UI/UIManager.cs5
-rw-r--r--SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs9
8 files changed, 64 insertions, 9 deletions
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelBase.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelBase.cs
index 421ff37..3081d97 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelBase.cs
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelBase.cs
@@ -15,9 +15,8 @@ public class PanelBase : MonoBehaviour
}
- void Update()
+ protected virtual void Update()
{
-
}
protected virtual void OnSecondUpdate()
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.meta
new file mode 100644
index 0000000..4d64c73
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d8e34da1453880542b1bb02a066a5df9
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/ItemWidget.cs
index 04bb2d9..55898f2 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.cs
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/ItemWidget.cs
@@ -2,9 +2,8 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
-public class PanelItemBar : PanelBase
+public class ItemWidget : MonoBehaviour
{
-
-
+
}
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/ItemWidget.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/ItemWidget.cs.meta
new file mode 100644
index 0000000..29d8747
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/ItemWidget.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 677576640bb11e34e961b72e3c139f6a
+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
new file mode 100644
index 0000000..00acafc
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs
@@ -0,0 +1,32 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PanelItemBar : PanelBase
+{
+ /// <summary>
+ /// 当前持有的Items
+ /// </summary>
+ public List<ItemWidget> m_Items = new List<ItemWidget>();
+
+ bool SwitchToLeft()
+ {
+ return Input.GetButtonDown("LeftItem");
+ }
+
+ bool SwitchToRight()
+ {
+ return Input.GetButtonDown("RightItem");
+ }
+
+ protected override void Update()
+ {
+ if (SwitchToLeft())
+ {
+ }
+ if (SwitchToRight())
+ {
+ }
+ }
+
+}
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs.meta
index 3925db5..3925db5 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.cs.meta
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs.meta
diff --git a/SurvivalTest/Assets/Scripts/UI/UIManager.cs b/SurvivalTest/Assets/Scripts/UI/UIManager.cs
index a9c85c0..f9b4ff8 100644
--- a/SurvivalTest/Assets/Scripts/UI/UIManager.cs
+++ b/SurvivalTest/Assets/Scripts/UI/UIManager.cs
@@ -7,8 +7,7 @@ public partial class UIManager : Singleton<UIManager>
public UIManager()
{
+ SetPanels();
}
-
-
-
+
}
diff --git a/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs b/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs
index e3914d3..049f733 100644
--- a/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs
+++ b/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs
@@ -7,6 +7,7 @@ public enum PanelType
None,
PanelLevelBar,
+ PanelItemBar,
}
public partial class UIManager : Singleton<UIManager>
@@ -15,7 +16,13 @@ public partial class UIManager : Singleton<UIManager>
void SetPanels()
{
- m_Panels.Add(PanelType.PanelLevelBar, "");
+ AddPanel(PanelType.PanelLevelBar, "PanelLevelBar");
+ AddPanel(PanelType.PanelItemBar, "PanelItemBar");
+ }
+
+ void AddPanel(PanelType type, string path)
+ {
+ m_Panels.Add(type, "prefabs/ui/" + path);
}
void OpenPanel(PanelType type, object param)