From 97ea642edaa63c4d5723902f337931a4a8642baa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E6=B0=B4?= <53346444+ArchiDog1998@users.noreply.github.com> Date: Thu, 11 Apr 2024 21:45:30 +0800 Subject: [PATCH] fix: kofi. --- RotationSolver/Helpers/SpeechHelper.cs | 3 +-- RotationSolver/Localization/Localization.json | 13 ++++++++++++- RotationSolver/UI/RotationConfigWindow.cs | 6 +----- XIVConfigUI | 2 +- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/RotationSolver/Helpers/SpeechHelper.cs b/RotationSolver/Helpers/SpeechHelper.cs index 068c5699d..4fd92663e 100644 --- a/RotationSolver/Helpers/SpeechHelper.cs +++ b/RotationSolver/Helpers/SpeechHelper.cs @@ -32,8 +32,7 @@ internal static void Speak(string text) { _stop?.Invoke(_manager, []); - _say?.Invoke(_textToTalk, [null, new SeString(new TextPayload("Rotation Solver")), XivChatType.SystemMessage, - text, 2]); + _say?.Invoke(_textToTalk, [null, new SeString(new TextPayload("Rotation Solver")), text, 2]); } catch (Exception ex) { diff --git a/RotationSolver/Localization/Localization.json b/RotationSolver/Localization/Localization.json index 5874119e8..9bdea9b8f 100644 --- a/RotationSolver/Localization/Localization.json +++ b/RotationSolver/Localization/Localization.json @@ -357,5 +357,16 @@ "RotationSolver.Data.UiString.SpecialCommandType_Smart": "Auto Target ", "RotationSolver.Data.UiString.SpecialCommandType_EndSpecial": "End Special", "RotationSolver.Data.UiString.SpecialCommandType_Off": "Off", - "RotationSolver.Data.UiString.SpecialCommandType_Cancel": "Cancel" + "RotationSolver.Data.UiString.SpecialCommandType_Cancel": "Cancel", + "DescriptionAboutCommand": "Open config window.", + "RotationSolver.Data.UiString.Timeline_OpenLink": "Open the timeline link", + "RotationSolver.Data.UiString.AddTimelineButton": "Add a timeline item.", + "RotationSolver.Basic.Configuration.Timeline.ActionTimelineItem": "Action Timeline", + "RotationSolver.Basic.Configuration.Timeline.StateTimelineItem": "State Timeline", + "RotationSolver.Basic.Configuration.Timeline.DrawingTimeline": "Drawing Timeline", + "RotationSolver.Basic.Configuration.Timeline.MacroTimelineItem": "Macro Time line", + "RotationSolver.Basic.Configuration.Timeline.MoveTimelineItem": "Move Time line", + "RotationSolver.Data.UiString.TimelineExecute": "Execute", + "RotationSolver.Data.UiString.TimelineItemCondition": "Click to toggle the timeline item condition.", + "RotationSolver.Data.UiString.TimelineItemTime": "The time before this action." } \ No newline at end of file diff --git a/RotationSolver/UI/RotationConfigWindow.cs b/RotationSolver/UI/RotationConfigWindow.cs index fc9e8a0d4..82297ab99 100644 --- a/RotationSolver/UI/RotationConfigWindow.cs +++ b/RotationSolver/UI/RotationConfigWindow.cs @@ -36,6 +36,7 @@ public class RotationConfigWindow : ConfigWindow public static Vector3 HoveredPosition { get; private set; } = Vector3.Zero; protected override string Kofi => "B0B0IN5DX"; + protected override string Crowdin => "rotationsolver"; public override IEnumerable Searchables => [.. base.Searchables, ..DataCenter.RightNowRotation?.Configs]; @@ -591,11 +592,6 @@ private static void DrawAboutLinks() { var width = ImGui.GetWindowWidth(); - if (ImageLoader.GetTexture("https://badges.crowdin.net/badge/light/crowdin-on-dark.png", out var icon) && ImGuiHelper.TextureButton(icon, width, width)) - { - Util.OpenLink("https://crowdin.com/project/rotationsolver"); - } - var text = "My story about FFXIV and Rotation Solver\n - ArchiTed / Youtube"; var textWidth = ImGuiHelpers.GetButtonSize(text).X; ImGuiHelper.DrawItemMiddle(() => diff --git a/XIVConfigUI b/XIVConfigUI index 93dd6dfc7..35e5fd500 160000 --- a/XIVConfigUI +++ b/XIVConfigUI @@ -1 +1 @@ -Subproject commit 93dd6dfc7bcacd007d869bb7fb0d0485d007fc5a +Subproject commit 35e5fd5004b19edde4dfc2fa08c2bcbd8fba84de