diff --git a/languages/zh-hans.js b/languages/zh-hans.js index 0776f707..2056f05f 100644 --- a/languages/zh-hans.js +++ b/languages/zh-hans.js @@ -190,7 +190,7 @@ const _localTranslating = { L_shape: tp`以L字形式消除5个${'orbs'}时`, heal: tp`以${'orbs'}回复${'heal'}${'stats'}时`, - awakening_activated: tp`${'awakenings'}同时发动时`, + awakening_activated: tp`[${'awakenings'}]发动时`, }, position: { top: tp`上方第${'pos'}横行`, diff --git a/languages/zh-hant.js b/languages/zh-hant.js index 2c45ea01..869aed5e 100644 --- a/languages/zh-hant.js +++ b/languages/zh-hant.js @@ -189,7 +189,7 @@ const _localTranslating = { L_shape: tp`以L字形式消除5個${'orbs'}時`, heal: tp`以${'orbs'}回復${'heal'}${'stats'}時`, - awakening_activated: tp`${'awakenings'}同時發動時`, + awakening_activated: tp`[${'awakenings'}]發動時`, }, position: { top: tp`上方第${'pos'}橫行`, diff --git a/script-json_data.js b/script-json_data.js index 7b3b9379..121c91c6 100644 --- a/script-json_data.js +++ b/script-json_data.js @@ -205,7 +205,7 @@ let localTranslating = { L_shape: tp`When matching an L shape of 5 ${'orbs'} `, heal: tp`When healing at least ${'heal'} ${'stats'} with ${'orbs'} `, - awakening_activated: tp`When ${'awakenings'} activated at the same time `, + awakening_activated: tp`When [${'awakenings'}] activated `, }, position: { top: tp`${'pos'} of top rows`, @@ -569,8 +569,8 @@ const official_badge_sorting = [ //20是没有启用的全属性徽章,现在 10, 12, 13, 14, 41, 42, 43, 44, 45, 46, 47, 48, 24, 25, 26, 53, 27, 28, 29, 30, 31, 15, 16, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 49, - 50, 51, 52, 54, 55, 56, 57, 58, 59, 60, 61, 62, + 34, 35, 36, 37, 38, 62, 39, 40, 49, + 50, 51, 52, 54, 55, 56, 57, 58, 59, 60, 61, ] //官方的觉醒排列顺序 @@ -3969,11 +3969,32 @@ const specialSearchFunctions = (function() { }, {name:"Less remain on the board",otLangName:{chs:"剩珠倍率",cht:"剩珠倍率"}, function:cards=>cards.filter(card=>{ - const searchTypeArray = [177]; - const skill = getCardLeaderSkill(card, searchTypeArray); - return skill?.params[5]; + const searchTypeArray = [177]; + const skill = getCardLeaderSkill(card, searchTypeArray); + return skill?.params[5]; }) }, + {name:"Awakening active",otLangName:{chs:"激活觉醒",cht:"激活覺醒"}, + function:cards=>cards.filter(card=>{ + const searchTypeArray = [271]; + const skill = getCardLeaderSkill(card, searchTypeArray); + return skill; + }), + addition:card=>{ + const searchTypeArray = [271]; + const skill = getCardLeaderSkill(card, searchTypeArray); + if (!skill) return; + const parsedSkills = skillParser(skill.id); + const parsedSkill = parsedSkills.find(subSkil=> + subSkil + ?.condition + ?.awakeningActivated + ?.awakenings?.length); + const fragment = document.createDocumentFragment(); + fragment.append("要",creatAwokenList(parsedSkill.condition.awakeningActivated.awakenings)); + return fragment; + } + }, ]}, {group:true,name:"Restriction/Bind",otLangName:{chs:"限制",cht:"限制"}, functions: [ {name:"Attribute Enchantment",otLangName:{chs:"属性增强",cht:"屬性增强"}, diff --git a/service-worker.js b/service-worker.js index de1516e5..3e22c9ba 100644 --- a/service-worker.js +++ b/service-worker.js @@ -48275,7 +48275,7 @@ const cachesMap = new Map([ ], [ "script-json_data.js", - "3f01d6d8fc67fd998598f847cb874bb0" + "01b72db639555d40de9f57b80e10d580" ], [ "script-skill-parser.js", @@ -48347,7 +48347,7 @@ const cachesMap = new Map([ ], [ "languages/zh-hans.js", - "b383afb22425f7874a3a1c109551d478" + "a339f8b008f9a85a87a923b6267152cc" ], [ "languages/zh-hant.css", @@ -48355,7 +48355,7 @@ const cachesMap = new Map([ ], [ "languages/zh-hant.js", - "9ecee6c2178fe3676700b33caf92c640" + "9cd0585f504a4887c5a5f38a539e2e74" ], [ "images/attrs.png",