From 195e2e94ab288ab8ee4e78d335cec89933a4afda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= Date: Tue, 17 Mar 2020 19:00:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E6=96=87=E7=9A=84=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E7=89=B9=E6=AE=8A=E6=90=9C=E7=B4=A2=E5=BC=BA=E8=A1=8C=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E6=8E=89=E9=BB=98=E8=AE=A4=E6=90=9C=E7=B4=A2=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- languages/zh-CN.js | 14 +++++++++++++- script.js | 10 ---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/languages/zh-CN.js b/languages/zh-CN.js index f3a98728..a27928c7 100644 --- a/languages/zh-CN.js +++ b/languages/zh-CN.js @@ -1203,7 +1203,7 @@ function parseBigNumber(number) (function() { 'use strict'; const specialSearchFunctions = [ - {name:"临时的特殊搜索",function:()=>false}, + {name:"临时的特殊搜索(求翻译)",function:()=>false}, {name:"====主动技====",function:()=>false}, {name:"所有 1 CD",function:()=>Cards.filter(card=>{ if (card.activeSkillId == 0) return false; @@ -2120,5 +2120,17 @@ function parseBigNumber(number) specialSearch.onchange = function(){ searchBox.startSearch(specialSearchFunctions[parseInt(this.value,10)].function()); }; + //将搜索按钮强制改成特殊搜索 + const searchStart = controlDiv.querySelector(".search-start"); + searchStart.onclick = function(){ + const specialSearchResualt = specialSearchFunctions[parseInt(specialSearch.value,10)].function(); + if (specialSearchResualt) + { + searchBox.startSearch(specialSearchResualt) + }else + { + searchBox.startSearch(Cards); + } + }; controlDiv.insertBefore(fragment,controlDiv.querySelector(".sort-div")); })(); \ No newline at end of file diff --git a/script.js b/script.js index bc6b94ee..af31093e 100644 --- a/script.js +++ b/script.js @@ -969,16 +969,6 @@ function initialize() s_awokensEquivalent.checked, s_includeSuperAwoken.checked ); - console.debug("搜索条件:属性[%d,%d],固定主副%s,类型:%o,觉醒:%o,超觉醒:%o,等效觉醒%s,搜超觉醒%s。\n搜索结果:%o", - attr1,attr2, - s_fixMainColor.checked, - typesFilter, - awokensFilter, - sawokensFilter, - s_awokensEquivalent.checked, - s_includeSuperAwoken.checked, - searchResult - ); showSearch(searchResult); }; searchBox.startSearch = startSearch;