diff options
| author | chai <chaifix@163.com> | 2022-04-24 19:10:43 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2022-04-24 19:10:43 +0800 |
| commit | d69adc7009c7953749b59ace2518c0a7c99faa47 (patch) | |
| tree | 113b15cd7861b600dc001ab203999fd59adb26f1 /SurvivalTest/Assets/Scripts/Managers | |
| parent | 6158af99ad803d9e29096ee6f65026d5e0db0f1f (diff) | |
+ light saber
Diffstat (limited to 'SurvivalTest/Assets/Scripts/Managers')
4 files changed, 13 insertions, 2 deletions
diff --git a/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs b/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs index ee52548..681e87b 100644 --- a/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs +++ b/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs @@ -8,6 +8,7 @@ public class BattleManager : Singleton<BattleManager> public void Init() { UIManager.Instance.OpenPanel(PanelType.PanelTopSuffBar, null); + UIManager.Instance.OpenPanel(PanelType.PanelBossHpBar, null); //UIManager.Instance.OpenPanel(PanelType.PanelItemBar, null); //UIManager.Instance.OpenPanel(PanelType.PanelEquipBar, null); } diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs index 95ad08e..bb97ce3 100644 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs @@ -27,6 +27,7 @@ public partial class PlayerManager : Singleton<PlayerManager> public void SetCrew(CrewScript crew) { m_Crew = crew; + m_Equips.ForEach(e => e.OnInitialize(crew.gameObject)); } }
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs index 3f1669a..5076dea 100644 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs @@ -14,6 +14,7 @@ public partial class PlayerManager : Singleton<PlayerManager> { m_Decorations.Add(new Decoration_MystreyMask()); m_Decorations.Add(new Decoration_PowerRing()); + m_Decorations.Add(new Decoration_Horn()); } void UpdateDecorations() diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs index 44197c7..d921545 100644 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs @@ -38,7 +38,7 @@ public partial class PlayerManager : Singleton<PlayerManager> { for(int i = 0; i < m_Equips.Count; ++i) { - m_Equips[i].Update(); + m_Equips[i].Update(m_Crew.gameObject); } } @@ -93,13 +93,14 @@ 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_CoFire = null; } } } /// <summary> - /// Ώͺ»π + /// ΧΤΣΙΏͺ»π /// </summary> /// <returns></returns> IEnumerator coFire() @@ -124,6 +125,13 @@ public partial class PlayerManager : Singleton<PlayerManager> { } } + else if(equip.autoMode == EquipBase.AutoMode.Condition) + { + if(equip.CheckCondition(m_Crew.gameObject)) + { + equip.OnTrigger(m_Crew.gameObject); + } + } } yield return null; } |