diff --git a/languages/en.css b/languages/en.css index 13b8db14..26aaa1b5 100644 --- a/languages/en.css +++ b/languages/en.css @@ -255,6 +255,9 @@ .control-box .btn-show-mon-skill-cd-lbl::after{ content:"โ„๏ธShow full skill's cooldown"; } +.control-box .btn-show-mon-awoken-lbl::after{ + content:"๐Ÿ‘Show card awoken"; +} .control-box .btn-show-awoken-count-lbl::after{ content:"โš”๏ธShow awoken count and ability"; } diff --git a/languages/ja.css b/languages/ja.css index b54733ff..3afc1045 100644 --- a/languages/ja.css +++ b/languages/ja.css @@ -247,6 +247,9 @@ .control-box .btn-show-mon-skill-cd-lbl::after{ content:"โ„๏ธใƒ•ใƒซ ใ‚นใ‚ญใƒซ ใ‚ฏใƒผใƒซใ‚’่กจ็คบ"; } +.control-box .btn-show-mon-awoken-lbl::after{ + content:"๐Ÿ‘ใ‚ซใƒผใƒ‰ใฎ่ฆš้†’ใ‚’่กจ็คบใ—ใพใ™"; +} .control-box .btn-show-awoken-count-lbl::after{ content:"โš”๏ธ็ท่ฆš้†’ใจ่ƒฝๅŠ›ๅ€คใฎ่กจ็คบ"; } diff --git a/languages/ko.css b/languages/ko.css index c95938ca..11df11ad 100644 --- a/languages/ko.css +++ b/languages/ko.css @@ -244,6 +244,9 @@ .control-box .btn-show-mon-skill-cd-lbl::after{ content:"โ„๏ธ์ „์ฒด ์Šคํ‚ฌ ์ฟจ์„ ํ‘œ์‹œ"; } +.control-box .btn-show-mon-awoken-lbl::after{ + content:"๐Ÿ‘์นด๋“œ ๊ฐ์„ฑ์„ ํ‘œ์‹œํ•ฉ๋‹ˆ๋‹ค"; +} .control-box .btn-show-awoken-count-lbl::after{ content:"โš”๏ธ๊ฐ์„ฑ ํ†ต๊ณ„ ๋ฐ ๊ธฐ๋Šฅ ๊ฐ’ ํ‘œ์‹œ"; } diff --git a/languages/zh-TW.css b/languages/zh-TW.css index 660a50df..64949280 100644 --- a/languages/zh-TW.css +++ b/languages/zh-TW.css @@ -250,6 +250,9 @@ .control-box .btn-show-mon-skill-cd-lbl::after{ content:"โ„๏ธ้กฏ็คบๅทฒๆปฟๆŠ€่ƒฝๅ†ทๅป"; } +.control-box .btn-show-mon-awoken-lbl::after{ + content:"๐Ÿ‘้กฏ็คบๅก็‰‡่ฆบ้†’"; +} .control-box .btn-show-awoken-count-lbl::after{ content:"โš”๏ธ้กฏ็คบ่ฆบ้†’็ตฑ่จˆๅ’Œ่ƒฝๅŠ›ๅ€ผ"; } diff --git a/script.js b/script.js index dedcc778..17d26874 100644 --- a/script.js +++ b/script.js @@ -2055,6 +2055,10 @@ function initialize() { const formationTotalInfoDom = formationBox.querySelector(".formation-total-info"); //ๆ‰€ๆœ‰้˜Ÿไผ่ƒฝๅŠ›ๅ€ผๅˆ่ฎก if (formationTotalInfoDom) refreshFormationTotalHP(formationTotalInfoDom, formation.teams); + const teamMenberAwokenDom = teamBigBox.querySelector(".team-menber-awoken"); //้˜Ÿๅ‘˜่ง‰้†’ + const teamAssistAwokenDom = teamBigBox.querySelector(".team-assist-awoken"); //่พ…ๅŠฉ่ง‰้†’ + if (teamMenberAwokenDom && teamAssistAwokenDom) refreshMenberAwoken(teamMenberAwokenDom, teamAssistAwokenDom, teamData, editBox.memberIdx[2]); //ๅˆทๆ–ฐๆœฌไบบ่ง‰้†’ + const teamAwokenDom = teamBigBox.querySelector(".team-awoken"); //้˜Ÿไผ่ง‰้†’ๅˆ่ฎก if (teamAwokenDom) refreshTeamAwokenCount(teamAwokenDom, teamData); const formationAwokenDom = formationBox.querySelector(".formation-awoken"); //ๆ‰€ๆœ‰้˜Ÿไผ่ง‰้†’ๅˆ่ฎก @@ -2090,6 +2094,10 @@ function initialize() { const formationTotalInfoDom = formationBox.querySelector(".formation-total-info"); //ๆ‰€ๆœ‰้˜Ÿไผ่ƒฝๅŠ›ๅ€ผๅˆ่ฎก if (formationTotalInfoDom) refreshFormationTotalHP(formationTotalInfoDom, formation.teams); + const teamMenberAwokenDom = teamBigBox.querySelector(".team-menber-awoken"); //้˜Ÿๅ‘˜่ง‰้†’ + const teamAssistAwokenDom = teamBigBox.querySelector(".team-assist-awoken"); //่พ…ๅŠฉ่ง‰้†’ + if (teamMenberAwokenDom && teamAssistAwokenDom) refreshMenberAwoken(teamMenberAwokenDom, teamAssistAwokenDom, teamData, editBox.memberIdx[2]); //ๅˆทๆ–ฐๆœฌไบบ่ง‰้†’ + const teamAwokenDom = teamBigBox.querySelector(".team-awoken"); //้˜Ÿไผ่ง‰้†’ๅˆ่ฎก if (teamAwokenDom) refreshTeamAwokenCount(teamAwokenDom, teamData); const formationAwokenDom = formationBox.querySelector(".formation-awoken"); //ๆ‰€ๆœ‰้˜Ÿไผ่ง‰้†’ๅˆ่ฎก @@ -2117,6 +2125,10 @@ function initialize() { const formationTotalInfoDom = formationBox.querySelector(".formation-total-info"); //ๆ‰€ๆœ‰้˜Ÿไผ่ƒฝๅŠ›ๅ€ผๅˆ่ฎก if (formationTotalInfoDom) refreshFormationTotalHP(formationTotalInfoDom, formation.teams); + const teamMenberAwokenDom = teamBigBox.querySelector(".team-menber-awoken"); //้˜Ÿๅ‘˜่ง‰้†’ + const teamAssistAwokenDom = teamBigBox.querySelector(".team-assist-awoken"); //่พ…ๅŠฉ่ง‰้†’ + if (teamMenberAwokenDom && teamAssistAwokenDom) refreshMenberAwoken(teamMenberAwokenDom, teamAssistAwokenDom, teamData, editBox.memberIdx[2]); //ๅˆทๆ–ฐๆœฌไบบ่ง‰้†’ + const teamAwokenDom = teamBigBox.querySelector(".team-awoken"); //้˜Ÿไผ่ง‰้†’ๅˆ่ฎก if (teamAwokenDom) refreshTeamAwokenCount(teamAwokenDom, teamData); const formationAwokenDom = formationBox.querySelector(".formation-awoken"); //ๆ‰€ๆœ‰้˜Ÿไผ่ง‰้†’ๅˆ่ฎก @@ -2848,8 +2860,8 @@ function refreshAll(formationData) { const latentsDom = teamBox.querySelector(".team-latents"); const assistsDom = teamBox.querySelector(".team-assist"); const teamAbilityDom = teamBigBox.querySelector(".team-ability"); - const teamMenberAwokenDom = teamBigBox.querySelector(".team-menber-awoken"); //้˜Ÿไผ้˜Ÿๅ‘˜่ง‰้†’ - const teamAssistAwokenDom = teamBigBox.querySelector(".team-assist-awoken"); //้˜Ÿไผ้˜Ÿๅ‘˜่ง‰้†’ + const teamMenberAwokenDom = teamBigBox.querySelector(".team-menber-awoken"); //้˜Ÿๅ‘˜่ง‰้†’ + const teamAssistAwokenDom = teamBigBox.querySelector(".team-assist-awoken"); //่พ…ๅŠฉ่ง‰้†’ for (let ti = 0, ti_len = membersDom.querySelectorAll(".member").length; ti < ti_len; ti++) { const member = membersDom.querySelector(`.member-${ti+1} .monster`); const latent = latentsDom.querySelector(`.latents-${ti+1} .latent-ul`); @@ -2989,7 +3001,7 @@ function refreshMenberAwoken(menberAwokenDom, assistAwokenDom, team, idx) { //้˜Ÿๅ‘˜่ง‰้†’ let menberAwokens = Cards[memberData.id].awakenings.slice(0,memberData.awoken); //ๅ•ไบบๅ’Œไธ‰ไบบไธบ้˜Ÿๅ‘˜ๅขžๅŠ ่ถ…่ง‰้†’ - if ((solo || teamsCount === 3) && memberData.sawoken != undefined) menberAwokens.push(Cards[memberData.id].superAwakenings[memberData.sawoken]); + if ((solo || teamsCount === 3) && memberData.sawoken >= 0) menberAwokens.push(Cards[memberData.id].superAwakenings[memberData.sawoken]); //menberAwokens.sort(); //ๆญฆๅ™จ่ง‰้†’ let assistAwokens = Cards[assistData.id].awakenings.slice(0,assistData.awoken);