diff --git a/Assets/PerfectWorld/Scripts/Skills/CECSCSkill.cs b/Assets/PerfectWorld/Scripts/Skills/CECSCSkill.cs index 39d8402f47..a0a41ef180 100644 --- a/Assets/PerfectWorld/Scripts/Skills/CECSCSkill.cs +++ b/Assets/PerfectWorld/Scripts/Skills/CECSCSkill.cs @@ -58,6 +58,7 @@ namespace BrewMonster } public CECSkill GetSkill() { return m_pSkill; } public void SetSkill(CECSkill pSkill) { m_pSkill = pSkill; } + public override string GetDesc() { return m_pSkill.GetSkillID().ToString(); } } } diff --git a/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillAction.cs b/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillAction.cs index f31d3608b8..9db5c6f4df 100644 --- a/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillAction.cs +++ b/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillAction.cs @@ -13,17 +13,20 @@ namespace BrewMonster [SerializeField] private SkillUI skillUI; bool m_bOpenAction; - bool m_bReceivedNCPGreeting; // ÊÇ·ñÊÕµ½ÁËNPCµÄGreeting + bool m_bReceivedNCPGreeting; // �Ƿ��յ���NPC��Greeting public override void Awake() { base.Awake(); uiSkillButton.onClick.RemoveAllListeners(); uiSkillButton.onClick.AddListener(OnSkillButtonClicked); - EventBus.Unsubscribe(OnOpenSkillUIEvent); EventBus.Subscribe(OnOpenSkillUIEvent); } - + public void OnDestroy() + { + EventBus.Unsubscribe(OnOpenSkillUIEvent); + } + private void OnOpenSkillUIEvent(OpenSkillUIEvent @event) { TryOpenDialog(false); @@ -35,6 +38,10 @@ namespace BrewMonster } public void TryOpenDialog(bool bAction) { + if(skillUI == null) + { + return; + } var boolll = skillUI.gameObject.activeInHierarchy; if (boolll) {