From 4eec60791aca29385934ca3d2c348e9bd4558b21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E6=B0=B4?= <1123993881@qq.com> Date: Wed, 4 Oct 2023 11:49:19 +0800 Subject: [PATCH] fix: add an option for hide in cutscene. --- ActionTimelineEx/Configurations/Settings.cs | 1 + ActionTimelineEx/Plugin.cs | 6 ++++++ ActionTimelineEx/Windows/SettingsWindow.cs | 1 + 3 files changed, 8 insertions(+) diff --git a/ActionTimelineEx/Configurations/Settings.cs b/ActionTimelineEx/Configurations/Settings.cs index ed5cf83..d281c05 100644 --- a/ActionTimelineEx/Configurations/Settings.cs +++ b/ActionTimelineEx/Configurations/Settings.cs @@ -9,6 +9,7 @@ public class Settings : IPluginConfiguration { public bool ShowTimelineOnlyInDuty = false; public bool ShowTimelineOnlyInCombat = false; + public bool HideTimelineInCutscene = true; public bool Record = true; public bool RecordTargetStatus = true; public List TimelineSettings = new(); diff --git a/ActionTimelineEx/Plugin.cs b/ActionTimelineEx/Plugin.cs index 3f8fa36..4e92cc3 100644 --- a/ActionTimelineEx/Plugin.cs +++ b/ActionTimelineEx/Plugin.cs @@ -155,6 +155,12 @@ private bool ShowTimeline() return false; } + if (Settings.HideTimelineInCutscene + && (Svc.Condition[ConditionFlag.WatchingCutscene] || Svc.Condition[ConditionFlag.WatchingCutscene78])) + { + return false; + } + return true; } diff --git a/ActionTimelineEx/Windows/SettingsWindow.cs b/ActionTimelineEx/Windows/SettingsWindow.cs index 33e83bf..c79d264 100644 --- a/ActionTimelineEx/Windows/SettingsWindow.cs +++ b/ActionTimelineEx/Windows/SettingsWindow.cs @@ -120,6 +120,7 @@ private void DrawGeneralSetting() ImGui.Checkbox("Record Data", ref Settings.Record); ImGui.Checkbox("Show Only In Duty", ref Settings.ShowTimelineOnlyInDuty); ImGui.Checkbox("Show Only In Combat", ref Settings.ShowTimelineOnlyInCombat); + ImGui.Checkbox("Hide In Cutscene", ref Settings.HideTimelineInCutscene); ImGui.Checkbox("Print Clipping Time On Chat", ref Settings.PrintClipping); if (Settings.PrintClipping) {