From 6b5cc9ed26ef93dd4f60bcee1797fe02ab403680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= Date: Wed, 26 Feb 2020 01:15:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=8F=AF=E5=90=A6=E8=BE=85=E5=8A=A9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=8D=B3=E6=97=B6=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- multi.html | 2 +- script.js | 40 ++++++++++++++++++++-------------------- solo.html | 2 +- style.css | 16 +++++++++++----- triple.html | 2 +- 5 files changed, 34 insertions(+), 28 deletions(-) diff --git a/multi.html b/multi.html index 0e99ba20..4f93715d 100644 --- a/multi.html +++ b/multi.html @@ -506,7 +506,6 @@ var formation = new Formation(teamsCount,5);
-
@@ -666,6 +665,7 @@ var formation = new Formation(teamsCount,5); +
diff --git a/script.js b/script.js index 17460e81..603ecf48 100644 --- a/script.js +++ b/script.js @@ -686,6 +686,7 @@ function initialize() const searchOpen = settingBox.querySelector(".row-mon-id .open-search"); searchOpen.onclick = function(){ s_includeSuperAwoken.onclick(); + s_canAssist.onclick(); searchBox.classList.toggle("display-none"); }; @@ -701,8 +702,16 @@ function initialize() return it.querySelector(".count"); }); + const searchMonList = searchBox.querySelector(".search-mon-list"); //搜索结果列表 + const s_awokensEquivalent = searchBox.querySelector("#consider-equivalent-awoken"); //搜索等效觉醒 const s_canAssist = searchBox.querySelector("#can-assist"); //只搜索辅助 + s_canAssist.onclick = function(){ + if (this.checked) + searchMonList.classList.add("only-display-can-assist"); + else + searchMonList.classList.remove("only-display-can-assist"); + } const s_sawokenDiv = searchBox.querySelector(".sawoken-div"); @@ -765,7 +774,6 @@ function initialize() const searchStart = searchBox.querySelector(".control-div .search-start"); const searchClose = searchBox.querySelector(".control-div .search-close"); const searchClear = searchBox.querySelector(".control-div .search-clear"); - const searchMonList = searchBox.querySelector(".search-mon-list"); function returnCheckedInput(ipt) { return ipt.checked == true; @@ -833,17 +841,15 @@ function initialize() awokensFilter, sawokensFilter, s_awokensEquivalent.checked, - s_canAssist.checked, s_includeSuperAwoken.checked ); - console.debug("搜索条件：属性[%d,%d]，固定主副%s，类型：%o，觉醒：%o，超觉醒：%o，等效觉醒%s，可做辅助%s，搜超觉醒%s。\n搜索结果：%o", + console.debug("搜索条件：属性[%d,%d]，固定主副%s，类型：%o，觉醒：%o，超觉醒：%o，等效觉醒%s，搜超觉醒%s。\n搜索结果：%o", attr1,attr2, s_fixMainColor.checked, typesFilter, awokensFilter, sawokensFilter, s_awokensEquivalent.checked, - s_canAssist.checked, s_includeSuperAwoken.checked, searchResult ); @@ -1461,6 +1467,10 @@ function changeid(mon,monDom,latentDom) monDom.querySelector(".subproperty").className = "subproperty subproperty-" + card.attrs[1]; //副属性 monDom.title = "No." + monId + " " + (card.otLangName ? (card.otLangName[currentLanguage.searchlist[0]] || card.name) : card.name); monDom.href = monId.toString().replace(/^(\d+)$/ig,currentLanguage.guideURL); + if (card.canAssist) + monDom.classList.add("allowable-assist"); + else + monDom.classList.remove("allowable-assist"); } const levelDom = monDom.querySelector(".level"); if (levelDom) //如果提供了等级 @@ -1496,27 +1506,17 @@ function changeid(mon,monDom,latentDom) if (mon.awoken == card.awakenings.length) { awokenIcon.classList.add("full-awoken"); - if (card.canAssist) - {//可以辅助的满觉醒打黄色星星 - awokenIcon.classList.add("allowable-assist"); - if (card.awakenings.indexOf(49)>=0) - {//武器 - awokenIcon.classList.add("wepon"); - }else - { - awokenIcon.classList.remove("wepon"); - } - }else - { - awokenIcon.classList.remove("allowable-assist"); - } }else { awokenIcon.classList.remove("full-awoken"); - awokenIcon.classList.remove("allowable-assist"); + } + if (card.awakenings.indexOf(49)>=0) + {//武器 + awokenIcon.classList.add("wepon"); + }else + { awokenIcon.classList.remove("wepon"); } - } } const sawoken = monDom.querySelector(".super-awoken"); diff --git a/solo.html b/solo.html index 05b4340e..71744fa7 100644 --- a/solo.html +++ b/solo.html @@ -458,7 +458,6 @@ var formation = new Formation(teamsCount,6);
-
@@ -618,6 +617,7 @@ var formation = new Formation(teamsCount,6); +
diff --git a/style.css b/style.css index 1365a018..2eb59589 100644 --- a/style.css +++ b/style.css @@ -268,16 +268,16 @@ ul{ .monster .awoken-count.full-awoken::before{ content: "★"; } -.monster .awoken-count.allowable-assist.full-awoken::before{ - content: none; -} -.monster .awoken-count.allowable-assist{ +.monster.allowable-assist .awoken-count.full-awoken{ font-size: 0; text-shadow: none; background-position: 0 -38px; } +.monster.allowable-assist .awoken-count.full-awoken::before{ + content: none; +} /*武器*/ -.monster .awoken-count.allowable-assist.wepon{ +.monster.allowable-assist .awoken-count.full-awoken.wepon{ transform: scale(0.80) translateY(4px); width:32px;height:32px; background-image: url(images/awoken.png); @@ -885,6 +885,12 @@ ul{ border-radius: 5px; background: grey; } +.search-mon-list.only-display-can-assist .monster{ + opacity: 0.3; +} +.search-mon-list.only-display-can-assist .monster.allowable-assist{ + opacity: 1; +} .setting-box .row-mon-id .open-search{ float: right; } diff --git a/triple.html b/triple.html index f8e6d126..7b3e85c1 100644 --- a/triple.html +++ b/triple.html @@ -1092,7 +1092,6 @@ var formation = new Formation(teamsCount,6);
-
@@ -1252,6 +1251,7 @@ var formation = new Formation(teamsCount,6); +