diff --git a/Assets/Cryville.EEW.Unity/UI/EventGroupView.cs b/Assets/Cryville.EEW.Unity/UI/EventGroupView.cs index 3aecef8..278a1d6 100644 --- a/Assets/Cryville.EEW.Unity/UI/EventGroupView.cs +++ b/Assets/Cryville.EEW.Unity/UI/EventGroupView.cs @@ -14,9 +14,12 @@ namespace Cryville.EEW.Unity.UI { [SerializeField] GameObject m_listViewRail; [SerializeField] GameObject m_expander; - void Start() { + void OnEnable() { m_groupHeader.onClick.AddListener(OnGroupHeaderClicked); } + void OnDisable() { + m_groupHeader.onClick.RemoveListener(OnGroupHeaderClicked); + } void OnGroupHeaderClicked() { SetExpanded(!m_listViewContainer.activeSelf); } diff --git a/Assets/Cryville.EEW.Unity/UI/EventOngoingView.cs b/Assets/Cryville.EEW.Unity/UI/EventOngoingView.cs index 2a2b548..8a5dcc5 100644 --- a/Assets/Cryville.EEW.Unity/UI/EventOngoingView.cs +++ b/Assets/Cryville.EEW.Unity/UI/EventOngoingView.cs @@ -47,9 +47,12 @@ namespace Cryville.EEW.Unity.UI { void Awake() { _dockRatioTweener = new(() => m_dockLayoutGroup.DockOccupiedRatio, v => m_dockLayoutGroup.DockOccupiedRatio = v, Tweeners.Single); } - void Start() { + void OnEnable() { m_button.onClick.AddListener(OnViewClicked); } + void OnDisable() { + m_button.onClick.RemoveListener(OnViewClicked); + } void OnViewClicked() { EventOngoingListView.Instance.OnItemClicked(_viewModel); } diff --git a/Assets/Cryville.EEW.Unity/UI/EventReportView.cs b/Assets/Cryville.EEW.Unity/UI/EventReportView.cs index 8941f42..2606893 100644 --- a/Assets/Cryville.EEW.Unity/UI/EventReportView.cs +++ b/Assets/Cryville.EEW.Unity/UI/EventReportView.cs @@ -14,9 +14,12 @@ namespace Cryville.EEW.Unity.UI { [SerializeField] TMPLocalizedText m_revisionView; ReportViewModel _viewModel; - protected virtual void Start() { + protected virtual void OnEnable() { if (m_reportViewButton != null) m_reportViewButton.onClick.AddListener(OnViewClicked); } + protected virtual void OnDisable() { + if (m_reportViewButton != null) m_reportViewButton.onClick.RemoveListener(OnViewClicked); + } void OnViewClicked() { Worker.Instance.SetSelected(_viewModel); } diff --git a/Assets/Cryville.EEW.Unity/UI/EventUnitView.cs b/Assets/Cryville.EEW.Unity/UI/EventUnitView.cs index 4ad9163..d6ff68d 100644 --- a/Assets/Cryville.EEW.Unity/UI/EventUnitView.cs +++ b/Assets/Cryville.EEW.Unity/UI/EventUnitView.cs @@ -8,10 +8,14 @@ namespace Cryville.EEW.Unity.UI { [SerializeField] Button m_revisionViewContainerButton; - protected override void Start() { - base.Start(); + protected override void OnEnable() { + base.OnEnable(); m_revisionViewContainerButton.onClick.AddListener(OnRevisionViewClicked); } + protected override void OnDisable() { + base.OnDisable(); + m_revisionViewContainerButton.onClick.RemoveListener(OnRevisionViewClicked); + } void OnRevisionViewClicked() { m_listView.gameObject.SetActive(!m_listView.gameObject.activeSelf); }