63 files changed, 251 insertions, 236 deletions

diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon.meta
index b402ae1..0ca3c42 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon.meta
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e749821f81bfed2428b1befd0927f182
+guid: d339f1fd84bbf184b8fe7847aaadfc04
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/boomerang.png
index c8571b8..c8571b8 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/boomerang.png
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/boomerang.png.meta
index 4e936cf..4e936cf 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png.meta
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/boomerang.png.meta
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/glove.png
index e33bf32..e33bf32 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/glove.png
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/glove.png.meta
index 3a2f65c..3a2f65c 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png.meta
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/glove.png.meta
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/grenade.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/grenade.png
index 3036358..3036358 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/grenade.png
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/grenade.png
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/grenade.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/grenade.png.meta
index 78c3200..78c3200 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/grenade.png.meta
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/grenade.png.meta
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/gun.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/gun.png
index 0b5cab0..0b5cab0 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/gun.png
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/gun.png
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/gun.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/gun.png.meta
index 8e738de..8e738de 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/gun.png.meta
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/gun.png.meta
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/light_saber.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/light_saber.png
index 9fcb826..9fcb826 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/light_saber.png
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/light_saber.png
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/light_saber.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/light_saber.png.meta
index 31cb26f..31cb26f 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/light_saber.png.meta
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/light_saber.png.meta
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/mystery_mask.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/mystery_mask.png
index 6008995..6008995 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/mystery_mask.png
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/mystery_mask.png
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/mystery_mask.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/mystery_mask.png.meta
index e719db3..e719db3 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/mystery_mask.png.meta
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/mystery_mask.png.meta
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/tesla_coil.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/tesla_coil.png
index c2acabb..c2acabb 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/tesla_coil.png
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/tesla_coil.png
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/tesla_coil.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/tesla_coil.png.meta
index d55aa57..d55aa57 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/tesla_coil.png.meta
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/tesla_coil.png.meta
diff --git a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab
index 1a7ff02..65d34ed 100644
--- a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab
+++ b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab
@@ -264,9 +264,10 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 563803806}
-  - component: {fileID: 2748991041996116403}
+  - component: {fileID: 696148772594564389}
+  - component: {fileID: 7551546431576210827}
   m_Layer: 5
-  m_Name: Root_Equip
+  m_Name: Root_Weapon
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -293,7 +294,7 @@ RectTransform:
   m_AnchoredPosition: {x: 10, y: -25}
   m_SizeDelta: {x: 395.19995, y: 30}
   m_Pivot: {x: 0, y: 1}
---- !u!114 &2748991041996116403
+--- !u!114 &696148772594564389
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -305,8 +306,22 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3eefcc4321abff24e88f7cbb843e3fda, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EquipTemplate: {fileID: 1891821505}
-  m_EquipGrid: {fileID: 913444338}
+  m_WeaponTemplate: {fileID: 1891821505}
+  m_WeaponGrid: {fileID: 913444338}
+--- !u!114 &7551546431576210827
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 563803805}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3eefcc4321abff24e88f7cbb843e3fda, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_WeaponTemplate: {fileID: 1891821505}
+  m_WeaponGrid: {fileID: 913444338}
 --- !u!1 &657550471
 GameObject:
   m_ObjectHideFlags: 0
@@ -914,7 +929,7 @@ GameObject:
   - component: {fileID: 1891821504}
   - component: {fileID: 1891821505}
   m_Layer: 5
-  m_Name: EquipTemplate
+  m_Name: WeaponTemplate
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1522,6 +1537,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9c7a0239a22d86847b5806d7e4f2e500, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EquipBar: {fileID: 2748991041996116403}
+  m_WeaponBar: {fileID: 696148772594564389}
   m_ItemBar: {fileID: 1336027010569382835}
   m_DecorationBar: {fileID: 1323087931109695763}
diff --git a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelEquipBar.prefab b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelWeaponBar.prefab
index a59dfcd..c0f697f 100644
--- a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelEquipBar.prefab
+++ b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelWeaponBar.prefab
@@ -452,7 +452,7 @@ GameObject:
   - component: {fileID: 8436628705391075523}
   - component: {fileID: 719302489}
   m_Layer: 5
