diff --git a/languages/en.css b/languages/en.css
index 972dedf5..83032cb1 100644
--- a/languages/en.css
+++ b/languages/en.css
@@ -302,7 +302,7 @@
.search-box .show-official-awoken-sorting-label::after{
content: "Use the official Awoken sorting";
}
-.search-mon-list .search-list-length::before{
+.search-box .search-list-length::before{
content: "Number of results:";
}
.search-box .sort-div::before{
@@ -341,6 +341,10 @@
.search-box .awoken-option::before{
content: "▼Awoken (AND)";
}
+.search-box .rare-clear::before
+{
+ content: "Reset";
+}
.search-box .awoken-clear::before,
.search-box .sawoken-clear::before
{
diff --git a/languages/ja.css b/languages/ja.css
index 9018d694..c7ccc700 100644
--- a/languages/ja.css
+++ b/languages/ja.css
@@ -294,7 +294,7 @@
.search-box .show-official-awoken-sorting-label::after{
content: "公式の覚醒ソートを使用";
}
-.search-mon-list .search-list-length::before{
+.search-box .search-list-length::before{
content: "結果の数:";
}
.search-box .sort-div::before{
@@ -333,6 +333,10 @@
.search-box .awoken-option::before{
content: "▼觉醒（AND）";
}
+.search-box .rare-clear::before
+{
+ content: "リセット";
+}
.search-box .awoken-clear::before,
.search-box .sawoken-clear::before
{
diff --git a/languages/ko.css b/languages/ko.css
index 8ed2c249..9bec5906 100644
--- a/languages/ko.css
+++ b/languages/ko.css
@@ -291,7 +291,7 @@
.search-box .show-official-awoken-sorting-label::after{
content: "공식 각성 순서를 사용합니다";
}
-.search-mon-list .search-list-length::before{
+.search-box .search-list-length::before{
content: "결과 수:";
}
.search-box .sort-div::before{
@@ -330,6 +330,10 @@
.search-box .awoken-option::before{
content: "▼각성（AND）";
}
+.search-box .rare-clear::before
+{
+ content: "재설정";
+}
.search-box .awoken-clear::before,
.search-box .sawoken-clear::before
{
diff --git a/languages/zh-TW.css b/languages/zh-TW.css
index 97575d94..1ed2250d 100644
--- a/languages/zh-TW.css
+++ b/languages/zh-TW.css
@@ -297,7 +297,7 @@
.search-box .show-official-awoken-sorting-label::after{
content: "使用官方覺醒排序";
}
-.search-mon-list .search-list-length::before{
+.search-box .search-list-length::before{
content: "結果數量：";
}
.search-box .sort-div::before{
@@ -336,6 +336,10 @@
.search-box .awoken-option::before{
content: "▼觉醒（AND）";
}
+.search-box .rare-clear::before
+{
+ content: "重置";
+}
.search-box .awoken-clear::before,
.search-box .sawoken-clear::before
{
diff --git a/languages/zh.css b/languages/zh.css
index a641912b..d66d09a3 100644
--- a/languages/zh.css
+++ b/languages/zh.css
@@ -297,7 +297,7 @@
.search-box .show-official-awoken-sorting-label::after{
content: "使用官方觉醒排序";
}
-.search-mon-list .search-list-length::before{
+.search-box .search-list-length::before{
content: "结果数量：";
}
.search-box .sort-div::before{
@@ -336,6 +336,10 @@
.search-box .awoken-option::before{
content: "▼觉醒（AND）";
}
+.search-box .rare-clear::before
+{
+ content: "重置";
+}
.search-box .awoken-clear::before,
.search-box .sawoken-clear::before
{
diff --git a/multi.html b/multi.html
index 1548c081..2efd12cd 100644
--- a/multi.html
+++ b/multi.html
@@ -561,6 +561,7 @@ var formation = new Formation(teamsCount,5);
+
diff --git a/script.js b/script.js
index 31c184a8..554532b8 100644
--- a/script.js
+++ b/script.js
@@ -1355,17 +1355,51 @@ function initialize() {
const radioHigh = s_rareHighs.find(radio=>radio.checked);
const rangeLow = radioLow ? parseInt(radioLow.value,10) : 1;
const rangeHigh = radioHigh ? parseInt(radioHigh.value,10) : 10;
+
+ s_rareLows.find(radio=>parseInt(radio.value,10) == (
+ rangeLow != rangeHigh ?
+ thisValue :
+ (
+ thisValue == rangeLow ?
+ 1 :
+ Math.min(thisValue,rangeLow)
+ )
+ )).checked = true;
+ s_rareHighs.find(radio=>parseInt(radio.value,10) == (
+ rangeLow != rangeHigh ?
+ thisValue :
+ (
+ thisValue == rangeLow ?
+ 10 :
+ Math.max(thisValue,rangeHigh)
+ )
+ )).checked = true;
+/*
if (rangeLow == rangeHigh)
{
- s_rareLows.find(radio=>parseInt(radio.value,10) == Math.min(thisValue,rangeLow)).checked = true;
- s_rareHighs.find(radio=>parseInt(radio.value,10) == Math.max(thisValue,rangeLow)).checked = true;
+ if (thisValue == rangeLow)
+ {
+ s_rareLows.find(radio=>parseInt(radio.value,10) == 1).checked = true;
+ s_rareHighs.find(radio=>parseInt(radio.value,10) == 10).checked = true;
+ }else
+ {
+ s_rareLows.find(radio=>parseInt(radio.value,10) == Math.min(thisValue,rangeLow)).checked = true;
+ s_rareHighs.find(radio=>parseInt(radio.value,10) == Math.max(thisValue,rangeLow)).checked = true;
+ }
}else
{
+ console.log("恢复单选");
s_rareLows.find(radio=>parseInt(radio.value,10) == thisValue).checked = true;
s_rareHighs.find(radio=>parseInt(radio.value,10) == thisValue).checked = true;
}
+ */
}
s_rareIcons.forEach(icon=>icon.onclick = s_rareIcons_onclick);
+ const s_rareClear = s_rareDiv.querySelector(".rare-clear");
+ s_rareClear.onclick = function(){
+ s_rareLows[0].checked = true;
+ s_rareHighs[s_rareHighs.length-1].checked = true;
+ }
//const s_rare = s_rareLi.map(li=>li.querySelector(".rare-check")); //checkbox集合
@@ -1497,6 +1531,7 @@ function initialize() {
const s_add_show_abilities = searchBox.querySelector("#add-show-abilities"); //是否显示三维
const s_add_show_abilities_with_awoken = searchBox.querySelector("#add-show-abilities-with-awoken"); //是否显示计算觉醒的三维
+ const searchResultCount = searchBox.querySelector(".search-list-length");
showSearch = function(searchArr, customAdditionalFunction)
{
if (!(searchArr instanceof Array))
@@ -1521,9 +1556,6 @@ function initialize() {
if (searchArr.length > 0) {
const fragment = document.createDocumentFragment(); //创建节点用的临时空间
- const listLength = fragment.appendChild(document.createElement("div"));
- listLength.className = "search-list-length";
- listLength.textContent = searchArr.length;
//获取原始排序的头像列表
const additionalOption = { //搜索列表的额外选项
showAwoken: s_add_show_awoken.checked,
@@ -1545,6 +1577,7 @@ function initialize() {
//const state = {searchArr:idArr,mid:editBox.mid};
//history.pushState(state, null, location);
}
+ searchResultCount.setAttribute("data-search-result-count", searchArr.length);
searchMonList.classList.remove(className_displayNone);
};
//对已经搜索到的Cards重新附加显示
@@ -1620,13 +1653,13 @@ function initialize() {
t.checked = false;
});
s_typeAndOr.onchange();
- s_rareLows[0].checked = true;
- s_rareHighs[9].checked = true;
+ s_rareClear.onclick();
- awokenClear.click();
- sawokenClear.click();;
+ awokenClear.onclick();
+ sawokenClear.onclick();
searchMonList.originalHeads = null;
+ searchResultCount.setAttribute("data-search-result-count", 0);
searchMonList.innerHTML = "";
};
diff --git a/solo.html b/solo.html
index b648390b..f6c35514 100644
--- a/solo.html
+++ b/solo.html
@@ -477,6 +477,7 @@ var formation = new Formation(teamsCount,6);
+
diff --git a/style.css b/style.css
index 3cb011bd..7fe5527f 100644
--- a/style.css
+++ b/style.css
@@ -1200,6 +1200,10 @@ ul{
{
content: attr(data-rare-icon);
}
+.search-box .rare-clear
+{
+ margin-left: 5px;
+}
.search-box .awoken-option .selected-awokens{
min-height: 32px;
@@ -1221,11 +1225,13 @@ ul{
display: inline-block;
vertical-align: top;
}
+.search-box .rare-clear,
.search-box .awoken-clear,
.search-box .sawoken-clear
{
vertical-align: top;
}
+.search-box .rare-clear::before,
.search-box .awoken-clear::before,
.search-box .sawoken-clear::before
{
@@ -1395,9 +1401,17 @@ ul{
border-radius: 5px;
background: grey;
}
-.search-mon-list .search-list-length::before
+.search-box .search-list-length
{
- margin-left:4px;
+ float: right;
+}
+.search-box .search-list-length[data-search-result-count="0"]
+{
+ display: none;
+}
+.search-box .search-list-length:not([data-search-result-count="0"])::after
+{
+ content: attr(data-search-result-count);
}
.guide-mod .search-box .search-mon-list{
max-height: 790px;
diff --git a/triple.html b/triple.html
index a0ae333d..9fe2d7b4 100644
--- a/triple.html
+++ b/triple.html
@@ -1204,6 +1204,7 @@ var formation = new Formation(teamsCount,6);
+