diff --git a/Assets/Spell/crusader-strike.png b/Assets/Spell/crusader-strike.png new file mode 100644 index 00000000..77973fc8 Binary files /dev/null and b/Assets/Spell/crusader-strike.png differ diff --git a/Assets/Spell/spell-528.jpg b/Assets/Spell/spell-528.jpg new file mode 100644 index 00000000..c4f4e235 Binary files /dev/null and b/Assets/Spell/spell-528.jpg differ diff --git a/Assets/SpellIconManifest.json b/Assets/SpellIconManifest.json index e9de1ebd..eeebbe67 100644 --- a/Assets/SpellIconManifest.json +++ b/Assets/SpellIconManifest.json @@ -102,14 +102,20 @@ "icon": "spell_nature_removecurse", "target": "Spell/spell-475.jpg" }, - { - "spellId": 527, - "name": "纯净术", - "icon": "spell_holy_dispelmagic", - "target": "Spell/spell-527.jpg" - }, - { - "spellId": 585, + { + "spellId": 527, + "name": "纯净术", + "icon": "spell_holy_dispelmagic", + "target": "Spell/spell-527.jpg" + }, + { + "spellId": 528, + "name": "驱散魔法", + "icon": "spell_nature_nullifydisease", + "target": "Spell/spell-528.jpg" + }, + { + "spellId": 585, "name": "惩击", "icon": "spell_holy_holysmite", "target": "Spell/spell-585.jpg" diff --git a/Fuyutsui/class/Paladin.lua b/Fuyutsui/class/Paladin.lua index 22519dde..07266f64 100644 --- a/Fuyutsui/class/Paladin.lua +++ b/Fuyutsui/class/Paladin.lua @@ -352,4 +352,5 @@ Fuyutsui.spellsList = { [6940] = { index = 27, name = "牺牲祝福" }, [391054] = { index = 28, name = "代祷" }, [633] = { index = 29, name = "圣疗术" }, + [35395] = { index = 30, name = "十字军打击" } } diff --git a/Fuyutsui/class/Priest.lua b/Fuyutsui/class/Priest.lua index 959d6a71..a05ac597 100644 --- a/Fuyutsui/class/Priest.lua +++ b/Fuyutsui/class/Priest.lua @@ -385,4 +385,5 @@ Fuyutsui.spellsList = { [1262763] = { index = 33, name = "祈福" }, [186263] = { index = 34, name = "暗影愈合" }, [472433] = { index = 35, name = "福音" }, + [528] = { index = 36, name = "驱散魔法" }, } diff --git a/UI/SpellIconCatalog.cs b/UI/SpellIconCatalog.cs index ba0df2a5..f70dc771 100644 --- a/UI/SpellIconCatalog.cs +++ b/UI/SpellIconCatalog.cs @@ -13,6 +13,10 @@ internal static class SpellIconCatalog private static readonly Dictionary Icons = new(); private static readonly Dictionary NamedIcons = new(StringComparer.Ordinal); private static readonly Dictionary SpellIdsByName = LoadSpellIdsByName(); + private static readonly Dictionary SpellIdIconResources = new() + { + [35395] = $"{typeof(SpellIconCatalog).Namespace}.Assets.Spell.crusader-strike.png" + }; private static readonly Dictionary NamedIconResources = new(StringComparer.Ordinal) { ["银月城生命药水"] = $"{typeof(SpellIconCatalog).Namespace}.Assets.Spell.silvermoon-city-health-potion.png", @@ -21,7 +25,8 @@ internal static class SpellIconCatalog [ModuleSpecialActions.FailedSpell] = $"{typeof(SpellIconCatalog).Namespace}.Assets.Spell.auto-insert-spell.png", ["鲁莽药水"] = $"{typeof(SpellIconCatalog).Namespace}.Assets.Spell.recklessness-potion.jpg", ["圣光潜力"] = $"{typeof(SpellIconCatalog).Namespace}.Assets.Spell.lights-potential.jpg", - ["光注法力药水"] = $"{typeof(SpellIconCatalog).Namespace}.Assets.Spell.light-infused-mana-potion.jpg" + ["光注法力药水"] = $"{typeof(SpellIconCatalog).Namespace}.Assets.Spell.light-infused-mana-potion.jpg", + ["十字军打击"] = $"{typeof(SpellIconCatalog).Namespace}.Assets.Spell.crusader-strike.png" }; private static readonly string LastRuleRowIconResource = $"{typeof(SpellIconCatalog).Namespace}.Assets.Spell.last-rule-row.png"; @@ -33,7 +38,8 @@ internal static class SpellIconCatalog return cached; } - var resourceName = $"{typeof(SpellIconCatalog).Namespace}.Assets.Spell.spell-{spellId}.jpg"; + var resourceName = SpellIdIconResources.GetValueOrDefault(spellId) + ?? $"{typeof(SpellIconCatalog).Namespace}.Assets.Spell.spell-{spellId}.jpg"; using var stream = typeof(SpellIconCatalog).Assembly.GetManifestResourceStream(resourceName); if (stream is null) {