From 53722a2abe133151cde7fb4d73fa7be991a17182 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, 15 Apr 2020 15:32:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0type=E7=9A=84and=E4=B8=8Eor?= =?UTF-8?q?=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- languages/en.css | 14 +++++++------- languages/ja.css | 14 +++++++------- languages/ko.css | 14 +++++++------- languages/zh-TW.css | 14 +++++++------- languages/zh.css | 14 +++++++------- multi.html | 1 + script-universal_function.js | 7 +++++-- script.js | 7 ++++++- solo.html | 1 + style.css | 10 ++++++++++ triple.html | 1 + 11 files changed, 59 insertions(+), 38 deletions(-) diff --git a/languages/en.css b/languages/en.css index bb74527c..eab444ad 100644 --- a/languages/en.css +++ b/languages/en.css @@ -255,13 +255,13 @@ content: "Simple Search"; } .search-box::before{ - content: "▼Search Cards"; + content: "Search Cards"; } .search-box .attrs .attr-list-1::before{ - content: "Attribute 1"; + content: "Attribute 1:"; } .search-box .attrs .attr-list-2::before{ - content: "Attribute 2"; + content: "Attribute 2:"; } .search-box .attrs .fix-main-color-label::after{ content: "Fix attr-1 for main-attr, attr-2 for sub-attr."; @@ -281,7 +281,7 @@ .search-box .sort-reverse-label::after{ content: "Same"; } -.search-box #sort-reverse:checked+ .sort-reverse-label::after{ +.search-box input:checked+ .sort-reverse-label::after{ content: "Reverse"; } .attrs .attr-all::before{ @@ -291,13 +291,13 @@ content: "None"; } .search-box .types-div::before{ - content: "Type (OR)"; + content: "Type:"; } .search-box .awoken-div::before{ - content: "Awoken (AND) (Tips: Click on number to reduce value)"; + content: "▼Awoken (AND) (Tips: Click on number to reduce value)"; } .search-box .sawoken-div::before{ - content: "Super Awoken (OR)"; + content: "▼Super Awoken (OR)"; } .control-div .search-start::before{ content: "🔍Start Search"; diff --git a/languages/ja.css b/languages/ja.css index 4541fa85..946332ba 100644 --- a/languages/ja.css +++ b/languages/ja.css @@ -248,13 +248,13 @@ content: "簡単な検索"; } .search-box::before{ - content: "▼モンスターの検索"; + content: "モンスターの検索"; } .search-box .attrs .attr-list-1::before{ - content: "属性 1"; + content: "属性 1:"; } .search-box .attrs .attr-list-2::before{ - content: "属性 2"; + content: "属性 2:"; } .search-box .attrs .fix-main-color-label::after{ content: "限定 属性 1->主属性，属性 2->副属性"; @@ -274,7 +274,7 @@ .search-box .sort-reverse-label::after{ content: "正序"; } -.search-box #sort-reverse:checked+ .sort-reverse-label::after{ +.search-box input:checked+ .sort-reverse-label::after{ content: "逆序"; } .attrs .attr-all::before{ @@ -284,13 +284,13 @@ content: "空"; } .search-box .types-div::before{ - content: "タイプ（OR）"; + content: "タイプ:"; } .search-box .awoken-div::before{ - content: "覚醒（AND）（しえ:数値をクリックすると数値が減少します）"; + content: "▼覚醒（AND）（しえ:数値をクリックすると数値が減少します）"; } .search-box .sawoken-div::before{ - content: "超覚醒（OR）"; + content: "▼超覚醒（OR）"; } .control-div .search-start::before{ content: "🔍検索の開始"; diff --git a/languages/ko.css b/languages/ko.css index 1f48111e..6ba71959 100644 --- a/languages/ko.css +++ b/languages/ko.css @@ -248,13 +248,13 @@ content: "간단한 검색"; } .search-box::before{ - content: "▼몬스터 검색"; + content: "몬스터 검색"; } .search-box .attrs .attr-list-1::before{ - content: "속성 1"; + content: "속성 1:"; } .search-box .attrs .attr-list-2::before{ - content: "속성 1"; + content: "속성 1:"; } .search-box .attrs .fix-main-color-label::after{ content: "제한 속성 1은 기본 속성 이며 속성 2 하위 속성입니다."; @@ -274,7 +274,7 @@ .search-box .sort-reverse-label::after{ content: "양의"; } -.search-box #sort-reverse:checked+ .sort-reverse-label::after{ +.search-box input:checked+ .sort-reverse-label::after{ content: "역순"; } .attrs .attr-all::before{ @@ -284,13 +284,13 @@ content: "없음"; } .search-box .types-div::before{ - content: "형식（OR）"; + content: "형식:"; } .search-box .awoken-div::before{ - content: "각성（AND）（번째:숫자를 누르면 숫자가 낮아집니다）"; + content: "▼각성（AND）（번째:숫자를 누르면 숫자가 낮아집니다）"; } .search-box .sawoken-div::before{ - content: "슈퍼 각성（OR）"; + content: "▼슈퍼 각성（OR）"; } .control-div .search-start::before{ content: "🔍검색 시작"; diff --git a/languages/zh-TW.css b/languages/zh-TW.css index a2a4cfb8..666b42ac 100644 --- a/languages/zh-TW.css +++ b/languages/zh-TW.css @@ -254,13 +254,13 @@ content: "簡易搜索"; } .search-box::before{ - content: "▼搜索怪物"; + content: "搜索怪物"; } .search-box .attrs .attr-list-1::before{ - content: "屬性 1"; + content: "屬性 1："; } .search-box .attrs .attr-list-2::before{ - content: "屬性 2"; + content: "屬性 2："; } .search-box .attrs .fix-main-color-label::after{ content: "限制屬性 1 爲主屬性，屬性 2 爲副屬性"; @@ -280,7 +280,7 @@ .search-box .sort-reverse-label::after{ content: "順序"; } -.search-box #sort-reverse:checked+ .sort-reverse-label::after{ +.search-box input:checked+ .sort-reverse-label::after{ content: "逆序"; } .attrs .attr-all::before{ @@ -290,13 +290,13 @@ content: "無"; } .search-box .types-div::before{ - content: "類型（OR）"; + content: "類型："; } .search-box .awoken-div::before{ - content: "覺醒（AND）（提示：點擊數字可減少數值）"; + content: "▼覺醒（AND）（提示：點擊數字可減少數值）"; } .search-box .sawoken-div::before{ - content: "超覺醒（OR）"; + content: "▼超覺醒（OR）"; } .control-div .search-start::before{ content: "🔍開始搜索"; diff --git a/languages/zh.css b/languages/zh.css index 920b125d..130f1ede 100644 --- a/languages/zh.css +++ b/languages/zh.css @@ -254,13 +254,13 @@ content: "简易搜索"; } .search-box::before{ - content: "▼搜索怪物"; + content: "搜索怪物"; } .search-box .attrs .attr-list-1::before{ - content: "属性 1"; + content: "属性 1："; } .search-box .attrs .attr-list-2::before{ - content: "属性 2"; + content: "属性 2："; } .search-box .attrs .fix-main-color-label::after{ content: "限制属性 1 为主属性，属性 2 为副属性"; @@ -280,7 +280,7 @@ .search-box .sort-reverse-label::after{ content: "顺序"; } -.search-box #sort-reverse:checked+ .sort-reverse-label::after{ +.search-box input:checked+ .sort-reverse-label::after{ content: "逆序"; } .attrs .attr-all::before{ @@ -290,13 +290,13 @@ content: "无"; } .search-box .types-div::before{ - content: "类型（OR）"; + content: "类型："; } .search-box .awoken-div::before{ - content: "觉醒（AND）（提示：点击数字可减少数值）"; + content: "▼觉醒（AND）（提示：点击数字可减少数值）"; } .search-box .sawoken-div::before{ - content: "超觉醒（OR）"; + content: "▼超觉醒（OR）"; } .control-div .search-start::before{ content: "🔍开始搜索"; diff --git a/multi.html b/multi.html index ab5b7c65..ec4a25b8 100644 --- a/multi.html +++ b/multi.html @@ -482,6 +482,7 @@ var formation = new Formation(teamsCount,5);
    • +
    diff --git a/script-universal_function.js b/script-universal_function.js index 0e4f0a67..94dee127 100644 --- a/script-universal_function.js +++ b/script-universal_function.js @@ -353,7 +353,7 @@ function calculateAbility(member = null, assist = null, solo = true) return abilitys; } //搜索卡片用 -function searchCards(cards,attr1,attr2,fixMainColor,types,awokens,sawokens,equalAk,incSawoken) +function searchCards(cards,attr1,attr2,fixMainColor,types,typeAndOr,awokens,sawokens,equalAk,incSawoken) { let cardsRange = cards.concat(); //这里需要复制一份原来的数组，不然若无筛选，后面的排序会改变初始Cards //属性 @@ -384,7 +384,10 @@ function searchCards(cards,attr1,attr2,fixMainColor,types,awokens,sawokens,equal //类型 if (types.length>0) { - cardsRange = cardsRange.filter(c=>types.some(t=>c.types.includes(t))); + cardsRange = cardsRange.filter(c=>typeAndOr ? + types.every(t=>c.types.includes(t)) : //所有type都满足 + types.some(t=>c.types.includes(t)) //只需要满足一个type + ); } //觉醒 //等效觉醒时，事先去除大觉醒 diff --git a/script.js b/script.js index 02c383b4..95bee62d 100644 --- a/script.js +++ b/script.js @@ -807,6 +807,7 @@ function initialize() const s_attr2s = Array.from(searchBox.querySelectorAll(".attrs .attr-list-2 .attr-radio")); const s_fixMainColor = searchBox.querySelector("#fix-main-color"); const s_types = Array.from(searchBox.querySelectorAll(".types-div .type-check")); + const s_typeAndOr = searchBox.querySelector("#type-and-or"); const s_awokensItems = Array.from(searchBox.querySelectorAll(".awoken-div .awoken-count")); const s_awokensIcons = s_awokensItems.map(it=>it.querySelector(".awoken-icon")); const s_awokensCounts = s_awokensItems.map(it=>it.querySelector(".count")); @@ -945,6 +946,7 @@ function initialize() attr1,attr2, s_fixMainColor.checked, typesFilter, + s_typeAndOr.checked, awokensFilter, sawokensFilter, s_awokensEquivalent.checked, @@ -1633,9 +1635,9 @@ function changeid(mon,monDom,latentDom) levelDom.classList.remove("_110"); } } + const awokenIcon = monDom.querySelector(".awoken-count"); if (mon.awoken>-1) //如果提供了觉醒 { - const awokenIcon = monDom.querySelector(".awoken-count"); if (mon.awoken == 0 || card.awakenings.length < 1 || !awokenIcon) //没觉醒 { awokenIcon.classList.add(className_displayNone); @@ -1652,6 +1654,9 @@ function changeid(mon,monDom,latentDom) awokenIcon.classList.remove("full-awoken"); } } + }else if (card.awakenings.length < 1) + { + awokenIcon.classList.add("display-none"); } const sawoken = monDom.querySelector(".super-awoken"); if (sawoken) //如果存在超觉醒的DOM且提供了超觉醒 diff --git a/solo.html b/solo.html index 0ea8d10a..482635e6 100644 --- a/solo.html +++ b/solo.html @@ -434,6 +434,7 @@ var formation = new Formation(teamsCount,6);
    • +
    diff --git a/style.css b/style.css index aeeae8f9..1b23a10d 100644 --- a/style.css +++ b/style.css @@ -130,6 +130,12 @@ body{ margin-right: 20px; display: inline-block; } +.config-checkbox-lbl[for$=and-or]::after{ + content: "OR"; +} +input:checked+ .config-checkbox-lbl[for$=and-or]::after{ + content: "AND"; +} .status{ line-height: 16px; @@ -841,6 +847,10 @@ ul{ .types-div .type-list input:checked~label{ opacity: 1; } +.types-div .type-and-or-label{ + margin-left: 10px; + margin-right: 0; +} /*.search-box .awoken-div::before{ content: "觉醒"; }*/ diff --git a/triple.html b/triple.html index d8f42028..595b05bd 100644 --- a/triple.html +++ b/triple.html @@ -1069,6 +1069,7 @@ var formation = new Formation(teamsCount,6);
    • +