diff --git a/02-A-Realm-Reborn/Trials/BattleOnTheBigBridge.cs b/02-A-Realm-Reborn/Trials/BattleOnTheBigBridge.cs index 1e89c55..d042787 100644 --- a/02-A-Realm-Reborn/Trials/BattleOnTheBigBridge.cs +++ b/02-A-Realm-Reborn/Trials/BattleOnTheBigBridge.cs @@ -21,24 +21,36 @@ using KodakkuAssist.Extensions; namespace BattleOnTheBigBridgen; [ScriptType(guid: "3e4102cb-9410-44fd-85e8-d43a3bc25737", name: "大桥上的决斗", territorys: [366], - version: "0.0.0.2", author: "Tetora", note: noteStr)] + version: "0.0.0.3", author: "Tetora", note: noteStr)] public class BattleOnTheBigBridge { const string noteStr = """ - v0.0.0.2: + v0.0.0.3: LV50 大桥上的决斗 初版绘制 + TTS请在“用户设置”中二选一启用,请勿同时开启 """; + [UserSetting("TTS开关(TTS请二选一开启)")] + public bool isTTS { get; set; } = false; + + [UserSetting("EdgeTTS开关(TTS请二选一开启)")] + public bool isEdgeTTS { get; set; } = true; + + [UserSetting("弹窗文本提示开关")] + public bool isText { get; set; } = true; + + [ScriptMethod(name: "蛙变之歌", eventType: EventTypeEnum.StatusAdd, eventCondition: ["StatusID:439"])] public void 蛙变之歌(Event @event, ScriptAccessory accessory) { if ( @event.TargetId() != accessory.Data.Me) return; - accessory.Method.TextInfo("躲避绿鸡", duration: 5000, true); - accessory.Method.EdgeTTS("躲避绿鸡"); + if (isText) accessory.Method.TextInfo("躲避绿鸡", duration: 5000, true); + if (isTTS) accessory.Method.TTS("躲避绿鸡"); + if (isEdgeTTS) accessory.Method.EdgeTTS("躲避绿鸡"); foreach (var item in accessory.Data.Objects.GetByDataId(2824)) { @@ -58,11 +70,14 @@ public class BattleOnTheBigBridge accessory.Method.RemoveDraw("恩奇都"); } - [ScriptMethod(name: "混乱 奶满提示", eventType: EventTypeEnum.StatusAdd, eventCondition: ["StatusID:11"])] + [ScriptMethod(name: "混乱 奶满提示", eventType: EventTypeEnum.StatusAdd, eventCondition: ["StatusID:11"],suppress:(5000))] public void 混乱(Event @event, ScriptAccessory accessory) { - accessory.Method.TextInfo("奶满混乱队友", duration: 5000, false); - accessory.Method.EdgeTTS("奶满混乱队友"); + var isHealer = accessory.Data.MyObject?.IsHealer() ?? false; + + if (isHealer && isText)accessory.Method.TextInfo("奶满混乱队友", duration: 5000, false); + if (isHealer && isTTS)accessory.Method.TTS("奶满混乱队友"); + if (isHealer && isEdgeTTS)accessory.Method.EdgeTTS("奶满混乱队友"); var dp = accessory.Data.GetDefaultDrawProperties(); dp.Name = $"混乱{@event.SourceId()}"; @@ -193,20 +208,4 @@ public static class EventExtensions { return JsonConvert.DeserializeObject(@event["Param"]); } -} - - -public static class Extensions -{ - public static void TTS(this ScriptAccessory accessory, string text, bool isTTS, bool isDRTTS) - { - if (isDRTTS) - { - accessory.Method.SendChat($"/pdr tts {text}"); - } - else if (isTTS) - { - accessory.Method.TTS(text); - } - } -} +} \ No newline at end of file diff --git a/03-Heavensward/Trials/Sophia.cs b/03-Heavensward/Trials/Sophia.cs new file mode 100644 index 0000000..7e6b4fe --- /dev/null +++ b/03-Heavensward/Trials/Sophia.cs @@ -0,0 +1,6 @@ +namespace The_Navel___EX._03_Heavensward.Trials; + +public class Sophia +{ + +} \ No newline at end of file diff --git a/05-Shadowbringers/Raid-Eden/Savage/E7S.cs b/05-Shadowbringers/Raid-Eden/Savage/E7S.cs new file mode 100644 index 0000000..5a850ab --- /dev/null +++ b/05-Shadowbringers/Raid-Eden/Savage/E7S.cs @@ -0,0 +1,6 @@ +namespace The_Navel___EX._05_Shadowbringers.Raid_Eden.Savage; + +public class E7S +{ + +} \ No newline at end of file diff --git a/OnlineRepo.json b/OnlineRepo.json index d30792f..c86d504 100644 --- a/OnlineRepo.json +++ b/OnlineRepo.json @@ -145,12 +145,12 @@ { "Name": "大桥上的决斗", "Guid": "3e4102cb-9410-44fd-85e8-d43a3bc25737", - "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/BattleOnTheBigBridge.cs", - "Note": "v0.0.0.2:\r\nLV50 大桥上的决斗 初版绘制", - "UpdateInfo": "API12", + "Note": "v0.0.0.3:\r\nLV50 大桥上的决斗 初版绘制", + "UpdateInfo": "增加部分机制职能限制", "TerritoryIds": [ 366 ]