From ba2c63c00f72ca2626f816430cd03a8a170775d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= Date: Sat, 21 Mar 2020 22:00:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=89=E9=86=92=E6=90=9C=E7=B4=A2=E7=9A=84bu?= =?UTF-8?q?ttom=E6=94=B9=E6=88=90input?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- multi.html | 145 ++++++++++++++++++++++++++-------------------------- script.js | 24 ++++----- solo.html | 145 ++++++++++++++++++++++++++-------------------------- style.css | 26 +++++++--- triple.html | 145 ++++++++++++++++++++++++++-------------------------- 5 files changed, 247 insertions(+), 238 deletions(-) diff --git a/multi.html b/multi.html index a9360e03..a20523ed 100644 --- a/multi.html +++ b/multi.html @@ -474,6 +474,7 @@ var formation = new Formation(teamsCount,5);
    • +
    @@ -483,78 +484,78 @@ var formation = new Formation(teamsCount,5);
    diff --git a/script.js b/script.js index 89fcade2..54934cac 100644 --- a/script.js +++ b/script.js @@ -814,12 +814,8 @@ function initialize() const s_fixMainColor = searchBox.querySelector("#fix-main-color"); const s_types = Array.from(searchBox.querySelectorAll(".types-div .type-check")); const s_awokensItems = Array.from(searchBox.querySelectorAll(".awoken-div .awoken-count")); - const s_awokensIcons = s_awokensItems.map(it=>{ - return it.querySelector(".awoken-icon"); - }); - const s_awokensCounts = s_awokensItems.map(it=>{ - return it.querySelector(".count"); - }); + const s_awokensIcons = s_awokensItems.map(it=>it.querySelector(".awoken-icon")); + const s_awokensCounts = s_awokensItems.map(it=>it.querySelector(".count")); const searchMonList = searchBox.querySelector(".search-mon-list"); //搜索结果列表 searchMonList.originalHeads = null; //用于存放原始搜索结果 @@ -841,11 +837,11 @@ function initialize() function search_awokenAdd1() { const countDom = this.parentNode.querySelector(".count"); - let count = parseInt(countDom.innerHTML,10); + let count = parseInt(countDom.value,10); if (count<9) { count++; - countDom.innerHTML = count; + countDom.value = count; this.parentNode.classList.remove("zero"); } } @@ -854,14 +850,14 @@ function initialize() }); function search_awokenSub1() { - let count = parseInt(this.innerHTML,10); + let count = parseInt(this.value,10); if (count>0) { count--; - this.innerHTML = count; + this.value = count; if (count === 0) { - this.parentNode.classList.add("zero"); + this.parentNode.parentNode.classList.add("zero"); } } } @@ -947,9 +943,9 @@ function initialize() } const typesFilter = s_types.filter(returnCheckedInput).map(returnInputValue).map(Str2Int); const sawokensFilter = s_sawokens.filter(returnCheckedInput).map(returnInputValue).map(Str2Int); - const awokensFilter = s_awokensCounts.filter(btn=>parseInt(btn.innerHTML,10)>0).map(btn=>{ - const awokenIndex = parseInt(btn.parentNode.querySelector(".awoken-icon").getAttribute("data-awoken-icon"),10); - return {id:awokenIndex,num:parseInt(btn.innerHTML,10)}; + const awokensFilter = s_awokensCounts.filter(btn=>parseInt(btn.value,10)>0).map(btn=>{ + const awokenIndex = parseInt(btn.parentNode.parentNode.querySelector(".awoken-icon").getAttribute("data-awoken-icon"),10); + return {id:awokenIndex,num:parseInt(btn.value,10)}; }); const searchResult = searchCards(cards, attr1,attr2, diff --git a/solo.html b/solo.html index 6487f9c7..5380ac42 100644 --- a/solo.html +++ b/solo.html @@ -426,6 +426,7 @@ var formation = new Formation(teamsCount,6);
    • +
    @@ -435,78 +436,78 @@ var formation = new Formation(teamsCount,6);
    diff --git a/style.css b/style.css index 56ccb690..c34845cd 100644 --- a/style.css +++ b/style.css @@ -876,10 +876,14 @@ ul{ display: inline-block; vertical-align: middle; } -.awoken-ul .count::before{ +.awoken-ul .count::before, +.search-box .awoken-div .count-symbol::before +{ content: "×"; } -.search-box .awoken-ul button{ +.search-box .awoken-ul button, +.search-box .awoken-ul input[type='button'] +{ border: none; background-color: unset; font-family: var(--game-font-family); @@ -887,20 +891,26 @@ ul{ line-height: 32px; font-size: 16px; padding: 0; + text-align: left; } .search-box .awoken-ul .awoken-count.zero{ opacity: var(--search-icon-unchecked); } .search-box .awoken-ul .count{ - width: 30px; -} -.search-box .awoken-ul .awoken-count .awoken-icon{ - cursor: pointer; + width: 1em; + height: auto; } -.search-box .awoken-ul .awoken-count .count{ +.search-box .awoken-ul .awoken-count .awoken-icon, +.search-box .awoken-ul .awoken-count .count-symbol, +.search-box .awoken-ul .awoken-count .count-symbol .count +{ cursor: pointer; + display: inline-block; + vertical-align: bottom; } -.search-box .awoken-ul .awoken-count.zero .count{ +.search-box .awoken-ul .awoken-count.zero .count-symbol, +.search-box .awoken-ul .awoken-count.zero .count-symbol .count +{ cursor: auto; } /*.search-box .sawoken-div::before{ diff --git a/triple.html b/triple.html index 62c13c96..b8837792 100644 --- a/triple.html +++ b/triple.html @@ -1061,6 +1061,7 @@ var formation = new Formation(teamsCount,6);
    • +
    @@ -1070,78 +1071,78 @@ var formation = new Formation(teamsCount,6);