diff --git a/Infrastructure/ClassStateCatalog.cs b/Infrastructure/ClassStateCatalog.cs index fa9e53ca..d113b0b9 100644 --- a/Infrastructure/ClassStateCatalog.cs +++ b/Infrastructure/ClassStateCatalog.cs @@ -28,7 +28,7 @@ internal static class ClassStateCatalog (CategoryState, [ "职业", "专精", "有效性", "战斗时间", "移动", - "生命值", "一键辅助", "法术失败", "队伍类型", "队伍人数", + "生命值", "一键辅助", "插入法术", "队伍类型", "队伍人数", "首领战", "难度", "英雄天赋", "施法目标", "施法技能", "敌人人数", "施法", "引导", "蓄力", "蓄力层数", "酒池", "符文", "姿态" diff --git a/Infrastructure/ConfigService.cs b/Infrastructure/ConfigService.cs index 381bad63..9ac20f02 100644 --- a/Infrastructure/ConfigService.cs +++ b/Infrastructure/ConfigService.cs @@ -8,6 +8,7 @@ public sealed class ConfigService public const string ConfigDirectoryName = "config"; public const string CommonConfigFileName = "common.json"; public const string LegacyConfigFileName = "config.json"; + private static readonly string[] FixedStateNames = ["锚点", "职业", "专精"]; public JsonObject Root { get; } @@ -126,6 +127,15 @@ public sealed class ConfigService } } + // 固定启动字段始终以 common.json 为准,禁止职业配置覆盖。 + foreach (var name in FixedStateNames) + { + if (Root[name] is { } fixedField) + { + merged[name] = fixedField.DeepClone(); + } + } + return merged; } @@ -147,7 +157,7 @@ public sealed class ConfigService } public IReadOnlyDictionary GetFailedSpells(int? classId) - => GetClassSpellMap(classId, ModuleSpecialActions.FailedSpell); + => GetClassSpellMap(classId, ModuleSpecialActions.OneKeySpell); public IReadOnlyDictionary GetOneKeySpells(int? classId) => GetClassSpellMap(classId, ModuleSpecialActions.OneKeySpell); @@ -182,4 +192,3 @@ public sealed class ConfigService } } } - diff --git a/Infrastructure/FuyutsuiConfigConverter.cs b/Infrastructure/FuyutsuiConfigConverter.cs index 8d4a8e5f..738bd5dc 100644 --- a/Infrastructure/FuyutsuiConfigConverter.cs +++ b/Infrastructure/FuyutsuiConfigConverter.cs @@ -18,7 +18,7 @@ internal static class FuyutsuiConfigConverter private static readonly HashSet CommonStateNames = new(StringComparer.Ordinal) { - "锚点", "职业", "专精", "队伍类型", "英雄天赋", "有效性", "一键辅助", "法术失败" + "锚点", "职业", "专精" }; private static readonly HashSet BoolFieldNames = new(StringComparer.Ordinal) @@ -70,9 +70,19 @@ internal static class FuyutsuiConfigConverter var lua = File.ReadAllText(luaPath, Encoding.UTF8); var classBlocks = ExtractAssignedTable(lua, "Fuyutsui.ClassBlocks") ?? throw new InvalidDataException($"{fileName}.lua 中未找到 Fuyutsui.ClassBlocks"); + var spellsList = ExtractAssignedTable(lua, "Fuyutsui.spellsList"); var root = new JsonObject(); PreserveMeta(existing, root); + root["keymap"] ??= fileName.ToLowerInvariant() + ".json"; + if (spellsList is null) + { + warnings.Add($"{fileName}: 未找到 Fuyutsui.spellsList,已保留现有一键法术"); + } + else + { + CompileSpellMaps(spellsList, root, warnings, fileName); + } for (var specId = 1; specId <= 4; specId++) { @@ -103,7 +113,7 @@ internal static class FuyutsuiConfigConverter private static void PreserveMeta(JsonObject existing, JsonObject target) { - foreach (var key in new[] { "keymap", "插入法术", "一键法术" }) + foreach (var key in new[] { "keymap", "一键法术" }) { if (existing[key] is { } node) { @@ -112,6 +122,72 @@ internal static class FuyutsuiConfigConverter } } + private static void CompileSpellMaps( + TableValue spellsList, + JsonObject target, + List warnings, + string label) + { + var oneKeySpells = new SortedDictionary(); + + foreach (var (_, value) in spellsList.Entries) + { + if (value is not TableValue spell) + { + continue; + } + + var indexValue = spell.GetNumber("index"); + var name = spell.GetString("name")?.Trim(); + if (indexValue is null + || indexValue.Value <= 0 + || indexValue.Value > int.MaxValue + || indexValue.Value != Math.Truncate(indexValue.Value) + || string.IsNullOrWhiteSpace(name)) + { + warnings.Add($"{label}: spellsList 条目缺少有效 index/name,已跳过"); + continue; + } + + var index = (int)indexValue.Value; + AddSpellMapEntry(oneKeySpells, index, name, "一键法术", warnings, label); + } + + target[ModuleSpecialActions.OneKeySpell] = ToSpellMap(oneKeySpells); + } + + private static void AddSpellMapEntry( + IDictionary target, + int index, + string name, + string mapName, + List warnings, + string label) + { + if (!target.TryGetValue(index, out var existingName)) + { + target[index] = name; + return; + } + + if (!string.Equals(existingName, name, StringComparison.Ordinal)) + { + warnings.Add( + $"{label}: {mapName} index {index} 同时对应“{existingName}”和“{name}”,已保留前者"); + } + } + + private static JsonObject ToSpellMap(IEnumerable> spells) + { + var result = new JsonObject(); + foreach (var (index, name) in spells) + { + result[index.ToString()] = name; + } + + return result; + } + private static (JsonObject Spec, List Warnings) CompileSpec(TableValue spec, string label) { var warnings = new List(); @@ -139,9 +215,10 @@ internal static class FuyutsuiConfigConverter continue; } + var stateName = NormalizeStateName(nameValue.Value); var key = category is ClassStateCatalog.CategoryTarget or ClassStateCatalog.CategoryFocus - ? category + nameValue.Value - : nameValue.Value; + ? category + stateName + : stateName; AddStateField(result, key, index, skipCommon: true); index++; } @@ -156,7 +233,7 @@ internal static class FuyutsuiConfigConverter continue; } - AddStateField(result, nameValue.Value, index, skipCommon: true); + AddStateField(result, NormalizeStateName(nameValue.Value), index, skipCommon: true); index++; } } @@ -399,4 +476,9 @@ internal static class FuyutsuiConfigConverter private static string EnsureSuffix(string name, string suffix) => name.EndsWith(suffix, StringComparison.Ordinal) ? name : name + suffix; + + private static string NormalizeStateName(string name) + => string.Equals(name, "法术失败", StringComparison.Ordinal) + ? ModuleSpecialActions.FailedSpell + : name; } diff --git a/Modules/ConditionFieldCatalog.cs b/Modules/ConditionFieldCatalog.cs index d5ce0a5a..d0b6eb38 100644 --- a/Modules/ConditionFieldCatalog.cs +++ b/Modules/ConditionFieldCatalog.cs @@ -68,7 +68,8 @@ public sealed class ConditionFieldCatalog foreach (var (key, node) in stateConfig) { - if (key is "group" or "spells" or "auras") + if (key is "group" or "spells" or "auras" + || ModuleSpecialActions.IsFailedSpell(key)) { continue; } diff --git a/Modules/ModuleSpecialActions.cs b/Modules/ModuleSpecialActions.cs index fb095bea..929a05f3 100644 --- a/Modules/ModuleSpecialActions.cs +++ b/Modules/ModuleSpecialActions.cs @@ -25,7 +25,7 @@ internal static class ModuleSpecialActions public static string? GetFailedSpell(GameState state, IReadOnlyDictionary? failedSpellMap) { - var failedSpellId = state.GetInt("法术失败"); + var failedSpellId = state.GetInt(FailedSpell); if (failedSpellMap is null || !failedSpellMap.TryGetValue(failedSpellId, out var spellName)) { return null; diff --git a/Runtime/StateBuilder.cs b/Runtime/StateBuilder.cs index 474b5aa9..f748c79c 100644 --- a/Runtime/StateBuilder.cs +++ b/Runtime/StateBuilder.cs @@ -146,4 +146,3 @@ public sealed class StateBuilder }; } } - diff --git a/TEXTURE_LAYOUT_zh-CN.md b/TEXTURE_LAYOUT_zh-CN.md index 91d33661..9b5a641f 100644 --- a/TEXTURE_LAYOUT_zh-CN.md +++ b/TEXTURE_LAYOUT_zh-CN.md @@ -100,7 +100,7 @@ states = { | 5 | 英雄天赋 | | 6 | 有效性 | | 7 | 一键辅助 | -| 8 | 法术失败 | +| 8 | 插入法术 | 其后是专精自定义状态(战斗时间、生命值、能量、敌人人数等)。 diff --git a/UI/ClassConfigEditorControl.cs b/UI/ClassConfigEditorControl.cs index d9cafbb4..92c7a198 100644 --- a/UI/ClassConfigEditorControl.cs +++ b/UI/ClassConfigEditorControl.cs @@ -43,7 +43,7 @@ public sealed class ClassConfigEditorControl : UserControl private string _lastStateCategory = ClassStateCatalog.CategoryState; private string _lastAuraBucket = "player"; - private const string HiddenAnchorStateName = "锚点"; + private static readonly string[] FixedStateNames = ["锚点", "职业", "专精"]; private static readonly (string Key, string Text)[] AuraBuckets = [ @@ -1252,6 +1252,7 @@ public sealed class ClassConfigEditorControl : UserControl return; } + NormalizeFixedStateNames(_currentSpec); WriteBackStatesCategory(_lastStateCategory); WriteBackAuras(_lastAuraBucket); @@ -1302,7 +1303,7 @@ public sealed class ClassConfigEditorControl : UserControl if (insertIndex < 0) { var anchorIndex = string.Equals(category, ClassStateCatalog.CategoryState, StringComparison.Ordinal) - ? list.FindIndex(IsHiddenStateName) + ? list.FindLastIndex(IsHiddenStateName) : -1; insertIndex = anchorIndex >= 0 ? anchorIndex + 1 : list.Count; } @@ -1593,8 +1594,17 @@ public sealed class ClassConfigEditorControl : UserControl private static decimal Clamp(NumericUpDown box, int value) => Math.Min(box.Maximum, Math.Max(box.Minimum, value)); + private static void NormalizeFixedStateNames(ClassBlocksStore.SpecBlocks spec) + { + var states = spec.NestedStates + ? spec.CategorizedStates[ClassStateCatalog.CategoryState] + : spec.FlatStates; + states.RemoveAll(IsHiddenStateName); + states.InsertRange(0, FixedStateNames); + } + private static bool IsHiddenStateName(string? name) - => string.Equals(name, HiddenAnchorStateName, StringComparison.Ordinal); + => name is not null && FixedStateNames.Contains(name, StringComparer.Ordinal); private sealed record ClassListItem(int ClassId, string Name, string FileName, bool IsModern, string? Error = null) { diff --git a/config/DeathKnight.json b/config/DeathKnight.json index 87cf1f02..03abe27e 100644 --- a/config/DeathKnight.json +++ b/config/DeathKnight.json @@ -1,15 +1,9 @@ -{ +{ "keymap": "deathknight.json", - "插入法术": { + "一键法术": { "1": "反魔法领域", "2": "窒息", "3": "致盲冰雨", - "4": "亡者大军", - "23": "血魔之握", - "24": "憎恶附肢", - "39": "死亡之握" - }, - "一键法术": { "4": "亡者大军", "5": "心脏打击", "6": "枯萎凋零", @@ -18,7 +12,7 @@ "9": "符文刃舞", "10": "精髓分裂", "11": "血液沸腾", - "12": "心脏打击", + "12": "吸血鬼打击", "13": "亡者复生", "14": "凋零缠绕", "15": "天灾打击", @@ -28,7 +22,9 @@ "19": "腐化", "20": "黑暗突变", "21": "灵魂收割", - "22": "脓疮打击", + "22": "脓疮毒镰", + "23": "血魔之握", + "24": "憎恶附肢", "25": "死神印记", "26": "冰川突进", "27": "冰霜巨龙之怒", @@ -42,12 +38,62 @@ "35": "符文武器增效", "36": "符文打击", "37": "冰霜巨龙之怒", - "38": "冰霜打击", + "38": "冰霜灾祸", + "39": "死亡之握", "40": "吞噬", - "41": "扩散", - "42": "凋零缠绕" + "41": "灾殃坟茔", + "42": "死灵缠绕", + "101": "奥术洪流", + "102": "石像形态", + "103": "影遁", + "104": "狂暴", + "105": "血性狂怒", + "106": "战争践踏", + "107": "生存意志", + "108": "亡灵意志", + "109": "逃命专家", + "110": "黑暗飞行", + "111": "火箭跳", + "112": "火箭弹幕", + "113": "空间裂隙", + "114": "圣光裁决", + "115": "先祖召唤", + "116": "烈焰之血", + "117": "蛮牛冲撞", + "118": "奥术脉冲", + "119": "袋里乾坤", + "120": "再生", + "121": "震山掌", + "122": "纳鲁的赐福", + "123": "重拳出击", + "124": "超有机光发起源", + "125": "扫尾", + "126": "翼击", + "127": "艾泽里特涌动", + "151": "切换天赋", + "152": "切换专精" }, "1": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -76,118 +122,162 @@ "step": 15, "type": "int" }, - "符文能量": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "敌人人数": { "step": 19, "type": "int" }, "符文": { - "step": 20, + "step": 22, "type": "int" }, - "敌人人数": { + "符文能量": { "step": 21, "type": "int" }, "目标类型": { - "step": 22, - "type": "int" - }, - "目标生命值": { "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": 31, "type": "int" }, - "spells": { - "死亡之握": { - "step": 32, - "type": "int" - }, - "反魔法领域": { + "焦点引导可打断": { + "step": 32, + "type": "int" + }, + "auras": { + "白骨之盾": { "step": 33, "type": "int" }, - "窒息": { + "白骨之盾层数": { + "step": "bar", + "bar": 2, + "type": "int" + } + }, + "spells": { + "死亡之握": { "step": 34, "type": "int" }, - "致盲冰雨": { + "反魔法领域": { "step": 35, "type": "int" }, - "亡者复生": { + "窒息": { "step": 36, "type": "int" }, - "吸血鬼之血": { + "致盲冰雨": { "step": 37, "type": "int" }, - "冰封之韧": { + "亡者复生": { "step": 38, "type": "int" }, - "巫妖之躯": { + "吸血鬼之血": { "step": 39, "type": "int" }, - "血魔之握": { + "冰封之韧": { "step": 40, "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": "bar", + "bar": 1, + "type": "int" } } }, "2": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -216,47 +306,47 @@ "step": 15, "type": "int" }, - "符文能量": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "敌人人数": { "step": 19, "type": "int" }, - "符文": { + "符文能量": { "step": 20, "type": "int" }, - "敌人人数": { + "符文": { "step": 21, "type": "int" }, - "爆发开关": { + "鲁莽药水": { "step": 22, "type": "int" }, - "输出模式": { + "爆发开关": { "step": 23, "type": "int" }, - "AOE开关": { + "输出模式": { "step": 24, "type": "int" }, - "爆发药水开关": { + "AOE开关": { "step": 25, "type": "int" }, - "鲁莽药水冷却": { + "爆发药水开关": { "step": 26, "type": "int" }, @@ -349,6 +439,26 @@ } }, "3": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -377,171 +487,179 @@ "step": 15, "type": "int" }, - "符文能量": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "敌人人数": { "step": 19, "type": "int" }, - "符文": { + "天启骑士数量": { "step": 20, "type": "int" }, - "敌人人数": { + "符文": { "step": 21, "type": "int" }, - "爆发开关": { + "符文能量": { "step": 22, "type": "int" }, - "输出模式": { + "治疗药水": { "step": 23, "type": "int" }, - "AOE开关": { + "鲁莽药水": { "step": 24, "type": "int" }, - "疾病判断": { + "延迟": { "step": 25, "type": "int" }, - "鲁莽药水冷却": { + "爆发开关": { "step": 26, "type": "int" }, - "大红冷却": { + "输出模式": { "step": 27, "type": "int" }, - "爆发药水开关": { + "AOE开关": { "step": 28, "type": "int" }, - "延迟": { + "爆发药水开关": { "step": 29, "type": "int" }, - "天启骑士数量": { + "目标类型": { "step": 30, "type": "int" }, - "目标类型": { + "目标生命值": { "step": 31, "type": "int" }, - "目标生命值": { + "目标距离": { "step": 32, "type": "int" }, - "目标距离": { + "目标施法": { "step": 33, "type": "int" }, - "目标施法": { + "目标施法可打断": { "step": 34, "type": "int" }, - "目标施法可打断": { + "目标引导": { "step": 35, "type": "int" }, - "目标引导": { + "目标引导可打断": { "step": 36, "type": "int" }, - "目标引导可打断": { + "焦点类型": { "step": 37, "type": "int" }, - "焦点施法": { + "焦点生命值": { "step": 38, "type": "int" }, - "焦点施法可打断": { + "焦点距离": { "step": 39, "type": "int" }, - "焦点引导": { + "焦点施法": { "step": 40, "type": "int" }, - "焦点引导可打断": { + "焦点施法可打断": { "step": 41, "type": "int" }, + "焦点引导": { + "step": 42, + "type": "int" + }, + "焦点引导可打断": { + "step": 43, + "type": "int" + }, "spells": { "死亡之握": { - "step": 42, - "type": "int" - }, - "反魔法领域": { - "step": 43, - "type": "int" - }, - "窒息": { "step": 44, "type": "int" }, - "致盲冰雨": { + "反魔法领域": { "step": 45, "type": "int" }, - "亡者复生": { + "窒息": { "step": 46, "type": "int" }, - "亡者大军": { + "致盲冰雨": { "step": 47, "type": "int" }, - "腐化": { + "亡者复生": { "step": 48, "type": "int" }, - "腐化充能": { + "亡者大军": { "step": 49, "type": "int" }, + "腐化": { + "step": 50, + "type": "int" + }, + "腐化充能": { + "step": 51, + "type": "int" + }, "腐化层数": { "step": "bar", "bar": 1, "type": "int" }, "黑暗突变": { - "step": 50, - "type": "int" - }, - "灵魂收割": { - "step": 51, - "type": "int" - }, - "枯萎凋零": { "step": 52, "type": "int" }, - "枯萎凋零充能": { + "灵魂收割": { "step": 53, "type": "int" }, + "枯萎凋零": { + "step": 54, + "type": "int" + }, + "枯萎凋零充能": { + "step": 55, + "type": "int" + }, "枯萎凋零层数": { "step": "bar", "bar": 2, "type": "int" }, "天灾打击": { - "step": 54, + "step": 56, "type": "int" }, "天灾打击层数": { diff --git a/config/DemonHunter.json b/config/DemonHunter.json index 091f616d..d07f96f1 100644 --- a/config/DemonHunter.json +++ b/config/DemonHunter.json @@ -1,17 +1,5 @@ -{ +{ "keymap": "demonhunter.json", - "插入法术": { - "3": "悲苦咒符", - "4": "禁锢", - "6": "混乱新星", - "16": "恶魔变形", - "26": "邪能毁灭", - "27": "沉默咒符", - "28": "虚空新星", - "29": "虚空变形", - "43": "黑暗", - "45": "虚空变形" - }, "一键法术": { "1": "复仇回避", "2": "投掷利刃", @@ -49,18 +37,18 @@ "34": "虚空射线", "35": "恶魔追击", "36": "饥渴斩击", - "37": "收割", - "38": "混乱打击", - "39": "刃舞", - "40": "献祭光环", + "37": "剔除", + "38": "毁灭", + "39": "死亡横扫", + "40": "吞噬之焰", "41": "献祭光环", "42": "投掷利刃", "43": "黑暗", "44": "吞噬", - "45": "虚空变形", - "46": "收割", - "47": "献祭光环", - "48": "眼棱", + "45": "坍缩之星", + "46": "根除", + "47": "灵魂献祭", + "48": "深渊凝视", "49": "邪能之刃", "50": "毁灭", "51": "毁灭", @@ -68,9 +56,58 @@ "53": "混乱打击", "54": "恶魔变形", "55": "恶魔变形", - "56": "献祭光环" + "56": "吞噬之焰", + "101": "奥术洪流", + "102": "石像形态", + "103": "影遁", + "104": "狂暴", + "105": "血性狂怒", + "106": "战争践踏", + "107": "生存意志", + "108": "亡灵意志", + "109": "逃命专家", + "110": "黑暗飞行", + "111": "火箭跳", + "112": "火箭弹幕", + "113": "空间裂隙", + "114": "圣光裁决", + "115": "先祖召唤", + "116": "烈焰之血", + "117": "蛮牛冲撞", + "118": "奥术脉冲", + "119": "袋里乾坤", + "120": "再生", + "121": "震山掌", + "122": "纳鲁的赐福", + "123": "重拳出击", + "124": "超有机光发起源", + "125": "扫尾", + "126": "翼击", + "127": "艾泽里特涌动", + "151": "切换天赋", + "152": "切换专精" }, "1": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -99,23 +136,23 @@ "step": 15, "type": "int" }, - "恶魔之怒": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "敌人人数": { "step": 19, "type": "int" }, - "敌人人数": { + "恶魔之怒": { "step": 20, "type": "int" }, @@ -155,78 +192,102 @@ "step": 29, "type": "int" }, + "焦点生命值": { + "step": 30, + "type": "int" + }, "spells": { "黑暗": { - "step": 30, - "type": "int" - }, - "复仇回避": { "step": 31, "type": "int" }, - "投掷利刃": { + "复仇回避": { "step": 32, "type": "int" }, - "投掷利刃充能": { + "投掷利刃": { "step": 33, "type": "int" }, - "悲苦咒符": { + "投掷利刃充能": { "step": 34, "type": "int" }, - "禁锢": { + "悲苦咒符": { "step": 35, "type": "int" }, - "献祭光环": { + "禁锢": { "step": 36, "type": "int" }, - "混乱新星": { + "献祭光环": { "step": 37, "type": "int" }, - "恶魔变形": { + "混乱新星": { "step": 38, "type": "int" }, - "邪能之刃": { + "恶魔变形": { "step": 39, "type": "int" }, - "刃舞": { + "邪能之刃": { "step": 40, "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": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -255,23 +316,23 @@ "step": 15, "type": "int" }, - "恶魔之怒": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "敌人人数": { "step": 19, "type": "int" }, - "敌人人数": { + "恶魔之怒": { "step": 20, "type": "int" }, @@ -436,6 +497,26 @@ } }, "3": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -464,23 +545,23 @@ "step": 15, "type": "int" }, - "恶魔之怒": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "敌人人数": { "step": 19, "type": "int" }, - "敌人人数": { + "恶魔之怒": { "step": 20, "type": "int" }, diff --git a/config/Druid.json b/config/Druid.json index 4719b518..dc3e2e6b 100644 --- a/config/Druid.json +++ b/config/Druid.json @@ -1,26 +1,28 @@ -{ +{ "keymap": "druid.json", - "插入法术": { + "一键法术": { "1": "台风", "2": "夺魂咆哮", "3": "乌索尔旋风", - "4": "自然迅捷" - }, - "一键法术": { + "4": "自然迅捷", + "5": "月火术", + "6": "野性印记", "7": "摧折", "8": "明月普照", - "5": "月火术", "9": "横扫", "10": "熊形态", "11": "痛击", "12": "裂伤", - "6": "野性印记", - "13": "月火术", - "14": "摧折", + "13": "赤红之月", + "14": "毁灭", "15": "凶猛撕咬", "16": "割裂", "17": "撕碎", "18": "斜掠", + "19": "愤怒", + "20": "愈合", + "21": "野性生长", + "22": "宁静", "23": "愤怒", "24": "星涌术", "25": "星火术", @@ -29,6 +31,7 @@ "28": "自然之力", "29": "日蚀", "30": "超凡之盟", + "31": "日光术", "32": "化身:艾露恩之眷", "33": "艾露恩之怒", "34": "新月", @@ -48,11 +51,75 @@ "48": "啃噬", "49": "野性狂乱", "50": "横扫", - "51": "凶猛撕咬", + "51": "毁灭", "52": "碎甲咆哮", - "53": "重殴" + "53": "重殴", + "54": "野性之心", + "55": "迎头痛击", + "56": "迎头痛击", + "57": "铁鬃", + "58": "明月普照", + "59": "树皮术", + "60": "安抚", + "61": "急奔", + "62": "纠缠根须", + "63": "清除腐蚀", + "64": "低吼", + "65": "狂奔怒吼", + "66": "旅行形态", + "67": "化身:乌索克的守护者", + "68": "狂奔怒吼", + "101": "奥术洪流", + "102": "石像形态", + "103": "影遁", + "104": "狂暴", + "105": "血性狂怒", + "106": "战争践踏", + "107": "生存意志", + "108": "亡灵意志", + "109": "逃命专家", + "110": "黑暗飞行", + "111": "火箭跳", + "112": "火箭弹幕", + "113": "空间裂隙", + "114": "圣光裁决", + "115": "先祖召唤", + "116": "烈焰之血", + "117": "蛮牛冲撞", + "118": "奥术脉冲", + "119": "袋里乾坤", + "120": "再生", + "121": "震山掌", + "122": "纳鲁的赐福", + "123": "重拳出击", + "124": "超有机光发起源", + "125": "扫尾", + "126": "翼击", + "127": "艾泽里特涌动", + "151": "切换天赋", + "152": "切换专精" }, "1": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -81,27 +148,27 @@ "step": 15, "type": "int" }, - "能量值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "敌人人数": { "step": 19, "type": "int" }, - "敌人人数": { + "姿态": { "step": 20, "type": "int" }, - "姿态": { + "能量值": { "step": 21, "type": "int" }, @@ -173,6 +240,26 @@ } }, "2": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -201,27 +288,27 @@ "step": 15, "type": "int" }, - "能量值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "敌人人数": { "step": 19, "type": "int" }, - "敌人人数": { + "姿态": { "step": 20, "type": "int" }, - "姿态": { + "能量值": { "step": 21, "type": "int" }, @@ -289,6 +376,26 @@ } }, "3": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -317,27 +424,27 @@ "step": 15, "type": "int" }, - "能量值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "敌人人数": { "step": 19, "type": "int" }, - "敌人人数": { + "姿态": { "step": 20, "type": "int" }, - "姿态": { + "能量值": { "step": 21, "type": "int" }, @@ -441,6 +548,26 @@ } }, "4": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -469,31 +596,31 @@ "step": 15, "type": "int" }, - "法力值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "姿态": { "step": 19, "type": "int" }, - "姿态": { + "施法技能": { "step": 20, "type": "int" }, - "连击点": { + "法力值": { "step": 21, "type": "int" }, - "施法技能": { + "连击点": { "step": 22, "type": "int" }, diff --git a/config/Evoker.json b/config/Evoker.json index dddf5fff..43aff52b 100644 --- a/config/Evoker.json +++ b/config/Evoker.json @@ -1,26 +1,83 @@ -{ +{ "keymap": "evoker.json", - "插入法术": { - "1": "黑曜鳞片", - "2": "灼烧之焰" - }, "一键法术": { + "1": "净除", "2": "火焰吐息", "3": "青铜龙的祝福", + "4": "灼烧之焰", + "5": "黑曜鳞片", + "6": "山崩", + "7": "悬空", "8": "碧蓝打击", + "9": "扫尾", + "10": "翡翠之花", + "11": "扭转天平", "12": "活化烈焰", "13": "裂解", + "14": "深呼吸", + "15": "青翠之拥", "16": "永恒之涌", "17": "葬火", - "25": "碧蓝打击", + "18": "狂龙之怒", + "19": "镇压", + "20": "梦游", + "21": "微风", + "22": "时间螺旋", + "23": "空间悖论", + "24": "营救", + "25": "碧蓝横扫", "26": "火焰吐息", "27": "永恒之涌", - "28": "喷发", - "29": "地壳激变", - "30": "先知先觉", - "31": "黑檀之力" + "101": "奥术洪流", + "102": "石像形态", + "103": "影遁", + "104": "狂暴", + "105": "血性狂怒", + "106": "战争践踏", + "107": "生存意志", + "108": "亡灵意志", + "109": "逃命专家", + "110": "黑暗飞行", + "111": "火箭跳", + "112": "火箭弹幕", + "113": "空间裂隙", + "114": "圣光裁决", + "115": "先祖召唤", + "116": "烈焰之血", + "117": "蛮牛冲撞", + "118": "奥术脉冲", + "119": "袋里乾坤", + "120": "再生", + "121": "震山掌", + "122": "纳鲁的赐福", + "123": "重拳出击", + "124": "超有机光发起源", + "126": "翼击", + "127": "艾泽里特涌动", + "151": "切换天赋", + "152": "切换专精" }, "1": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -49,23 +106,23 @@ "step": 15, "type": "int" }, - "能量值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "施法技能": { "step": 19, "type": "int" }, - "施法技能": { + "能量值": { "step": 20, "type": "int" }, @@ -180,7 +237,49 @@ } } }, + "2": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + } + }, "3": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -209,23 +308,23 @@ "step": 15, "type": "int" }, - "能量值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "施法技能": { "step": 19, "type": "int" }, - "施法技能": { + "能量值": { "step": 20, "type": "int" }, @@ -335,7 +434,7 @@ "type": "int" }, "先知先觉": { - "step": 47, + "step": 50, "type": "int" }, "黑檀之力": { @@ -347,12 +446,12 @@ "type": "int" }, "先知先觉充能": { - "step": 50, + "step": 51, "type": "int" } }, "group": { - "start": 51, + "start": 52, "num": 5, "生命值": { "step": 1, diff --git a/config/Hunter.json b/config/Hunter.json index fa2af41c..d9e15631 100644 --- a/config/Hunter.json +++ b/config/Hunter.json @@ -1,12 +1,8 @@ -{ +{ "keymap": "hunter.json", - "插入法术": { - "1": "意气风发", - "2": "胁迫" - }, "一键法术": { - "2": "杀戮命令", "1": "倒刺射击", + "2": "杀戮命令", "3": "眼镜蛇射击", "4": "狂野怒火", "5": "荒野呼唤", @@ -43,9 +39,65 @@ "36": "猛禽一击", "37": "野火炸弹", "38": "牺牲咆哮", - "46": "猛禽一击" + "39": "震荡射击", + "40": "宁神射击", + "41": "焦油陷进", + "42": "恐吓野兽", + "43": "束缚射击", + "44": "伪装", + "45": "摔绊", + "46": "猛禽横扫", + "101": "奥术洪流", + "102": "石像形态", + "103": "影遁", + "104": "狂暴", + "105": "血性狂怒", + "106": "战争践踏", + "107": "生存意志", + "108": "亡灵意志", + "109": "逃命专家", + "110": "黑暗飞行", + "111": "火箭跳", + "112": "火箭弹幕", + "113": "空间裂隙", + "114": "圣光裁决", + "115": "先祖召唤", + "116": "烈焰之血", + "117": "蛮牛冲撞", + "118": "奥术脉冲", + "119": "袋里乾坤", + "120": "再生", + "121": "震山掌", + "122": "纳鲁的赐福", + "123": "重拳出击", + "124": "超有机光发起源", + "125": "扫尾", + "126": "翼击", + "127": "艾泽里特涌动", + "151": "切换天赋", + "152": "切换专精" }, "1": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -74,23 +126,23 @@ "step": 15, "type": "int" }, - "集中值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "敌人人数": { "step": 19, "type": "int" }, - "敌人人数": { + "集中值": { "step": 20, "type": "int" }, @@ -210,6 +262,26 @@ } }, "2": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -238,19 +310,19 @@ "step": 15, "type": "int" }, - "集中值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "集中值": { "step": 19, "type": "int" }, @@ -350,6 +422,26 @@ } }, "3": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -378,19 +470,19 @@ "step": 15, "type": "int" }, - "集中值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "集中值": { "step": 19, "type": "int" }, diff --git a/config/Mage.json b/config/Mage.json index 448bc9eb..cfc94050 100644 --- a/config/Mage.json +++ b/config/Mage.json @@ -1,10 +1,5 @@ -{ +{ "keymap": "mage.json", - "插入法术": { - "18": "强化隐形术", - "19": "冰霜新星", - "20": "龙息术" - }, "一键法术": { "1": "寒冰屏障", "2": "解除诅咒", @@ -60,9 +55,58 @@ "52": "霜火之箭", "53": "烈焰风暴", "54": "灼烧", - "55": "造餐术" + "55": "造餐术", + "101": "奥术洪流", + "102": "石像形态", + "103": "影遁", + "104": "狂暴", + "105": "血性狂怒", + "106": "战争践踏", + "107": "生存意志", + "108": "亡灵意志", + "109": "逃命专家", + "110": "黑暗飞行", + "111": "火箭跳", + "112": "火箭弹幕", + "113": "空间裂隙", + "114": "圣光裁决", + "115": "先祖召唤", + "116": "烈焰之血", + "117": "蛮牛冲撞", + "118": "奥术脉冲", + "119": "袋里乾坤", + "120": "再生", + "121": "震山掌", + "122": "纳鲁的赐福", + "123": "重拳出击", + "124": "超有机光发起源", + "125": "扫尾", + "126": "翼击", + "127": "艾泽里特涌动", + "151": "切换天赋", + "152": "切换专精" }, "1": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -91,19 +135,19 @@ "step": 15, "type": "int" }, - "法力值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "法力值": { "step": 19, "type": "int" }, @@ -145,6 +189,26 @@ } }, "2": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -173,19 +237,19 @@ "step": 15, "type": "int" }, - "法力值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "法力值": { "step": 19, "type": "int" }, @@ -227,6 +291,26 @@ } }, "3": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -255,27 +339,27 @@ "step": 15, "type": "int" }, - "法力值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "施法技能": { "step": 19, "type": "int" }, - "施法技能": { + "敌人人数": { "step": 20, "type": "int" }, - "敌人人数": { + "法力值": { "step": 21, "type": "int" }, diff --git a/config/Monk.json b/config/Monk.json index d0efab18..6bfd29ec 100644 --- a/config/Monk.json +++ b/config/Monk.json @@ -1,17 +1,14 @@ -{ +{ "keymap": "monk.json", - "插入法术": { + "一键法术": { "1": "轮回之触", "2": "扫堂腿", "3": "魂体双分", - "4": "魂体双分:转移", + "4": "转移", "5": "还魂术", "6": "平心之环", "7": "分筋错骨", - "8": "玄牛下凡" - }, - "一键法术": { - "1": "轮回之触", + "8": "玄牛下凡", "9": "猛虎掌", "10": "神鹤引项踢", "11": "幻灭踢", @@ -20,16 +17,71 @@ "14": "醉酿投", "15": "火焰之息", "16": "碧玉疾风", + "17": "碎玉闪电", + "18": "神鹤引项踢", "19": "幻灭踢", "20": "怒雷破", "21": "旭日东升踢", - "17": "碎玉闪电", - "18": "神鹤引项踢", "22": "风领主之击", - "23": "旭日东升踢", - "24": "升龙霸" + "23": "疾风呼啸踢", + "24": "升龙霸", + "25": "神龙之赐", + "26": "活血术", + "27": "抚慰之雾", + "28": "天神御身", + "29": "氤氲之雾", + "30": "法力茶", + "101": "奥术洪流", + "102": "石像形态", + "103": "影遁", + "104": "狂暴", + "105": "血性狂怒", + "106": "战争践踏", + "107": "生存意志", + "108": "亡灵意志", + "109": "逃命专家", + "110": "黑暗飞行", + "111": "火箭跳", + "112": "火箭弹幕", + "113": "空间裂隙", + "114": "圣光裁决", + "115": "先祖召唤", + "116": "烈焰之血", + "117": "蛮牛冲撞", + "118": "奥术脉冲", + "119": "袋里乾坤", + "120": "再生", + "121": "震山掌", + "122": "纳鲁的赐福", + "123": "重拳出击", + "124": "超有机光发起源", + "125": "扫尾", + "126": "翼击", + "127": "艾泽里特涌动", + "151": "切换天赋", + "152": "切换专精" }, "1": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -58,27 +110,27 @@ "step": 15, "type": "int" }, - "能量值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "酒池": { "step": 19, "type": "int" }, - "酒池": { + "敌人人数": { "step": 20, "type": "int" }, - "敌人人数": { + "能量值": { "step": 21, "type": "int" }, @@ -223,6 +275,26 @@ } }, "2": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -251,31 +323,31 @@ "step": 15, "type": "int" }, - "法力值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "敌人人数": { "step": 19, "type": "int" }, - "敌人人数": { + "施法技能": { "step": 20, "type": "int" }, - "施法技能": { + "施法目标": { "step": 21, "type": "int" }, - "施法目标": { + "法力值": { "step": 22, "type": "int" }, @@ -401,6 +473,26 @@ } }, "3": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -429,23 +521,23 @@ "step": 15, "type": "int" }, - "能量值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "敌人人数": { "step": 19, "type": "int" }, - "敌人人数": { + "能量值": { "step": 20, "type": "int" }, diff --git a/config/Paladin.json b/config/Paladin.json index 798c6353..56f38863 100644 --- a/config/Paladin.json +++ b/config/Paladin.json @@ -1,34 +1,83 @@ -{ +{ "keymap": "paladin.json", - "插入法术": { + "一键法术": { "1": "盲目之光", "2": "光环掌握", "3": "自由祝福", "4": "制裁之锤", "5": "保护祝福", "6": "圣盾术", - "16": "灰烬觉醒", - "24": "美德道标" - }, - "一键法术": { "7": "圣洁鸣钟", "8": "复仇者之盾", "9": "奉献", "10": "审判", "11": "正义盾击", - "12": "十字军打击", - "19": "审判", - "21": "审判", + "12": "祝福之锤", "13": "公正之剑", "14": "审判", "15": "最终审判", "16": "灰烬觉醒", "17": "神圣风暴", - "18": "灰烬觉醒", + "18": "圣光之锤", + "19": "愤怒之锤", "20": "处决宣判", - "26": "十字军打击" + "21": "愤怒之锤", + "22": "圣光术", + "23": "圣光闪现", + "24": "美德道标", + "25": "神圣棱镜", + "26": "正义之锤", + "101": "奥术洪流", + "102": "石像形态", + "103": "影遁", + "104": "狂暴", + "105": "血性狂怒", + "106": "战争践踏", + "107": "生存意志", + "108": "亡灵意志", + "109": "逃命专家", + "110": "黑暗飞行", + "111": "火箭跳", + "112": "火箭弹幕", + "113": "空间裂隙", + "114": "圣光裁决", + "115": "先祖召唤", + "116": "烈焰之血", + "117": "蛮牛冲撞", + "118": "奥术脉冲", + "119": "袋里乾坤", + "120": "再生", + "121": "震山掌", + "122": "纳鲁的赐福", + "123": "重拳出击", + "124": "超有机光发起源", + "125": "扫尾", + "126": "翼击", + "127": "艾泽里特涌动", + "151": "切换天赋", + "152": "切换专精" }, "1": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -57,39 +106,39 @@ "step": 15, "type": "int" }, - "法力值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "施法技能": { "step": 19, "type": "int" }, - "神圣能量": { + "施法目标": { "step": 20, "type": "int" }, - "施法技能": { + "法力值": { "step": 21, "type": "int" }, - "施法目标": { + "神圣能量": { "step": 22, "type": "int" }, - "爆发开关": { + "治疗药水": { "step": 23, "type": "int" }, - "大红冷却": { + "爆发开关": { "step": 24, "type": "int" }, @@ -189,6 +238,26 @@ } }, "2": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -217,19 +286,19 @@ "step": 15, "type": "int" }, - "法力值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "法力值": { "step": 19, "type": "int" }, @@ -237,7 +306,7 @@ "step": 20, "type": "int" }, - "大红冷却": { + "治疗药水": { "step": 21, "type": "int" }, @@ -369,6 +438,26 @@ } }, "3": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -397,43 +486,43 @@ "step": 15, "type": "int" }, - "法力值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "敌人人数": { "step": 19, "type": "int" }, - "神圣能量": { + "法力值": { "step": 20, "type": "int" }, - "爆发开关": { + "神圣能量": { "step": 21, "type": "int" }, - "AOE开关": { + "治疗药水": { "step": 22, "type": "int" }, - "输出模式": { + "爆发开关": { "step": 23, "type": "int" }, - "敌人人数": { + "AOE开关": { "step": 24, "type": "int" }, - "大红冷却": { + "输出模式": { "step": 25, "type": "int" }, diff --git a/config/Priest.json b/config/Priest.json index 5c62c44c..f39c1ec8 100644 --- a/config/Priest.json +++ b/config/Priest.json @@ -1,6 +1,6 @@ -{ +{ "keymap": "priest.json", - "插入法术": { + "一键法术": { "1": "心灵尖啸", "2": "群体驱散", "3": "真言术:障", @@ -10,25 +10,83 @@ "7": "神圣赞美诗", "8": "虚空形态", "9": "吸血鬼的拥抱", - "30": "真言术:耀", - "35": "福音" - }, - "一键法术": { - "19": "吸血鬼之触", + "10": "真言术:韧", "11": "心灵震爆", + "12": "惩击", "13": "暗言术:灭", "14": "暗言术:痛", + "15": "苦修", + "16": "圣言术:罚", + "17": "神圣之火", + "18": "神圣新星", + "19": "吸血鬼之触", + "20": "暗影形态", "21": "暗言术:癫", "22": "精神鞭笞", - "8": "虚空形态", "23": "虚空洪流", "24": "触须猛击", "25": "虚空冲击", "26": "虚空齐射", - "27": "精神鞭笞", - "28": "光晕" + "27": "精神鞭笞:狂", + "28": "光晕", + "29": "快速治疗", + "30": "真言术:耀", + "31": "神圣赞美诗", + "32": "治疗祷言", + "33": "祈福", + "34": "暗影愈合", + "35": "福音", + "101": "奥术洪流", + "102": "石像形态", + "103": "影遁", + "104": "狂暴", + "105": "血性狂怒", + "106": "战争践踏", + "107": "生存意志", + "108": "亡灵意志", + "109": "逃命专家", + "110": "黑暗飞行", + "111": "火箭跳", + "112": "火箭弹幕", + "113": "空间裂隙", + "114": "圣光裁决", + "115": "先祖召唤", + "116": "烈焰之血", + "117": "蛮牛冲撞", + "118": "奥术脉冲", + "119": "袋里乾坤", + "120": "再生", + "121": "震山掌", + "122": "纳鲁的赐福", + "123": "重拳出击", + "124": "超有机光发起源", + "125": "扫尾", + "126": "翼击", + "127": "艾泽里特涌动", + "151": "切换天赋", + "152": "切换专精" }, "1": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -57,103 +115,115 @@ "step": 15, "type": "int" }, - "法力值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "施法技能": { "step": 19, "type": "int" }, - "施法技能": { + "施法目标": { "step": 20, "type": "int" }, - "施法目标": { + "敌人人数": { "step": 21, "type": "int" }, - "延迟": { + "法力值": { "step": 22, "type": "int" }, - "大红冷却": { + "魔法药水": { "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": 31, + "type": "int" + }, "auras": { "黑暗主宰": { - "step": 29, - "type": "int" - }, - "圣光涌动": { - "step": 30, - "type": "int" - }, - "福音": { - "step": 31, - "type": "int" - }, - "祸福相依": { "step": 32, "type": "int" }, - "熵能裂隙": { + "圣光涌动": { "step": 33, "type": "int" }, - "目标暗言术:痛": { + "福音": { "step": 34, "type": "int" }, - "目标救赎": { + "祸福相依": { "step": 35, "type": "int" }, - "目标真言术:盾": { + "熵能裂隙": { "step": 36, "type": "int" }, - "焦点暗言术:痛": { + "目标暗言术:痛": { "step": 37, "type": "int" }, - "焦点救赎": { + "目标救赎": { "step": 38, "type": "int" }, - "焦点真言术:盾": { + "目标真言术:盾": { "step": 39, "type": "int" }, + "焦点暗言术:痛": { + "step": 40, + "type": "int" + }, + "焦点救赎": { + "step": 41, + "type": "int" + }, + "焦点真言术:盾": { + "step": 42, + "type": "int" + }, "圣光涌动层数": { "step": "bar", "bar": 3, @@ -172,44 +242,44 @@ }, "spells": { "心灵尖啸": { - "step": 40, - "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" + }, + "苦修": { + "step": 48, + "type": "int" + }, + "苦修充能": { + "step": 49, + "type": "int" + }, "苦修层数": { "step": "bar", "bar": 1, "type": "int" }, "真言术:耀": { - "step": 47, + "step": 50, "type": "int" }, "真言术:耀充能": { - "step": 48, + "step": 51, "type": "int" }, "真言术:耀层数": { @@ -218,44 +288,44 @@ "type": "int" }, "真言术:盾": { - "step": 49, - "type": "int" - }, - "真言术:障": { - "step": 50, - "type": "int" - }, - "终极苦修": { - "step": 51, - "type": "int" - }, - "福音": { "step": 52, "type": "int" }, - "心灵震爆": { + "真言术:障": { "step": 53, "type": "int" }, - "暗言术:灭": { + "终极苦修": { "step": 54, "type": "int" }, - "暗影魔": { + "福音": { "step": 55, "type": "int" }, - "暗影分流": { + "心灵震爆": { "step": 56, "type": "int" }, - "渐隐术": { + "暗言术:灭": { "step": 57, "type": "int" + }, + "暗影魔": { + "step": 58, + "type": "int" + }, + "暗影分流": { + "step": 59, + "type": "int" + }, + "渐隐术": { + "step": 60, + "type": "int" } }, "group": { - "start": 58, + "start": 61, "num": 5, "生命值": { "step": 1, @@ -280,6 +350,26 @@ } }, "2": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -308,27 +398,27 @@ "step": 15, "type": "int" }, - "法力值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "施法技能": { "step": 19, "type": "int" }, - "施法技能": { + "施法目标": { "step": 20, "type": "int" }, - "施法目标": { + "法力值": { "step": 21, "type": "int" }, @@ -426,6 +516,26 @@ } }, "3": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -454,39 +564,39 @@ "step": 15, "type": "int" }, - "法力值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "敌人人数": { "step": 19, "type": "int" }, - "爆发开关": { + "施法技能": { "step": 20, "type": "int" }, - "输出模式": { + "法力值": { "step": 21, "type": "int" }, - "AOE开关": { + "爆发开关": { "step": 22, "type": "int" }, - "敌人人数": { + "输出模式": { "step": 23, "type": "int" }, - "施法技能": { + "AOE开关": { "step": 24, "type": "int" }, diff --git a/config/Rogue.json b/config/Rogue.json index 6b17acdb..1d2af15d 100644 --- a/config/Rogue.json +++ b/config/Rogue.json @@ -1,6 +1,5 @@ -{ +{ "keymap": "rogue.json", - "插入法术": {}, "一键法术": { "1": "毒刃", "2": "致盲", @@ -58,12 +57,61 @@ "54": "袖剑风暴", "55": "暗影打击", "56": "飞镖投掷", - "57": "背刺", + "57": "幽暗之刃", "58": "赤喉之咬", "59": "影袭", - "60": "致命一击" + "60": "致命一击", + "101": "奥术洪流", + "102": "石像形态", + "103": "影遁", + "104": "狂暴", + "105": "血性狂怒", + "106": "战争践踏", + "107": "生存意志", + "108": "亡灵意志", + "109": "逃命专家", + "110": "黑暗飞行", + "111": "火箭跳", + "112": "火箭弹幕", + "113": "空间裂隙", + "114": "圣光裁决", + "115": "先祖召唤", + "116": "烈焰之血", + "117": "蛮牛冲撞", + "118": "奥术脉冲", + "119": "袋里乾坤", + "120": "再生", + "121": "震山掌", + "122": "纳鲁的赐福", + "123": "重拳出击", + "124": "超有机光发起源", + "125": "扫尾", + "126": "翼击", + "127": "艾泽里特涌动", + "151": "切换天赋", + "152": "切换专精" }, "1": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -92,19 +140,19 @@ "step": 15, "type": "int" }, - "能量值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "能量值": { "step": 19, "type": "int" }, @@ -224,6 +272,26 @@ } }, "2": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -252,19 +320,19 @@ "step": 15, "type": "int" }, - "能量值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "能量值": { "step": 19, "type": "int" }, @@ -400,6 +468,26 @@ } }, "3": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -428,19 +516,19 @@ "step": 15, "type": "int" }, - "能量值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "能量值": { "step": 19, "type": "int" }, diff --git a/config/Shaman.json b/config/Shaman.json index 87437c40..db5e1818 100644 --- a/config/Shaman.json +++ b/config/Shaman.json @@ -1,6 +1,18 @@ -{ +{ "keymap": "shaman.json", - "插入法术": { + "一键法术": { + "1": "唤潮者的护卫", + "2": "大地生命武器", + "3": "天怒", + "4": "水之护盾", + "5": "烈焰震击", + "6": "熔岩爆裂", + "7": "闪电箭", + "8": "闪电链", + "9": "治疗之泉图腾", + "10": "风剪", + "11": "先祖迅捷", + "12": "自然迅捷", "13": "涌动图腾", "14": "电能图腾", "15": "阵风", @@ -11,21 +23,6 @@ "20": "图腾投射", "21": "升腾", "22": "治疗之潮图腾", - "45": "治疗之雨", - "47": "狂风图腾", - "51": "幽魂之狼" - }, - "一键法术": { - "1": "唤潮者的护卫", - "2": "大地生命武器", - "3": "天怒", - "4": "水之护盾", - "5": "烈焰震击", - "6": "熔岩爆裂", - "7": "闪电箭", - "8": "闪电链", - "11": "先祖迅捷", - "13": "涌动图腾", "23": "毁灭闪电", "24": "流电炽焰", "25": "火舌武器", @@ -35,16 +32,79 @@ "29": "风切", "30": "风怒武器", "31": "风暴打击", - "32": "闪电箭", + "32": "狂风怒号", "33": "元素冲击", "34": "地震术", "35": "大地震击", "36": "风暴守护者", "37": "闪电之盾", + "38": "治疗波", + "39": "治疗链", + "40": "激流", + "41": "大地之盾", + "42": "净化灵魂", + "43": "生命释放", + "44": "风暴涌流图腾", "45": "治疗之雨", - "47": "狂风图腾" + "46": "倾盆大雨", + "47": "狂风图腾", + "48": "治疗之雨", + "49": "灵魂行者的恩赐", + "50": "星界转移", + "51": "幽魂之狼", + "52": "净化术", + "53": "强效净化术", + "101": "奥术洪流", + "102": "石像形态", + "103": "影遁", + "104": "狂暴", + "105": "血性狂怒", + "106": "战争践踏", + "107": "生存意志", + "108": "亡灵意志", + "109": "逃命专家", + "110": "黑暗飞行", + "111": "火箭跳", + "112": "火箭弹幕", + "113": "空间裂隙", + "114": "圣光裁决", + "115": "先祖召唤", + "116": "烈焰之血", + "117": "蛮牛冲撞", + "118": "奥术脉冲", + "119": "袋里乾坤", + "120": "再生", + "121": "震山掌", + "122": "纳鲁的赐福", + "123": "重拳出击", + "124": "超有机光发起源", + "125": "扫尾", + "126": "翼击", + "127": "艾泽里特涌动", + "151": "切换天赋", + "152": "切换专精" }, "1": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -73,27 +133,27 @@ "step": 15, "type": "int" }, - "漩涡值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "敌人人数": { "step": 19, "type": "int" }, - "敌人人数": { + "漩涡值": { "step": 20, "type": "int" }, - "大红冷却": { + "治疗药水": { "step": 21, "type": "int" }, @@ -185,6 +245,26 @@ } }, "2": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -213,27 +293,27 @@ "step": 15, "type": "int" }, - "法力值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "敌人人数": { "step": 19, "type": "int" }, - "敌人人数": { + "漩涡武器层数": { "step": 20, "type": "int" }, - "漩涡武器层数": { + "法力值": { "step": 21, "type": "int" }, @@ -382,6 +462,26 @@ } }, "3": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -410,31 +510,31 @@ "step": 15, "type": "int" }, - "法力值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "施法技能": { "step": 19, "type": "int" }, - "延迟": { + "施法目标": { "step": 20, "type": "int" }, - "施法技能": { + "法力值": { "step": 21, "type": "int" }, - "施法目标": { + "延迟": { "step": 22, "type": "int" }, diff --git a/config/Warlock.json b/config/Warlock.json index eebb4017..a7f4d10e 100644 --- a/config/Warlock.json +++ b/config/Warlock.json @@ -1,13 +1,5 @@ -{ +{ "keymap": "warlock.json", - "插入法术": { - "1": "死亡缠绕", - "2": "暗影之怒", - "3": "暗影之怒", - "4": "内爆", - "5": "召唤恶魔暴君", - "6": "魔典:邪能破坏者" - }, "一键法术": { "1": "恐惧", "2": "死亡缠绕", @@ -26,7 +18,7 @@ "15": "虚弱灾厄", "16": "语言灾厄", "17": "陨灭", - "18": "暗影箭", + "18": "狱火箭", "19": "灵魂石", "20": "邪能统御", "21": "黑暗契约", @@ -69,9 +61,58 @@ "58": "大灾变", "59": "吸取灵魂", "60": "召唤虚空行者", - "61": "召唤萨亚德" + "61": "召唤萨亚德", + "101": "奥术洪流", + "102": "石像形态", + "103": "影遁", + "104": "狂暴", + "105": "血性狂怒", + "106": "战争践踏", + "107": "生存意志", + "108": "亡灵意志", + "109": "逃命专家", + "110": "黑暗飞行", + "111": "火箭跳", + "112": "火箭弹幕", + "113": "空间裂隙", + "114": "圣光裁决", + "115": "先祖召唤", + "116": "烈焰之血", + "117": "蛮牛冲撞", + "118": "奥术脉冲", + "119": "袋里乾坤", + "120": "再生", + "121": "震山掌", + "122": "纳鲁的赐福", + "123": "重拳出击", + "124": "超有机光发起源", + "125": "扫尾", + "126": "翼击", + "127": "艾泽里特涌动", + "151": "切换天赋", + "152": "切换专精" }, "1": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -100,27 +141,27 @@ "step": 15, "type": "int" }, - "法力值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "施法技能": { "step": 19, "type": "int" }, - "灵魂碎片": { + "法力值": { "step": 20, "type": "int" }, - "施法技能": { + "灵魂碎片": { "step": 21, "type": "int" }, @@ -224,6 +265,26 @@ } }, "2": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -252,35 +313,35 @@ "step": 15, "type": "int" }, - "法力值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "施法技能": { "step": 19, "type": "int" }, - "治疗石冷却": { + "法力值": { "step": 20, "type": "int" }, - "大红冷却": { + "灵魂碎片": { "step": 21, "type": "int" }, - "灵魂碎片": { + "治疗石": { "step": 22, "type": "int" }, - "施法技能": { + "治疗药水": { "step": 23, "type": "int" }, @@ -413,6 +474,26 @@ } }, "3": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -441,27 +522,27 @@ "step": 15, "type": "int" }, - "法力值": { + "队伍人数": { "step": 16, "type": "int" }, - "队伍人数": { + "首领战": { "step": 17, "type": "int" }, - "首领战": { + "难度": { "step": 18, "type": "int" }, - "难度": { + "施法技能": { "step": 19, "type": "int" }, - "灵魂碎片": { + "法力值": { "step": 20, "type": "int" }, - "施法技能": { + "灵魂碎片": { "step": 21, "type": "int" }, diff --git a/config/Warrior.json b/config/Warrior.json index f77276ec..860ed621 100644 --- a/config/Warrior.json +++ b/config/Warrior.json @@ -1,6 +1,6 @@ -{ +{ "keymap": "warrior.json", - "插入法术": { + "一键法术": { "1": "胜利在望", "2": "勇士之矛", "3": "英勇飞跃", @@ -10,9 +10,7 @@ "7": "破裂投掷", "8": "碎裂投掷", "9": "破胆怒吼", - "10": "盾牌冲锋" - }, - "一键法术": { + "10": "盾牌冲锋", "11": "英勇投掷", "12": "战斗怒吼", "13": "猛击", @@ -33,17 +31,66 @@ "28": "奥丁之怒", "29": "怒击", "30": "雷霆一击", - "31": "雷霆一击", + "31": "雷霆轰击", "32": "复仇", "33": "盾牌猛击", "34": "斩杀", - "35": "猛击", - "36": "嗜血", - "37": "怒击", + "35": "英勇打击", + "36": "浴血奋战", + "37": "碎甲猛击", "38": "破坏者", - "39": "斩杀" + "39": "斩杀(点了屠杀天赋)", + "101": "奥术洪流", + "102": "石像形态", + "103": "影遁", + "104": "狂暴", + "105": "血性狂怒", + "106": "战争践踏", + "107": "生存意志", + "108": "亡灵意志", + "109": "逃命专家", + "110": "黑暗飞行", + "111": "火箭跳", + "112": "火箭弹幕", + "113": "空间裂隙", + "114": "圣光裁决", + "115": "先祖召唤", + "116": "烈焰之血", + "117": "蛮牛冲撞", + "118": "奥术脉冲", + "119": "袋里乾坤", + "120": "再生", + "121": "震山掌", + "122": "纳鲁的赐福", + "123": "重拳出击", + "124": "超有机光发起源", + "125": "扫尾", + "126": "翼击", + "127": "艾泽里特涌动", + "151": "切换天赋", + "152": "切换专精" }, "1": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -56,23 +103,23 @@ "step": 11, "type": "int" }, - "怒气值": { + "队伍人数": { "step": 12, "type": "int" }, - "队伍人数": { + "首领战": { "step": 13, "type": "int" }, - "首领战": { + "难度": { "step": 14, "type": "int" }, - "难度": { + "敌人人数": { "step": 15, "type": "int" }, - "敌人人数": { + "怒气值": { "step": 16, "type": "int" }, @@ -188,6 +235,26 @@ } }, "2": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -200,23 +267,23 @@ "step": 11, "type": "int" }, - "怒气值": { + "队伍人数": { "step": 12, "type": "int" }, - "队伍人数": { + "首领战": { "step": 13, "type": "int" }, - "首领战": { + "难度": { "step": 14, "type": "int" }, - "难度": { + "敌人人数": { "step": 15, "type": "int" }, - "敌人人数": { + "怒气值": { "step": 16, "type": "int" }, @@ -308,6 +375,26 @@ } }, "3": { + "队伍类型": { + "step": 4, + "type": "int" + }, + "英雄天赋": { + "step": 5, + "type": "int" + }, + "有效性": { + "step": 6, + "type": "bool" + }, + "一键辅助": { + "step": 7, + "type": "int" + }, + "插入法术": { + "step": 8, + "type": "int" + }, "战斗时间": { "step": 9, "type": "int" @@ -320,23 +407,23 @@ "step": 11, "type": "int" }, - "怒气值": { + "队伍人数": { "step": 12, "type": "int" }, - "队伍人数": { + "首领战": { "step": 13, "type": "int" }, - "首领战": { + "难度": { "step": 14, "type": "int" }, - "难度": { + "敌人人数": { "step": 15, "type": "int" }, - "敌人人数": { + "怒气值": { "step": 16, "type": "int" }, diff --git a/config/common.json b/config/common.json index 7f9447c9..9465033a 100644 --- a/config/common.json +++ b/config/common.json @@ -10,25 +10,5 @@ "专精": { "step": 3, "type": "int" - }, - "队伍类型": { - "step": 4, - "type": "int" - }, - "英雄天赋": { - "step": 5, - "type": "int" - }, - "有效性": { - "step": 6, - "type": "bool" - }, - "一键辅助": { - "step": 7, - "type": "int" - }, - "法术失败": { - "step": 8, - "type": "int" } -} \ No newline at end of file +}