From 27f02d78f918dd1d318d53ca2df8319f04fb708e 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, 25 Jul 2024 19:25:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- languages/en.css | 6 +++--- languages/ja.css | 6 +++--- languages/ko.css | 6 +++--- languages/zh-hans.css | 6 +++--- languages/zh-hant.css | 6 +++--- script-json_data.js | 30 ++++++++++++++++++++++++++++-- script-universal_function.js | 9 +++------ script.js | 4 ++-- service-worker.js | 16 ++++++++-------- 9 files changed, 56 insertions(+), 33 deletions(-) diff --git a/languages/en.css b/languages/en.css index d43fa70d..7bf17f85 100644 --- a/languages/en.css +++ b/languages/en.css @@ -28,13 +28,13 @@ .monsterinfo-box .monster-id::before{ content: "No."; } -.monsterinfo-box .monster-seriesId::before{ +.monsterinfo-groupId .monster-seriesId::before{ content: "Series ID："; } -.monsterinfo-box .monster-collabId::before{ +.monsterinfo-groupId .monster-collabId::before{ content: "Collab ID："; } -.monsterinfo-box .monster-gachaId::before{ +.monsterinfo-groupId .monster-gachaId::before{ content: "Egg Machine ID："; transform: scaleX(0.62); margin: 0 -25px; diff --git a/languages/ja.css b/languages/ja.css index 64b7cf91..1be024af 100644 --- a/languages/ja.css +++ b/languages/ja.css @@ -30,13 +30,13 @@ label[for="languages"]::after{ .monsterinfo-box .monster-id::before{ content: "No."; } -.monsterinfo-box .monster-seriesId::before{ +.monsterinfo-groupId .monster-seriesId::before{ content: "シリーズ ID："; } -.monsterinfo-box .monster-collabId::before{ +.monsterinfo-groupId .monster-collabId::before{ content: "コラボ ID:"; } -.monsterinfo-box .monster-gachaId::before{ +.monsterinfo-groupId .monster-gachaId::before{ content: "ガチャ ID："; } .monsterinfo-box .monster-altName::before{ diff --git a/languages/ko.css b/languages/ko.css index df406afd..106b8000 100644 --- a/languages/ko.css +++ b/languages/ko.css @@ -30,13 +30,13 @@ label[for="languages"]::after{ .monsterinfo-box .monster-id::before{ content: "No."; } -.monsterinfo-box .monster-seriesId::before{ +.monsterinfo-groupId .monster-seriesId::before{ content: "시리즈 ID："; } -.monsterinfo-box .monster-gachaId::before{ +.monsterinfo-groupId .monster-gachaId::before{ content: "가챠 ID："; } -.monsterinfo-box .monster-collabId::before{ +.monsterinfo-groupId .monster-collabId::before{ content: "콜라보 ID:"; } .monsterinfo-box .monster-altName::before{ diff --git a/languages/zh-hans.css b/languages/zh-hans.css index d2801411..c628a165 100644 --- a/languages/zh-hans.css +++ b/languages/zh-hans.css @@ -36,13 +36,13 @@ label[for="languages"]::after{ .monsterinfo-box .monster-id::before{ content: "No."; } -.monsterinfo-box .monster-seriesId::before{ +.monsterinfo-groupId .monster-seriesId::before{ content: "系列ID："; } -.monsterinfo-box .monster-collabId::before{ +.monsterinfo-groupId .monster-collabId::before{ content: "合作ID："; } -.monsterinfo-box .monster-gachaId::before{ +.monsterinfo-groupId .monster-gachaId::before{ content: "抽蛋ID："; } .monsterinfo-box .monster-altName::before{ diff --git a/languages/zh-hant.css b/languages/zh-hant.css index ef6f8d94..f7963765 100644 --- a/languages/zh-hant.css +++ b/languages/zh-hant.css @@ -36,13 +36,13 @@ label[for="languages"]::after{ .monsterinfo-box .monster-id::before{ content: "No."; } -.monsterinfo-box .monster-seriesId::before{ +.monsterinfo-groupId .monster-seriesId::before{ content: "系列ID："; } -.monsterinfo-box .monster-collabId::before{ +.monsterinfo-groupId .monster-collabId::before{ content: "合作ID："; } -.monsterinfo-box .monster-gachaId::before{ +.monsterinfo-groupId .monster-gachaId::before{ content: "抽蛋ID："; } .monsterinfo-box .monster-altName::before{ diff --git a/script-json_data.js b/script-json_data.js index 40537b17..7004969b 100644 --- a/script-json_data.js +++ b/script-json_data.js @@ -4345,15 +4345,16 @@ const specialSearchFunctions = (function() { }, {name:"Will get Orbs skin",otLangName:{chs:"能获得宝珠皮肤",cht:"能獲得寶珠皮膚"}, function:cards=>cards.filter(({orbSkinOrBgmId})=>orbSkinOrBgmId>0 && orbSkinOrBgmId<1e4), - addition:({orbSkinOrBgmId})=>`ID.${orbSkinOrBgmId}` + addition:({orbSkinOrBgmId})=>Boolean(orbSkinOrBgmId) && `ID.${orbSkinOrBgmId}` }, {name:"Will get BGM",otLangName:{chs:"能获得背景音乐",cht:"能獲得背景音樂"}, function:cards=>cards.filter(({orbSkinOrBgmId})=>orbSkinOrBgmId>=1e4), - addition:({orbSkinOrBgmId})=>`ID.${orbSkinOrBgmId}` + addition:({orbSkinOrBgmId})=>Boolean(orbSkinOrBgmId) && `ID.${orbSkinOrBgmId}` }, {name:"Will get Team Badge",otLangName:{chs:"能获得队伍徽章",cht:"能獲得隊伍徽章"}, function:cards=>cards.filter(({badgeId})=>badgeId), addition:({badgeId})=>{ + if (!badgeId) return; const fragment = document.createDocumentFragment(); fragment.append(`ID.${badgeId}`); const icon = document.createElement("icon"); @@ -4375,6 +4376,8 @@ const specialSearchFunctions = (function() { {name:"Not stacked material",otLangName:{chs:"不堆叠的素材",cht:"不堆疊的素材"}, function:cards=>cards.filter(card=>!card.stackable && card.types.some(t=>[0,12,14,15].includes(t))), }, + ]}, + {group:true,name:"----- Additional display -----",otLangName:{chs:"----- 附加显示 -----",cht:"----- 附加显示 -----"}, functions: [ {name:"Show Original Name",otLangName:{chs:"显示怪物原始名称",cht:"显示怪物原始名稱"}, function:cards=>cards, addition:card=>card.name @@ -4399,6 +4402,29 @@ const specialSearchFunctions = (function() { function:cards=>cards, addition:card=>`COST ${card.cost}` }, + {name:"Show Card Group ID",otLangName:{chs:"显示角色分组ID",cht:"顯示角色分組ID"}, + function:cards=>cards, + addition:card=>{ + const ul = document.createElement("ul"); + ul.className = "monsterinfo-groupId"; + const mSeriesId = ul.appendChild(document.createElement("li")); + mSeriesId.className = "monster-seriesId"; + mSeriesId.textContent = card.seriesId; + mSeriesId.setAttribute(dataAttrName, card.seriesId); + mSeriesId.classList.toggle(className_displayNone, !card.seriesId); + const mCollabId = ul.appendChild(document.createElement("li")); + mCollabId.className = "monster-collabId"; + mCollabId.textContent = card.collabId; + mCollabId.setAttribute(dataAttrName, card.collabId); + mCollabId.classList.toggle(className_displayNone, !card.collabId); + const mGachaId = ul.appendChild(document.createElement("li")); + mGachaId.className = "monster-gachaId"; + mGachaId.textContent = card.gachaIds.join(); + mGachaId.setAttribute(dataAttrName, card.gachaIds.join()); + mGachaId.classList.toggle(className_displayNone, !card.gachaIds.length); + return ul; + } + }, ]}, ]; return functions; diff --git a/script-universal_function.js b/script-universal_function.js index e49eff4b..9e3be819 100644 --- a/script-universal_function.js +++ b/script-universal_function.js @@ -1191,21 +1191,18 @@ function showSearchBySeriesId(sId, sType) { switch (sType) { case "collab": {//合作 if (!Number.isInteger(sId)) sId = parseInt(sId, 10); - showSearch(Cards.filter(card => card.collabId == sId), - card => card.collabId); + showSearch(Cards.filter(card => card.collabId == sId)); break; } case "gacha": {//桶，是数组 if (!sId.every(id=>Number.isInteger(id))) sId = sId,map(id=>parseInt(id, 10)); - showSearch(sId.flatMap(gachaId=>Cards.filter(card => card.gachaIds.includes(gachaId))), - card => card.gachaIds.join()); + showSearch(sId.flatMap(gachaId=>Cards.filter(card => card.gachaIds.includes(gachaId)))); break; } case "series": default: { //系列 if (!Number.isInteger(sId)) sId = parseInt(sId, 10); - showSearch(Cards.filter(card => card.seriesId == sId), - card => card.seriesId); + showSearch(Cards.filter(card => card.seriesId == sId)); break; } } diff --git a/script.js b/script.js index 33e363c2..5f005234 100644 --- a/script.js +++ b/script.js @@ -5965,8 +5965,8 @@ function editMember(teamNum, isAssist, indexInTeam) { editBox.reCalculateAbility(); //自动选中ID狂，以方便修改 - monstersID.focus(); - monstersID.select(); + //monstersID.focus(); + //monstersID.select(); } //编辑窗，修改怪物ID function editBoxChangeMonId(id) { diff --git a/service-worker.js b/service-worker.js index 9078b970..6982a10f 100644 --- a/service-worker.js +++ b/service-worker.js @@ -32319,7 +32319,7 @@ const cachesMap = new Map([ ], [ "script-json_data.js", - "e6ed32d5988d693a323f2b3447d3debd" + "9fa903b7626ba07214e8e0eee5c1e727" ], [ "script-skill-parser.js", @@ -32327,11 +32327,11 @@ const cachesMap = new Map([ ], [ "script-universal_function.js", - "23209e5aee458faeb1282ae19fe7bc3e" + "3dce522c470f4467770beee0d0da373c" ], [ "script.js", - "dc322be758e879d0c5ad90c5a891687c" + "4a1f2eb029b504915689566bb5662b9a" ], [ "solo.html", @@ -32355,7 +32355,7 @@ const cachesMap = new Map([ ], [ "languages/en.css", - "67b83a234625b0eaf862297381468b99" + "c7abc60c4d5ce2714fd955f09c6ad477" ], [ "languages/en.js", @@ -32363,7 +32363,7 @@ const cachesMap = new Map([ ], [ "languages/ja.css", - "e26f6a6dd6b37dcd037d96aedc66ed2f" + "21aef0c61a6ff92fac58a4cbf373a8c6" ], [ "languages/ja.js", @@ -32371,7 +32371,7 @@ const cachesMap = new Map([ ], [ "languages/ko.css", - "809fde0cadfafb0ded31cc52b411578b" + "cbff1d800258b0b1273fd93d8577cae9" ], [ "languages/ko.js", @@ -32383,7 +32383,7 @@ const cachesMap = new Map([ ], [ "languages/zh-hans.css", - "2983021b08b7537b48fc4d1aeb556321" + "101f0fb90d5586c2c373b853907169b9" ], [ "languages/zh-hans.js", @@ -32391,7 +32391,7 @@ const cachesMap = new Map([ ], [ "languages/zh-hant.css", - "12e90b96170f015450c40e49b3921098" + "5d6d6923691d5c7d44678f1b310e82a7" ], [ "languages/zh-hant.js",