From 4c762ebf87445d35509b93f41f4e2eef5bf607e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= Date: Mon, 16 Nov 2020 02:02:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8A=A0=E6=9D=83=E8=83=BD?= =?UTF-8?q?=E5=8A=9B=E6=8C=87=E6=95=B0=E7=9A=84=E6=8E=92=E5=BA=8F=E5=92=8C?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- languages/en.css | 4 ++++ languages/en.js | 1 + languages/ja.css | 4 ++++ languages/ja.js | 1 + languages/ko.css | 4 ++++ languages/ko.js | 1 + languages/language-list.js | 3 ++- languages/zh-TW.css | 4 ++++ languages/zh-TW.js | 1 + languages/zh.css | 4 ++++ script-json_data.js | 9 +++++++++ script-universal_function.js | 5 ++++- script.js | 3 +++ 13 files changed, 42 insertions(+), 2 deletions(-) diff --git a/languages/en.css b/languages/en.css index c3a3995a..d8f3635f 100644 --- a/languages/en.css +++ b/languages/en.css @@ -63,6 +63,10 @@ { content: "RCV:"; } +.search-mon-list .index-preview::before +{ + content: "Weit:"; +} .edit-box .edit-box-title::before{ content: "Edit Member"; } diff --git a/languages/en.js b/languages/en.js index e66f8949..e7fc1e66 100644 --- a/languages/en.js +++ b/languages/en.js @@ -18,6 +18,7 @@ sort_hpMax110_awoken: "Max HP (+Awoken)", sort_atkMax110_awoken: "Max ATK (+Awoken)", sort_rcvMax110_awoken: "Max RCV (+Awoken)", + sort_abilityIndex_awoken: "Maximum Weighted Ability Index (+Awakening)", }, force_reload_data: "Force refresh data", } diff --git a/languages/ja.css b/languages/ja.css index db943392..01565dbc 100644 --- a/languages/ja.css +++ b/languages/ja.css @@ -61,6 +61,10 @@ { content: "回復:"; } +.search-mon-list .index-preview::before +{ + content: "加重:"; +} .edit-box .edit-box-title::before{ content: "変更メンバー"; } diff --git a/languages/ja.js b/languages/ja.js index 22323c77..28ffde30 100644 --- a/languages/ja.js +++ b/languages/ja.js @@ -18,6 +18,7 @@ sort_hpMax110_awoken: "最大 HP (+覚醒)", sort_atkMax110_awoken: "最大攻撃 (+覚醒)", sort_rcvMax110_awoken: "最大回復 (+覚醒)", + sort_abilityIndex_awoken: "最大加重能力指数 (+覚醒)", }, force_reload_data: "データの強制更新", } diff --git a/languages/ko.css b/languages/ko.css index 35d44323..addc7d40 100644 --- a/languages/ko.css +++ b/languages/ko.css @@ -62,6 +62,10 @@ { content: "회복:"; } +.search-mon-list .index-preview::before +{ + content: "가중:"; +} .edit-box .edit-box-title::before{ content: "회원 수정"; } diff --git a/languages/ko.js b/languages/ko.js index cf06ebb2..997b1757 100644 --- a/languages/ko.js +++ b/languages/ko.js @@ -18,6 +18,7 @@ sort_hpMax110_awoken: "최대 HP (+각성)", sort_atkMax110_awoken: "최대 공격 (+각성)", sort_rcvMax110_awoken: "최대 회복 (+각성)", + sort_abilityIndex_awoken: "최대 가중 능력 지수 (+각성)", }, force_reload_data: "데이터 강제 새로 고침", } diff --git a/languages/language-list.js b/languages/language-list.js index 61c062da..111e28e7 100644 --- a/languages/language-list.js +++ b/languages/language-list.js @@ -9,7 +9,8 @@ }, { name:"中文（简体）技能解析",i18n:"zh-CN",searchlist:["chs","ja"], - guideURL:id=>{const url = new URL(location);url.search = '';url.searchParams.set("guide",1);url.searchParams.set("id",id); return url;} + guideURL:id=>`http://pad.skyozora.com/pets/${id}` + //guideURL:id=>{const url = new URL(location);url.search = '';url.searchParams.set("guide",1);url.searchParams.set("id",id); return url;} }, { name:"中文（简体）原版技能",i18n:"zh",searchlist:["chs","ja"], diff --git a/languages/zh-TW.css b/languages/zh-TW.css index 8792349f..56ea2ab4 100644 --- a/languages/zh-TW.css +++ b/languages/zh-TW.css @@ -65,6 +65,10 @@ { content: "回復："; } +.search-mon-list .index-preview::before +{ + content: "加權:"; +} .edit-box .edit-box-title::before{ content: "修改隊員"; } diff --git a/languages/zh-TW.js b/languages/zh-TW.js index e020158d..b4b99ee9 100644 --- a/languages/zh-TW.js +++ b/languages/zh-TW.js @@ -18,6 +18,7 @@ sort_hpMax110_awoken: "最大 HP(+覺醒)", sort_atkMax110_awoken: "最大攻擊(+覺醒)", sort_rcvMax110_awoken: "最大回復(+覺醒)", + sort_abilityIndex_awoken: "最大加權能力指數（+覺醒）", }, force_reload_data: "強制刷新數據", } diff --git a/languages/zh.css b/languages/zh.css index 95caeb04..844eaeaf 100644 --- a/languages/zh.css +++ b/languages/zh.css @@ -65,6 +65,10 @@ { content: "回复:"; } +.search-mon-list .index-preview::before +{ + content: "加权:"; +} .edit-box .edit-box-title::before{ content: "修改队员"; } diff --git a/script-json_data.js b/script-json_data.js index 9caae5b5..481befa9 100644 --- a/script-json_data.js +++ b/script-json_data.js @@ -102,4 +102,13 @@ const sort_function_list = [ return abA - abB; } }, + {tag:"sort_abilityIndex_awoken",name:"最大加权能力指数(+觉醒)",function:(a,b)=> + { + const abilities_2statusA = calculateAbility_max(a.id, solo, teamsCount), + abilities_2statusB = calculateAbility_max(b.id, solo, teamsCount); + const abA = abilities_2statusA ? abilities_2statusA.withAwoken.hp / 10 + abilities_2statusA.withAwoken.atk / 5 + abilities_2statusA.withAwoken.rcv / 3 : 0, + abB = abilities_2statusB ? abilities_2statusB.withAwoken.hp / 10 + abilities_2statusB.withAwoken.atk / 5 + abilities_2statusB.withAwoken.rcv / 3 : 0; + return abA - abB; + } + }, ]; \ No newline at end of file diff --git a/script-universal_function.js b/script-universal_function.js index 362f0677..b0b2a406 100644 --- a/script-universal_function.js +++ b/script-universal_function.js @@ -345,8 +345,11 @@ function calculateAbility(member, assist = null, solo = true, teamsCount = 1) let reValueNoAwoken = n_base * n_awokenScale + n_plus + (n_assist_base + n_assist_plus) * bonusScale[idx]; //觉醒生效时的协力、语音觉醒等的倍率 - reValue = Math.round(reValue * latterAwokenScale[idx].reduce(calculateAwokenScale,1)); + reValue = reValue * latterAwokenScale[idx].reduce(calculateAwokenScale,1); + //都要做四舍五入 + reValue = Math.round(reValue); + reValueNoAwoken = Math.round(reValueNoAwoken); if (idx<2) //idx顺序为HP、ATK、RCV { //HP和ATK最低为1 reValue = Math.max(reValue,1); diff --git a/script.js b/script.js index cf863fde..db297113 100644 --- a/script.js +++ b/script.js @@ -1031,6 +1031,9 @@ function initialize() { const rcvDom = abilitiesPreview.appendChild(document.createElement("li")); rcvDom.className = "rcv-preview"; rcvDom.textContent = abilities.rcv; + const indexDom = abilitiesPreview.appendChild(document.createElement("li")); + indexDom.className = "index-preview"; + indexDom.textContent = Math.round(abilities.hp/10 + abilities.atk/5 + abilities.rcv/3); return abilitiesPreview; } if (options.showAbilities || options.showAbilitiesWithAwoken)