From eae7706177fdb6f7880cd723578e92bfd9c5bc18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= Date: Thu, 28 Mar 2024 21:52:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=BF=9B=E5=8C=96=E9=93=BE?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE=EF=BC=8C=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?id=E6=90=9C=E7=B4=A2=E5=88=B0=E9=94=9A=E5=AE=9A=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- languages/en.css | 3 --- languages/ja.css | 3 --- languages/ko.css | 3 --- languages/zh-hans.css | 3 --- languages/zh-hant.css | 3 --- multi.html | 20 +++++++++----------- script.js | 40 +++++++++++++++++++--------------------- solo.html | 20 +++++++++----------- style.css | 32 +++++++++++++++++++++++--------- triple.html | 20 +++++++++----------- 10 files changed, 69 insertions(+), 78 deletions(-) diff --git a/languages/en.css b/languages/en.css index b9ed040e..6b568db5 100644 --- a/languages/en.css +++ b/languages/en.css @@ -42,9 +42,6 @@ .edit-box .edit-box-title.edit-box-title-assist::before{ content: "Edit Assist"; } -.edit-box .setting-box .row-mon-id::before{ - content: "▼ID and Search"; -} .monsterinfo-box .monster-id::before{ content: "No."; } diff --git a/languages/ja.css b/languages/ja.css index 7c826234..93552ca3 100644 --- a/languages/ja.css +++ b/languages/ja.css @@ -44,9 +44,6 @@ label[for="languages"]::after{ .edit-box .edit-box-title.edit-box-title-assist::before{ content: "変更継承"; } -.edit-box .setting-box .row-mon-id::before{ - content: "▼ID と検索"; -} .monsterinfo-box .monster-id::before{ content: "No."; } diff --git a/languages/ko.css b/languages/ko.css index 58d0b453..4c550897 100644 --- a/languages/ko.css +++ b/languages/ko.css @@ -44,9 +44,6 @@ label[for="languages"]::after{ .edit-box .edit-box-title.edit-box-title-assist::before{ content: "보조 수정"; } -.edit-box .setting-box .row-mon-id::before{ - content: "▼ID 및 검색"; -} .monsterinfo-box .monster-id::before{ content: "No."; } diff --git a/languages/zh-hans.css b/languages/zh-hans.css index 62c82c79..419122bf 100644 --- a/languages/zh-hans.css +++ b/languages/zh-hans.css @@ -50,9 +50,6 @@ label[for="languages"]::after{ .edit-box .edit-box-title.edit-box-title-assist::before{ content: "修改辅助"; } -.edit-box .setting-box .row-mon-id::before{ - content: "▼ID 和 搜索"; -} .monsterinfo-box .monster-id::before{ content: "No."; } diff --git a/languages/zh-hant.css b/languages/zh-hant.css index 548d21b8..a5379f35 100644 --- a/languages/zh-hant.css +++ b/languages/zh-hant.css @@ -50,9 +50,6 @@ label[for="languages"]::after{ .edit-box .edit-box-title.edit-box-title-assist::before{ content: "修改輔助"; } -.edit-box .setting-box .row-mon-id::before{ - content: "▼ID 和 搜索"; -} .monsterinfo-box .monster-id::before{ content: "No."; } diff --git a/multi.html b/multi.html index 83c01dbd..2002b269 100644 --- a/multi.html +++ b/multi.html @@ -1275,21 +1275,19 @@ const teamsCount = 2;
+
+ + +
- - - -
- - -
    +
    diff --git a/script.js b/script.js index cb8b9b0a..f255e305 100644 --- a/script.js +++ b/script.js @@ -4643,14 +4643,6 @@ function initialize() { maskContent.innerHTML = ""; maskContent.appendChild(fragment); } - const openEvolutionaryTree = settingBox.querySelector(".row-mon-id .open-evolutionary-tree"); - openEvolutionaryTree.onclick = function(event) { - if (event.ctrlKey) { //显示进化需求树，不是常用功能，就不做额外的按钮了，所以按住Ctrl点击生效 - evolutionaryTreeMask.showRequirementTree(editBox.mid); - } else { - evolutionaryTreeMask.show(editBox.mid); - } - }; //显示进化需求树 evolutionaryTreeMask.showRequirementTree = function(monid) { @@ -5355,15 +5347,6 @@ function initialize() { const monstersID = document.getElementById("card-id"); // const txtSearchString = document.getElementById("search-string"); // const btnSearchByString = document.getElementById("search-by-string"); - //输入id数字即时更新的开关 - const realTimeClassName = 'real-time-change-card'; - const s_realTimeChangeCard = document.getElementById(realTimeClassName); - s_realTimeChangeCard.onchange = function(e) { - monstersID.oninput = this.checked ? ()=>{formIdSearch.onsubmit();} : null; - if (e) localStorage.setItem(cfgPrefix + realTimeClassName, Number(this.checked)); - } - s_realTimeChangeCard.checked = Boolean(Number(localStorage.getItem(cfgPrefix + realTimeClassName))); - s_realTimeChangeCard.onchange(false); //觉醒 const monEditOuterAwokensRow = editBox.querySelector(".row-awoken-sawoken"); @@ -6228,11 +6211,22 @@ function editBoxChangeMonId(id) { const createCardHead = editBox.createCardHead; const evoCardUl = settingBox.querySelector(".row-mon-id .evo-card-list"); + + //进化树 + const evolutionaryTreeMask = settingBox.querySelector(".mask-evolutionary-tree"); + const openEvolutionaryTreeClick = function(event) { + if (event.ctrlKey) { //显示进化需求树，不是常用功能，就不做额外的按钮了，所以按住Ctrl点击生效 + evolutionaryTreeMask.showRequirementTree(editBox.mid); + } else { + evolutionaryTreeMask.show(editBox.mid); + } + }; + evoCardUl.classList.add(className_displayNone); evoCardUl.innerHTML = ""; //据说直接清空HTML性能更好 - const openEvolutionaryTree = settingBox.querySelector(".row-mon-id .open-evolutionary-tree"); + //const openEvolutionaryTree = settingBox.querySelector(".row-mon-id .open-evolutionary-tree"); if (evoLinkCardsIdArray.length > 1) { - let fragment = document.createDocumentFragment(); //创建节点用的临时空间 + const fragment = document.createDocumentFragment(); //创建节点用的临时空间 evoLinkCardsIdArray.forEach(function(mid) { const cli = createCardHead(mid, {noTreeCount: true}); if (mid == id) { @@ -6240,12 +6234,16 @@ function editBoxChangeMonId(id) { } fragment.appendChild(cli); }); + const li = fragment.appendChild(document.createElement("li")); + const openEvolutionaryTree = li.appendChild(document.createElement("button")); + openEvolutionaryTree.classList = "open-evolutionary-tree"; + openEvolutionaryTree.onclick = openEvolutionaryTreeClick; evoCardUl.appendChild(fragment); evoCardUl.classList.remove(className_displayNone); - openEvolutionaryTree.classList.remove(className_displayNone); //显示进化树按钮 + //openEvolutionaryTree.classList.remove(className_displayNone); //显示进化树按钮 }else { - openEvolutionaryTree.classList.add(className_displayNone); //隐藏进化树按钮 + //openEvolutionaryTree.classList.add(className_displayNone); //隐藏进化树按钮 } const searchEvolutionByThis = settingBox.querySelector(".row-mon-id .search-evolution-by-this"); //对于进化型才显示 diff --git a/solo.html b/solo.html index 7d328e4d..8d3448e2 100644 --- a/solo.html +++ b/solo.html @@ -1013,21 +1013,19 @@ const teamsCount = 1;
    +
    + + +
    - - - -
    - - -
      +
      diff --git a/style.css b/style.css index 0a92c369..7569aae3 100644 --- a/style.css +++ b/style.css @@ -1415,25 +1415,29 @@ body:not(.solo) .awoken-icon[data-awoken-icon="64"]::after /*.edit-box .setting-box .row-mon-id::before{ content: "▼怪物ID"; }*/ -.row-mon-id .id-string-search { +.id-string-search { display: flex; gap: 20px; - align-items: baseline; + margin-top: 5px; } -.row-mon-id .id-string-search :where( +.id-string-search, +.id-string-search :where( input, button ) { font-size: 25px; line-height: 25px; + height: 100%; } -#form-id-search { - flex: 1 1 auto; - display: flex; -} +#form-id-search, #form-string-search { flex: 1 1 auto; display: flex; + align-items: baseline; +} +#form-id-search::before { + content: "ID:"; + text-shadow: 3px 3px 0 black; } #card-id{ box-sizing: border-box; @@ -1446,7 +1450,7 @@ body:not(.solo) .awoken-icon[data-awoken-icon="64"]::after #search-by-string{ flex: 0 0 50px; } -.edit-box .setting-box .row-mon-id #search-by-string::before{ +#search-by-string::before{ content: "🔍"; } .edit-box .setting-box .row-mon-id .unable-monster{ @@ -1467,7 +1471,13 @@ body:not(.solo) .awoken-icon[data-awoken-icon="64"]::after height: 40px; font-size: 25px; } -.edit-box .setting-box .row-mon-id .evo-card-list>li, +.evo-card-list { + display: inline-flex; + flex-wrap: wrap; + gap: 3px; + margin-top: 5px; +} + .edit-box .search-mon-list>li { display: inline-block; @@ -3302,6 +3312,10 @@ table .orb-icon { content: "⛓️进化链"; }*/ +.open-evolutionary-tree { + height: 100%; + box-sizing: border-box; +} .search-evolution-by-this icon { transform: scale(50%); diff --git a/triple.html b/triple.html index ae8d7a5d..e64b7dce 100644 --- a/triple.html +++ b/triple.html @@ -1957,21 +1957,19 @@ const teamsCount = 3;
      +
      + + +
      - - - -
      - - -
        +