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/Decorations.meta | 8 +++++ .../Assets/Scripts/Decorations/DecorationBase.cs | 15 +++++++++ .../Scripts/Decorations/DecorationBase.cs.meta | 11 +++++++ .../Assets/Scripts/Decorations/Decoration_Horn.cs | 12 +++++++ .../Scripts/Decorations/Decoration_Horn.cs.meta | 11 +++++++ SurvivalTest/Assets/Scripts/Equips.meta | 8 +++++ SurvivalTest/Assets/Scripts/Equips/EquipBase.cs | 38 ++++++++++++++++++++++ .../Assets/Scripts/Equips/EquipBase.cs.meta | 11 +++++++ .../Assets/Scripts/Equips/Equip_Boomerang.cs | 30 +++++++++++++++++ .../Assets/Scripts/Equips/Equip_Boomerang.cs.meta | 11 +++++++ .../Assets/Scripts/Equips/Equip_GrenadeLauncher.cs | 18 ++++++++++ .../Scripts/Equips/Equip_GrenadeLauncher.cs.meta | 11 +++++++ SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs | 18 ++++++++++ .../Assets/Scripts/Equips/Equip_Gun.cs.meta | 11 +++++++ SurvivalTest/Assets/Scripts/Items.meta | 8 +++++ SurvivalTest/Assets/Scripts/Items/ItemBase.cs | 13 ++++++++ SurvivalTest/Assets/Scripts/Items/ItemBase.cs.meta | 11 +++++++ SurvivalTest/Assets/Scripts/Items/Item_B2Phone.cs | 16 +++++++++ .../Assets/Scripts/Items/Item_B2Phone.cs.meta | 11 +++++++ .../Assets/Scripts/Items/Item_SpaceBeamer.cs | 13 ++++++++ .../Assets/Scripts/Items/Item_SpaceBeamer.cs.meta | 11 +++++++ SurvivalTest/Assets/Scripts/Managers.meta | 8 +++++ SurvivalTest/Assets/Scripts/Rendering/Effects.meta | 8 +++++ .../Assets/Scripts/Resources/ResourceManager.cs | 5 ++- 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 ++++- 34 files changed, 398 insertions(+), 28 deletions(-) create mode 100644 SurvivalTest/Assets/Scripts/Decorations.meta create mode 100644 SurvivalTest/Assets/Scripts/Decorations/DecorationBase.cs create mode 100644 SurvivalTest/Assets/Scripts/Decorations/DecorationBase.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Decorations/Decoration_Horn.cs create mode 100644 SurvivalTest/Assets/Scripts/Decorations/Decoration_Horn.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Equips.meta create mode 100644 SurvivalTest/Assets/Scripts/Equips/EquipBase.cs create mode 100644 SurvivalTest/Assets/Scripts/Equips/EquipBase.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs create mode 100644 SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs create mode 100644 SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs create mode 100644 SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Items.meta create mode 100644 SurvivalTest/Assets/Scripts/Items/ItemBase.cs create mode 100644 SurvivalTest/Assets/Scripts/Items/ItemBase.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_B2Phone.cs create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_B2Phone.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_SpaceBeamer.cs create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_SpaceBeamer.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Managers.meta create mode 100644 SurvivalTest/Assets/Scripts/Rendering/Effects.meta 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') diff --git a/SurvivalTest/Assets/Scripts/Decorations.meta b/SurvivalTest/Assets/Scripts/Decorations.meta new file mode 100644 index 0000000..8c9736b --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Decorations.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aa2a546ebc805a349adf837fc40a8b9d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/DecorationBase.cs b/SurvivalTest/Assets/Scripts/Decorations/DecorationBase.cs new file mode 100644 index 0000000..a181628 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Decorations/DecorationBase.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 饰品，加BUFF +/// +public class DecorationBase : MonoBehaviour +{ + + public virtual void Update() + { + } + +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Decorations/DecorationBase.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/DecorationBase.cs.meta new file mode 100644 index 0000000..9f1912a --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Decorations/DecorationBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 72da216a6b7eca344bbc15fbae26c2a3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Horn.cs b/SurvivalTest/Assets/Scripts/Decorations/Decoration_Horn.cs new file mode 100644 index 0000000..8618df6 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Decorations/Decoration_Horn.cs @@ -0,0 +1,12 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 兽角，提升攻击力 +/// +public class Decoration_Horn : DecorationBase +{ + + +} diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Horn.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_Horn.cs.meta new file mode 100644 index 0000000..0991538 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Decorations/Decoration_Horn.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 96a5f4ce988299c4683d64b3b8d41852 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips.meta b/SurvivalTest/Assets/Scripts/Equips.meta new file mode 100644 index 0000000..0cc5388 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Equips.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 09f9eba1fb9f9ac4aaf7bb4f335eb9f1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/EquipBase.cs b/SurvivalTest/Assets/Scripts/Equips/EquipBase.cs new file mode 100644 index 0000000..bda8b81 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Equips/EquipBase.cs @@ -0,0 +1,38 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public abstract class EquipBase +{ + + /// + /// 连发模式 + /// + public enum AutoMode + { + Interval, // 按时连发，需要设置Interval + Condition, // 按条件触发，需要重写CheckCondition + } + + public abstract AutoMode autoMode { get; } + + /// + /// 触发的时间间隔 + /// + public virtual float interval { get; } + + /// + /// 使用装备 + /// + public abstract void OnTrigger(GameObject owner); + + public virtual bool CheckCondition(GameObject owner) + { + return false; + } + + public virtual void Update() + { + } + +} diff --git a/SurvivalTest/Assets/Scripts/Equips/EquipBase.cs.meta b/SurvivalTest/Assets/Scripts/Equips/EquipBase.cs.meta new file mode 100644 index 0000000..23e0a00 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Equips/EquipBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a9ad03a26b4af7a42a81bd9216665ebb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs b/SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs new file mode 100644 index 0000000..be1645b --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs @@ -0,0 +1,30 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 回旋镖 +/// +public class Equip_Boomerang : EquipBase +{ + public override AutoMode autoMode => AutoMode.Condition; + + /// + /// 接到回旋镖后重新掷出，否则间隔一段时间投掷 + /// + /// + /// + public override bool CheckCondition(GameObject owner) + { + return false; + } + + public override void OnTrigger(GameObject owner) + { + } + + public override void Update() + { + } + +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs.meta b/SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs.meta new file mode 100644 index 0000000..dc65c95 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: de55161bf2db13f48b0192e0c4fcbcfa +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs b/SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs new file mode 100644 index 0000000..6e3eb26 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 榴弹发射器 +/// +public class Equip_GrenadeLauncher : EquipBase +{ + public override AutoMode autoMode => AutoMode.Interval; + + public override float interval => 0.5f; + + public override void OnTrigger(GameObject owner) + { + + } +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs.meta b/SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs.meta new file mode 100644 index 0000000..0664e49 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8576c95cf1a888f41be5cb6907cd02bc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs b/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs new file mode 100644 index 0000000..335e2a7 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 枪 +/// +public class Equip_Gun : EquipBase +{ + public override AutoMode autoMode => AutoMode.Interval; + + public override float interval => 0.1f; + + public override void OnTrigger(GameObject owner) + { + } + +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs.meta b/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs.meta new file mode 100644 index 0000000..0388d5b --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3e3705ee478644d4092b29376c9173ad +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Items.meta b/SurvivalTest/Assets/Scripts/Items.meta new file mode 100644 index 0000000..da0f982 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d89bbcd2760178c4f8c2503630774c73 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Items/ItemBase.cs b/SurvivalTest/Assets/Scripts/Items/ItemBase.cs new file mode 100644 index 0000000..91beca8 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/ItemBase.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 物品 +/// +public abstract class ItemBase +{ + + public abstract void OnUse(GameObject owner); + +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Items/ItemBase.cs.meta b/SurvivalTest/Assets/Scripts/Items/ItemBase.cs.meta new file mode 100644 index 0000000..97b7e17 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/ItemBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a1be6fd9c07374849acc8fe23dd6a6d0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Items/Item_B2Phone.cs b/SurvivalTest/Assets/Scripts/Items/Item_B2Phone.cs new file mode 100644 index 0000000..eb870b0 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_B2Phone.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// B2呼叫机 +/// +public class Item_B2Phone : ItemBase +{ + + public override void OnUse(GameObject owner) + { + + } + +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Items/Item_B2Phone.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_B2Phone.cs.meta new file mode 100644 index 0000000..224b947 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_B2Phone.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8c784b1bd77f0eb4384b262c56b0d2bb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Items/Item_SpaceBeamer.cs b/SurvivalTest/Assets/Scripts/Items/Item_SpaceBeamer.cs new file mode 100644 index 0000000..2ccbb9c --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_SpaceBeamer.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Item_SpaceBeamer : ItemBase +{ + + public override void OnUse(GameObject owner) + { + + } + +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Items/Item_SpaceBeamer.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_SpaceBeamer.cs.meta new file mode 100644 index 0000000..2a064aa --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_SpaceBeamer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3ce271fd294dfa141b3467d795a524b0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Managers.meta b/SurvivalTest/Assets/Scripts/Managers.meta new file mode 100644 index 0000000..2ccb2fc --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Managers.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1f1f860ced7c9d54b86d88687db3c771 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Rendering/Effects.meta b/SurvivalTest/Assets/Scripts/Rendering/Effects.meta new file mode 100644 index 0000000..1efdebb --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Rendering/Effects.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ec6fb6fd67f5a8e49a06291bf5b90e24 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Resources/ResourceManager.cs b/SurvivalTest/Assets/Scripts/Resources/ResourceManager.cs index 0b23d68..ddd3225 100644 --- a/SurvivalTest/Assets/Scripts/Resources/ResourceManager.cs +++ b/SurvivalTest/Assets/Scripts/Resources/ResourceManager.cs @@ -4,6 +4,9 @@ using UnityEngine; public class ResourceManager : Singleton { - + T Load(string path) where T : UnityEngine.Object + { + return Resources.Load(path); + } } 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