-  m_Name: PanelEquipBar
+  m_Name: PanelWeaponBar
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
diff --git a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelEquipBar.prefab.meta b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelWeaponBar.prefab.meta
index 9a75998..9a75998 100644
--- a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelEquipBar.prefab.meta
+++ b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelWeaponBar.prefab.meta
diff --git a/SurvivalTest/Assets/Scenes/UIEditScene.unity b/SurvivalTest/Assets/Scenes/UIEditScene.unity
index 1ca54d7..d947f78 100644
--- a/SurvivalTest/Assets/Scenes/UIEditScene.unity
+++ b/SurvivalTest/Assets/Scenes/UIEditScene.unity
@@ -799,10 +799,6 @@ PrefabInstance:
       propertyPath: m_Name
       value: PanelTopSuffBar
       objectReference: {fileID: 0}
-    - target: {fileID: 8494652252006705341, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3}
 --- !u!1001 &870056664923787661
@@ -1010,6 +1006,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: PanelBossHpBar
       objectReference: {fileID: 0}
+    - target: {fileID: 1765710737091365654, guid: f7e86ba455ca20d4a940269f96b2a62b, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6288909076716388209, guid: f7e86ba455ca20d4a940269f96b2a62b, type: 3}
       propertyPath: m_AnchorMax.y
       value: 1
diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs.meta b/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs.meta
deleted file mode 100644
index 1a7c505..0000000
--- a/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 3fb783e0a66c9e349bbd4a5c0d51a55b
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs.meta b/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs.meta
deleted file mode 100644
index b8d5d7f..0000000
--- a/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: d7080bdedf9532d4bb649fe643619fab
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/SurvivalTest/Assets/Scripts/Equips/LightSaber/Equip_LightSaber.cs.meta b/SurvivalTest/Assets/Scripts/Equips/LightSaber/Equip_LightSaber.cs.meta
deleted file mode 100644
index dcc1028..0000000
--- a/SurvivalTest/Assets/Scripts/Equips/LightSaber/Equip_LightSaber.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: cf80263cc579a3c46887c696a8f09d56
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs.meta b/SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs.meta
deleted file mode 100644
index 6d71ccc..0000000
--- a/SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: a9a37b2731565934eb4ef0f95a64aaea
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs b/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs
index 701f27c..c473a5d 100644
--- a/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs
+++ b/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs
@@ -10,7 +10,7 @@ public class BattleManager : Singleton<BattleManager>
 		UIManager.Instance.OpenPanel(PanelType.PanelTopSuffBar, null);
 		//UIManager.Instance.OpenPanel(PanelType.PanelBossHpBar, null);
 		//UIManager.Instance.OpenPanel(PanelType.PanelItemBar, null);
-		//UIManager.Instance.OpenPanel(PanelType.PanelEquipBar, null);
+		//UIManager.Instance.OpenPanel(PanelType.PanelWeaponBar, null);
 	}
 
 	public void Update()
diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs
index bb97ce3..bae437e 100644
--- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs
+++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs
@@ -11,7 +11,7 @@ public partial class PlayerManager : Singleton<PlayerManager>
 	public void Init()
 	{
 		InitItems();
-		InitEquips();
+		InitWeapons();
 		InitDecorations();
 	}
 
@@ -20,14 +20,14 @@ public partial class PlayerManager : Singleton<PlayerManager>
 		CheckInput();
 
 		UpdateItems();
-		UpdateEquips();
+		UpdateWeapons();
 		UpdateDecorations();
 	}
 
 	public void SetCrew(CrewScript crew)
 	{
 		m_Crew = crew;
-		m_Equips.ForEach(e => e.OnInitialize(crew.gameObject));
+		m_Weapons.ForEach(e => e.OnInitialize(crew.gameObject));
 	}
 
 }
