From 71ae3d755a03a706d93291ca57c6de8e6f0d5926 Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 25 Apr 2022 09:58:56 +0800 Subject: * rename equip to weapon --- .../Assets/Scripts/UI/Panel/PanelEquipBar.meta | 8 ----- .../UI/Panel/PanelEquipBar/PanelEquipBar.cs | 40 --------------------- .../UI/Panel/PanelEquipBar/PanelEquipBar.cs.meta | 11 ------ .../UI/Panel/PanelEquipBar/UIEquipWidget.cs | 39 -------------------- .../UI/Panel/PanelEquipBar/UIEquipWidget.cs.meta | 11 ------ .../UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs | 4 +-- .../UI/Panel/PanelTopStuffBar/UIEquipBar.cs | 41 ---------------------- .../UI/Panel/PanelTopStuffBar/UIEquipBar.cs.meta | 11 ------ .../UI/Panel/PanelTopStuffBar/UIWeaponBar.cs | 41 ++++++++++++++++++++++ .../UI/Panel/PanelTopStuffBar/UIWeaponBar.cs.meta | 11 ++++++ .../Assets/Scripts/UI/Panel/PanelWeaponBar.meta | 8 +++++ .../UI/Panel/PanelWeaponBar/PanelWeaponBar.cs | 40 +++++++++++++++++++++ .../UI/Panel/PanelWeaponBar/PanelWeaponBar.cs.meta | 11 ++++++ .../UI/Panel/PanelWeaponBar/UIWeaponWidget.cs | 39 ++++++++++++++++++++ .../UI/Panel/PanelWeaponBar/UIWeaponWidget.cs.meta | 11 ++++++ 15 files changed, 163 insertions(+), 163 deletions(-) delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.meta delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar.meta create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs.meta (limited to 'SurvivalTest/Assets/Scripts/UI/Panel') diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.meta deleted file mode 100644 index 380d967..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 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 m_Equips = new List(); - - 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(m_EquipTemplate); - widget.transform.SetParent(m_EquipGrid.transform); - widget.gameObject.SetActive(true); - widget.GetComponent().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/PanelEquipBar.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs.meta deleted file mode 100644 index bf78ef3..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f1382539f3296aa47b7e2d7f269f9007 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: 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(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/PanelEquipBar/UIEquipWidget.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs.meta deleted file mode 100644 index bad655e..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -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/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 m_Equips = new List(); - - 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(m_EquipTemplate); - widget.transform.SetParent(m_EquipGrid.transform); - widget.gameObject.SetActive(true); - widget.GetComponent().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/UIEquipBar.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs.meta deleted file mode 100644 index 68bf843..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3eefcc4321abff24e88f7cbb843e3fda -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: 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 m_Weapons = new List(); + + 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(m_WeaponTemplate); + widget.transform.SetParent(m_WeaponGrid.transform); + widget.gameObject.SetActive(true); + widget.GetComponent().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/UIWeaponBar.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs.meta new file mode 100644 index 0000000..68bf843 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3eefcc4321abff24e88f7cbb843e3fda +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar.meta new file mode 100644 index 0000000..380d967 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 26efe0e32407015498a94f7fe8930a70 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: 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 m_Weapons = new List(); + + 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(m_WeaponTemplate); + widget.transform.SetParent(m_WeaponGrid.transform); + widget.gameObject.SetActive(true); + widget.GetComponent().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/PanelWeaponBar/PanelWeaponBar.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs.meta new file mode 100644 index 0000000..bf78ef3 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f1382539f3296aa47b7e2d7f269f9007 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: 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(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/PanelWeaponBar/UIWeaponWidget.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs.meta new file mode 100644 index 0000000..bad655e --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 83ab90093bb5312428311a589a4fe90f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: -- cgit v1.1-26-g67d0