diff --git a/languages/zh-CN.js b/languages/zh-CN.js index 89035008..aa6b4b60 100644 --- a/languages/zh-CN.js +++ b/languages/zh-CN.js @@ -3041,25 +3041,33 @@ function parseSkillDescription(skill) { name:"回复力 buff(顶降回复)", function:cards=>{ const searchTypeArray = [50,90]; + function getRecScale(as) + { + const sk = as.params; + return sk.slice(1,sk.length>2?-1:undefined).includes(5) && sk.length > 2 ? sk[sk.length-1] : 0; + } return cards.filter(card=>{ - const skill = getCardActiveSkill(card, searchTypeArray); - if (skill) + const skills = getCardActiveSkills(card, searchTypeArray); + if (skills.length) { - const sk = skill.params; - return sk.slice(1,sk.length>2?-1:undefined).includes(5); + return skills.some(as=>getRecScale(as) > 0); }else return false; }).sort((a,b)=>{ - const a_s = getCardActiveSkill(a, searchTypeArray), b_s = getCardActiveSkill(b, searchTypeArray); - //将技能的手指类型转换为二进制01、10、11等形式,低位表示加固定秒,高位表示手指加倍 - const a_ss = a_s.params.length > 2 ? a_s.params[a_s.params.length-1] : 0, b_ss = b_s.params.length > 2 ? b_s.params[b_s.params.length-1] : 0; - return a_ss - b_ss; + const a_ss = getCardActiveSkills(a, searchTypeArray), b_ss = getCardActiveSkills(b, searchTypeArray); + const a_sv = a_ss.map(a_s=>getRecScale(a_s)).sort().reverse()[0], b_sv = b_ss.map(b_s=>getRecScale(b_s)).sort().reverse()[0]; + return a_sv - b_sv; }); }, addition:card=>{ const searchTypeArray = [50,90]; - const skill = getCardActiveSkill(card, searchTypeArray); - const sk = skill.params; - return document.createTextNode(`回x${sk.length > 2 ? sk[sk.length-1]/100 : 0}`); + function getRecScale(as) + { + const sk = as.params; + return sk.slice(1,sk.length>2?-1:undefined).includes(5) && sk.length > 2 ? sk[sk.length-1] : 0; + } + const skills = getCardActiveSkills(card, searchTypeArray); + const skill = skills.find(as=>getRecScale(as) > 0); + return document.createTextNode(`回x${getRecScale(skill) / 100}`); } }, {name:"攻击力 buff(顶降攻击)",function:cards=>cards.filter(card=>{ diff --git a/monsters-info/ckey.json b/monsters-info/ckey.json index 6713bd9b..6d8fbb90 100644 --- a/monsters-info/ckey.json +++ b/monsters-info/ckey.json @@ -1 +1 @@ -[{"code":"ja","ckey":{"card":"28e0ffdae722c11b378f802caabefc0e","skill":"614df68ca015f37452d64a85708e26d1"},"updateTime":1616152734244},{"code":"en","ckey":{"card":"1eec12ff3f829f4c9ce71ccb1a6d3f54","skill":"f1674ef0fcaba5f1ff36b034abbc2a9d"},"updateTime":1616059757458},{"code":"ko","ckey":{"card":"0175f46be7abfeca3df156545ec49018","skill":"a881d3f3d7f5aee6be4855b444f87117"},"updateTime":1616059757458}] \ No newline at end of file +[{"code":"ja","ckey":{"card":"28e0ffdae722c11b378f802caabefc0e","skill":"614df68ca015f37452d64a85708e26d1"},"updateTime":1616153089310},{"code":"en","ckey":{"card":"1eec12ff3f829f4c9ce71ccb1a6d3f54","skill":"f1674ef0fcaba5f1ff36b034abbc2a9d"},"updateTime":1616059757458},{"code":"ko","ckey":{"card":"0175f46be7abfeca3df156545ec49018","skill":"a881d3f3d7f5aee6be4855b444f87117"},"updateTime":1616059757458}] diff --git a/script-universal_function.js b/script-universal_function.js index 967f3df1..c1e08c5e 100644 --- a/script-universal_function.js +++ b/script-universal_function.js @@ -669,6 +669,10 @@ function countTeamHp(memberArr, leader1id, leader2id, solo, noAwoken = false) { function getCardLeaderSkills(card, skillTypes) { return getActuallySkills(Skills[card.leaderSkillId], skillTypes, false); } +//返回卡片的主动技能 +function getCardActiveSkills(card, skillTypes) { + return getActuallySkills(Skills[card.activeSkillId], skillTypes, false); +} //查找到真正起作用的那一个技能 function getActuallySkills(skill, skillTypes, searchRandom = true) { if (skillTypes.includes(skill.type))