From 71ae3d755a03a706d93291ca57c6de8e6f0d5926 Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 25 Apr 2022 09:58:56 +0800 Subject: * rename equip to weapon --- .../Assets/Scripts/Managers/BattleManager.cs | 2 +- .../Assets/Scripts/Managers/PlayerManager.cs | 6 +- .../Scripts/Managers/PlayerManager_Equips.cs | 140 --------------------- .../Scripts/Managers/PlayerManager_Equips.cs.meta | 11 -- .../Scripts/Managers/PlayerManager_Weapons.cs | 140 +++++++++++++++++++++ .../Scripts/Managers/PlayerManager_Weapons.cs.meta | 11 ++ 6 files changed, 155 insertions(+), 155 deletions(-) delete mode 100644 SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs delete mode 100644 SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs create mode 100644 SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs.meta (limited to 'SurvivalTest/Assets/Scripts/Managers') 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 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 public void Init() { InitItems(); - InitEquips(); + InitWeapons(); InitDecorations(); } @@ -20,14 +20,14 @@ public partial class PlayerManager : Singleton 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_Equips.cs deleted file mode 100644 index 7f50ea9..0000000 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs +++ /dev/null @@ -1,140 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public partial class PlayerManager : Singleton -{ - // 持有的装备 - public List equips { get { return m_Equips; } } - private List m_Equips = new List(); - - private Coroutine m_CoFire; - - public bool isFire { get; private set; } - - private bool m_AutoFire; - private float m_AutoFireDuration = 0.8f; - - private float m_LastAxisValue = 0; - - void InitEquips() - { - 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_AutoFire = false; - - m_LastAxisValue = Input.GetAxisRaw("GunTrigger"); - } - - /// - /// 装备循环 - /// - void UpdateEquips() - { - for(int i = 0; i < m_Equips.Count; ++i) - { - m_Equips[i].Update(m_Crew.gameObject); - } - } - - /// - /// 检查输入，使用装备 - /// - void CheckInput() - { - float axis = Input.GetAxisRaw("GunTrigger"); - - if (Input.GetButtonDown("Fire1") || (axis == 1 && m_LastAxisValue != 1)) - { - if(m_AutoFire) - { - m_AutoFire = false; - } - - isFire = true; - RunFireCoroutine(true); - } - - if (!m_AutoFire && !Input.GetButton("Fire1") && (axis == 0 && m_LastAxisValue != 0)) - { - if (TinyCountDown.Instance.Get("ReleaseFire") > 0) - { - m_AutoFire = true; - isFire = true; - RunFireCoroutine(true); - } - else - { - TinyCountDown.Instance.Set("ReleaseFire", m_AutoFireDuration); - isFire = false; - RunFireCoroutine(false); - } - } - - m_LastAxisValue = axis; - } - - void RunFireCoroutine(bool start) - { - if (start) - { - if (m_CoFire == null) - { - m_CoFire = GameApp.Instance.StartCoroutine(coFire()); - } - } - else - { - if (m_CoFire != null) - { - GameApp.Instance.StopCoroutine(m_CoFire); - m_Equips.ForEach(e => e.OnStop(m_Crew.gameObject)); - m_CoFire = null; - } - } - } - - /// - /// 自由开火 - /// - /// - IEnumerator coFire() - { - while (true) - { - for(int i = 0; i < m_Equips.Count; ++i) - { - EquipBase equip = m_Equips[i]; - if (equip == null) - continue; - if(equip.autoMode == EquipBase.AutoMode.Interval) - { - string id = equip.GetHashCode().ToString(); - float countDown = TinyCountDown.Instance.Get(id); // 倒计时脱离fire单独计时 - if(countDown <= 0) - { - equip.OnTrigger(m_Crew.gameObject); - TinyCountDown.Instance.Set(id, equip.interval); - } - else - { - } - } - else if(equip.autoMode == EquipBase.AutoMode.Condition) - { - if(equip.CheckCondition(m_Crew.gameObject)) - { - equip.OnTrigger(m_Crew.gameObject); - } - } - } - yield return null; - } - } - -} \ 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_Weapons.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs new file mode 100644 index 0000000..381beb8 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs @@ -0,0 +1,140 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public partial class PlayerManager : Singleton +{ + // 持有的装备 + public List weapons { get { return m_Weapons; } } + private List m_Weapons = new List(); + + private Coroutine m_CoFire; + + public bool isFire { get; private set; } + + private bool m_AutoFire; + private float m_AutoFireDuration = 0.8f; + + private float m_LastAxisValue = 0; + + void InitWeapons() + { + 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; + + m_LastAxisValue = Input.GetAxisRaw("GunTrigger"); + } + + /// + /// 装备循环 + /// + void UpdateWeapons() + { + for(int i = 0; i < m_Weapons.Count; ++i) + { + m_Weapons[i].Update(m_Crew.gameObject); + } + } + + /// + /// 检查输入，使用装备 + /// + void CheckInput() + { + float axis = Input.GetAxisRaw("GunTrigger"); + + if (Input.GetButtonDown("Fire1") || (axis == 1 && m_LastAxisValue != 1)) + { + if(m_AutoFire) + { + m_AutoFire = false; + } + + isFire = true; + RunFireCoroutine(true); + } + + if (!m_AutoFire && !Input.GetButton("Fire1") && (axis == 0 && m_LastAxisValue != 0)) + { + if (TinyCountDown.Instance.Get("ReleaseFire") > 0) + { + m_AutoFire = true; + isFire = true; + RunFireCoroutine(true); + } + else + { + TinyCountDown.Instance.Set("ReleaseFire", m_AutoFireDuration); + isFire = false; + RunFireCoroutine(false); + } + } + + m_LastAxisValue = axis; + } + + void RunFireCoroutine(bool start) + { + if (start) + { + if (m_CoFire == null) + { + m_CoFire = GameApp.Instance.StartCoroutine(coFire()); + } + } + else + { + if (m_CoFire != null) + { + GameApp.Instance.StopCoroutine(m_CoFire); + m_Weapons.ForEach(e => e.OnStop(m_Crew.gameObject)); + m_CoFire = null; + } + } + } + + /// + /// 自由开火 + /// + /// + IEnumerator coFire() + { + while (true) + { + for(int i = 0; i < m_Weapons.Count; ++i) + { + WeaponBase weapon = m_Weapons[i]; + if (weapon == null) + continue; + if(weapon.autoMode == WeaponBase.AutoMode.Interval) + { + string id = weapon.GetHashCode().ToString(); + float countDown = TinyCountDown.Instance.Get(id); // 倒计时脱离fire单独计时 + if(countDown <= 0) + { + weapon.OnTrigger(m_Crew.gameObject); + TinyCountDown.Instance.Set(id, weapon.interval); + } + else + { + } + } + else if(weapon.autoMode == WeaponBase.AutoMode.Condition) + { + if(weapon.CheckCondition(m_Crew.gameObject)) + { + weapon.OnTrigger(m_Crew.gameObject); + } + } + } + yield return null; + } + } + +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs.meta b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs.meta new file mode 100644 index 0000000..baba6a3 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dc3ba8ee467185942a84fa7c6ced6ec9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: -- cgit v1.1-26-g67d0