diff --git a/script.js b/script.js
index b6f978d5..851ae176 100644
--- a/script.js
+++ b/script.js
@@ -1363,7 +1363,6 @@ function initialize() {
const s_awokensUl = s_awokensDiv.querySelector(".all-awokens");
const s_awokensLi = Array.from(s_awokensUl.querySelectorAll(".awoken-count"));
const s_awokensIcons = s_awokensLi.map(li => li.querySelector(".awoken-icon"));
- const s_awokensSubs = s_awokensLi.map(li => li.querySelector(".awoken-sub1"));
s_awokensUl.originalSorting = s_awokensIcons.map(icon => parseInt(icon.getAttribute("data-awoken-icon"), 10)); //储存觉醒列表的原始排序
const searchMonList = searchBox.querySelector(".search-mon-list"); //搜索结果列表
@@ -1419,61 +1418,37 @@ function initialize() {
s_showOfficialAwokenSorting.checked = Boolean(parseInt(localStorage.getItem("PADDF-" + officialSortingClassName)));
s_showOfficialAwokenSorting.onchange();
+ const s_selectedAwokensUl = searchBox.querySelector(".selected-awokens");
function search_awokenAdd1() {
let count = parseInt(this.value || 0, 10);
- if (count < 9) {
+ const maxCount = parseInt(this.getAttribute("data-max-count") || 9, 10);
+ if (count < maxCount) {
count++;
this.setAttribute("value", count);
- }
- }
- function search_awokenClear() {
- this.setAttribute("value", 0);
- }
- const longPressDuration = 700; //700毫秒
- function search_awokenLongPressStart(e) {
- console.log(e);
- let _this = this;
- this.longPress = setTimeout(function(){
- search_awokenClear.apply(_this);
- }, longPressDuration);
- this.startTime = new Date(); //仅仅给自己设一个开始时间
- e.preventDefault();
- }
- function search_awokenLongPressEnd(e) {
- console.log(e);
- const endTime = new Date();
- if ((endTime - this.startTime) < longPressDuration)
- {
- search_awokenAdd1.apply(this);
- }
- clearTimeout(this.longPress);
- this.startTime = null;
- }
- function search_awokenLongPressCancel(e) {
- console.log(e);
- clearTimeout(this.longPress);
- this.startTime = null;
- }
- s_awokensIcons.forEach(b => {
- //b.ontouchstart = search_awokenLongPressStart;
- //b.ontouchend = search_awokenLongPressEnd;
- //b.ontouchcancel = search_awokenLongPressCancel;
- //b.onmousedown = search_awokenLongPressStart;
- //b.onmouseup = search_awokenLongPressEnd;
- //b.onmouseout = search_awokenLongPressCancel;
- b.onclick = search_awokenAdd1; //每种觉醒增加1
- });
+ const iconLi = document.createElement("li");
+ const icon = iconLi.appendChild(document.createElement("icon"))
+ icon.className = "awoken-icon";
+ icon.setAttribute("data-awoken-icon", this.getAttribute("data-awoken-icon"));
+ icon.onclick = search_awokenSub1;
+ s_selectedAwokensUl.appendChild(iconLi);
+ }
+ }
function search_awokenSub1() {
- const awokenIcon = this.previousElementSibling;
+ const awokenId = this.getAttribute("data-awoken-icon");
+ const awokenIcon = s_awokensIcons.find(icon=>icon.getAttribute("data-awoken-icon") == awokenId);
let count = parseInt(awokenIcon.value || 0, 10);
if (count > 0) {
count--;
awokenIcon.setAttribute("value", count);
}
+ this.parentNode.remove();
}
- s_awokensSubs.forEach(b => {
- b.onclick = search_awokenSub1; //每种觉醒减少1
+ function search_awokenClear() {
+ this.setAttribute("value", 0);
+ }
+ s_awokensIcons.forEach(b => {
+ b.onclick = search_awokenAdd1; //每种觉醒增加1
});
const awokenClear = searchBox.querySelector(".awoken-div .awoken-clear");
@@ -1482,6 +1457,7 @@ function initialize() {
s_awokensIcons.forEach(t => {
t.setAttribute("value", 0);
});
+ s_selectedAwokensUl.innerHTML = "";
};
sawokenClear.onclick = function() { //清空超觉醒选项
s_sawokens.forEach(t => {
diff --git a/solo.html b/solo.html
index ea198de2..26e7c833 100644
--- a/solo.html
+++ b/solo.html
@@ -482,171 +482,171 @@ var formation = new Formation(teamsCount,6);
+
diff --git a/style.css b/style.css
index ccb90b96..e6315690 100644
--- a/style.css
+++ b/style.css
@@ -1188,13 +1188,22 @@ ul{
content: attr(data-rare-icon);
}
+.search-box .awoken-option .selected-awokens{
+ min-height: 32px;
+ width: auto;
+ min-width: 320px;
+ background-color: #00000044;
+ border-radius: 6px;
+ box-shadow: inset black 0 0 3px;
+}
/*.search-box .awoken-div::before{
content: "觉醒";
}*/
-.awoken-div,
-.sawoken-div{
+.search-box .awoken-div,
+.search-box .sawoken-div{
display: inline-block;
+ vertical-align: top;
}
.search-box .awoken-div .awoken-clear::before,
@@ -1207,9 +1216,10 @@ ul{
{
padding: 0;
}
-.awoken-div .awoken-ul.official-awoken-sorting
+.awoken-div .awoken-ul.official-awoken-sorting,
+.sawoken-div .sawoken-ul.official-awoken-sorting
{
- width: 490px;
+ width: 335px;
}
.awoken-ul .awoken-count
{
@@ -1254,8 +1264,8 @@ ul{
}
.awoken-div .awoken-icon:not([value="0"])::before
{
- display: inline-block;
content: attr(value);
+ display: inline-block;
position: absolute;
line-height: 18px;
font-size: 18px;
@@ -1265,39 +1275,6 @@ ul{
text-stroke: 1px black;
text-shadow: black 1px 1px 1px;
}
-.awoken-div .awoken-sub1
-{
- background-image: linear-gradient(to bottom,#C38E5F,#2F2008);
- border: none;
- border-radius: 5px;
- padding: 2px;
- cursor: pointer;
- transition: transform 0.1s;
- height: 32px;
-}
-.awoken-div .awoken-sub1::before
-{
- line-height: unset;
- display: inline-block;
- box-sizing: border-box;
- background-color: #956A42;
- background-image: url(images/slate.svg);
- background-size: 120px 120px;
- border-radius: 2px;
- vertical-align: middle;
- color: white;
- font-family: var(--game-font-family);
- text-shadow: black 2px 2px 0;
-}
-.awoken-div .awoken-sub1::before
-{
- content: "▼";
-}
-.awoken-div .awoken-sub1:active
-{
- transform: scale(1.1);
-}
-
.search-box .awoken-ul .awoken-count.zero{
opacity: var(--search-icon-unchecked);
}
@@ -1321,10 +1298,6 @@ ul{
/*.search-box .sawoken-div::before{
content: "超觉醒";
}*/
-.sawoken-div .sawoken-ul.official-awoken-sorting
-{
- width: 350px;
-}
.sawoken-div .sawoken-ul li label{
opacity: var(--search-icon-unchecked);
}
diff --git a/triple.html b/triple.html
index 5d61cbc5..9589d5ae 100644
--- a/triple.html
+++ b/triple.html
@@ -1209,169 +1209,171 @@ var formation = new Formation(teamsCount,6);
+