diff options
Diffstat (limited to 'SurvivalTest/Assets/Scripts')
50 files changed, 243 insertions, 251 deletions
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/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_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.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.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.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.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.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.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.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.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/Decorations/DecorationBase.cs b/SurvivalTest/Assets/Scripts/Items/ItemBase.cs index 0a7c735..7e4414f 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/DecorationBase.cs +++ b/SurvivalTest/Assets/Scripts/Items/ItemBase.cs @@ -5,7 +5,7 @@ using UnityEngine; /// <summary> /// 饰品，加BUFF /// </summary> -public class DecorationBase : MonoBehaviour +public class ItemBase : MonoBehaviour { public virtual string name { get; } diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_DefenseGem.cs.meta b/SurvivalTest/Assets/Scripts/Items/ItemBase.cs.meta index c0964a1..97b7e17 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_DefenseGem.cs.meta +++ b/SurvivalTest/Assets/Scripts/Items/ItemBase.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 88a39027075cea64198761d1c8d0dd02 +guid: a1be6fd9c07374849acc8fe23dd6a6d0 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs b/SurvivalTest/Assets/Scripts/Items/Item_Battery.cs index e8814cd..faac345 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs +++ b/SurvivalTest/Assets/Scripts/Items/Item_Battery.cs @@ -2,10 +2,10 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class Decoration_Battery : DecorationBase +public class Item_Battery : ItemBase { public override string name => "电池"; - public override string iconPath => "art/ui/decoration/battery"; + public override string iconPath => "art/ui/item/battery"; }
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_Battery.cs.meta index ab1ca1d..5459bc3 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs.meta +++ b/SurvivalTest/Assets/Scripts/Items/Item_Battery.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 18bc88c977364ba4db2e0b1499a839be +guid: b3cc389af6c83cc4990afa7a15169ebb MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Boot.cs b/SurvivalTest/Assets/Scripts/Items/Item_Boot.cs index 5f156b1..1421a35 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Boot.cs +++ b/SurvivalTest/Assets/Scripts/Items/Item_Boot.cs @@ -5,7 +5,7 @@ using UnityEngine; /// <summary> /// 靴子 /// </summary> -public class Decoration_Boot : DecorationBase +public class Item_Boot : ItemBase { diff --git a/SurvivalTest/Assets/Scripts/Decorations/DecorationBase.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_Boot.cs.meta index 9f1912a..58f7961 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/DecorationBase.cs.meta +++ b/SurvivalTest/Assets/Scripts/Items/Item_Boot.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 72da216a6b7eca344bbc15fbae26c2a3 +guid: 673b04089a9020146b93e2cfbf2aa451 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_GemBase.cs b/SurvivalTest/Assets/Scripts/Items/Item_DefenseGem.cs index 6d701f7..dd347d4 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_GemBase.cs +++ b/SurvivalTest/Assets/Scripts/Items/Item_DefenseGem.cs @@ -2,8 +2,8 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class Decoration_GemBase : DecorationBase +public class Item_DefenseGem : Item_GemBase { -}
\ No newline at end of file +} diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Boot.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_DefenseGem.cs.meta index 4a2bc5b..308130f 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Boot.cs.meta +++ b/SurvivalTest/Assets/Scripts/Items/Item_DefenseGem.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ebcc96daf380bd8468f21598f8b9ce2d +guid: 215f309cc57670748802ed791345978b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_LifeGem.cs b/SurvivalTest/Assets/Scripts/Items/Item_GemBase.cs index 536fa98..6e68b47 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_LifeGem.cs +++ b/SurvivalTest/Assets/Scripts/Items/Item_GemBase.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class Decoration_LifeGem : Decoration_GemBase +public class Item_GemBase : ItemBase { 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/Decorations/Decoration_Horn.cs b/SurvivalTest/Assets/Scripts/Items/Item_Horn.cs index 78192e2..6092267 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Horn.cs +++ b/SurvivalTest/Assets/Scripts/Items/Item_Horn.cs @@ -5,10 +5,10 @@ using UnityEngine; /// <summary> /// 兽角，提升攻击力 /// </summary> -public class Decoration_Horn : DecorationBase +public class Item_Horn : ItemBase { public override string name => "角"; - public override string iconPath => "art/ui/decoration/horn"; + 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/Decorations/Decoration_PowerGem.cs b/SurvivalTest/Assets/Scripts/Items/Item_LifeGem.cs index e72d73b..8d14bb5 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerGem.cs +++ b/SurvivalTest/Assets/Scripts/Items/Item_LifeGem.cs @@ -2,7 +2,8 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class Decoration_PowerGem : Decoration_GemBase +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/Decorations/Decoration_LuckyGem.cs b/SurvivalTest/Assets/Scripts/Items/Item_LuckyGem.cs index 3c0c8f4..b56e126 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_LuckyGem.cs +++ b/SurvivalTest/Assets/Scripts/Items/Item_LuckyGem.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class Decoration_LuckyGem : Decoration_GemBase +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/Decorations/Decoration_MystreyMask.cs b/SurvivalTest/Assets/Scripts/Items/Item_MystreyMask.cs index fe1868e..512b598 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_MystreyMask.cs +++ b/SurvivalTest/Assets/Scripts/Items/Item_MystreyMask.cs @@ -5,10 +5,10 @@ using UnityEngine; /// <summary> /// 神秘面罩 /// </summary> -public class Decoration_MystreyMask : DecorationBase +public class Item_MystreyMask : ItemBase { public override string name => "神秘面罩"; - public override string iconPath => "art/ui/decoration/mestry_mask"; + 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/Decorations/Decoration_PowerRing.cs b/SurvivalTest/Assets/Scripts/Items/Item_PowerRing.cs index 79befce..b796103 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerRing.cs +++ b/SurvivalTest/Assets/Scripts/Items/Item_PowerRing.cs @@ -5,11 +5,11 @@ using UnityEngine; /// <summary> /// 力量戒指 /// </summary> -public class Decoration_PowerRing : DecorationBase +public class Item_PowerRing : ItemBase { public override string name => "力量戒指"; - public override string iconPath => "art/ui/decoration/power_ring"; + 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/Decorations/Decoration_SpeedGem.cs b/SurvivalTest/Assets/Scripts/Items/Item_SpeedGem.cs index 3d684d3..2da6cf6 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_SpeedGem.cs +++ b/SurvivalTest/Assets/Scripts/Items/Item_SpeedGem.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class Decoration_SpeedGem : Decoration_GemBase +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/Decorations/Decoration_SwordSpectrum.cs b/SurvivalTest/Assets/Scripts/Items/Item_SwordSpectrum.cs index 1ebb021..788126b 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_SwordSpectrum.cs +++ b/SurvivalTest/Assets/Scripts/Items/Item_SwordSpectrum.cs @@ -5,11 +5,11 @@ using UnityEngine; /// <summary> /// 剑谱，持有之后按照招式舞动会有剑气等附加效果 /// </summary> -public class Decoration_SwordSpectrum : DecorationBase +public class Item_SwordSpectrum : ItemBase { public override string name => "剑术大师的剑谱"; - public override string iconPath => "art/ui/decoration/spectrum"; + 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<PlayerManager> { InitProps(); InitWeapons(); - InitDecorations(); + InitItems(); } public void Update() @@ -21,7 +21,7 @@ public partial class PlayerManager : Singleton<PlayerManager> 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<PlayerManager> -{ - // 当前饰品 - public List<DecorationBase> decorations { get { return m_Decorations; } } - private List<DecorationBase> m_Decorations = new List<DecorationBase>(); - - - 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<PlayerManager> +{ + // 当前饰品 + public List<ItemBase> items { get { return m_Items; } } + private List<ItemBase> m_Items = new List<ItemBase>(); + + + 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/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<Sprite>(info.decoration.iconPath); - } - - private void Update() - { - } - -}
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelDecorationBar.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.meta index 01fa061..01fa061 100644 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelDecorationBar.meta +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.meta 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<Sprite>(info.item.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/PanelItemBar/UIItemWidget.cs.meta index 893e695..893e695 100644 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelDecorationBar/UIDecorationWidget.cs.meta +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/UIItemWidget.cs.meta 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<UIDecorationWidget> m_Decorations = new List<UIDecorationWidget>(); - - 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<UIDecorationWidget>(m_DecorationTemplate); - widget.transform.SetParent(m_DecorationGrid.transform); - widget.gameObject.SetActive(true); - widget.GetComponent<RectTransform>().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/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<UIItemWidget> m_Items = new List<UIItemWidget>(); + + 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<UIItemWidget>(m_ItemTemplate); + widget.transform.SetParent(m_ItemGrid.transform); + widget.gameObject.SetActive(true); + widget.GetComponent<RectTransform>().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/UIDecorationBar.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIItemBar.cs.meta index ac771c3..ac771c3 100644 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIDecorationBar.cs.meta +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIItemBar.cs.meta |