\ No newline at end of file
diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs.meta b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs.meta
deleted file mode 100644
index c43b512..0000000
--- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 19dc8d657411e8d47a563a47442d687d
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs
index 7f50ea9..381beb8 100644
--- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs
+++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs
@@ -5,8 +5,8 @@ using UnityEngine;
 public partial class PlayerManager : Singleton<PlayerManager>
 {
 	// ³ÖÓеÄ×°±¸
-	public List<EquipBase> equips { get { return m_Equips; } }
-	private List<EquipBase> m_Equips = new List<EquipBase>();
+	public List<WeaponBase> weapons { get { return m_Weapons; } }
+	private List<WeaponBase> m_Weapons = new List<WeaponBase>();
 
 	private Coroutine m_CoFire;
 
@@ -17,14 +17,14 @@ public partial class PlayerManager : Singleton<PlayerManager>
 
 	private float m_LastAxisValue = 0;
 
-	void InitEquips()
+	void InitWeapons()
 	{
-		m_Equips.Add(new Equip_LightSaber());
-		m_Equips.Add(new Equip_Gun());
-		m_Equips.Add(new Equip_GrenadeLauncher());
-		m_Equips.Add(new Equip_Boomerang());
-		m_Equips.Add(new Equip_TeslaCoil());
-		m_Equips.Add(new Equip_MightyGlove());
+		m_Weapons.Add(new Weapon_LightSaber());
+		m_Weapons.Add(new Weapon_Gun());
+		m_Weapons.Add(new Weapon_GrenadeLauncher());
+		m_Weapons.Add(new Weapon_Boomerang());
+		m_Weapons.Add(new Weapon_TeslaCoil());
+		m_Weapons.Add(new Weapon_MightyGlove());
 
 		m_AutoFire = false;
 
@@ -34,11 +34,11 @@ public partial class PlayerManager : Singleton<PlayerManager>
 	/// <summary>
 	/// ×°±¸Ñ­»·
 	/// </summary>
-	void UpdateEquips()
+	void UpdateWeapons()
 	{
-		for(int i = 0; i < m_Equips.Count; ++i)
+		for(int i = 0; i < m_Weapons.Count; ++i)
 		{
-			m_Equips[i].Update(m_Crew.gameObject);
+			m_Weapons[i].Update(m_Crew.gameObject);
 		}
 	}
 
@@ -93,7 +93,7 @@ public partial class PlayerManager : Singleton<PlayerManager>
 			if (m_CoFire != null)
 			{
 				GameApp.Instance.StopCoroutine(m_CoFire);
-				m_Equips.ForEach(e => e.OnStop(m_Crew.gameObject));
+				m_Weapons.ForEach(e => e.OnStop(m_Crew.gameObject));
 				m_CoFire = null;
 			}
 		}
@@ -107,29 +107,29 @@ public partial class PlayerManager : Singleton<PlayerManager>
 	{
 		while (true)
 		{
-			for(int i = 0; i < m_Equips.Count; ++i)
+			for(int i = 0; i < m_Weapons.Count; ++i)
 			{
-				EquipBase equip = m_Equips[i];
-				if (equip == null)
+				WeaponBase weapon = m_Weapons[i];
+				if (weapon == null)
 					continue;
-				if(equip.autoMode == EquipBase.AutoMode.Interval)
+				if(weapon.autoMode == WeaponBase.AutoMode.Interval)
 				{
-					string id = equip.GetHashCode().ToString();
+					string id = weapon.GetHashCode().ToString();
 					float countDown = TinyCountDown.Instance.Get(id); // µ¹¼ÆʱÍÑÀëfireµ¥¶À¼Æʱ
 					if(countDown <= 0)
 					{
-						equip.OnTrigger(m_Crew.gameObject);
-						TinyCountDown.Instance.Set(id, equip.interval);
+						weapon.OnTrigger(m_Crew.gameObject);
+						TinyCountDown.Instance.Set(id, weapon.interval);
 					}
 					else
 					{
 					}
 				}
-				else if(equip.autoMode == EquipBase.AutoMode.Condition)
+				else if(weapon.autoMode == WeaponBase.AutoMode.Condition)
 				{
-					if(equip.CheckCondition(m_Crew.gameObject))
+					if(weapon.CheckCondition(m_Crew.gameObject))
 					{
-						equip.OnTrigger(m_Crew.gameObject);
+						weapon.OnTrigger(m_Crew.gameObject);
 					}
 				}
 			}
diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs.meta b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs.meta
index dc65c95..baba6a3 100644
--- a/SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs.meta
+++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: de55161bf2db13f48b0192e0c4fcbcfa
+guid: dc3ba8ee467185942a84fa7c6ced6ec9
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs
deleted file mode 100644
index 03ee945..0000000
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class PanelEquipBar : PanelBase
-{
-	public UIEquipWidget m_EquipTemplate;
-
-	public UISimpleGrid m_EquipGrid;
-
-	private List<UIEquipWidget> m_Equips = new List<UIEquipWidget>();
-
-	public override void Set(object param)
-	{
-		m_EquipTemplate.gameObject.SetActive(false);
-
-		for (int i = 0; i < PlayerManager.Instance.equips.Count; ++i)
-		{
-			UIEquipWidget widget = MakeEquipWidget(PlayerManager.Instance.equips[i]);
-			m_Equips.Add(widget);
-		}
-	}
-
-	UIEquipWidget MakeEquipWidget(EquipBase equip)
-	{
-		UIEquipWidget widget = Instantiate<UIEquipWidget>(m_EquipTemplate);
-		widget.transform.SetParent(m_EquipGrid.transform);
-		widget.gameObject.SetActive(true);
-		widget.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0);
-#if UNITY_EDITOR
-		widget.name = "equip (" + equip.name + ")";
-#endif
-
-		UIEquipWidgetParam param = new UIEquipWidgetParam();
-		param.equip = equip;
-		widget.Set(param);
-		return widget;
-	}
-
-}
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs
deleted file mode 100644
index 9099f18..0000000
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-public struct UIEquipWidgetParam
-{
-	public EquipBase equip;
-}
-
-public class UIEquipWidget : UIGridItemBase
-{
-	public Image Image_Icon;
-	public Image Image_CD;
-
-	public EquipBase equip { get { return m_Equip; } }
-	private EquipBase m_Equip;
-
-	public override void Set(object param)
-	{
-		UIEquipWidgetParam info = (UIEquipWidgetParam)param;
-		m_Equip = info.equip;
-
-		Image_Icon.sprite = ResourceManager.Instance.Load<Sprite>(info.equip.iconPath);
-
-		Image_CD.gameObject.SetActive(equip.autoMode == EquipBase.AutoMode.Interval);
-	}
-
-	private void Update()
-	{
-		if(equip.autoMode == EquipBase.AutoMode.Interval)
-		{
-			float countDown = TinyCountDown.Instance.Get(equip.GetHashCode().ToString());
-			float t = countDown / equip.interval;
-			Image_CD.fillAmount = t;
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs
index 2d1e02b..6e91c6b 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs
@@ -4,13 +4,13 @@ using UnityEngine;
 
 public class PanelTopStuffBar : PanelBase
 {
-	public UIEquipBar m_EquipBar;
+	public UIWeaponBar m_WeaponBar;
 	public UIItemBar m_ItemBar;
 	public UIDecorationBar m_DecorationBar;
 
 	public override void Set(object param)
 	{
-		m_EquipBar.Set();
+		m_WeaponBar.Set();
 		m_ItemBar.Set();
 		m_DecorationBar.Set();
 	}
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs
deleted file mode 100644
index d658663..0000000
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class UIEquipBar : MonoBehaviour
-{
-	public UIEquipWidget m_EquipTemplate;
-
-	public UISimpleGrid m_EquipGrid;
-
-	private List<UIEquipWidget> m_Equips = new List<UIEquipWidget>();
-
-	public void Set()
-	{
-		m_EquipTemplate.gameObject.SetActive(false);
-
-		for (int i = 0; i < PlayerManager.Instance.equips.Count; ++i)
-		{
-			UIEquipWidget widget = MakeEquipWidget(PlayerManager.Instance.equips[i]);
-			m_Equips.Add(widget);
-		}
-	}
-
-	UIEquipWidget MakeEquipWidget(EquipBase equip)
-	{
-		UIEquipWidget widget = Instantiate<UIEquipWidget>(m_EquipTemplate);
-		widget.transform.SetParent(m_EquipGrid.transform);
-		widget.gameObject.SetActive(true);
-		widget.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0);
-#if UNITY_EDITOR
-		widget.name = "equip (" + equip.name + ")";
-#endif
-
-		UIEquipWidgetParam param = new UIEquipWidgetParam();
-		param.equip = equip;
-		widget.Set(param);
-		return widget;
-	}
-
-
-}
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs
new file mode 100644
index 0000000..96e6cfd
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs
@@ -0,0 +1,41 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class UIWeaponBar : MonoBehaviour
+{
+	public UIWeaponWidget m_WeaponTemplate;
+
+	public UISimpleGrid m_WeaponGrid;
+
+	private List<UIWeaponWidget> m_Weapons = new List<UIWeaponWidget>();
+
+	public void Set()
+	{
+		m_WeaponTemplate.gameObject.SetActive(false);
+
+		for (int i = 0; i < PlayerManager.Instance.weapons.Count; ++i)
+		{
+			UIWeaponWidget widget = MakeWeaponWidget(PlayerManager.Instance.weapons[i]);
+			m_Weapons.Add(widget);
+		}
+	}
+
+	UIWeaponWidget MakeWeaponWidget(WeaponBase weapon)
+	{
+		UIWeaponWidget widget = Instantiate<UIWeaponWidget>(m_WeaponTemplate);
+		widget.transform.SetParent(m_WeaponGrid.transform);
+		widget.gameObject.SetActive(true);
+		widget.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0);
+#if UNITY_EDITOR
+		widget.name = "weapon (" + weapon.name + ")";
+#endif
+
+		UIWeaponWidgetParam param = new UIWeaponWidgetParam();
+		param.weapon = weapon;
+		widget.Set(param);
+		return widget;
+	}
+
+
+}
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs.meta
index 68bf843..68bf843 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs.meta
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs.meta
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar.meta
index 380d967..380d967 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.meta
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar.meta
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs
new file mode 100644
index 0000000..24c208c
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs
@@ -0,0 +1,40 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PanelWeaponBar : PanelBase
+{
+	public UIWeaponWidget m_WeaponTemplate;
+
+	public UISimpleGrid m_WeaponGrid;
+
+	private List<UIWeaponWidget> m_Weapons = new List<UIWeaponWidget>();
+
+	public override void Set(object param)
+	{
+		m_WeaponTemplate.gameObject.SetActive(false);
+
+		for (int i = 0; i < PlayerManager.Instance.weapons.Count; ++i)
+		{
+			UIWeaponWidget widget = MakeWeaponWidget(PlayerManager.Instance.weapons[i]);
+			m_Weapons.Add(widget);
+		}
+	}
+
+	UIWeaponWidget MakeWeaponWidget(WeaponBase weapon)
+	{
+		UIWeaponWidget widget = Instantiate<UIWeaponWidget>(m_WeaponTemplate);
+		widget.transform.SetParent(m_WeaponGrid.transform);
+		widget.gameObject.SetActive(true);
+		widget.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0);
+#if UNITY_EDITOR
+		widget.name = "weapon (" + weapon.name + ")";
+#endif
+
+		UIWeaponWidgetParam param = new UIWeaponWidgetParam();
+		param.weapon = weapon;
+		widget.Set(param);
+		return widget;
+	}
+
+}
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs.meta
index bf78ef3..bf78ef3 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs.meta
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs.meta
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs
new file mode 100644
index 0000000..f061a3b
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs
@@ -0,0 +1,39 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public struct UIWeaponWidgetParam
+{
+	public WeaponBase weapon;
+}
+
+public class UIWeaponWidget : UIGridItemBase
+{
+	public Image Image_Icon;
+	public Image Image_CD;
+
+	public WeaponBase weapon { get { return m_Weapon; } }
+	private WeaponBase m_Weapon;
+
+	public override void Set(object param)
+	{
+		UIWeaponWidgetParam info = (UIWeaponWidgetParam)param;
+		m_Weapon = info.weapon;
+
+		Image_Icon.sprite = ResourceManager.Instance.Load<Sprite>(info.weapon.iconPath);
+
+		Image_CD.gameObject.SetActive(weapon.autoMode == WeaponBase.AutoMode.Interval);
+	}
+
+	private void Update()
+	{
+		if(weapon.autoMode == WeaponBase.AutoMode.Interval)
+		{
+			float countDown = TinyCountDown.Instance.Get(weapon.GetHashCode().ToString());
+			float t = countDown / weapon.interval;
+			Image_CD.fillAmount = t;
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs.meta
index bad655e..bad655e 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs.meta
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs.meta
diff --git a/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs b/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs
index 02b3a06..649d685 100644
--- a/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs
+++ b/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs
@@ -9,7 +9,7 @@ public enum PanelType
 
 	PanelLevelBar,
 	PanelItemBar,
-	PanelEquipBar,
+	PanelWeaponBar,
 	PanelTopSuffBar,
 	PanelBossHpBar,
 }
@@ -30,7 +30,7 @@ public partial class UIManager : Singleton<UIManager>
 	{
 		AddPanel(PanelType.PanelLevelBar, "PanelLevelBar");
 		AddPanel(PanelType.PanelItemBar, "PanelItemBar");
-		AddPanel(PanelType.PanelEquipBar, "PanelEquipBar");
+		AddPanel(PanelType.PanelWeaponBar, "PanelWeaponBar");
 		AddPanel(PanelType.PanelTopSuffBar, "PanelTopSuffBar");
 		AddPanel(PanelType.PanelBossHpBar, "PanelBossHpBar");
 	}
diff --git a/SurvivalTest/Assets/Scripts/Equips.meta b/SurvivalTest/Assets/Scripts/Weapons.meta
index 0cc5388..0cc5388 100644
--- a/SurvivalTest/Assets/Scripts/Equips.meta
+++ b/SurvivalTest/Assets/Scripts/Weapons.meta
diff --git a/SurvivalTest/Assets/Scripts/Equips/LightSaber.meta b/SurvivalTest/Assets/Scripts/Weapons/LightSaber.meta
index 1920297..1920297 100644
--- a/SurvivalTest/Assets/Scripts/Equips/LightSaber.meta
+++ b/SurvivalTest/Assets/Scripts/Weapons/LightSaber.meta
diff --git a/SurvivalTest/Assets/Scripts/Equips/LightSaber/LightSaber.cs b/SurvivalTest/Assets/Scripts/Weapons/LightSaber/LightSaber.cs
index 4db08ee..4db08ee 100644
--- a/SurvivalTest/Assets/Scripts/Equips/LightSaber/LightSaber.cs
+++ b/SurvivalTest/Assets/Scripts/Weapons/LightSaber/LightSaber.cs
diff --git a/SurvivalTest/Assets/Scripts/Equips/LightSaber/LightSaber.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/LightSaber/LightSaber.cs.meta
index e8200d8..e8200d8 100644
--- a/SurvivalTest/Assets/Scripts/Equips/LightSaber/LightSaber.cs.meta
+++ b/SurvivalTest/Assets/Scripts/Weapons/LightSaber/LightSaber.cs.meta
diff --git a/SurvivalTest/Assets/Scripts/Equips/LightSaber/Equip_LightSaber.cs b/SurvivalTest/Assets/Scripts/Weapons/LightSaber/Weapon_LightSaber.cs
index 9066884..ad942f3 100644
--- a/SurvivalTest/Assets/Scripts/Equips/LightSaber/Equip_LightSaber.cs
+++ b/SurvivalTest/Assets/Scripts/Weapons/LightSaber/Weapon_LightSaber.cs
@@ -2,11 +2,11 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class Equip_LightSaber : EquipBase
+public class Weapon_LightSaber : WeaponBase
 {
 	public override string name => "¹â½£";
 
-	public override string iconPath => "art/ui/equipicon/light_saber";
+	public override string iconPath => "art/ui/weaponicon/light_saber";
 
 	public override AutoMode autoMode => AutoMode.Condition;
 
diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/LightSaber/Weapon_LightSaber.cs.meta
index 0664e49..68db854 100644
--- a/SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs.meta
+++ b/SurvivalTest/Assets/Scripts/Weapons/LightSaber/Weapon_LightSaber.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8576c95cf1a888f41be5cb6907cd02bc
+guid: d419253b4eae555459a2800a7c95308c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/SurvivalTest/Assets/Scripts/Equips/RailGun.meta b/SurvivalTest/Assets/Scripts/Weapons/RailGun.meta
index 901bfca..901bfca 100644
--- a/SurvivalTest/Assets/Scripts/Equips/RailGun.meta
+++ b/SurvivalTest/Assets/Scripts/Weapons/RailGun.meta
diff --git a/SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs b/SurvivalTest/Assets/Scripts/Weapons/RailGun/RailGun.cs
index 0ffb5eb..0ffb5eb 100644
--- a/SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs
+++ b/SurvivalTest/Assets/Scripts/Weapons/RailGun/RailGun.cs
diff --git a/SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/RailGun/RailGun.cs.meta
index 28040c3..28040c3 100644
--- a/SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs.meta
+++ b/SurvivalTest/Assets/Scripts/Weapons/RailGun/RailGun.cs.meta
diff --git a/SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs b/SurvivalTest/Assets/Scripts/Weapons/RailGun/Weapon_RailGun.cs
index e83614c..abad760 100644
--- a/SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs
+++ b/SurvivalTest/Assets/Scripts/Weapons/RailGun/Weapon_RailGun.cs
@@ -2,7 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class Equip_RailGun : EquipBase
+public class Weapon_RailGun : WeaponBase
 {
 	public override string name => "¹ìµÀÅÚ";
 
diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/RailGun/Weapon_RailGun.cs.meta
index 0388d5b..8ecfcb4 100644
--- a/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs.meta
+++ b/SurvivalTest/Assets/Scripts/Weapons/RailGun/Weapon_RailGun.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3e3705ee478644d4092b29376c9173ad
+guid: b319aeb6ad3ae5842bb716ffa24b898a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/SurvivalTest/Assets/Scripts/Equips/EquipBase.cs b/SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs
index ff8a198..d143199 100644
--- a/SurvivalTest/Assets/Scripts/Equips/EquipBase.cs
+++ b/SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs
@@ -2,7 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public abstract class EquipBase 
+public abstract class WeaponBase 
 {
 
 	public abstract string name { get; }
diff --git a/SurvivalTest/Assets/Scripts/Equips/EquipBase.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs.meta
index 23e0a00..23e0a00 100644
--- a/SurvivalTest/Assets/Scripts/Equips/EquipBase.cs.meta
+++ b/SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs.meta
diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs b/SurvivalTest/Assets/Scripts/Weapons/Weapon_Boomerang.cs
index 8e3d917..d701c83 100644
--- a/SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs
+++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_Boomerang.cs
@@ -5,13 +5,13 @@ using UnityEngine;
 /// <summary>
 /// »ØÐýïÚ
 /// </summary>
-public class Equip_Boomerang : EquipBase
+public class Weapon_Boomerang : WeaponBase
 {
 	public override AutoMode autoMode => AutoMode.Condition;
 
 	public override string name => "»ØÐýïÚ";
 
-	public override string iconPath => "art/ui/equipicon/boomerang";
+	public override string iconPath => "art/ui/weaponicon/boomerang";
 
 	/// <summary>
 	/// ½Óµ½»ØÐýïÚºóÖØÐÂÖÀ³ö£¬·ñÔò¼ä¸ôÒ»¶Îʱ¼äͶÖÀ
diff --git a/SurvivalTest/Assets/Scripts/Weapons/Weapon_Boomerang.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/Weapon_Boomerang.cs.meta
new file mode 100644
index 0000000..401fde6
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_Boomerang.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1c95bca840a78e64bba70c9ecceb2628
+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/Weapons/Weapon_GrenadeLauncher.cs
index cd020a0..3a4457a 100644
--- a/SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs
+++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_GrenadeLauncher.cs
@@ -5,12 +5,12 @@ using UnityEngine;
 /// <summary>
 /// Áñµ¯·¢ÉäÆ÷
 /// </summary>
-public class Equip_GrenadeLauncher : EquipBase
+public class Weapon_GrenadeLauncher : WeaponBase
 {
 
 	public override string name => "Áñµ¯·¢ÉäÆ÷";
 
-	public override string iconPath => "art/ui/equipicon/grenade";
+	public override string iconPath => "art/ui/weaponicon/grenade";
 
 	public override AutoMode autoMode => AutoMode.Interval;
 
diff --git a/SurvivalTest/Assets/Scripts/Weapons/Weapon_GrenadeLauncher.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/Weapon_GrenadeLauncher.cs.meta
new file mode 100644
index 0000000..024da76
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_GrenadeLauncher.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: dba5a0f9f2cde934e9a3c047eadfbf00
+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/Weapons/Weapon_Gun.cs
index 8daf999..5517edd 100644
--- a/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs
+++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_Gun.cs
@@ -5,12 +5,12 @@ using UnityEngine;
 /// <summary>
 /// 枪
 /// </summary>
-public class Equip_Gun : EquipBase
+public class Weapon_Gun : WeaponBase
 {
 
 	public override string name => "枪";
 
-	public override string iconPath => "art/ui/equipicon/gun";
+	public override string iconPath => "art/ui/weaponicon/gun";
 
 	public override AutoMode autoMode => AutoMode.Interval;
 
diff --git a/SurvivalTest/Assets/Scripts/Weapons/Weapon_Gun.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/Weapon_Gun.cs.meta
new file mode 100644
index 0000000..5aeaa24
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_Gun.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5a5f1ba1ce3c9824f9dd23e7a47458e8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs b/SurvivalTest/Assets/Scripts/Weapons/Weapon_MightyGlove.cs
index 6a05b18..3253f33 100644
--- a/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs
+++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_MightyGlove.cs
@@ -5,12 +5,12 @@ using UnityEngine;
 /// <summary>
 /// ³¬·²ÊÖÌ×£¬¼¯ÆëÎå¿Å±¦Ê¯ÊÎÆ·½âËø³¬Îä
 /// </summary>
-public class Equip_MightyGlove : EquipBase
+public class Weapon_MightyGlove : WeaponBase
 {
 
 	public override string name => "³¬·²ÊÖÌ×";
 
-	public override string iconPath => "art/ui/equipicon/glove";
+	public override string iconPath => "art/ui/weaponicon/glove";
 
 	public override AutoMode autoMode => AutoMode.Interval;
 
diff --git a/SurvivalTest/Assets/Scripts/Weapons/Weapon_MightyGlove.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/Weapon_MightyGlove.cs.meta
new file mode 100644
index 0000000..b0c414f
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_MightyGlove.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d9fff60e7cb47d545bef9de999f5a0f0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs b/SurvivalTest/Assets/Scripts/Weapons/Weapon_TeslaCoil.cs
index af523cd..1a6e448 100644
--- a/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs
+++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_TeslaCoil.cs
@@ -5,12 +5,12 @@ using UnityEngine;
 /// <summary>
 /// ÌØ˹À­ÏßȦ
 /// </summary>
-public class Equip_TeslaCoil : EquipBase
+public class Weapon_TeslaCoil : WeaponBase
 {
 
 	public override string name => "ÌØ˹À­ÏßȦ";
 
-	public override string iconPath => "art/ui/equipicon/tesla_coil";
+	public override string iconPath => "art/ui/weaponicon/tesla_coil";
 
 	public override AutoMode autoMode => AutoMode.Interval;
 
diff --git a/SurvivalTest/Assets/Scripts/Weapons/Weapon_TeslaCoil.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/Weapon_TeslaCoil.cs.meta
new file mode 100644
index 0000000..5a30a14
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_TeslaCoil.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 482fe3c5e222fbe4b82527cd796989db
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: