diff --git a/fonts/fa-regular-400.woff2 b/fonts/fa-regular-400.woff2 new file mode 100644 index 00000000..452b49c0 Binary files /dev/null and b/fonts/fa-regular-400.woff2 differ diff --git a/fonts/fa-solid-900.woff2 b/fonts/fa-solid-900.woff2 index 758dd4f6..fec1fae7 100644 Binary files a/fonts/fa-solid-900.woff2 and b/fonts/fa-solid-900.woff2 differ diff --git a/languages/en.css b/languages/en.css index d8ea97b9..dcf1b0e1 100644 --- a/languages/en.css +++ b/languages/en.css @@ -181,11 +181,8 @@ label[for="merge-skill"]::after{ .type-name[data-type-name='9']::after{ content: "Special Protection"; } -.control-box .datasource-label::before{ - content: "🕹️Data source:"; -} -.control-box .datasource-updatetime::before{ - content: "🗓️Update Time:"; +label[for="datasource"]::after{ + content: "Game:"; } .control-box .btn-solo-link::before{ content: "🧑Jump To Solo Mode"; @@ -381,7 +378,6 @@ label[for="fix-main-color"]::after{ } .search-box .awoken-clear::before, .search-box .sawoken-clear::before, -.special-div .special-clear::before, #attr-clear::before { content: "Clear"; @@ -417,15 +413,6 @@ label[for="box-have"]::after { content: "Emphasize my box"; } -.special-div .special-add::before { - content: "➕"; -} -.special-div .special-star::before { - content: "☆"; -} -.special-div .special-star.marked::before { - content: "★"; -} .control-div .search-start::before{ content: "🔍Start Search"; } diff --git a/languages/ja.css b/languages/ja.css index d071723f..4d3cf70a 100644 --- a/languages/ja.css +++ b/languages/ja.css @@ -174,11 +174,8 @@ label[for="merge-skill"]::after{ .type-name[data-type-name='9']::after{ content: "特別保護"; } -.control-box .datasource-label::before{ - content: "🕹️データ ソース:"; -} -.control-box .datasource-updatetime::before{ - content: "🗓️更新時刻:"; +label[for="datasource"]::after{ + content: "ゲーム:"; } .control-box .btn-solo-link::before{ content: "🧑ソロモードに移動"; @@ -375,7 +372,6 @@ label[for="fix-main-color"]::after{ } .search-box .awoken-clear::before, .search-box .sawoken-clear::before, -.special-div .special-clear::before, #attr-clear::before { content: "クリア"; @@ -411,15 +407,6 @@ label[for="box-have"]::after { content: "ケースに所有することを強調"; } -.special-div .special-add::before { - content: "➕"; -} -.special-div .special-star::before { - content: "☆"; -} -.special-div .special-star.marked::before { - content: "★"; -} .control-div .search-start::before{ content: "🔍検索の開始"; } diff --git a/languages/ko.css b/languages/ko.css index 5b0f20f2..7743142e 100644 --- a/languages/ko.css +++ b/languages/ko.css @@ -170,11 +170,8 @@ label[for="merge-skill"]::after{ .type-name[data-type-name='9']::after{ content: "특별 보호"; } -.control-box .datasource-label::before{ - content: "🕹️데이터 소스:"; -} -.control-box .datasource-updatetime::before{ - content: "🗓️업데이트 시간:"; +label[for="datasource"]::after{ + content: "게임:"; } .control-box .btn-solo-link::before{ content: "🧑1인 모드 이동"; @@ -370,7 +367,6 @@ label[for="fix-main-color"]::after{ } .search-box .awoken-clear::before, .search-box .sawoken-clear::before, -.special-div .special-clear::before, #attr-clear::before { content: "명확한"; @@ -402,15 +398,6 @@ label[for="not-weapon"]::after { content: "무기가 아님"; } -.special-div .special-add::before { - content: "➕"; -} -.special-div .special-star::before { - content: "☆"; -} -.special-div .special-star.marked::before { - content: "★"; -} .control-div .search-start::before{ content: "🔍검색 시작"; } diff --git a/languages/zh-hans.css b/languages/zh-hans.css index 00f211f1..9372aede 100644 --- a/languages/zh-hans.css +++ b/languages/zh-hans.css @@ -176,11 +176,8 @@ label[for="merge-skill"]::after{ .type-name[data-type-name='9']::after{ content: "特別保護"; } -.control-box .datasource-label::before{ - content: "🕹️数据来源："; -} -.control-box .datasource-updatetime::before{ - content: "🗓️更新时间："; +label[for="datasource"]::after{ + content: "游戏："; } .control-box .btn-solo-link::before{ content: "🧑转到单人游戏"; @@ -375,7 +372,6 @@ label[for="fix-main-color"]::after{ } .search-box .awoken-clear::before, .search-box .sawoken-clear::before, -.special-div .special-clear::before, #attr-clear::before { content: "清除"; @@ -411,15 +407,6 @@ label[for="box-have"]::after { content: "强调箱子拥有"; } -.special-div .special-add::before { - content: "➕"; -} -.special-div .special-star::before { - content: "☆"; -} -.special-div .special-star.marked::before { - content: "★"; -} .control-div .search-start::before{ content: "🔍开始搜索"; } diff --git a/languages/zh-hant.css b/languages/zh-hant.css index 88fa307a..e6c50771 100644 --- a/languages/zh-hant.css +++ b/languages/zh-hant.css @@ -176,11 +176,8 @@ label[for="merge-skill"]::after{ .type-name[data-type-name='9']::after{ content: "特別保護"; } -.control-box .datasource-label::before{ - content: "🕹️數據來源："; -} -.control-box .datasource-updatetime::before{ - content: "🗓️更新時間："; +label[for="datasource"]::after{ + content: "遊戲："; } .control-box .btn-solo-link::before{ content: "🧑轉到單人遊戲"; @@ -376,7 +373,6 @@ label[for="fix-main-color"]::after{ } .search-box .awoken-clear::before, .search-box .sawoken-clear::before, -.special-div .special-clear::before, #attr-clear::before { content: "清除"; @@ -412,15 +408,6 @@ label[for="box-have"]::after { content: "强調箱子擁有"; } -.special-div .special-add::before { - content: "➕"; -} -.special-div .special-star::before { - content: "☆"; -} -.special-div .special-star.marked::before { - content: "★"; -} .control-div .search-start::before{ content: "🔍開始搜索"; } diff --git a/multi.html b/multi.html index da43199c..72a37f60 100644 --- a/multi.html +++ b/multi.html @@ -53,11 +53,11 @@ const teamsCount = 2;
- - - - - + + + + +
@@ -110,7 +110,7 @@ const teamsCount = 2;
+
@@ -1226,20 +1226,28 @@ const teamsCount = 2;
-
- - - - -
+
+
+ + + +
+ +
diff --git a/script.js b/script.js index c3e0d7ec..f69294b8 100644 --- a/script.js +++ b/script.js @@ -2155,7 +2155,7 @@ function loadData(force = false) { if (controlBox) { - const updateTime = controlBox.querySelector(".datasource-updatetime"); + const updateTime = controlBox.querySelector("#datasource-updatetime"); updateTime.textContent = new Date(currentCkey.updateTime).toLocaleString(undefined, { hour12: false }); clearInterval(controlBoxHook); } @@ -2683,7 +2683,7 @@ function initialize() { } //▼添加语言列表开始 - const langSelectDom = controlBox.querySelector(".languages"); + const langSelectDom = controlBox.querySelector("#languages"); languageList.forEach(lang => langSelectDom.options.add(new Option(lang.name, lang.i18n)) ); @@ -2693,7 +2693,7 @@ function initialize() { //▲添加语言列表结束 //▼添加数据来源列表开始 - const dataSelectDom = controlBox.querySelector(".datasource"); + const dataSelectDom = controlBox.querySelector("#datasource"); dataSourceList.forEach(ds => dataSelectDom.options.add(new Option(ds.source, ds.code)) ); @@ -4689,6 +4689,40 @@ function initialize() { const specialFilterUl = s_specialDiv.querySelector(".special-filter-list"); const specialFilterFirstLi = specialFilterUl.querySelector("li"); const specialFirstSelect = specialFilterFirstLi.querySelector(".special-filter"); + function filterCopy() { + const target = this.parentElement; + const newFilter = target.cloneNode(true); + const newSelect = newFilter.querySelector(".special-filter"); + newSelect.selectedIndex = target.querySelector(".special-filter").selectedIndex; + filterBindOnclick(newFilter); + target.insertAdjacentElement('afterend', newFilter); + return newSelect; + } + function filterShiftUp() { + const parent = this.parentElement; + const target = parent.previousElementSibling; + if (target) { + target.insertAdjacentElement('beforebegin', parent); + } + } + function filterShiftDown() { + const parent = this.parentElement; + const target = parent.nextElementSibling; + if (target) { + target.insertAdjacentElement('afterend', parent); + } + } + function filterRemove() { + this.parentElement.remove(); + } + //给这个特殊搜索绑定函数 + function filterBindOnclick(li) { + li.querySelector(".copy-filter").onclick = filterCopy; + li.querySelector(".shift-up-filter").onclick = filterShiftUp; + li.querySelector(".shift-down-filter").onclick = filterShiftDown; + li.querySelector(".remove-filter").onclick = filterRemove; + } + filterBindOnclick(specialFilterFirstLi); function newSpecialSearchOption(func, idx1, idx2) { @@ -4764,7 +4798,6 @@ function initialize() { specialFilterUl.appendChild(specialFilterLi); return specialFilterSelection; } - //specialAdd.onclick(); //先运行一次产生两个 specialClear.onclick = function() { searchMonList.customAddition = null; specialFilterUl.innerHTML = ""; @@ -4773,6 +4806,8 @@ function initialize() { } specialStar.onclick = function() { const indexs = specialFirstSelect.value.split("|").map(Number); + if (indexs[0] === 0 && indexs.length === 1) return; + let markIdx = markedFilter.findIndex(arr=>arr[0] === indexs[0] && arr[1] === indexs[1]); if (markIdx >= 0) {//已经存在的收藏 markedFilter.splice(markIdx,1); @@ -4955,7 +4990,7 @@ function initialize() { const specialFilterSelections = Array.from(specialFilterUl.querySelectorAll(".special-filter")); //将筛选个数增加到需要的个数 for (let i = specialFilterSelections.length; i < specialFilters.length; i++) { - specialFilterSelections.push(specialAdd.onclick()); + specialFilterSelections.push(specialAdd.onclick.onclick()); } //将每一个搜索都设置好 for (let i = 0; i < specialFilters.length; i++) { @@ -5587,14 +5622,12 @@ function initialize() { }; //语言选择 - const langList = controlBox.querySelector(".languages"); - langList.onchange = function() { + langSelectDom.onchange = function() { createNewUrl({ "language": this.value }); history.go(); }; //数据源选择 - const dataList = controlBox.querySelector(".datasource"); - dataList.onchange = function() { + dataSelectDom.onchange = function() { createNewUrl({ datasource: this.value }); history.go(); }; @@ -5603,7 +5636,7 @@ function initialize() { const languageJS = document.head.appendChild(document.createElement("script")); languageJS.id = "language-js"; languageJS.type = "text/javascript"; - languageJS.src = "languages/" + currentLanguage.i18n + ".js"; + languageJS.src = `languages/${currentLanguage.i18n}.js`; if (isGuideMod) //图鉴模式直接打开搜索框 { @@ -7551,7 +7584,7 @@ function fastShowSkill(event) { function localisation($tra) { if (!$tra) return; document.title = $tra.webpage_title; - controlBox.querySelector(".datasource-updatetime").title = $tra.force_reload_data; + controlBox.querySelector("#datasource-updatetime").title = $tra.force_reload_data; formationBox.querySelector(".title-box .title-code").placeholder = $tra.title_blank; formationBox.querySelector(".title-box .title-display").setAttribute("placeholder",$tra.title_blank); formationBox.querySelector(".detail-box .detail-code").placeholder = $tra.detail_blank; diff --git a/service-worker.js b/service-worker.js index d20e91ae..bb96e8ac 100644 --- a/service-worker.js +++ b/service-worker.js @@ -32289,9 +32289,13 @@ const cachesMap = new Map([ "sound/voice/ko/padv999.wav", "698cf604dfbcb60921bcbea85b8e8feb" ], + [ + "fonts/fa-regular-400.woff2", + "2d89b49ac28614e9ccd9c81308b5120c" + ], [ "fonts/fa-solid-900.woff2", - "1ec0ba058c021acf7feaa18081445d63" + "237f4a0afbdb652fb2330ee7e1567dd3" ], [ "fonts/FOT-KurokaneStd-EB.woff2", @@ -32311,7 +32315,7 @@ const cachesMap = new Map([ ], [ "multi.html", - "20f7503e67106e457882ddd5848e422f" + "ef8b77ed22257043aa2feb5011d50711" ], [ "script-custom_elements.js", @@ -32331,11 +32335,11 @@ const cachesMap = new Map([ ], [ "script.js", - "4f423034d218b6443b52cd4ad053aa3e" + "669ff567d056349838dd31918ba5d518" ], [ "solo.html", - "4973f9f1a8169d2660cf06205e1f814b" + "c56f8538c50ca10224097ec96487a7ca" ], [ "style-monsterimages.css", @@ -32343,7 +32347,7 @@ const cachesMap = new Map([ ], [ "style.css", - "2074baa0c03382beb5858ae76469b4df" + "1a5c25f37b6f053d824f69a95ff2f0ac" ], [ "temp.js", @@ -32351,11 +32355,11 @@ const cachesMap = new Map([ ], [ "triple.html", - "57ff5938b64613dc98dc842cc182c10f" + "ee62c5f5155957f3677e91cbe0cf9c42" ], [ "languages/en.css", - "8e6a6b48781076a0f548169412cbfc96" + "303c429e4dbff852fa693ee3554d50c7" ], [ "languages/en.js", @@ -32363,7 +32367,7 @@ const cachesMap = new Map([ ], [ "languages/ja.css", - "86b9631b90553cfd9f876d48911e0719" + "cf65de21289e398c959063a2d08c833b" ], [ "languages/ja.js", @@ -32371,7 +32375,7 @@ const cachesMap = new Map([ ], [ "languages/ko.css", - "c931cfd2d7f370991513b7ee8f7066c3" + "10b25940cb5923fd63b39a9c02b4b957" ], [ "languages/ko.js", @@ -32383,7 +32387,7 @@ const cachesMap = new Map([ ], [ "languages/zh-hans.css", - "e402033bd75079423d580b6ad652d071" + "4c9116d3e9d22a171271346d8f79a2ae" ], [ "languages/zh-hans.js", @@ -32391,7 +32395,7 @@ const cachesMap = new Map([ ], [ "languages/zh-hant.css", - "f7f098fd4f3959ba2d0d1185e0b296d0" + "a7ce01454f8233168f34fa711d35f349" ], [ "languages/zh-hant.js", diff --git a/solo.html b/solo.html index 2e131226..2751f7a6 100644 --- a/solo.html +++ b/solo.html @@ -33,11 +33,11 @@ const teamsCount = 1;
- - - - - + + + + +
@@ -89,7 +89,7 @@ const teamsCount = 1;
+
@@ -963,20 +963,28 @@ const teamsCount = 1;
-
- - - -
    -
    • -
-
+
+
+ + + +
+
    +
  • + + + + + +
    • +
+
@@ -1216,10 +1224,10 @@ const teamsCount = 1;
- - - - + + + +