* equip, item, decoration

32 files changed, 380 insertions, 10 deletions

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;
+
+/// <summary>
+/// 饰品，加BUFF
+/// </summary>
+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;
+
+/// <summary>
+/// 兽角，提升攻击力
+/// </summary>
+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 
+{
+
+	/// <summary>
+	/// 连发模式
+	/// </summary>
+	public enum AutoMode
+	{
+		Interval,  // 按时连发，需要设置Interval
+		Condition, // 按条件触发，需要重写CheckCondition
+	}
+
+	public abstract AutoMode autoMode { get; }
+
+	/// <summary>
+	/// 触发的时间间隔
+	/// </summary>
+	public virtual float interval { get; }
+
+	/// <summary>
+	/// 使用装备
+	/// </summary>
+	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;
+
+/// <summary>
+/// 回旋镖
+/// </summary>
+public class Equip_Boomerang : EquipBase
+{
+	public override AutoMode autoMode => AutoMode.Condition;
+
+	/// <summary>
+	/// 接到回旋镖后重新掷出，否则间隔一段时间投掷
+	/// </summary>
+	/// <param name="owner"></param>
+	/// <returns></returns>
+	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;
+
+/// <summary>
+/// 榴弹发射器
+/// </summary>
+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;
+
+/// <summary>
+/// 枪
+/// </summary>
+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;
+
+/// <summary>
+/// 物品
+/// </summary>
+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;
+
+/// <summary>
+/// B2呼叫机
+/// </summary>
+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<ResourceManager>
 {
-
+	T Load<T>(string path) where T : UnityEngine.Object
+	{
+		return Resources.Load<T>(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.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.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/ItemWidget.cs
index 04bb2d9..55898f2 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.cs
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/ItemWidget.cs
@@ -2,9 +2,8 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class PanelItemBar : PanelBase
+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
+{
+	/// <summary>
+	/// 当前持有的Items
+	/// </summary>
+	public List<ItemWidget> m_Items = new List<ItemWidget>(); 
+
+	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.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs.meta
index 3925db5..3925db5 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.cs.meta
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs.meta
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<UIManager>
 
 	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<UIManager>
@@ -15,7 +16,13 @@ public partial class UIManager : Singleton<UIManager>
 
 	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)