* rename equip to weapon

4 files changed, 28 insertions, 28 deletions

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 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/Managers/PlayerManager_Equips.cs.meta b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs.meta
index c43b512..baba6a3 100644
--- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs.meta
+++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 19dc8d657411e8d47a563a47442d687d
+guid: dc3ba8ee467185942a84fa7c6ced6ec9
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2