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);
+
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);
+
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);
+