From 64eeb50eb855d1166d41bd25b58a34919a49589d Mon Sep 17 00:00:00 2001 From: chai Date: Fri, 22 Apr 2022 22:00:37 +0800 Subject: * equip, item, decoration --- SurvivalTest/Assets/Scripts/UI/Panel/PanelBase.cs | 3 +- .../Assets/Scripts/UI/Panel/PanelItemBar.cs | 10 ------- .../Assets/Scripts/UI/Panel/PanelItemBar.cs.meta | 11 -------- .../Assets/Scripts/UI/Panel/PanelItemBar.meta | 8 ++++++ .../Scripts/UI/Panel/PanelItemBar/ItemWidget.cs | 9 ++++++ .../UI/Panel/PanelItemBar/ItemWidget.cs.meta | 11 ++++++++ .../Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs | 32 ++++++++++++++++++++++ .../UI/Panel/PanelItemBar/PanelItemBar.cs.meta | 11 ++++++++ SurvivalTest/Assets/Scripts/UI/UIManager.cs | 5 ++-- SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs | 9 +++++- 10 files changed, 82 insertions(+), 27 deletions(-) delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.cs delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.meta create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/ItemWidget.cs create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/ItemWidget.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs.meta (limited to 'SurvivalTest/Assets/Scripts/UI') 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.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.cs deleted file mode 100644 index 04bb2d9..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class PanelItemBar : PanelBase -{ - - - -} diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.cs.meta deleted file mode 100644 index 3925db5..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b3e9f15745561dd4f9119ac8f893dbfc -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: 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/ItemWidget.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/ItemWidget.cs new file mode 100644 index 0000000..55898f2 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/ItemWidget.cs @@ -0,0 +1,9 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +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 +{ + /// + /// 当前持有的Items + /// + public List m_Items = new List(); + + 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/PanelItemBar.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs.meta new file mode 100644 index 0000000..3925db5 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b3e9f15745561dd4f9119ac8f893dbfc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: 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 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 @@ -15,7 +16,13 @@ public partial class UIManager : Singleton 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) -- cgit v1.1-26-g67d0