*misc

5 files changed, 19 insertions, 5 deletions

diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs b/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs
index fbc3aac..8daf999 100644
--- a/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs
+++ b/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs
@@ -22,7 +22,6 @@ public class Equip_Gun : EquipBase
 
 	TestPeaceMakerBullet CreateBullet(CrewScript crew, Vector2 dir, float speed, float lifeTime)
 	{
-
 		TestPeaceMakerBullet bullet = UnityEngine.Object.Instantiate<TestPeaceMakerBullet>(ResourceManager.Instance.Load< TestPeaceMakerBullet>(prefabPath));
 
 		bullet.transform.position = crew.arrow.position + new Vector3(crew.aimDirection.x, crew.aimDirection.y, 0) * -0.3f;
diff --git a/SurvivalTest/Assets/Scripts/Items/Item_B2Phone.cs b/SurvivalTest/Assets/Scripts/Items/Item_B2Phone.cs
index 4690e03..a7aff51 100644
--- a/SurvivalTest/Assets/Scripts/Items/Item_B2Phone.cs
+++ b/SurvivalTest/Assets/Scripts/Items/Item_B2Phone.cs
@@ -7,7 +7,7 @@ using UnityEngine;
 /// </summary>
 public class Item_B2Phone : ItemBase
 {
-	public override string name => "B2ºäÕ¨»ú";
+	public override string name => "B2";
 
 	public override string iconPath => "art/ui/itemicon/plane";
 
diff --git a/SurvivalTest/Assets/Scripts/Items/Item_SpaceBeamer.cs b/SurvivalTest/Assets/Scripts/Items/Item_SpaceBeamer.cs
index 9a6cf19..db76bb8 100644
--- a/SurvivalTest/Assets/Scripts/Items/Item_SpaceBeamer.cs
+++ b/SurvivalTest/Assets/Scripts/Items/Item_SpaceBeamer.cs
@@ -4,7 +4,7 @@ using UnityEngine;
 
 public class Item_SpaceBeamer : ItemBase
 {
-	public override string name => "Ì«¿ÕÉäÏß";
+	public override string name => "ÎÀÐÇÉäÏß";
 
 	public override string iconPath => "art/ui/itemicon/space_beamer";
 
diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs
index 3e21c56..a0a595a 100644
--- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs
+++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs
@@ -12,10 +12,15 @@ public partial class PlayerManager : Singleton<PlayerManager>
 
 	public bool isFire { get; private set; }
 
+	private bool m_AutoFire;
+	private float m_AutoFireDuration = 1f; 
+
 	void InitEquips()
 	{
 		m_Equips.Add(new Equip_Gun());
 		m_Equips.Add(new Equip_GrenadeLauncher());
+
+		m_AutoFire = false;
 	}
 
 	/// <summary>
@@ -34,16 +39,25 @@ public partial class PlayerManager : Singleton<PlayerManager>
 	/// </summary>
 	void CheckInput()
 	{
-		if (Input.GetButtonDown("Fire1") || (Input.GetAxis("GunTrigger") == 1))
+		if (Input.GetButtonDown("Fire1") || (Input.GetAxisRaw("GunTrigger") == 1))
 		{
+			if(m_AutoFire)
+			{
+				m_AutoFire = false;
+			}
+			if(TinyCountDown.Instance.Get("ReleaseFire") > 0)
+			{
+				m_AutoFire = true;
+			}
 			isFire = true;
 			if (m_CoFire == null)
 			{
 				m_CoFire = GameApp.Instance.StartCoroutine(coFire());
 			}
 		}
-		if (!Input.GetButton("Fire1") && (Input.GetAxis("GunTrigger") == 0))
+		if (!m_AutoFire && !Input.GetButton("Fire1") && (Input.GetAxisRaw("GunTrigger") == 0))
 		{
+			TinyCountDown.Instance.Set("ReleaseFire", m_AutoFireDuration);
 			isFire = false;
 			if (m_CoFire != null)
 			{
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs
index d426b84..9ca1220 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs
@@ -87,6 +87,7 @@ public class PanelItemBar : PanelBase
 		m_Items[index].OnSelectCallback();
 
 		m_TextName.text = m_Items[index].item.name;
+		m_TextName.gameObject.SetActive(false);
 
 		m_CurrentIndex = index;
 	}