* equip

1 files changed, 5 insertions, 2 deletions

diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs
index 67e8ae7..3e21c56 100644
--- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs
+++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs
@@ -4,13 +4,14 @@ using UnityEngine;
 
 public partial class PlayerManager : Singleton<PlayerManager>
 {
-
 	// 持有的装备
 	public List<EquipBase> equips { get { return m_Equips; } }
 	private List<EquipBase> m_Equips = new List<EquipBase>();
 
 	private Coroutine m_CoFire;
 
+	public bool isFire { get; private set; }
+
 	void InitEquips()
 	{
 		m_Equips.Add(new Equip_Gun());
@@ -35,6 +36,7 @@ public partial class PlayerManager : Singleton<PlayerManager>
 	{
 		if (Input.GetButtonDown("Fire1") || (Input.GetAxis("GunTrigger") == 1))
 		{
+			isFire = true;
 			if (m_CoFire == null)
 			{
 				m_CoFire = GameApp.Instance.StartCoroutine(coFire());
@@ -42,6 +44,7 @@ public partial class PlayerManager : Singleton<PlayerManager>
 		}
 		if (!Input.GetButton("Fire1") && (Input.GetAxis("GunTrigger") == 0))
 		{
+			isFire = false;
 			if (m_CoFire != null)
 			{
 				GameApp.Instance.StopCoroutine(m_CoFire);
@@ -66,7 +69,7 @@ public partial class PlayerManager : Singleton<PlayerManager>
 				if(equip.autoMode == EquipBase.AutoMode.Interval)
 				{
 					string id = equip.GetHashCode().ToString();
-					float countDown = TinyCountDown.Instance.Get(id);
+					float countDown = TinyCountDown.Instance.Get(id); // 倒计时脱离fire单独计时
 					if(countDown <= 0)
 					{
 						equip.OnTrigger(m_Crew.gameObject);