diff --git a/Modules/ConditionFieldCatalog.cs b/Modules/ConditionFieldCatalog.cs index 57450888..46523035 100644 --- a/Modules/ConditionFieldCatalog.cs +++ b/Modules/ConditionFieldCatalog.cs @@ -12,6 +12,7 @@ public enum ConditionFieldType public enum ConditionFieldCategory { State, + Aura, Spell, DynamicUnit } @@ -67,7 +68,7 @@ public sealed class ConditionFieldCatalog foreach (var (key, node) in stateConfig) { - if (key is "group" or "spells") + if (key is "group" or "spells" or "auras") { continue; } @@ -78,6 +79,17 @@ public sealed class ConditionFieldCatalog } } + if (JsonHelpers.Get(stateConfig, "auras") is JsonObject auras) + { + foreach (var (auraName, node) in auras) + { + if (node is JsonObject field && field.ContainsKey("step")) + { + AddField(fields, seen, $"auras.{auraName}", $"光环: {auraName}", ReadType(field), ConditionFieldCategory.Aura); + } + } + } + if (JsonHelpers.Get(stateConfig, "spells") is JsonObject spells) { foreach (var (spellName, node) in spells) diff --git a/Modules/ModuleStore.cs b/Modules/ModuleStore.cs index 551c0648..850b44a0 100644 --- a/Modules/ModuleStore.cs +++ b/Modules/ModuleStore.cs @@ -1060,6 +1060,16 @@ public static class ModuleConditionEvaluator return state.Spells.TryGetValue(key["spell.".Length..], out var value) ? value : null; } + if (key.StartsWith("auras.", StringComparison.OrdinalIgnoreCase)) + { + return state.Auras.TryGetValue(key["auras.".Length..], out var value) ? value : null; + } + + if (key.StartsWith("aura.", StringComparison.OrdinalIgnoreCase)) + { + return state.Auras.TryGetValue(key["aura.".Length..], out var value) ? value : null; + } + if (ModuleSpecialActions.IsFailedSpell(key)) { return ModuleSpecialActions.GetFailedSpell(state, failedSpells); diff --git a/Runtime/GameState.cs b/Runtime/GameState.cs index 1890f20a..ff3503ba 100644 --- a/Runtime/GameState.cs +++ b/Runtime/GameState.cs @@ -14,6 +14,11 @@ public sealed class GameState ? spells : new Dictionary(); + public IReadOnlyDictionary Auras => + Values.TryGetValue("auras", out var value) && value is IReadOnlyDictionary auras + ? auras + : new Dictionary(); + public IReadOnlyDictionary> Group => Values.TryGetValue("group", out var value) && value is IReadOnlyDictionary> group ? group @@ -21,7 +26,8 @@ public sealed class GameState public int GetInt(string key, int defaultValue = 0) { - if (!Values.TryGetValue(key, out var value) || value is null) + var value = GetValue(key); + if (value is null) { return defaultValue; } @@ -38,7 +44,8 @@ public sealed class GameState public bool GetBool(string key, bool defaultValue = false) { - if (!Values.TryGetValue(key, out var value) || value is null) + var value = GetValue(key); + if (value is null) { return defaultValue; } @@ -55,7 +62,33 @@ public sealed class GameState public object? GetValue(string key) { - return Values.TryGetValue(key, out var value) ? value : null; + var normalized = key.Trim(); + if (normalized.StartsWith("state.", StringComparison.OrdinalIgnoreCase)) + { + normalized = normalized["state.".Length..]; + } + + if (normalized.StartsWith("spells.", StringComparison.OrdinalIgnoreCase)) + { + return Spells.TryGetValue(normalized["spells.".Length..], out var value) ? value : null; + } + + if (normalized.StartsWith("spell.", StringComparison.OrdinalIgnoreCase)) + { + return Spells.TryGetValue(normalized["spell.".Length..], out var value) ? value : null; + } + + if (normalized.StartsWith("auras.", StringComparison.OrdinalIgnoreCase)) + { + return Auras.TryGetValue(normalized["auras.".Length..], out var value) ? value : null; + } + + if (normalized.StartsWith("aura.", StringComparison.OrdinalIgnoreCase)) + { + return Auras.TryGetValue(normalized["aura.".Length..], out var value) ? value : null; + } + + return Values.TryGetValue(normalized, out var directValue) ? directValue : null; } } diff --git a/Runtime/StateBuilder.cs b/Runtime/StateBuilder.cs index bd29fc3d..46d4088f 100644 --- a/Runtime/StateBuilder.cs +++ b/Runtime/StateBuilder.cs @@ -20,7 +20,7 @@ public sealed class StateBuilder foreach (var (key, node) in stateConfig) { - if (key is "group" or "spells" || node is not JsonObject field || !field.ContainsKey("step")) + if (key is "group" or "spells" or "auras" || node is not JsonObject field || !field.ContainsKey("step")) { continue; } @@ -30,18 +30,12 @@ public sealed class StateBuilder if (JsonHelpers.Get(stateConfig, "spells") is JsonObject spellsConfig) { - var spells = new Dictionary(); - foreach (var (spellName, node) in spellsConfig) - { - if (node is not JsonObject field || !field.ContainsKey("step")) - { - continue; - } + result["spells"] = BuildFieldMap(spellsConfig, rowData, barData); + } - spells[spellName] = ConvertRawValue(ResolveRaw(field, rowData, barData), JsonHelpers.GetString(JsonHelpers.Get(field, "type"))); - } - - result["spells"] = spells; + if (JsonHelpers.Get(stateConfig, "auras") is JsonObject aurasConfig) + { + result["auras"] = BuildFieldMap(aurasConfig, rowData, barData); } if (JsonHelpers.Get(stateConfig, "group") is JsonObject groupConfig) @@ -53,6 +47,25 @@ public sealed class StateBuilder return new GameState(result); } + private static Dictionary BuildFieldMap( + JsonObject fieldsConfig, + IReadOnlyDictionary rowData, + IReadOnlyDictionary barData) + { + var values = new Dictionary(); + foreach (var (fieldName, node) in fieldsConfig) + { + if (node is not JsonObject field || !field.ContainsKey("step")) + { + continue; + } + + values[fieldName] = ConvertRawValue(ResolveRaw(field, rowData, barData), JsonHelpers.GetString(JsonHelpers.Get(field, "type"))); + } + + return values; + } + private static Dictionary> BuildGroup( JsonObject groupConfig, IReadOnlyDictionary rowData, diff --git a/UI/ConditionEditorForm.cs b/UI/ConditionEditorForm.cs index 0ce5f409..8dda2d2c 100644 --- a/UI/ConditionEditorForm.cs +++ b/UI/ConditionEditorForm.cs @@ -152,6 +152,7 @@ public sealed class ConditionEditorForm : Form private static readonly CategoryItem[] CategoryItems = [ new("状态", ConditionFieldCategory.State), + new("光环", ConditionFieldCategory.Aura), new("技能", ConditionFieldCategory.Spell), new("动态单位", ConditionFieldCategory.DynamicUnit) ]; @@ -477,10 +478,19 @@ public sealed class ConditionEditorForm : Form return field.Category; } - return fieldName.StartsWith("spells.", StringComparison.OrdinalIgnoreCase) - || fieldName.StartsWith("spell.", StringComparison.OrdinalIgnoreCase) - ? ConditionFieldCategory.Spell - : ConditionFieldCategory.State; + if (fieldName.StartsWith("auras.", StringComparison.OrdinalIgnoreCase) + || fieldName.StartsWith("aura.", StringComparison.OrdinalIgnoreCase)) + { + return ConditionFieldCategory.Aura; + } + + if (fieldName.StartsWith("spells.", StringComparison.OrdinalIgnoreCase) + || fieldName.StartsWith("spell.", StringComparison.OrdinalIgnoreCase)) + { + return ConditionFieldCategory.Spell; + } + + return ConditionFieldCategory.State; } private static void SelectCategory(ConditionRow row, ConditionFieldCategory category) diff --git a/UI/ModuleEditorControl.cs b/UI/ModuleEditorControl.cs index 227a0e02..e8841f7c 100644 --- a/UI/ModuleEditorControl.cs +++ b/UI/ModuleEditorControl.cs @@ -80,7 +80,7 @@ public sealed class ModuleEditorControl : UserControl RowCount = 1, Margin = new Padding(0) }; - root.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 230)); + root.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 300)); root.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100)); Controls.Add(root); @@ -193,9 +193,9 @@ public sealed class ModuleEditorControl : UserControl var pages = new[] { + BuildRulesPanel(showTitle: false), BuildUnitsPanel(showTitle: false), BuildAdjustmentsPanel(showTitle: false), - BuildRulesPanel(showTitle: false) }; foreach (var page in pages) { @@ -229,7 +229,7 @@ public sealed class ModuleEditorControl : UserControl } } - var titles = new[] { "动态单位", "动态数值", "逻辑编辑" }; + var titles = new[] { "逻辑编辑", "动态单位", "动态数值" }; for (var i = 0; i < titles.Length; i++) { var index = i; diff --git a/UI/StatusForm.cs b/UI/StatusForm.cs index 065ebec3..e14263ee 100644 --- a/UI/StatusForm.cs +++ b/UI/StatusForm.cs @@ -9,6 +9,7 @@ public sealed class StatusForm : Form private bool _hasKnownBounds; private ListView _stateList = null!; + private ListView _auraList = null!; private ListView _dynamicUnitList = null!; private ListView _spellList = null!; private ListView _partyList = null!; @@ -73,6 +74,7 @@ public sealed class StatusForm : Form _aboutHost = CreatePageHost(); _stateList = UiTheme.CreateListView(Font, ("#", 56), ("名称", 150), ("值", 130)); + _auraList = UiTheme.CreateListView(Font, ("#", 48), ("光环", 140), ("值", 100)); _dynamicUnitList = UiTheme.CreateListView(Font, ("类型", 86), ("名称", 120), ("值", 160)); _spellList = UiTheme.CreateListView(Font, ("#", 56), ("技能", 150), ("状态", 110)); @@ -139,18 +141,20 @@ public sealed class StatusForm : Form { Dock = DockStyle.Fill, BackColor = UiTheme.Surface, - ColumnCount = 3, + ColumnCount = 4, RowCount = 1, Margin = new Padding(0) }; - statusSplit.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 34)); - statusSplit.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33)); - statusSplit.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33)); + statusSplit.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25)); + statusSplit.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25)); + statusSplit.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25)); + statusSplit.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25)); statusSplit.RowStyles.Add(new RowStyle(SizeType.Percent, 100)); statusSplit.Controls.Add(BuildSection("状态", _stateList, "基础字段与当前模块", isLast: false), 0, 0); - statusSplit.Controls.Add(BuildSection("动态单位", _dynamicUnitList, "模块运行时计算值", isLast: false), 1, 0); - statusSplit.Controls.Add(BuildSection("技能", _spellList, "冷却与可用状态", isLast: true), 2, 0); + statusSplit.Controls.Add(BuildSection("光环", _auraList, "光环层数与持续状态", isLast: false), 1, 0); + statusSplit.Controls.Add(BuildSection("技能", _spellList, "冷却与可用状态", isLast: false), 2, 0); + statusSplit.Controls.Add(BuildSection("动态单位", _dynamicUnitList, "模块运行时计算值"), 3, 0); return statusSplit; } @@ -433,6 +437,7 @@ public sealed class StatusForm : Form private void UpdateLists(RenderSnapshot snapshot) { UpdateStateList(snapshot); + UpdateAuraList(snapshot); UpdateDynamicUnitList(snapshot); UpdateSpellList(snapshot); UpdatePartyList(snapshot); @@ -457,7 +462,7 @@ public sealed class StatusForm : Form foreach (var (key, value) in snapshot.State.Values) { - if (key is "spells" or "group" || key.StartsWith('$')) + if (key is "spells" or "auras" or "group" || key.StartsWith('$')) { continue; } @@ -470,6 +475,26 @@ public sealed class StatusForm : Form ReplaceItems(_stateList, items); } + private void UpdateAuraList(RenderSnapshot snapshot) + { + var items = new List(); + if (snapshot.State is null || snapshot.State.Auras.Count == 0) + { + items.Add(new ListViewItem(new[] { "-", "光环", "无数据" })); + } + else + { + var index = 0; + foreach (var (key, value) in snapshot.State.Auras) + { + index++; + items.Add(new ListViewItem(new[] { index.ToString(), key, UiTheme.FormatValue(value) })); + } + } + + ReplaceItems(_auraList, items); + } + private void UpdateDynamicUnitList(RenderSnapshot snapshot) { var items = new List(); diff --git a/bin/Debug/net10.0-windows/Shigure.dll b/bin/Debug/net10.0-windows/Shigure.dll index d7355f4b..1a0f9edd 100644 Binary files a/bin/Debug/net10.0-windows/Shigure.dll and b/bin/Debug/net10.0-windows/Shigure.dll differ diff --git a/bin/Debug/net10.0-windows/Shigure.exe b/bin/Debug/net10.0-windows/Shigure.exe index 90763b9b..61c6eef4 100644 Binary files a/bin/Debug/net10.0-windows/Shigure.exe and b/bin/Debug/net10.0-windows/Shigure.exe differ diff --git a/bin/Debug/net10.0-windows/Shigure.pdb b/bin/Debug/net10.0-windows/Shigure.pdb index 11b58b7b..3b9b79c7 100644 Binary files a/bin/Debug/net10.0-windows/Shigure.pdb and b/bin/Debug/net10.0-windows/Shigure.pdb differ diff --git a/config/死亡骑士.json b/config/死亡骑士.json index dd3048c6..401443c2 100644 --- a/config/死亡骑士.json +++ b/config/死亡骑士.json @@ -172,21 +172,6 @@ } }, "3": { - "食尸鬼层数": { - "step": "bar", - "bar": 1, - "type": "int" - }, - "腐化层数": { - "step": "bar", - "bar": 2, - "type": "int" - }, - "凋零层数": { - "step": "bar", - "bar": 3, - "type": "int" - }, "符文": { "step": 21, "type": "int" @@ -235,57 +220,74 @@ "step": 31, "type": "int" }, - "次级食尸鬼": { - "step": 41, - "type": "int" - }, - "割魂索命": { - "step": 42, - "type": "int" - }, - "末日突降": { - "step": 43, - "type": "int" - }, - "末日层数": { - "step": 44, - "type": "int" - }, - "黑暗援助": { - "step": 45, - "type": "int" - }, - "禁断知识": { - "step": 46, - "type": "int" - }, - "脓疮毒镰": { - "step": 47, - "type": "int" - }, - "脓疮毒镰2": { - "step": 48, - "type": "int" - }, - "枯萎凋零": { - "step": 49, - "type": "int" - }, - "亡者指挥官": { - "step": 50, - "type": "int" - }, - "寒冰锁链": { - "step": 51, - "type": "int" - }, - "暗影之爪层数": { - "step": 52, - "type": "int" - }, - "凋萎": { - "step": 53, - "type": "int" + "auras": { + "食尸鬼层数": { + "step": "bar", + "bar": 1, + "type": "int" + }, + "腐化层数": { + "step": "bar", + "bar": 2, + "type": "int" + }, + "凋零层数": { + "step": "bar", + "bar": 3, + "type": "int" + }, + "次级食尸鬼": { + "step": 41, + "type": "int" + }, + "割魂索命": { + "step": 42, + "type": "int" + }, + "末日突降": { + "step": 43, + "type": "int" + }, + "末日层数": { + "step": 44, + "type": "int" + }, + "黑暗援助": { + "step": 45, + "type": "int" + }, + "禁断知识": { + "step": 46, + "type": "int" + }, + "脓疮毒镰": { + "step": 47, + "type": "int" + }, + "脓疮毒镰2": { + "step": 48, + "type": "int" + }, + "枯萎凋零": { + "step": 49, + "type": "int" + }, + "亡者指挥官": { + "step": 50, + "type": "int" + }, + "寒冰锁链": { + "step": 51, + "type": "int" + }, + "暗影之爪层数": { + "step": 52, + "type": "int" + }, + "凋萎": { + "step": 53, + "type": "int" + } }, "spells": { "死亡之握": { diff --git a/config/牧师.json b/config/牧师.json index a97a5a92..b4de675b 100644 --- a/config/牧师.json +++ b/config/牧师.json @@ -41,42 +41,6 @@ "step": 23, "type": "int" }, - "虚空之盾": { - "step": 24, - "type": "int" - }, - "圣光涌动": { - "step": 25, - "type": "int" - }, - "涌动层数": { - "step": 26, - "type": "int" - }, - "熵能裂隙": { - "step": 27, - "type": "int" - }, - "暗影愈合": { - "step": 28, - "type": "int" - }, - "暗影层数": { - "step": 29, - "type": "int" - }, - "福音层数": { - "step": 30, - "type": "int" - }, - "祸福相依": { - "step": 46, - "type": "int" - }, - "祸福层数": { - "step": 47, - "type": "int" - }, "延迟": { "step": 48, "type": "int" @@ -107,6 +71,44 @@ "bar": 2, "type": "int" }, + "auras": { + "虚空之盾": { + "step": 24, + "type": "int" + }, + "圣光涌动": { + "step": 25, + "type": "int" + }, + "涌动层数": { + "step": 26, + "type": "int" + }, + "熵能裂隙": { + "step": 27, + "type": "int" + }, + "暗影愈合": { + "step": 28, + "type": "int" + }, + "愈合层数": { + "step": 29, + "type": "int" + }, + "福音层数": { + "step": 30, + "type": "int" + }, + "祸福相依": { + "step": 46, + "type": "int" + }, + "祸福层数": { + "step": 47, + "type": "int" + } + }, "spells": { "心灵尖啸": { "step": 31, diff --git a/module/戒律-单人神谕者-测试.json b/module/戒律-单人神谕者-测试.json deleted file mode 100644 index 702db08f..00000000 --- a/module/戒律-单人神谕者-测试.json +++ /dev/null @@ -1,429 +0,0 @@ -{ - "Id": "新模块1-20260612100954681", - "Name": "戒律 单人神谕者 测试", - "Enabled": true, - "Match": { - "ClassId": 5, - "SpecId": 1, - "PartyType": "0", - "HeroTalent": 1 - }, - "Units": [ - { - "Name": "无盾坦克", - "Kind": "UnitWithRoleWithoutAura", - "Role": 1, - "Reverse": false, - "AuraNames": [ - "真言术:盾" - ] - }, - { - "Name": "驱散单位", - "Kind": "UnitWithDispelType", - "Reverse": false, - "DispelType": 1 - }, - { - "Name": "无盾最低", - "HealthName": "无盾最低值", - "Kind": "LowestHealthWithoutAura", - "HealthThreshold": 101, - "Reverse": false, - "AuraNames": [ - "真言术:盾" - ] - }, - { - "Name": "最低单位", - "HealthName": "最低单位值", - "Kind": "LowestHealth", - "HealthThreshold": 101, - "Reverse": false - }, - { - "Name": "无救赎最低", - "HealthName": "无救赎最低值", - "Kind": "LowestHealthWithoutAura", - "HealthThreshold": 101, - "Reverse": false, - "AuraNames": [ - "救赎" - ] - } - ], - "Counts": [ - { - "Name": "C90", - "Kind": "UnitsBelowHealth", - "HealthThreshold": 90 - }, - { - "Name": "C85", - "Kind": "UnitsBelowHealth", - "HealthThreshold": 85 - }, - { - "Name": "C80", - "Kind": "UnitsBelowHealth", - "HealthThreshold": 80 - }, - { - "Name": "耀80", - "Kind": "UnitsWithoutAuraBelowHealth", - "HealthThreshold": 80, - "AuraName": "救赎" - }, - { - "Name": "耀90", - "Kind": "UnitsWithoutAuraBelowHealth", - "HealthThreshold": 90, - "AuraName": "救赎" - }, - { - "Name": "有救赎数量", - "Kind": "UnitsWithAura", - "AuraName": "救赎" - } - ], - "ValueAdjustments": [ - { - "Enabled": true, - "Condition": "施法技能 == 30", - "Field": "耀层数", - "Delta": -1, - "Formula": "" - }, - { - "Enabled": true, - "Condition": "施法技能 == 34", - "Field": "暗影层数", - "Delta": -1, - "Formula": "" - }, - { - "Enabled": true, - "Condition": "施法技能 == 34", - "Field": "涌动层数", - "Delta": -1, - "Formula": "" - }, - { - "Enabled": true, - "Condition": "施法技能 == 30", - "Field": "耀90", - "Delta": -4, - "Formula": "" - }, - { - "Enabled": true, - "Condition": "施法技能 == 30", - "Field": "耀80", - "Delta": -4, - "Formula": "" - }, - { - "Enabled": true, - "Condition": "施法技能 == 30", - "Field": "有救赎数量", - "Delta": 4, - "Formula": "" - }, - { - "Enabled": true, - "Condition": "", - "Field": "阈值2", - "Delta": 0, - "Formula": "60 + (能量值 * 0.3)" - } - ], - "Rules": [ - { - "Enabled": true, - "Condition": "引导 > 0 || 延迟 > 0 || 施法技能 == 5", - "Spell": "暂停", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "生命值 <= 30 && 大红冷却 == 0", - "Unit": 0, - "Spell": "银月城生命药水", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.绝望祷言 == 0 && 生命值 <= 50", - "Unit": 0, - "Spell": "绝望祷言", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.渐隐术 == 0 && 生命值 <= 90", - "Unit": 0, - "Spell": "渐隐术", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "一键辅助 == 10", - "Unit": 0, - "Spell": "真言术:韧", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "插入法术 != \"\"", - "Unit": 0, - "Spell": "插入法术", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.纯净术 == 0 && 目标类型 in (12, 13)", - "Unit": 0, - "Spell": "纯净术", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.纯净术 == 0 && 驱散单位 == true", - "UnitName": "驱散单位", - "Spell": "纯净术", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "暗影愈合 >= 1 && 暗影愈合 == 2 && 最低单位 == true && 最低单位值 <= 75 && 圣光涌动 == 0 && 移动 == false", - "UnitName": "最低单位", - "Spell": "快速治疗", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "暗影愈合 == 2 && 最低单位 == true && 最低单位值 <= 75 && 圣光涌动 > 0", - "UnitName": "最低单位", - "Spell": "快速治疗", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "暗影愈合 >= 1 && 暗影愈合 == 1 && 最低单位 == true && 最低单位值 <= 65 && 圣光涌动 == 0 && 移动 == false", - "UnitName": "最低单位", - "Spell": "快速治疗", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "暗影愈合 == 1 && 最低单位 == true && 最低单位值 <= 65 && 圣光涌动 > 0", - "UnitName": "最低单位", - "Spell": "快速治疗", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.真言术:盾 == 0 && 虚空之盾 > 0 && 无盾最低 == true", - "UnitName": "无盾最低", - "Spell": "真言术:盾", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.暗言术:灭 == 0 && spells.暗影魔 == 0 && 战斗时间 > 0 && 目标类型 in (1, 2, 3) && 目标生命值 < 20", - "Unit": 0, - "Spell": "暗言术:灭", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "战斗时间 > 0 && 目标类型 in (1, 2, 3) && 一键辅助 == 14", - "Unit": 0, - "Spell": "暗言术:痛", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.苦修 == 0 && 目标光环数量 >= 1 && 敌人人数 >= 3 && 有光环敌人数 >= 1 && 有光环敌人数 <= 2", - "Unit": 0, - "Spell": "苦修", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.福音 == 0 && 福音层数 == 0 && C90 >= 3", - "Unit": 0, - "Spell": "福音", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.福音 == 0 && 福音层数 == 0 && 耀90 >= 2", - "Unit": 0, - "Spell": "福音", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.真言术:耀 == 0 && 福音层数 > 0 && 耀层数 == 2 && 耀90 >= 2", - "Unit": 0, - "Spell": "真言术:耀", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.真言术:耀 == 0 && 福音层数 > 0 && 耀层数 == 1 && 耀80 >= 2", - "Unit": 0, - "Spell": "真言术:耀", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.真言术:耀 == 0 && 福音层数 > 0 && 耀层数 == 2 && C85 >= 2", - "Unit": 0, - "Spell": "真言术:耀", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.真言术:耀 == 0 && 福音层数 > 0 && 耀层数 == 1 && C80 >= 2", - "Unit": 0, - "Spell": "真言术:耀", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.苦修 == 0 && 虚空之盾 == 0 && 最低单位 == true && 最低单位值 <= 70", - "UnitName": "最低单位", - "Spell": "苦修", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "暗影层数 == 0 && 圣光涌动 > 0 && 无救赎最低 == true && 无救赎最低值 <= 90", - "UnitName": "无救赎最低", - "Spell": "快速治疗", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "暗影层数 == 0 && 圣光涌动 > 0 && 最低单位 == true && 最低单位值 <= 80", - "UnitName": "最低单位", - "Spell": "快速治疗", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.真言术:盾 == 0 && 无盾最低 == true && 无盾最低值 <= 70", - "UnitName": "无盾最低", - "Spell": "真言术:盾", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.真言术:盾 == 0 && 无救赎最低 == true && 无救赎最低值 <= 90", - "UnitName": "无救赎最低", - "Spell": "真言术:盾", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.真言术:盾 == 0 && 无盾坦克 == true && 战斗 == false", - "UnitName": "无盾坦克", - "Spell": "真言术:盾", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.真言术:盾 == 0 && 无盾最低 == true", - "UnitName": "无盾最低", - "Spell": "真言术:盾", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.真言术:盾 == 0 && 无盾坦克 == true", - "UnitName": "无盾坦克", - "Spell": "真言术:盾", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.真言术:耀 == 0 && 移动 == false && 耀90 >= 3 && 耀层数 == 2", - "Unit": 0, - "Spell": "真言术:耀", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "战斗时间 > 0 && 目标类型 in (1, 2, 3) && spells.暗言术:灭 == 0 && 有救赎数量 > 0", - "Unit": 0, - "Spell": "暗言术:灭", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "战斗时间 > 0 && 目标类型 in (1, 2, 3) && spells.心灵震爆 == 0 && spells.暗影分流 == 0 && 有救赎数量 == 0 && 移动 == false", - "Unit": 0, - "Spell": "心灵震爆", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "战斗时间 > 0 && 目标类型 in (1, 2, 3) && spells.苦修 == 0 && 苦修层数 == 2", - "Unit": 0, - "Spell": "苦修", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "战斗时间 > 0 && 目标类型 in (1, 2, 3) && spells.苦修 == 0 && 苦修层数 == 1 && spells.苦修充能 <= 3", - "Unit": 0, - "Spell": "苦修", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "战斗时间 > 0 && 目标类型 in (1, 2, 3) && 移动 == false", - "Unit": 0, - "Spell": "惩击", - "Hotkey": "", - "Step": "" - } - ] -} \ No newline at end of file diff --git a/module/戒律团队神谕者-by-Wayne.json b/module/戒律团队神谕者-by-Wayne.json deleted file mode 100644 index 38dcf9be..00000000 --- a/module/戒律团队神谕者-by-Wayne.json +++ /dev/null @@ -1,429 +0,0 @@ -{ - "Id": "新模块1-20260612100954681", - "Name": "戒律团队神谕者 by Wayne", - "Enabled": true, - "Match": { - "ClassId": 5, - "SpecId": 1, - "PartyType": "1-40", - "HeroTalent": 1 - }, - "Units": [ - { - "Name": "无盾坦克", - "Kind": "UnitWithRoleWithoutAura", - "Role": 1, - "Reverse": false, - "AuraNames": [ - "真言术:盾" - ] - }, - { - "Name": "驱散单位", - "Kind": "UnitWithDispelType", - "Reverse": false, - "DispelType": 1 - }, - { - "Name": "无盾最低", - "HealthName": "无盾最低值", - "Kind": "LowestHealthWithoutAura", - "HealthThreshold": 101, - "Reverse": false, - "AuraNames": [ - "真言术:盾" - ] - }, - { - "Name": "最低单位", - "HealthName": "最低单位值", - "Kind": "LowestHealth", - "HealthThreshold": 101, - "Reverse": false - }, - { - "Name": "无救赎最低", - "HealthName": "无救赎最低值", - "Kind": "LowestHealthWithoutAura", - "HealthThreshold": 101, - "Reverse": false, - "AuraNames": [ - "救赎" - ] - } - ], - "Counts": [ - { - "Name": "C90", - "Kind": "UnitsBelowHealth", - "HealthThreshold": 90 - }, - { - "Name": "C85", - "Kind": "UnitsBelowHealth", - "HealthThreshold": 85 - }, - { - "Name": "C80", - "Kind": "UnitsBelowHealth", - "HealthThreshold": 80 - }, - { - "Name": "耀80", - "Kind": "UnitsWithoutAuraBelowHealth", - "HealthThreshold": 80, - "AuraName": "救赎" - }, - { - "Name": "耀90", - "Kind": "UnitsWithoutAuraBelowHealth", - "HealthThreshold": 90, - "AuraName": "救赎" - }, - { - "Name": "有救赎数量", - "Kind": "UnitsWithAura", - "AuraName": "救赎" - } - ], - "ValueAdjustments": [ - { - "Enabled": true, - "Condition": "施法技能 == 30", - "Field": "耀层数", - "Delta": -1, - "Formula": "" - }, - { - "Enabled": true, - "Condition": "施法技能 == 34", - "Field": "暗影层数", - "Delta": -1, - "Formula": "" - }, - { - "Enabled": true, - "Condition": "施法技能 == 34", - "Field": "涌动层数", - "Delta": -1, - "Formula": "" - }, - { - "Enabled": true, - "Condition": "施法技能 == 30", - "Field": "耀90", - "Delta": -4, - "Formula": "" - }, - { - "Enabled": true, - "Condition": "施法技能 == 30", - "Field": "耀80", - "Delta": -4, - "Formula": "" - }, - { - "Enabled": true, - "Condition": "施法技能 == 30", - "Field": "有救赎数量", - "Delta": 4, - "Formula": "" - }, - { - "Enabled": true, - "Condition": "", - "Field": "治疗阈值", - "Delta": 0, - "Formula": "60 + (能量值 * 0.3)" - } - ], - "Rules": [ - { - "Enabled": true, - "Condition": "引导 > 0 || 延迟 > 0 || 施法技能 == 5", - "Spell": "暂停", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "生命值 <= 30 && 大红冷却 == 0", - "Unit": 0, - "Spell": "银月城生命药水", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.绝望祷言 == 0 && 生命值 <= 50", - "Unit": 0, - "Spell": "绝望祷言", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.渐隐术 == 0 && 生命值 <= 90", - "Unit": 0, - "Spell": "渐隐术", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "一键辅助 == 10", - "Unit": 0, - "Spell": "真言术:韧", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "插入法术 != \"\"", - "Unit": 0, - "Spell": "插入法术", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.纯净术 == 0 && 目标类型 in (12, 13)", - "Unit": 0, - "Spell": "纯净术", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.纯净术 == 0 && 驱散单位 == true", - "UnitName": "驱散单位", - "Spell": "纯净术", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "暗影愈合 >= 1 && 暗影愈合 == 2 && 最低单位 == true && 最低单位值 <= 75 && 圣光涌动 == 0 && 移动 == false", - "UnitName": "最低单位", - "Spell": "快速治疗", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "暗影愈合 == 2 && 最低单位 == true && 最低单位值 <= 75 && 圣光涌动 > 0", - "UnitName": "最低单位", - "Spell": "快速治疗", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "暗影愈合 >= 1 && 暗影愈合 == 1 && 最低单位 == true && 最低单位值 <= 65 && 圣光涌动 == 0 && 移动 == false", - "UnitName": "最低单位", - "Spell": "快速治疗", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "暗影愈合 == 1 && 最低单位 == true && 最低单位值 <= 65 && 圣光涌动 > 0", - "UnitName": "最低单位", - "Spell": "快速治疗", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.真言术:盾 == 0 && 虚空之盾 > 0 && 无盾最低 == true", - "UnitName": "无盾最低", - "Spell": "真言术:盾", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.暗言术:灭 == 0 && spells.暗影魔 == 0 && 战斗时间 > 0 && 目标类型 in (1, 2, 3) && 目标生命值 < 20", - "Unit": 0, - "Spell": "暗言术:灭", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "战斗时间 > 0 && 目标类型 in (1, 2, 3) && 一键辅助 == 14", - "Unit": 0, - "Spell": "暗言术:痛", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.苦修 == 0 && 目标光环数量 >= 1 && 敌人人数 >= 3 && 有光环敌人数 >= 1 && 有光环敌人数 <= 2", - "Unit": 0, - "Spell": "苦修", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.福音 == 0 && 福音层数 == 0 && C90 >= 3", - "Unit": 0, - "Spell": "福音", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.福音 == 0 && 福音层数 == 0 && 耀90 >= 2", - "Unit": 0, - "Spell": "福音", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.真言术:耀 == 0 && 福音层数 > 0 && 耀层数 == 2 && 耀90 >= 2", - "Unit": 0, - "Spell": "真言术:耀", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.真言术:耀 == 0 && 福音层数 > 0 && 耀层数 == 1 && 耀80 >= 2", - "Unit": 0, - "Spell": "真言术:耀", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.真言术:耀 == 0 && 福音层数 > 0 && 耀层数 == 2 && C85 >= 2", - "Unit": 0, - "Spell": "真言术:耀", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.真言术:耀 == 0 && 福音层数 > 0 && 耀层数 == 1 && C80 >= 2", - "Unit": 0, - "Spell": "真言术:耀", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.苦修 == 0 && 虚空之盾 == 0 && 最低单位 == true && 最低单位值 <= 70", - "UnitName": "最低单位", - "Spell": "苦修", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "暗影层数 == 0 && 圣光涌动 > 0 && 无救赎最低 == true && 无救赎最低值 <= 90", - "UnitName": "无救赎最低", - "Spell": "快速治疗", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "暗影层数 == 0 && 圣光涌动 > 0 && 最低单位 == true && 最低单位值 <= 80", - "UnitName": "最低单位", - "Spell": "快速治疗", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.真言术:盾 == 0 && 无盾最低 == true && 无盾最低值 <= 70", - "UnitName": "无盾最低", - "Spell": "真言术:盾", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.真言术:盾 == 0 && 无救赎最低 == true && 无救赎最低值 <= 90", - "UnitName": "无救赎最低", - "Spell": "真言术:盾", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.真言术:盾 == 0 && 无盾坦克 == true && 战斗 == false", - "UnitName": "无盾坦克", - "Spell": "真言术:盾", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.真言术:盾 == 0 && 无盾最低 == true", - "UnitName": "无盾最低", - "Spell": "真言术:盾", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.真言术:盾 == 0 && 无盾坦克 == true", - "UnitName": "无盾坦克", - "Spell": "真言术:盾", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "spells.真言术:耀 == 0 && 移动 == false && 耀90 >= 3 && 耀层数 == 2", - "Unit": 0, - "Spell": "真言术:耀", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "战斗时间 > 0 && 目标类型 in (1, 2, 3) && spells.暗言术:灭 == 0 && 有救赎数量 > 0", - "Unit": 0, - "Spell": "暗言术:灭", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "战斗时间 > 0 && 目标类型 in (1, 2, 3) && spells.心灵震爆 == 0 && spells.暗影分流 == 0 && 有救赎数量 == 0 && 移动 == false", - "Unit": 0, - "Spell": "心灵震爆", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "战斗时间 > 0 && 目标类型 in (1, 2, 3) && spells.苦修 == 0 && 苦修层数 == 2", - "Unit": 0, - "Spell": "苦修", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "战斗时间 > 0 && 目标类型 in (1, 2, 3) && spells.苦修 == 0 && 苦修层数 == 1 && spells.苦修充能 <= 3", - "Unit": 0, - "Spell": "苦修", - "Hotkey": "", - "Step": "" - }, - { - "Enabled": true, - "Condition": "战斗时间 > 0 && 目标类型 in (1, 2, 3) && 移动 == false", - "Unit": 0, - "Spell": "惩击", - "Hotkey": "", - "Step": "" - } - ] -} \ No newline at end of file diff --git a/module/戒律队伍神谕者-by-Wayne.json b/module/戒律队伍神谕者-by-Wayne.json index ac966ddb..d564cb58 100644 --- a/module/戒律队伍神谕者-by-Wayne.json +++ b/module/戒律队伍神谕者-by-Wayne.json @@ -97,7 +97,7 @@ { "Enabled": true, "Condition": "施法技能 == 34", - "Field": "暗影层数", + "Field": "auras.暗影层数", "Delta": -1, "Formula": "" }, @@ -196,7 +196,7 @@ }, { "Enabled": true, - "Condition": "暗影愈合 >= 1 && 暗影愈合 == 2 && 最低单位 == true && 最低单位值 <= 75 && 圣光涌动 == 0 && 移动 == false", + "Condition": "auras.暗影愈合 >= 1 && auras.暗影愈合 == 2 && 最低单位 == true && 最低单位值 <= 75 && auras.圣光涌动 == 0 && 移动 == false", "UnitName": "最低单位", "Spell": "快速治疗", "Hotkey": "", @@ -204,7 +204,7 @@ }, { "Enabled": true, - "Condition": "暗影愈合 == 2 && 最低单位 == true && 最低单位值 <= 75 && 圣光涌动 > 0", + "Condition": "auras.暗影愈合 == 2 && 最低单位 == true && 最低单位值 <= 75 && auras.圣光涌动 > 0", "UnitName": "最低单位", "Spell": "快速治疗", "Hotkey": "", @@ -212,7 +212,7 @@ }, { "Enabled": true, - "Condition": "暗影愈合 >= 1 && 暗影愈合 == 1 && 最低单位 == true && 最低单位值 <= 65 && 圣光涌动 == 0 && 移动 == false", + "Condition": "auras.暗影愈合 >= 1 && auras.暗影愈合 == 1 && 最低单位 == true && 最低单位值 <= 65 && auras.圣光涌动 == 0 && 移动 == false", "UnitName": "最低单位", "Spell": "快速治疗", "Hotkey": "", @@ -220,7 +220,7 @@ }, { "Enabled": true, - "Condition": "暗影愈合 == 1 && 最低单位 == true && 最低单位值 <= 65 && 圣光涌动 > 0", + "Condition": "auras.暗影愈合 == 1 && 最低单位 == true && 最低单位值 <= 65 && auras.圣光涌动 > 0", "UnitName": "最低单位", "Spell": "快速治疗", "Hotkey": "", @@ -228,7 +228,7 @@ }, { "Enabled": true, - "Condition": "spells.真言术:盾 == 0 && 虚空之盾 > 0 && 无盾最低 == true", + "Condition": "spells.真言术:盾 == 0 && auras.虚空之盾 > 0 && 无盾最低 == true", "UnitName": "无盾最低", "Spell": "真言术:盾", "Hotkey": "", @@ -260,7 +260,7 @@ }, { "Enabled": true, - "Condition": "spells.福音 == 0 && 福音层数 == 0 && C90 >= 3", + "Condition": "spells.福音 == 0 && auras.福音层数 == 0 && C90 >= 3", "Unit": 0, "Spell": "福音", "Hotkey": "", @@ -268,7 +268,7 @@ }, { "Enabled": true, - "Condition": "spells.福音 == 0 && 福音层数 == 0 && 耀90 >= 2", + "Condition": "spells.福音 == 0 && auras.福音层数 == 0 && 耀90 >= 2", "Unit": 0, "Spell": "福音", "Hotkey": "", @@ -276,7 +276,7 @@ }, { "Enabled": true, - "Condition": "spells.真言术:耀 == 0 && 福音层数 > 0 && 耀层数 == 2 && 耀90 >= 2", + "Condition": "spells.真言术:耀 == 0 && auras.福音层数 > 0 && 耀层数 == 2 && 耀90 >= 2", "Unit": 0, "Spell": "真言术:耀", "Hotkey": "", @@ -284,7 +284,7 @@ }, { "Enabled": true, - "Condition": "spells.真言术:耀 == 0 && 福音层数 > 0 && 耀层数 == 1 && 耀80 >= 2", + "Condition": "spells.真言术:耀 == 0 && auras.福音层数 > 0 && 耀层数 == 1 && 耀80 >= 2", "Unit": 0, "Spell": "真言术:耀", "Hotkey": "", @@ -292,7 +292,7 @@ }, { "Enabled": true, - "Condition": "spells.真言术:耀 == 0 && 福音层数 > 0 && 耀层数 == 2 && C85 >= 2", + "Condition": "spells.真言术:耀 == 0 && auras.福音层数 > 0 && 耀层数 == 2 && C85 >= 2", "Unit": 0, "Spell": "真言术:耀", "Hotkey": "", @@ -300,7 +300,7 @@ }, { "Enabled": true, - "Condition": "spells.真言术:耀 == 0 && 福音层数 > 0 && 耀层数 == 1 && C80 >= 2", + "Condition": "spells.真言术:耀 == 0 && auras.福音层数 > 0 && 耀层数 == 1 && C80 >= 2", "Unit": 0, "Spell": "真言术:耀", "Hotkey": "", @@ -308,7 +308,7 @@ }, { "Enabled": true, - "Condition": "spells.苦修 == 0 && 虚空之盾 == 0 && 最低单位 == true && 最低单位值 <= 70", + "Condition": "spells.苦修 == 0 && auras.虚空之盾 == 0 && 最低单位 == true && 最低单位值 <= 70", "UnitName": "最低单位", "Spell": "苦修", "Hotkey": "", @@ -316,7 +316,7 @@ }, { "Enabled": true, - "Condition": "暗影层数 == 0 && 圣光涌动 > 0 && 无救赎最低 == true && 无救赎最低值 <= 90", + "Condition": "auras.暗影层数 == 0 && auras.圣光涌动 > 0 && 无救赎最低 == true && 无救赎最低值 <= 90", "UnitName": "无救赎最低", "Spell": "快速治疗", "Hotkey": "", @@ -324,7 +324,7 @@ }, { "Enabled": true, - "Condition": "暗影层数 == 0 && 圣光涌动 > 0 && 最低单位 == true && 最低单位值 <= 80", + "Condition": "auras.暗影层数 == 0 && auras.圣光涌动 > 0 && 最低单位 == true && 最低单位值 <= 80", "UnitName": "最低单位", "Spell": "快速治疗", "Hotkey": "", diff --git a/module/邪DK-By-Wayne.json b/module/邪DK-By-Wayne.json new file mode 100644 index 00000000..93d7f11e --- /dev/null +++ b/module/邪DK-By-Wayne.json @@ -0,0 +1,389 @@ +{ + "Id": "新模块1-20260615104504550", + "Name": "邪DK By Wayne", + "Enabled": true, + "Match": { + "ClassId": 6, + "SpecId": 3, + "HeroTalent": 3 + }, + "Units": [], + "Counts": [], + "ValueAdjustments": [], + "Rules": [ + { + "Enabled": true, + "Condition": "引导 > 0 || 延迟 > 0", + "Spell": "暂停", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "一键辅助 == 13", + "Unit": 0, + "Spell": "亡者复生", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "战斗时间 == 0 || 目标类型 == 0 || 目标类型 >= 10", + "Spell": "暂停", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "生命值 <= 30 && auras.黑暗援助 > 0", + "Unit": 0, + "Spell": "灵界打击", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "生命值 <= 30 && 能量值 >= 40", + "Unit": 0, + "Spell": "灵界打击", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "auras.脓疮毒镰2 >= 0 && auras.脓疮毒镰2 <= 1 && auras.脓疮毒镰 > 0 && 目标距离 <= 5", + "Unit": 0, + "Spell": "脓疮打击", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "符文 >= 2 && auras.脓疮毒镰2 <= 3 && auras.脓疮毒镰 == 0 && 目标距离 <= 5", + "Unit": 0, + "Spell": "脓疮打击", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "一键辅助 == 6 || 疾病判断 == 1", + "Unit": 0, + "Spell": "爆发", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "爆发药水开关 == 1 && 鲁莽药水冷却 == 0 && 爆发开关 == 1 && spells.黑暗突变 == 0 && spells.亡者大军 == 0", + "Unit": 0, + "Spell": "鲁莽药水", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "爆发开关 == 1 && spells.黑暗突变 == 0 && spells.亡者大军 == 0", + "Unit": 0, + "Spell": "亡者大军", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "spells.黑暗突变 == 0 && spells.亡者大军 > 38", + "Unit": 0, + "Spell": "黑暗突变", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "符文 > 0 && spells.黑暗突变 > 43", + "Unit": 0, + "Spell": "天灾打击", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "spells.灵魂收割 == 0 && auras.腐化层数 == 0 && 首领战 > 0 && 目标生命值 <= 35", + "Unit": 0, + "Spell": "灵魂收割", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "spells.灵魂收割 == 0 && auras.腐化层数 == 0 && 首领战 > 0 && auras.割魂索命 > 0", + "Unit": 0, + "Spell": "灵魂收割", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "spells.灵魂收割 >= 0 && spells.灵魂收割 <= 1 && auras.腐化层数 >= 2 && auras.亡者指挥官 > 1 && 目标生命值 <= 35", + "Unit": 0, + "Spell": "灵魂收割", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "spells.灵魂收割 >= 0 && spells.灵魂收割 <= 1 && auras.腐化层数 >= 2 && auras.亡者指挥官 > 1 && auras.割魂索命 > 0", + "Unit": 0, + "Spell": "灵魂收割", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "爆发开关 == 0 && auras.腐化层数 >= 2 && 首领战 > 0 && spells.灵魂收割 >= 0 && spells.灵魂收割 <= 1 && 目标生命值 < 35", + "Unit": 0, + "Spell": "灵魂收割", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "爆发开关 == 0 && auras.腐化层数 >= 2 && 首领战 > 0 && spells.灵魂收割 >= 0 && spells.灵魂收割 <= 1 && auras.割魂索命 > 0", + "Unit": 0, + "Spell": "灵魂收割", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "爆发开关 == 0 && auras.腐化层数 == 2 && 首领战 == 0 && spells.灵魂收割 >= 0 && spells.灵魂收割 <= 1 && spells.黑暗突变 > 20 && 目标生命值 > 15 && 目标生命值 < 35", + "Unit": 0, + "Spell": "灵魂收割", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "爆发开关 == 0 && auras.腐化层数 == 3 && 首领战 == 0 && spells.灵魂收割 >= 0 && spells.灵魂收割 <= 1 && spells.亡者大军 > 60 && 目标生命值 > 5 && 目标生命值 < 35", + "Unit": 0, + "Spell": "灵魂收割", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "爆发开关 == 0 && auras.腐化层数 == 2 && 首领战 == 0 && spells.灵魂收割 >= 0 && spells.灵魂收割 <= 1 && spells.黑暗突变 > 20 && auras.割魂索命 > 0", + "Unit": 0, + "Spell": "灵魂收割", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "爆发开关 == 0 && auras.腐化层数 == 3 && 首领战 == 0 && spells.灵魂收割 >= 0 && spells.灵魂收割 <= 1 && spells.亡者大军 > 60 && auras.割魂索命 > 0", + "Unit": 0, + "Spell": "灵魂收割", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "腐化层数 >= 2 && auras.亡者指挥官 > 1 && spells.灵魂收割 > 1", + "Unit": 0, + "Spell": "腐化", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "爆发开关 == 0 && auras.腐化层数 == 2 && 首领战 > 0 && spells.灵魂收割 == 0 && spells.亡者大军 > 30", + "Unit": 0, + "Spell": "腐化", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "爆发开关 == 0 && auras.腐化层数 == 2 && 首领战 == 0 && spells.灵魂收割 == 0 && spells.黑暗突变 > 20 && 目标生命值 > 50", + "Unit": 0, + "Spell": "腐化", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "爆发开关 == 0 && auras.腐化层数 == 3 && 首领战 > 0 && spells.灵魂收割 == 0 && spells.亡者大军 > 15", + "Unit": 0, + "Spell": "腐化", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "爆发开关 == 0 && auras.腐化层数 == 3 && 首领战 == 0 && spells.灵魂收割 == 0 && spells.亡者大军 > 60 && 目标生命值 > 50", + "Unit": 0, + "Spell": "腐化", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "auras.禁断知识 > 0 && auras.禁断知识 <= 5 && 能量值 >= 30 && 敌人人数 < 3", + "Unit": 0, + "Spell": "凋零缠绕", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "auras.禁断知识 > 0 && auras.禁断知识 <= 5 && 能量值 >= 30 && 敌人人数 >= 3", + "Unit": 0, + "Spell": "扩散", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "脓疮毒镰 > 0 && 目标距离 <= 5 && 脓疮毒镰2 == 0", + "Unit": 0, + "Spell": "脓疮打击", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "脓疮毒镰 > 0 && 目标距离 <= 5 && 脓疮毒镰 < 3", + "Unit": 0, + "Spell": "脓疮打击", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "移动 == false && auras.凋零层数 > 0 && 能量值 < 90 && auras.亡者指挥官 > 0 && 敌人人数 >= 3", + "Unit": 0, + "Spell": "枯萎凋零", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "移动 == false && auras.凋零层数 > 0 && 能量值 < 90 && auras.亡者指挥官 > 0 && 首领战 == 70", + "Unit": 0, + "Spell": "枯萎凋零", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "符文 > 0 && spells.黑暗突变 >= 25 && 能量值 < 30", + "Unit": 0, + "Spell": "天灾打击", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "auras.末日突降 >= 1 && 能量值 >= 15 && 敌人人数 >= 3", + "Unit": 0, + "Spell": "扩散", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "能量值 >= 80 && 敌人人数 >= 3", + "Unit": 0, + "Spell": "扩散", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "auras.末日突降 >= 1 && 能量值 >= 15 && 敌人人数 < 3", + "Unit": 0, + "Spell": "凋零缠绕", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "能量值 >= 80 && 敌人人数 < 3", + "Unit": 0, + "Spell": "凋零缠绕", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "符文 > 0 && 能量值 < 30 && auras.食尸鬼层数 > 6", + "Unit": 0, + "Spell": "天灾打击", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "auras.禁断知识 > 0 && auras.禁断知识 <= 5 && 能量值 >= 30 && 敌人人数 >= 3", + "Unit": 0, + "Spell": "扩散", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "auras.禁断知识 > 0 && auras.禁断知识 <= 5 && 能量值 >= 30 && 敌人人数 < 3", + "Unit": 0, + "Spell": "凋零缠绕", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "符文 >= 2 && 目标距离 <= 5 && auras.食尸鬼层数 == 0", + "Unit": 0, + "Spell": "脓疮打击", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "符文 >= 2 && 目标距离 <= 5 && 脓疮毒镰2 == 0", + "Unit": 0, + "Spell": "脓疮打击", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "auras.凋萎 > 0 && spells.黑暗突变 == 0 && auras.食尸鬼层数 > 0 && 符文 > 0", + "Unit": 0, + "Spell": "天灾打击", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "能量值 >= 30 && 敌人人数 >= 3", + "Unit": 0, + "Spell": "扩散", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "能量值 >= 30 && 敌人人数 < 3", + "Unit": 0, + "Spell": "凋零缠绕", + "Hotkey": "", + "Step": "" + }, + { + "Enabled": true, + "Condition": "符文 > 0 && auras.食尸鬼层数 > 0", + "Unit": 0, + "Spell": "天灾打击", + "Hotkey": "", + "Step": "" + } + ] +} \ No newline at end of file diff --git a/obj/Debug/net10.0-windows/Shigure.AssemblyInfo.cs b/obj/Debug/net10.0-windows/Shigure.AssemblyInfo.cs index 0527e793..c0627a6a 100644 --- a/obj/Debug/net10.0-windows/Shigure.AssemblyInfo.cs +++ b/obj/Debug/net10.0-windows/Shigure.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Shigure")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fc482fe514fc8558f58e80e40ae79202651f3268")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7d8b772a5257179f8689de7fad7a33c32214251f")] [assembly: System.Reflection.AssemblyProductAttribute("Shigure")] [assembly: System.Reflection.AssemblyTitleAttribute("Shigure")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/obj/Debug/net10.0-windows/Shigure.AssemblyInfoInputs.cache b/obj/Debug/net10.0-windows/Shigure.AssemblyInfoInputs.cache index a452ca1d..76990fd8 100644 --- a/obj/Debug/net10.0-windows/Shigure.AssemblyInfoInputs.cache +++ b/obj/Debug/net10.0-windows/Shigure.AssemblyInfoInputs.cache @@ -1 +1 @@ -f1f612f00aa321e89bb7708a8539a544d13e2a1fef882d463fc419a9b7842777 +cbc3a8cac7edc7655040c6e6ff834cfadb6e0df85baf41270a359ebd25cca5ce diff --git a/obj/Debug/net10.0-windows/Shigure.csproj.FileListAbsolute.txt b/obj/Debug/net10.0-windows/Shigure.csproj.FileListAbsolute.txt index 6d856a5a..03ed68e3 100644 --- a/obj/Debug/net10.0-windows/Shigure.csproj.FileListAbsolute.txt +++ b/obj/Debug/net10.0-windows/Shigure.csproj.FileListAbsolute.txt @@ -104,7 +104,6 @@ C:\Users\bianw\OneDrive\VS Code\Shigure\artifacts\verify-about\Shigure.runtimeco C:\Users\bianw\OneDrive\VS Code\Shigure\artifacts\verify-about\Shigure.dll C:\Users\bianw\OneDrive\VS Code\Shigure\artifacts\verify-about\Shigure.pdb C:\Users\bianw\OneDrive\VS Code\Shigure\bin\Debug\net10.0-windows\module\戒律队伍神谕者-by-Wayne.json -C:\Users\bianw\OneDrive\VS Code\Shigure\bin\Debug\net10.0-windows\module\戒律团队神谕者-by-Wayne.json C:\Users\bianw\OneDrive\VS Code\Shigure\bin\CodexBuild\Assets\shigure-emblem-arasaka.ico C:\Users\bianw\OneDrive\VS Code\Shigure\bin\CodexBuild\Assets\shigure-emblem-arasaka.png C:\Users\bianw\OneDrive\VS Code\Shigure\bin\CodexBuild\Assets\shigure-logo.svg @@ -132,7 +131,6 @@ C:\Users\bianw\OneDrive\VS Code\Shigure\bin\CodexBuild\Shigure.deps.json C:\Users\bianw\OneDrive\VS Code\Shigure\bin\CodexBuild\Shigure.runtimeconfig.json C:\Users\bianw\OneDrive\VS Code\Shigure\bin\CodexBuild\Shigure.dll C:\Users\bianw\OneDrive\VS Code\Shigure\bin\CodexBuild\Shigure.pdb -C:\Users\bianw\OneDrive\VS Code\Shigure\bin\Debug\net10.0-windows\module\戒律-单人神谕者-测试.json C:\Users\bianw\OneDrive\VS Code\Shigure\bin\Debug\net10.0-windows\module\DK-官方一键.json C:\Users\bianw\OneDrive\VS Code\Shigure\bin\Debug\net10.0-windows\Shigure.exe C:\Users\bianw\OneDrive\VS Code\Shigure\bin\Debug\net10.0-windows\Shigure.deps.json @@ -159,3 +157,4 @@ C:\Users\bianw\OneDrive\VS Code\Shigure\bin\Debug\net10.0-windows\config\猎人. C:\Users\bianw\OneDrive\VS Code\Shigure\bin\Debug\net10.0-windows\config\盗贼.json C:\Users\bianw\OneDrive\VS Code\Shigure\bin\Debug\net10.0-windows\config\萨满.json C:\Users\bianw\OneDrive\VS Code\Shigure\bin\Debug\net10.0-windows\module\DH-复仇-官方一键.json +C:\Users\bianw\OneDrive\VS Code\Shigure\bin\Debug\net10.0-windows\module\邪DK-By-Wayne.json diff --git a/obj/Debug/net10.0-windows/Shigure.dll b/obj/Debug/net10.0-windows/Shigure.dll index d7355f4b..1a0f9edd 100644 Binary files a/obj/Debug/net10.0-windows/Shigure.dll and b/obj/Debug/net10.0-windows/Shigure.dll differ diff --git a/obj/Debug/net10.0-windows/Shigure.pdb b/obj/Debug/net10.0-windows/Shigure.pdb index 11b58b7b..3b9b79c7 100644 Binary files a/obj/Debug/net10.0-windows/Shigure.pdb and b/obj/Debug/net10.0-windows/Shigure.pdb differ diff --git a/obj/Debug/net10.0-windows/Shigure.sourcelink.json b/obj/Debug/net10.0-windows/Shigure.sourcelink.json index 8719fc11..d0ddff41 100644 --- a/obj/Debug/net10.0-windows/Shigure.sourcelink.json +++ b/obj/Debug/net10.0-windows/Shigure.sourcelink.json @@ -1 +1 @@ -{"documents":{"C:\\Users\\bianw\\OneDrive\\VS Code\\Shigure\\*":"https://raw.githubusercontent.com/waynebian01/Shigure/fc482fe514fc8558f58e80e40ae79202651f3268/*"}} \ No newline at end of file +{"documents":{"C:\\Users\\bianw\\OneDrive\\VS Code\\Shigure\\*":"https://raw.githubusercontent.com/waynebian01/Shigure/7d8b772a5257179f8689de7fad7a33c32214251f/*"}} \ No newline at end of file diff --git a/obj/Debug/net10.0-windows/apphost.exe b/obj/Debug/net10.0-windows/apphost.exe index 90763b9b..61c6eef4 100644 Binary files a/obj/Debug/net10.0-windows/apphost.exe and b/obj/Debug/net10.0-windows/apphost.exe differ diff --git a/obj/Debug/net10.0-windows/ref/Shigure.dll b/obj/Debug/net10.0-windows/ref/Shigure.dll index 5b7cf600..9ae65d39 100644 Binary files a/obj/Debug/net10.0-windows/ref/Shigure.dll and b/obj/Debug/net10.0-windows/ref/Shigure.dll differ diff --git a/obj/Debug/net10.0-windows/refint/Shigure.dll b/obj/Debug/net10.0-windows/refint/Shigure.dll index 5b7cf600..9ae65d39 100644 Binary files a/obj/Debug/net10.0-windows/refint/Shigure.dll and b/obj/Debug/net10.0-windows/refint/Shigure.dll differ