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