Pop_Slime/Cryville.EEW.Unity
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Fix ongoing event cycling logic

Browse Source
This commit is contained in:
PopSlime
2025-02-21 21:40:54 +08:00
parent f783d45e23
commit c3cd512611
3 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Assets/Cryville.EEW.Unity/Map/MapElementManager.cs
View File

@@ -39,19 +39,39 @@ namespace Cryville.EEW.Unity.Map {
return _displayingElements[index].AABB; return _displayingElements[index].AABB;
} }
public void SetSelected(ReportViewModel e) { public void SetSelected(ReportViewModel e, bool forced = false) {
if (_selected is not null) if (e == null) {
Remove(_selected); Remove(_selected);
if (e == null || _displayingReports.Contains(e)) {
_selected = null; _selected = null;
return; return;
} }
if (_displayingReports.Contains(e)) {
if (forced) return;
Remove(_selected);
_selected = null;
return;
}
if (e.IsExcludedFromHistory)
return;
if (!Add(e)) if (!Add(e))
return; return;
if (_selected is not null)
Remove(_selected);
_selected = e; _selected = e;
} }
public void SetCurrent(ReportViewModel e) { public bool SetCurrent(ReportViewModel e) {
if (e == null) {
_current = null;
return true;
}
if (!_displayingReports.Contains(e)) {
_current = null;
return false;
}
if (_current == e)
return false;
_current = e; _current = e;
return true;
} }
public bool Add(ReportViewModel e) { public bool Add(ReportViewModel e) {
@@ -68,6 +88,7 @@ namespace Cryville.EEW.Unity.Map {
return true; return true;
} }
public void Remove(ReportViewModel e) { public void Remove(ReportViewModel e) {
if (_current == e) _current = null;
int index = _displayingReports.IndexOf(e); int index = _displayingReports.IndexOf(e);
if (index == -1) return; if (index == -1) return;
_displayingElements.RemoveAt(index); _displayingElements.RemoveAt(index);

2
Assets/Cryville.EEW.Unity/UI/EventOngoingListView.cs
View File

@@ -87,7 +87,7 @@ namespace Cryville.EEW.Unity.UI {
int index = _displayingReports.IndexOf(viewModel); int index = _displayingReports.IndexOf(viewModel);
if (index == -1) return; if (index == -1) return;
SwitchTo(index); SwitchTo(index);
Worker.Instance.SetSelected(viewModel); Worker.Instance.SetSelected(null);
} }
} }
} }

6
Assets/Cryville.EEW.Unity/Worker.cs
View File

@@ -176,20 +176,20 @@ namespace Cryville.EEW.Unity {
void OnOngoingReported(ReportViewModel item, CollectionChangeAction action) { void OnOngoingReported(ReportViewModel item, CollectionChangeAction action) {
if (action == CollectionChangeAction.Add) { if (action == CollectionChangeAction.Add) {
_uiActionQueue.Enqueue(() => { _uiActionQueue.Enqueue(() => {
m_ongoingEventList.Add(item);
if (m_mapElementManager.Add(item)) { if (m_mapElementManager.Add(item)) {
m_mapElementManager.SetSelected(null); m_mapElementManager.SetSelected(null);
} }
m_ongoingEventList.Add(item);
m_cameraController.OnMapElementUpdated(); m_cameraController.OnMapElementUpdated();
}); });
} }
else if (action == CollectionChangeAction.Remove) { else if (action == CollectionChangeAction.Remove) {
_uiActionQueue.Enqueue(() => { _uiActionQueue.Enqueue(() => {
m_ongoingEventList.Remove(item);
m_mapElementManager.Remove(item); m_mapElementManager.Remove(item);
if (m_mapElementManager.Count == 0 && SharedSettings.Instance.DoSwitchBackToHistory && _latestHistoryReport is not null) { if (m_mapElementManager.Count == 0 && SharedSettings.Instance.DoSwitchBackToHistory && _latestHistoryReport is not null) {
m_mapElementManager.SetSelected(_latestHistoryReport); m_mapElementManager.SetSelected(_latestHistoryReport, true);
} }
m_ongoingEventList.Remove(item);
m_cameraController.OnMapElementUpdated(); m_cameraController.OnMapElementUpdated();
}); });
} }