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 --- SurvivalTest/Assets/Scripts/Decorations.meta | 8 ----- .../Assets/Scripts/Decorations/DecorationBase.cs | 19 ---------- .../Scripts/Decorations/DecorationBase.cs.meta | 11 ------ .../Scripts/Decorations/Decoration_Battery.cs | 11 ------ .../Scripts/Decorations/Decoration_Battery.cs.meta | 11 ------ .../Assets/Scripts/Decorations/Decoration_Boot.cs | 13 ------- .../Scripts/Decorations/Decoration_Boot.cs.meta | 11 ------ .../Scripts/Decorations/Decoration_DefenseGem.cs | 9 ----- .../Decorations/Decoration_DefenseGem.cs.meta | 11 ------ .../Scripts/Decorations/Decoration_GemBase.cs | 9 ----- .../Scripts/Decorations/Decoration_GemBase.cs.meta | 11 ------ .../Assets/Scripts/Decorations/Decoration_Horn.cs | 14 -------- .../Scripts/Decorations/Decoration_Horn.cs.meta | 11 ------ .../Scripts/Decorations/Decoration_LifeGem.cs | 9 ----- .../Scripts/Decorations/Decoration_LifeGem.cs.meta | 11 ------ .../Scripts/Decorations/Decoration_LuckyGem.cs | 8 ----- .../Decorations/Decoration_LuckyGem.cs.meta | 11 ------ .../Scripts/Decorations/Decoration_MystreyMask.cs | 14 -------- .../Decorations/Decoration_MystreyMask.cs.meta | 11 ------ .../Scripts/Decorations/Decoration_PowerGem.cs | 8 ----- .../Decorations/Decoration_PowerGem.cs.meta | 11 ------ .../Scripts/Decorations/Decoration_PowerRing.cs | 15 -------- .../Decorations/Decoration_PowerRing.cs.meta | 11 ------ .../Scripts/Decorations/Decoration_SpeedGem.cs | 8 ----- .../Decorations/Decoration_SpeedGem.cs.meta | 11 ------ .../Decorations/Decoration_SwordSpectrum.cs | 15 -------- .../Decorations/Decoration_SwordSpectrum.cs.meta | 11 ------ SurvivalTest/Assets/Scripts/Items/ItemBase.cs | 19 ++++++++++ SurvivalTest/Assets/Scripts/Items/ItemBase.cs.meta | 11 ++++++ SurvivalTest/Assets/Scripts/Items/Item_Battery.cs | 11 ++++++ .../Assets/Scripts/Items/Item_Battery.cs.meta | 11 ++++++ SurvivalTest/Assets/Scripts/Items/Item_Boot.cs | 13 +++++++ .../Assets/Scripts/Items/Item_Boot.cs.meta | 11 ++++++ .../Assets/Scripts/Items/Item_DefenseGem.cs | 9 +++++ .../Assets/Scripts/Items/Item_DefenseGem.cs.meta | 11 ++++++ SurvivalTest/Assets/Scripts/Items/Item_GemBase.cs | 9 +++++ .../Assets/Scripts/Items/Item_GemBase.cs.meta | 11 ++++++ SurvivalTest/Assets/Scripts/Items/Item_Horn.cs | 14 ++++++++ .../Assets/Scripts/Items/Item_Horn.cs.meta | 11 ++++++ SurvivalTest/Assets/Scripts/Items/Item_LifeGem.cs | 9 +++++ .../Assets/Scripts/Items/Item_LifeGem.cs.meta | 11 ++++++ SurvivalTest/Assets/Scripts/Items/Item_LuckyGem.cs | 8 +++++ .../Assets/Scripts/Items/Item_LuckyGem.cs.meta | 11 ++++++ .../Assets/Scripts/Items/Item_MystreyMask.cs | 14 ++++++++ .../Assets/Scripts/Items/Item_MystreyMask.cs.meta | 11 ++++++ SurvivalTest/Assets/Scripts/Items/Item_PowerGem.cs | 8 +++++ .../Assets/Scripts/Items/Item_PowerGem.cs.meta | 11 ++++++ .../Assets/Scripts/Items/Item_PowerRing.cs | 15 ++++++++ .../Assets/Scripts/Items/Item_PowerRing.cs.meta | 11 ++++++ SurvivalTest/Assets/Scripts/Items/Item_SpeedGem.cs | 8 +++++ .../Assets/Scripts/Items/Item_SpeedGem.cs.meta | 11 ++++++ .../Assets/Scripts/Items/Item_SwordSpectrum.cs | 15 ++++++++ .../Scripts/Items/Item_SwordSpectrum.cs.meta | 11 ++++++ .../Assets/Scripts/Managers/PlayerManager.cs | 4 +-- .../Scripts/Managers/PlayerManager_Decorations.cs | 26 -------------- .../Managers/PlayerManager_Decorations.cs.meta | 11 ------ .../Assets/Scripts/Managers/PlayerManager_Items.cs | 26 ++++++++++++++ .../Scripts/Managers/PlayerManager_Items.cs.meta | 11 ++++++ .../Scripts/UI/Panel/PanelDecorationBar.meta | 8 ----- .../Panel/PanelDecorationBar/UIDecorationWidget.cs | 30 ---------------- .../PanelDecorationBar/UIDecorationWidget.cs.meta | 11 ------ .../Assets/Scripts/UI/Panel/PanelItemBar.meta | 8 +++++ .../Scripts/UI/Panel/PanelItemBar/UIItemWidget.cs | 30 ++++++++++++++++ .../UI/Panel/PanelItemBar/UIItemWidget.cs.meta | 11 ++++++ .../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 ++++++ 69 files changed, 438 insertions(+), 446 deletions(-) delete mode 100644 SurvivalTest/Assets/Scripts/Decorations.meta delete mode 100644 SurvivalTest/Assets/Scripts/Decorations/DecorationBase.cs delete mode 100644 SurvivalTest/Assets/Scripts/Decorations/DecorationBase.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs delete mode 100644 SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Decorations/Decoration_Boot.cs delete mode 100644 SurvivalTest/Assets/Scripts/Decorations/Decoration_Boot.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Decorations/Decoration_DefenseGem.cs delete mode 100644 SurvivalTest/Assets/Scripts/Decorations/Decoration_DefenseGem.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Decorations/Decoration_GemBase.cs delete mode 100644 SurvivalTest/Assets/Scripts/Decorations/Decoration_GemBase.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Decorations/Decoration_Horn.cs delete mode 100644 SurvivalTest/Assets/Scripts/Decorations/Decoration_Horn.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Decorations/Decoration_LifeGem.cs delete mode 100644 SurvivalTest/Assets/Scripts/Decorations/Decoration_LifeGem.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Decorations/Decoration_LuckyGem.cs delete mode 100644 SurvivalTest/Assets/Scripts/Decorations/Decoration_LuckyGem.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Decorations/Decoration_MystreyMask.cs delete mode 100644 SurvivalTest/Assets/Scripts/Decorations/Decoration_MystreyMask.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerGem.cs delete mode 100644 SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerGem.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerRing.cs delete mode 100644 SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerRing.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Decorations/Decoration_SpeedGem.cs delete mode 100644 SurvivalTest/Assets/Scripts/Decorations/Decoration_SpeedGem.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Decorations/Decoration_SwordSpectrum.cs delete mode 100644 SurvivalTest/Assets/Scripts/Decorations/Decoration_SwordSpectrum.cs.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_Battery.cs create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_Battery.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_Boot.cs create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_Boot.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_DefenseGem.cs create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_DefenseGem.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_GemBase.cs create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_GemBase.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_Horn.cs create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_Horn.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_LifeGem.cs create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_LifeGem.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_LuckyGem.cs create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_LuckyGem.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_MystreyMask.cs create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_MystreyMask.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_PowerGem.cs create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_PowerGem.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_PowerRing.cs create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_PowerRing.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_SpeedGem.cs create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_SpeedGem.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_SwordSpectrum.cs create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_SwordSpectrum.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs delete mode 100644 SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs create mode 100644 SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelDecorationBar.meta delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelDecorationBar/UIDecorationWidget.cs delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelDecorationBar/UIDecorationWidget.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.meta create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/UIItemWidget.cs create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/UIItemWidget.cs.meta 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') diff --git a/SurvivalTest/Assets/Scripts/Decorations.meta b/SurvivalTest/Assets/Scripts/Decorations.meta deleted file mode 100644 index 8c9736b..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 0a7c735..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/DecorationBase.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// 饰品，加BUFF -/// -public class DecorationBase : MonoBehaviour -{ - - public virtual string name { get; } - - public virtual string iconPath { get; } - - 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 deleted file mode 100644 index 9f1912a..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/DecorationBase.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -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_Battery.cs b/SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs deleted file mode 100644 index e8814cd..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Decoration_Battery : DecorationBase -{ - public override string name => "电池"; - - public override string iconPath => "art/ui/decoration/battery"; - -} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs.meta deleted file mode 100644 index ab1ca1d..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 18bc88c977364ba4db2e0b1499a839be -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Boot.cs b/SurvivalTest/Assets/Scripts/Decorations/Decoration_Boot.cs deleted file mode 100644 index 5f156b1..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Boot.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// 靴子 -/// -public class Decoration_Boot : DecorationBase -{ - - - -} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Boot.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_Boot.cs.meta deleted file mode 100644 index 4a2bc5b..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Boot.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ebcc96daf380bd8468f21598f8b9ce2d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_DefenseGem.cs b/SurvivalTest/Assets/Scripts/Decorations/Decoration_DefenseGem.cs deleted file mode 100644 index 0d1a22c..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_DefenseGem.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Decoration_DefenseGem : Decoration_GemBase -{ - - -} diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_DefenseGem.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_DefenseGem.cs.meta deleted file mode 100644 index c0964a1..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_DefenseGem.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 88a39027075cea64198761d1c8d0dd02 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_GemBase.cs b/SurvivalTest/Assets/Scripts/Decorations/Decoration_GemBase.cs deleted file mode 100644 index 6d701f7..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_GemBase.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Decoration_GemBase : DecorationBase -{ - - -} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_GemBase.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_GemBase.cs.meta deleted file mode 100644 index 0fdc4ea..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_GemBase.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 82650d48a9bafb2408e00ff6cdceeb0a -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 deleted file mode 100644 index 78192e2..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Horn.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// 兽角，提升攻击力 -/// -public class Decoration_Horn : DecorationBase -{ - public override string name => "角"; - - public override string iconPath => "art/ui/decoration/horn"; - -} diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Horn.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_Horn.cs.meta deleted file mode 100644 index 0991538..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Horn.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 96a5f4ce988299c4683d64b3b8d41852 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_LifeGem.cs b/SurvivalTest/Assets/Scripts/Decorations/Decoration_LifeGem.cs deleted file mode 100644 index 536fa98..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_LifeGem.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Decoration_LifeGem : Decoration_GemBase -{ - - -} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_LifeGem.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_LifeGem.cs.meta deleted file mode 100644 index 4aa051e..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_LifeGem.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: be6aa712c77087d49b88c1479d98b2b0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_LuckyGem.cs b/SurvivalTest/Assets/Scripts/Decorations/Decoration_LuckyGem.cs deleted file mode 100644 index 3c0c8f4..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_LuckyGem.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Decoration_LuckyGem : Decoration_GemBase -{ - -} diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_LuckyGem.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_LuckyGem.cs.meta deleted file mode 100644 index 1f7bbcf..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_LuckyGem.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ade20bcdbc8fee54fb992733a6d123c9 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_MystreyMask.cs b/SurvivalTest/Assets/Scripts/Decorations/Decoration_MystreyMask.cs deleted file mode 100644 index fe1868e..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_MystreyMask.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// 神秘面罩 -/// -public class Decoration_MystreyMask : DecorationBase -{ - public override string name => "神秘面罩"; - - public override string iconPath => "art/ui/decoration/mestry_mask"; - -} diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_MystreyMask.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_MystreyMask.cs.meta deleted file mode 100644 index b9de910..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_MystreyMask.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f800d56501978e247896b4a3b4978f5f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerGem.cs b/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerGem.cs deleted file mode 100644 index e72d73b..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerGem.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Decoration_PowerGem : Decoration_GemBase -{ - -} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerGem.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerGem.cs.meta deleted file mode 100644 index 2050c65..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerGem.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 84a4837fdcbd630499d11e34e6b51f9a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerRing.cs b/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerRing.cs deleted file mode 100644 index 79befce..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerRing.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// 力量戒指 -/// -public class Decoration_PowerRing : DecorationBase -{ - - public override string name => "力量戒指"; - - public override string iconPath => "art/ui/decoration/power_ring"; - -} diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerRing.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerRing.cs.meta deleted file mode 100644 index 469d520..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerRing.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6a4dc5304fcb7fd4eaceaa9f31ec491b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_SpeedGem.cs b/SurvivalTest/Assets/Scripts/Decorations/Decoration_SpeedGem.cs deleted file mode 100644 index 3d684d3..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_SpeedGem.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Decoration_SpeedGem : Decoration_GemBase -{ - -} diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_SpeedGem.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_SpeedGem.cs.meta deleted file mode 100644 index 54f130e..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_SpeedGem.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b364714184a532a49b5aaaea6d1518a5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_SwordSpectrum.cs b/SurvivalTest/Assets/Scripts/Decorations/Decoration_SwordSpectrum.cs deleted file mode 100644 index 1ebb021..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_SwordSpectrum.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// 剑谱，持有之后按照招式舞动会有剑气等附加效果 -/// -public class Decoration_SwordSpectrum : DecorationBase -{ - - public override string name => "剑术大师的剑谱"; - - public override string iconPath => "art/ui/decoration/spectrum"; - -} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_SwordSpectrum.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_SwordSpectrum.cs.meta deleted file mode 100644 index 1dc4d34..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_SwordSpectrum.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1c73c7e0a378c30408a7f06bb38bf06f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - 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..7e4414f --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/ItemBase.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 饰品，加BUFF +/// +public class ItemBase : MonoBehaviour +{ + + public virtual string name { get; } + + public virtual string iconPath { get; } + + public virtual void Update() + { + } + +} \ 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_Battery.cs b/SurvivalTest/Assets/Scripts/Items/Item_Battery.cs new file mode 100644 index 0000000..faac345 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_Battery.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Item_Battery : ItemBase +{ + public override string name => "电池"; + + public override string iconPath => "art/ui/item/battery"; + +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Items/Item_Battery.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_Battery.cs.meta new file mode 100644 index 0000000..5459bc3 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_Battery.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b3cc389af6c83cc4990afa7a15169ebb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Items/Item_Boot.cs b/SurvivalTest/Assets/Scripts/Items/Item_Boot.cs new file mode 100644 index 0000000..1421a35 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_Boot.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 靴子 +/// +public class Item_Boot : ItemBase +{ + + + +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Items/Item_Boot.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_Boot.cs.meta new file mode 100644 index 0000000..58f7961 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_Boot.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 673b04089a9020146b93e2cfbf2aa451 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Items/Item_DefenseGem.cs b/SurvivalTest/Assets/Scripts/Items/Item_DefenseGem.cs new file mode 100644 index 0000000..dd347d4 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_DefenseGem.cs @@ -0,0 +1,9 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Item_DefenseGem : Item_GemBase +{ + + +} diff --git a/SurvivalTest/Assets/Scripts/Items/Item_DefenseGem.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_DefenseGem.cs.meta new file mode 100644 index 0000000..308130f --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_DefenseGem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 215f309cc57670748802ed791345978b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Items/Item_GemBase.cs b/SurvivalTest/Assets/Scripts/Items/Item_GemBase.cs new file mode 100644 index 0000000..6e68b47 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_GemBase.cs @@ -0,0 +1,9 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Item_GemBase : ItemBase +{ + + +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Items/Item_GemBase.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_GemBase.cs.meta new file mode 100644 index 0000000..3921dec --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_GemBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 531f0bb50cd7dc745be6198b52db7e08 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Items/Item_Horn.cs b/SurvivalTest/Assets/Scripts/Items/Item_Horn.cs new file mode 100644 index 0000000..6092267 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_Horn.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 兽角，提升攻击力 +/// +public class Item_Horn : ItemBase +{ + public override string name => "角"; + + public override string iconPath => "art/ui/item/horn"; + +} diff --git a/SurvivalTest/Assets/Scripts/Items/Item_Horn.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_Horn.cs.meta new file mode 100644 index 0000000..f6e3e67 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_Horn.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d0c00302d35eaad48b79578b5ea49663 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Items/Item_LifeGem.cs b/SurvivalTest/Assets/Scripts/Items/Item_LifeGem.cs new file mode 100644 index 0000000..8d14bb5 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_LifeGem.cs @@ -0,0 +1,9 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Item_LifeGem : Item_GemBase +{ + + +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Items/Item_LifeGem.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_LifeGem.cs.meta new file mode 100644 index 0000000..24d77dd --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_LifeGem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: bf53a4fbb29d85548a1a8b2408ea1df3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Items/Item_LuckyGem.cs b/SurvivalTest/Assets/Scripts/Items/Item_LuckyGem.cs new file mode 100644 index 0000000..b56e126 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_LuckyGem.cs @@ -0,0 +1,8 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Item_LuckyGem : Item_GemBase +{ + +} diff --git a/SurvivalTest/Assets/Scripts/Items/Item_LuckyGem.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_LuckyGem.cs.meta new file mode 100644 index 0000000..ce72016 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_LuckyGem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c164cdc0c77616d4ba76be4d01664726 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Items/Item_MystreyMask.cs b/SurvivalTest/Assets/Scripts/Items/Item_MystreyMask.cs new file mode 100644 index 0000000..512b598 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_MystreyMask.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 神秘面罩 +/// +public class Item_MystreyMask : ItemBase +{ + public override string name => "神秘面罩"; + + public override string iconPath => "art/ui/item/mestry_mask"; + +} diff --git a/SurvivalTest/Assets/Scripts/Items/Item_MystreyMask.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_MystreyMask.cs.meta new file mode 100644 index 0000000..3fa40a2 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_MystreyMask.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 704898a642a3a474daf48137329f9b88 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Items/Item_PowerGem.cs b/SurvivalTest/Assets/Scripts/Items/Item_PowerGem.cs new file mode 100644 index 0000000..3dc811b --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_PowerGem.cs @@ -0,0 +1,8 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Item_PowerGem : Item_GemBase +{ + +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Items/Item_PowerGem.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_PowerGem.cs.meta new file mode 100644 index 0000000..2d4b9d9 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_PowerGem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 46ca2a019c35e664c8b21a4e6563b55f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Items/Item_PowerRing.cs b/SurvivalTest/Assets/Scripts/Items/Item_PowerRing.cs new file mode 100644 index 0000000..b796103 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_PowerRing.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 力量戒指 +/// +public class Item_PowerRing : ItemBase +{ + + public override string name => "力量戒指"; + + public override string iconPath => "art/ui/item/power_ring"; + +} diff --git a/SurvivalTest/Assets/Scripts/Items/Item_PowerRing.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_PowerRing.cs.meta new file mode 100644 index 0000000..9350060 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_PowerRing.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8b03b0571c4901a40a17868bb8407018 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Items/Item_SpeedGem.cs b/SurvivalTest/Assets/Scripts/Items/Item_SpeedGem.cs new file mode 100644 index 0000000..2da6cf6 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_SpeedGem.cs @@ -0,0 +1,8 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Item_SpeedGem : Item_GemBase +{ + +} diff --git a/SurvivalTest/Assets/Scripts/Items/Item_SpeedGem.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_SpeedGem.cs.meta new file mode 100644 index 0000000..c0554a5 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_SpeedGem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ee66876f85cc1924ea6f70b9a0e30786 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Items/Item_SwordSpectrum.cs b/SurvivalTest/Assets/Scripts/Items/Item_SwordSpectrum.cs new file mode 100644 index 0000000..788126b --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_SwordSpectrum.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 剑谱，持有之后按照招式舞动会有剑气等附加效果 +/// +public class Item_SwordSpectrum : ItemBase +{ + + public override string name => "剑术大师的剑谱"; + + public override string iconPath => "art/ui/item/spectrum"; + +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Items/Item_SwordSpectrum.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_SwordSpectrum.cs.meta new file mode 100644 index 0000000..96ff438 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_SwordSpectrum.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0ac49f77645545340826633e01e49126 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs index ce27739..9bb3f87 100644 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs @@ -12,7 +12,7 @@ public partial class PlayerManager : Singleton { InitProps(); InitWeapons(); - InitDecorations(); + InitItems(); } public void Update() @@ -21,7 +21,7 @@ public partial class PlayerManager : Singleton UpdateProps(); UpdateWeapons(); - UpdateDecorations(); + UpdateItems(); } public void SetCrew(CrewScript crew) diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs deleted file mode 100644 index ea4ba78..0000000 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - - -public partial class PlayerManager : Singleton -{ - // 当前饰品 - public List decorations { get { return m_Decorations; } } - private List m_Decorations = new List(); - - - void InitDecorations() - { - m_Decorations.Add(new Decoration_MystreyMask()); - m_Decorations.Add(new Decoration_PowerRing()); - m_Decorations.Add(new Decoration_Horn()); - m_Decorations.Add(new Decoration_Battery()); - m_Decorations.Add(new Decoration_SwordSpectrum()); - } - - void UpdateDecorations() - { - - } -} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs.meta b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs.meta deleted file mode 100644 index 3cc2dc3..0000000 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6f2b538b1ec21a548b41fe478e5b3bd3 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs new file mode 100644 index 0000000..6ee4969 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs @@ -0,0 +1,26 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + + +public partial class PlayerManager : Singleton +{ + // 当前饰品 + public List items { get { return m_Items; } } + private List m_Items = new List(); + + + void InitItems() + { + m_Items.Add(new Item_MystreyMask()); + m_Items.Add(new Item_PowerRing()); + m_Items.Add(new Item_Horn()); + m_Items.Add(new Item_Battery()); + m_Items.Add(new Item_SwordSpectrum()); + } + + void UpdateItems() + { + + } +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs.meta b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs.meta new file mode 100644 index 0000000..c0307e5 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2b31f1faa8e2c6a4085213ca15e56220 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelDecorationBar.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelDecorationBar.meta deleted file mode 100644 index 01fa061..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelDecorationBar.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fb019ee665a1bd64fab6f1cbf9a8c98c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelDecorationBar/UIDecorationWidget.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelDecorationBar/UIDecorationWidget.cs deleted file mode 100644 index c9d9312..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelDecorationBar/UIDecorationWidget.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; - -public struct UIDecorationWidgetParam -{ - public DecorationBase decoration; -} - -public class UIDecorationWidget : UIGridPropBase -{ - public Image Image_Icon; - - public DecorationBase decoration { get { return m_Decoration; } } - private DecorationBase m_Decoration; - - public override void Set(object param) - { - UIDecorationWidgetParam info = (UIDecorationWidgetParam)param; - m_Decoration = info.decoration; - - Image_Icon.sprite = ResourceManager.Instance.Load(info.decoration.iconPath); - } - - private void Update() - { - } - -} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelDecorationBar/UIDecorationWidget.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelDecorationBar/UIDecorationWidget.cs.meta deleted file mode 100644 index 893e695..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelDecorationBar/UIDecorationWidget.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 686d7a38ee74b0d4489402f2727a1765 -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..01fa061 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fb019ee665a1bd64fab6f1cbf9a8c98c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/UIItemWidget.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/UIItemWidget.cs new file mode 100644 index 0000000..0f9d623 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/UIItemWidget.cs @@ -0,0 +1,30 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public struct UIItemWidgetParam +{ + public ItemBase item; +} + +public class UIItemWidget : UIGridPropBase +{ + public Image Image_Icon; + + public ItemBase item { get { return m_Item; } } + private ItemBase m_Item; + + public override void Set(object param) + { + UIItemWidgetParam info = (UIItemWidgetParam)param; + m_Item = info.item; + + Image_Icon.sprite = ResourceManager.Instance.Load(info.item.iconPath); + } + + private void Update() + { + } + +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/UIItemWidget.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/UIItemWidget.cs.meta new file mode 100644 index 0000000..893e695 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/UIItemWidget.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 686d7a38ee74b0d4489402f2727a1765 +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 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