diff options
Diffstat (limited to 'SurvivalTest/Assets/Scripts/Managers')
4 files changed, 19 insertions, 7 deletions
diff --git a/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs b/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs index 4cdaa72..ee52548 100644 --- a/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs +++ b/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs @@ -7,8 +7,9 @@ public class BattleManager : Singleton<BattleManager> public void Init() { - UIManager.Instance.OpenPanel(PanelType.PanelItemBar, null); - UIManager.Instance.OpenPanel(PanelType.PanelEquipBar, null); + UIManager.Instance.OpenPanel(PanelType.PanelTopSuffBar, null); + //UIManager.Instance.OpenPanel(PanelType.PanelItemBar, null); + //UIManager.Instance.OpenPanel(PanelType.PanelEquipBar, null); } public void Update() diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs index 8bd1dd0..95ad08e 100644 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs @@ -8,14 +8,11 @@ public partial class PlayerManager : Singleton<PlayerManager> // 角色 private CrewScript m_Crew; - // 持有的饰品 - public List<DecorationBase> decorations { get { return m_Decorations; } } - private List<DecorationBase> m_Decorations = new List<DecorationBase>(); - public void Init() { InitItems(); InitEquips(); + InitDecorations(); } public void Update() @@ -24,6 +21,7 @@ public partial class PlayerManager : Singleton<PlayerManager> UpdateItems(); UpdateEquips(); + UpdateDecorations(); } public void SetCrew(CrewScript crew) diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs index ce85849..3f1669a 100644 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs @@ -5,6 +5,19 @@ using UnityEngine; public partial class PlayerManager : Singleton<PlayerManager> { + // 当前饰品 + public List<DecorationBase> decorations { get { return m_Decorations; } } + private List<DecorationBase> m_Decorations = new List<DecorationBase>(); + void InitDecorations() + { + m_Decorations.Add(new Decoration_MystreyMask()); + m_Decorations.Add(new Decoration_PowerRing()); + } + + void UpdateDecorations() + { + + } }
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs index 73f86ff..44197c7 100644 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs @@ -24,7 +24,7 @@ public partial class PlayerManager : Singleton<PlayerManager> m_Equips.Add(new Equip_Boomerang()); m_Equips.Add(new Equip_TeslaCoil()); m_Equips.Add(new Equip_MightyGlove()); - m_Equips.Add(new Equip_MysteryMask()); + m_Equips.Add(new Equip_LightSaber()); m_AutoFire = false; |