diff --git a/script-json_data.js b/script-json_data.js index 3f466627..5d236062 100644 --- a/script-json_data.js +++ b/script-json_data.js @@ -83,11 +83,11 @@ const sort_function_list = [ const skill_a = Skills[a.activeSkillId],skill_b = Skills[b.activeSkillId]; return (skill_a.initialCooldown - skill_a.maxLevel) - (skill_b.initialCooldown - skill_b.maxLevel); }}, - {tag:"sort_hpMax110",name:"最大HP",function:(a,b)=>a.hp.max * (1 + a.limitBreakIncr/100) - b.hp.max * (1 + b.limitBreakIncr/100)}, - {tag:"sort_atkMax110",name:"最大攻击",function:(a,b)=>a.atk.max * (1 + a.limitBreakIncr/100) - b.atk.max * (1 + b.limitBreakIncr/100)}, - {tag:"sort_rcvMax110",name:"最大回复",function:(a,b)=>a.rcv.max * (1 + a.limitBreakIncr/100) - b.rcv.max * (1 + b.limitBreakIncr/100)}, + {tag:"sort_hpMax110",name:"Lv110最大HP",function:(a,b)=>a.hp.max * (1 + a.limitBreakIncr/100) - b.hp.max * (1 + b.limitBreakIncr/100)}, + {tag:"sort_atkMax110",name:"Lv110最大攻击",function:(a,b)=>a.atk.max * (1 + a.limitBreakIncr/100) - b.atk.max * (1 + b.limitBreakIncr/100)}, + {tag:"sort_rcvMax110",name:"Lv110最大回复",function:(a,b)=>a.rcv.max * (1 + a.limitBreakIncr/100) - b.rcv.max * (1 + b.limitBreakIncr/100)}, - {tag:"sort_hpMax110_awoken",name:"最大攻击(+觉醒)",function:(a,b)=> + {tag:"sort_hpMax110_awoken",name:"Lv110最大攻击(+觉醒)",function:(a,b)=> { const abilities_2statusA = calculateAbility_max(a.id, solo, teamsCount), abilities_2statusB = calculateAbility_max(b.id, solo, teamsCount); @@ -96,7 +96,7 @@ const sort_function_list = [ return abA - abB; } }, - {tag:"sort_hpMax110_awoken",name:"最大HP(+觉醒)",function:(a,b)=> + {tag:"sort_hpMax110_awoken",name:"Lv110最大HP(+觉醒)",function:(a,b)=> { const abilities_2statusA = calculateAbility_max(a.id, solo, teamsCount), abilities_2statusB = calculateAbility_max(b.id, solo, teamsCount); @@ -105,7 +105,7 @@ const sort_function_list = [ return abA - abB; } }, - {tag:"sort_hpMax110_awoken",name:"最大回复(+觉醒)",function:(a,b)=> + {tag:"sort_hpMax110_awoken",name:"Lv110最大回复(+觉醒)",function:(a,b)=> { const abilities_2statusA = calculateAbility_max(a.id, solo, teamsCount), abilities_2statusB = calculateAbility_max(b.id, solo, teamsCount); @@ -114,7 +114,7 @@ const sort_function_list = [ return abA - abB; } }, - {tag:"sort_abilityIndex_awoken",name:"最大加权能力指数(+觉醒)",function:(a,b)=> + {tag:"sort_abilityIndex_awoken",name:"Lv110最大加权能力指数(+觉醒)",function:(a,b)=> { const abilities_2statusA = calculateAbility_max(a.id, solo, teamsCount), abilities_2statusB = calculateAbility_max(b.id, solo, teamsCount); diff --git a/script-universal_function.js b/script-universal_function.js index 0713d08a..32e999c1 100644 --- a/script-universal_function.js +++ b/script-universal_function.js @@ -371,12 +371,12 @@ function calculateAbility(member, assist = null, solo = true, teamsCount = 1) }); return abilitys; } -function calculateAbility_max(id,solo, teamsCount) +function calculateAbility_max(id, solo, teamsCount) { const card = Cards[id]; const tempMon = { id: id, - level: card.maxLevel + (card.limitBreakIncr ? 11 : 0), + level: card.limitBreakIncr ? 110 : card.maxLevel, plus: (card.overlay || card.types[0] == 15 && card.types[1] == -1) ? [0,0,0] : [99,99,99], //当可以叠加时,不能打297 awoken: card.awakenings.length, };