From 7eb9351d905ddf6316fd6b177fff967fbac6fc94 Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 25 Apr 2022 10:19:09 +0800 Subject: * rename decoration to item --- .../UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs | 4 +-- .../UI/Panel/PanelTopStuffBar/UIDecorationBar.cs | 42 ---------------------- .../Panel/PanelTopStuffBar/UIDecorationBar.cs.meta | 11 ------ .../Scripts/UI/Panel/PanelTopStuffBar/UIItemBar.cs | 42 ++++++++++++++++++++++ .../UI/Panel/PanelTopStuffBar/UIItemBar.cs.meta | 11 ++++++ 5 files changed, 55 insertions(+), 55 deletions(-) delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIDecorationBar.cs delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIDecorationBar.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIItemBar.cs create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIItemBar.cs.meta (limited to 'SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar') diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs index 98ff288..c523152 100644 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs @@ -6,12 +6,12 @@ public class PanelTopStuffBar : PanelBase { public UIWeaponBar m_WeaponBar; public UIPropBar m_PropBar; - public UIDecorationBar m_DecorationBar; + public UIItemBar m_ItemBar; public override void Set(object param) { m_WeaponBar.Set(); m_PropBar.Set(); - m_DecorationBar.Set(); + m_ItemBar.Set(); } } \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIDecorationBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIDecorationBar.cs deleted file mode 100644 index 6dce384..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIDecorationBar.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class UIDecorationBar : MonoBehaviour -{ - public UIDecorationWidget m_DecorationTemplate; - - public UISimpleGrid m_DecorationGrid; - - private List m_Decorations = new List(); - - public void Set() - { - m_DecorationTemplate.gameObject.SetActive(false); - - for (int i = 0; i < PlayerManager.Instance.decorations.Count; ++i) - { - UIDecorationWidget widget = MakeDecorationWidget(PlayerManager.Instance.decorations[i]); - m_Decorations.Add(widget); - } - } - - UIDecorationWidget MakeDecorationWidget(DecorationBase decoration) - { - UIDecorationWidget widget = Instantiate(m_DecorationTemplate); - widget.transform.SetParent(m_DecorationGrid.transform); - widget.gameObject.SetActive(true); - widget.GetComponent().anchoredPosition = new Vector2(0, 0); -#if UNITY_EDITOR - widget.name = "decoration (" + decoration.name + ")"; -#endif - - UIDecorationWidgetParam param = new UIDecorationWidgetParam(); - param.decoration = decoration; - widget.Set(param); - return widget; - } - - - -} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIDecorationBar.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIDecorationBar.cs.meta deleted file mode 100644 index ac771c3..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIDecorationBar.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d41adc469fe729a488b68790c33b6856 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIItemBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIItemBar.cs new file mode 100644 index 0000000..1269c0a --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIItemBar.cs @@ -0,0 +1,42 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class UIItemBar : MonoBehaviour +{ + public UIItemWidget m_ItemTemplate; + + public UISimpleGrid m_ItemGrid; + + private List m_Items = new List(); + + public void Set() + { + m_ItemTemplate.gameObject.SetActive(false); + + for (int i = 0; i < PlayerManager.Instance.items.Count; ++i) + { + UIItemWidget widget = MakeItemWidget(PlayerManager.Instance.items[i]); + m_Items.Add(widget); + } + } + + UIItemWidget MakeItemWidget(ItemBase item) + { + UIItemWidget widget = Instantiate(m_ItemTemplate); + widget.transform.SetParent(m_ItemGrid.transform); + widget.gameObject.SetActive(true); + widget.GetComponent().anchoredPosition = new Vector2(0, 0); +#if UNITY_EDITOR + widget.name = "item (" + item.name + ")"; +#endif + + UIItemWidgetParam param = new UIItemWidgetParam(); + param.item = item; + widget.Set(param); + return widget; + } + + + +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIItemBar.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIItemBar.cs.meta new file mode 100644 index 0000000..ac771c3 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIItemBar.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d41adc469fe729a488b68790c33b6856 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: -- cgit v1.1-26-g67d0