From f744cca396d60bfb9abf3d8ee9b6e61fe193a88c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=97=E6=B2=A2=E5=93=8D=E4=B9=9F?= <72963826+Hibiya615@users.noreply.github.com> Date: Fri, 19 Sep 2025 13:53:31 +0800 Subject: [PATCH] 7.3 --- .../Dungeon/MainScenario_Roulette.cs | 41 +++++++++++---- 02-A-Realm-Reborn/Trials/DhormeChimera.cs | 50 +++++++++++-------- OnlineRepo.json | 12 ++--- 3 files changed, 67 insertions(+), 36 deletions(-) diff --git a/02-A-Realm-Reborn/Dungeon/MainScenario_Roulette.cs b/02-A-Realm-Reborn/Dungeon/MainScenario_Roulette.cs index 5fae608..c908b08 100644 --- a/02-A-Realm-Reborn/Dungeon/MainScenario_Roulette.cs +++ b/02-A-Realm-Reborn/Dungeon/MainScenario_Roulette.cs @@ -12,22 +12,22 @@ using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; using KodakkuAssist.Data; using KodakkuAssist.Extensions; -using ECommons; -using ECommons.DalamudServices; -using ECommons.GameFunctions; -using ECommons.MathHelpers; +// using ECommons; +// using ECommons.DalamudServices; +// using ECommons.GameFunctions; +// using ECommons.MathHelpers; using System.Threading.Tasks; namespace MainScenario_Roulette; [ScriptType(guid: "84c15eea-2a19-4477-ad21-cd43d1263cfa", name: "随机任务：主线任务", territorys: [1043, 1044, 1048], - version: "0.0.0.1", author: "Tetora", note: noteStr)] + version: "0.0.0.2", author: "Tetora", note: noteStr)] public class MainScenario_Roulette { const string noteStr = """ - v0.0.0.1: + v0.0.0.2: LV50 随机任务：主线任务 初版绘制 选项中的DR辅助需要你正确安装Daily Routines插件才可使用 """; @@ -253,13 +253,13 @@ public class MainScenario_Roulette switch (@event.ActionId()) { case 29010: // 左 - dp.Rotation = 45f.DegToRad(); + dp.Rotation = MathHelpers.DegToRad(45f); break; case 29008: // 中 - dp.Rotation = 0f.DegToRad(); + dp.Rotation = MathHelpers.DegToRad(0f); break; case 29009: // 右 - dp.Rotation = 315f.DegToRad(); + dp.Rotation = MathHelpers.DegToRad(315f); break; } dp.DestoryAt = 1900; @@ -423,4 +423,27 @@ public static class EventExtensions { return JsonConvert.DeserializeObject(@event["Param"]); } +} + +public static class MathHelpers +{ + public static float DegToRad(float degrees) + { + return degrees * (float)(Math.PI / 180.0); + } + + public static double DegToRad(double degrees) + { + return degrees * Math.PI / 180.0; + } + + public static float RadToDeg(float radians) + { + return radians * (float)(180.0 / Math.PI); + } + + public static double RadToDeg(double radians) + { + return radians * 180.0 / Math.PI; + } } \ No newline at end of file diff --git a/02-A-Realm-Reborn/Trials/DhormeChimera.cs b/02-A-Realm-Reborn/Trials/DhormeChimera.cs index aa4b89e..e6bf7b3 100644 --- a/02-A-Realm-Reborn/Trials/DhormeChimera.cs +++ b/02-A-Realm-Reborn/Trials/DhormeChimera.cs @@ -11,22 +11,22 @@ using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; using KodakkuAssist.Data; -using ECommons; -using ECommons.DalamudServices; -using ECommons.GameFunctions; -using ECommons.MathHelpers; +// using ECommons; +// using ECommons.DalamudServices; +// using ECommons.GameFunctions; +// using ECommons.MathHelpers; using System.Threading.Tasks; namespace DhormeChimera; [ScriptType(guid: "e24bb311-704f-4f4c-8188-87eaa8da8b29", name: "死化奇美拉讨伐战", territorys: [368], - version: "0.0.0.2", author: "Tetora", note: noteStr)] + version: "0.0.0.3", author: "Tetora", note: noteStr)] public class DhormeChimera { const string noteStr = """ - v0.0.0.2: + v0.0.0.3: LV50 死化奇美拉讨伐战 初版绘制 """; @@ -83,8 +83,8 @@ public class DhormeChimera dp.Color = new Vector4(1f, 0.2f, 1f, 0.4f); dp.Owner = @event.SourceId(); dp.Scale = new Vector2(9.7f); - dp.Radian = 120f.DegToRad(); - dp.Rotation = 45f.DegToRad(); + dp.Radian = MathHelpers.DegToRad(120f); + dp.Rotation = MathHelpers.DegToRad(45); dp.DestoryAt = 60000; accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Fan, dp); } @@ -97,8 +97,8 @@ public class DhormeChimera dp.Color = new Vector4(0f, 1f, 1f, 0.4f); dp.Owner = @event.SourceId(); dp.Scale = new Vector2(9.7f); - dp.Radian = 120f.DegToRad(); - dp.Rotation = -45f.DegToRad(); + dp.Radian = MathHelpers.DegToRad(120f); + dp.Rotation = MathHelpers.DegToRad(-45); dp.DestoryAt = 60000; accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Fan, dp); } @@ -279,17 +279,25 @@ public static class EventExtensions return JsonConvert.DeserializeObject(@event["Param"]); } } -public static class Extensions +public static class MathHelpers { - public static void TTS(this ScriptAccessory accessory, string text, bool isTTS, bool isDRTTS) + public static float DegToRad(float degrees) { - if (isDRTTS) - { - accessory.Method.SendChat($"/pdr tts {text}"); - } - else if (isTTS) - { - accessory.Method.TTS(text); - } + return degrees * (float)(Math.PI / 180.0); } -} + + public static double DegToRad(double degrees) + { + return degrees * Math.PI / 180.0; + } + + public static float RadToDeg(float radians) + { + return radians * (float)(180.0 / Math.PI); + } + + public static double RadToDeg(double radians) + { + return radians * 180.0 / Math.PI; + } +} \ No newline at end of file diff --git a/OnlineRepo.json b/OnlineRepo.json index 2a832b8..5b85999 100644 --- a/OnlineRepo.json +++ b/OnlineRepo.json @@ -2,12 +2,12 @@ { "Name": "随机任务：主线任务", "Guid": "84c15eea-2a19-4477-ad21-cd43d1263cfa", - "Version": "0.0.0.1", + "Version": "0.0.0.2", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/02-A-Realm-Reborn/Dungeon/MainScenario_Roulette.cs", - "Note": "v0.0.0.1:\r\nLV50 随机任务：主线任务 初版绘制\r\n选项中的DR辅助需要你正确安装Daily Routines插件才可使用", - "UpdateInfo": "", + "Note": "v0.0.0.2:\r\nLV50 随机任务：主线任务 初版绘制\r\n选项中的DR辅助需要你正确安装Daily Routines插件才可使用", + "UpdateInfo": "v0.0.0.2: 7.3", "TerritoryIds": [ 1043, 1044, @@ -173,12 +173,12 @@ { "Name": "死化奇美拉讨伐战", "Guid": "e24bb311-704f-4f4c-8188-87eaa8da8b29", - "Version": "0.0.0.2", + "Version": "0.0.0.3", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/02-A-Realm-Reborn/Trials/DhormeChimera.cs", - "Note": "v0.0.0.2:\r\nLV50 死化奇美拉讨伐战 初版绘制", - "UpdateInfo": "增加TTS选项", + "Note": "v0.0.0.3:\r\nLV50 死化奇美拉讨伐战 初版绘制", + "UpdateInfo": "v0.0.0.3: 7.3", "TerritoryIds": [ 368 ]