Merge branch 'master' of gitee.com:mapaler/PADDashFormation

languages/en.css

@@ -368,7 +368,7 @@
 }
 .dialog-search-string .dialog-title::before
 {
-	content: "Search By String";
+	content: "Search By Tags";
 }
 .dialog-close::before
 {

languages/ja.css

@@ -360,7 +360,7 @@
 }
 .dialog-search-string .dialog-title::before
 {
-	content: "文字列で検索します";
+	content: "タグで検索";
 }
 .dialog-close::before
 {

languages/ko.css

@@ -357,7 +357,7 @@
 }
 .dialog-search-string .dialog-title::before
 {
-	content: "문자열로 검색합니다";
+	content: "태그로 검색";
 }
 .dialog-close::before
 {

languages/zh-TW.css

@@ -363,7 +363,7 @@
 }
 .dialog-search-string .dialog-title::before
 {
-	content: "以字符串搜索";
+	content: "以標簽搜索";
 }
 .dialog-close::before
 {

languages/zh.css

@@ -88,7 +88,7 @@
 	content: "合作ID：";
 }
 .monsterinfo-box .monster-altName::before{
-	content: "标签";
+	content: "標簽";
 }
 .m-level-exp::before{
 	content: "需要经验值：";
@@ -363,7 +363,7 @@
 }
 .dialog-search-string .dialog-title::before
 {
-	content: "以字符串搜索";
+	content: "以標簽搜索";
 }
 .dialog-close::before
 {

monsters-info/ckey.json

@@ -1 +1 @@
-[{"code":"ja","ckey":{"card":"d01e7b3d3ec52ddcf4603897fc256b73","skill":"f9288d2b436545fd7f081d92cc22b181"},"updateTime":1607601438558},{"code":"en","ckey":{"card":"13c53ec60b057b7a6547b8d9659a9664","skill":"40b9acf5827237c5c4a450bd8289c4f9"},"updateTime":1607595293431},{"code":"ko","ckey":{"card":"7d4e3027765ad46bc6d45843f9d909be","skill":"908399019cc34e9a73b5344855093243"},"updateTime":1607595293431}]
+[{"code":"ja","ckey":{"card":"ccaba156d47add7a6efacf7b7c7fae7d","skill":"6a9c3bfe493bb6a25e4baa4f4ebdab33"},"updateTime":1607706679065},{"code":"en","ckey":{"card":"13c53ec60b057b7a6547b8d9659a9664","skill":"40b9acf5827237c5c4a450bd8289c4f9"},"updateTime":1607595293431},{"code":"ko","ckey":{"card":"7d4e3027765ad46bc6d45843f9d909be","skill":"908399019cc34e9a73b5344855093243"},"updateTime":1607595293431}]

script.js

@@ -966,7 +966,7 @@ function initialize() {
 	//以字符串搜索窗口
 	const stringSearchDialog = settingBox.querySelector(".dialog-search-string");
 	function searchByString(str)
-	{
+	{ // 考虑了一下onlyInTag被废弃了，因为和游戏内搜索不符
 		str = str.trim();
 		if (str.length>0)
 		{
@@ -977,12 +977,13 @@ function initialize() {
 					{
 						names.push(...Object.values(card.otLangName));
 					}
-					const altNames = card.altName.concat();
+					const tags = card.altName.concat();
 					if (card.otTags)
 					{
-						altNames.push(...card.otTags);
+						tags.push(...card.otTags);
 					}
-					return altNames.some(astr=>astr.toLowerCase().includes(str.toLowerCase())) || names.some(astr=>astr.toLowerCase().includes(str.toLowerCase()));
+					return tags.some(astr=>astr.toLowerCase().includes(str.toLowerCase())) ||
+					names.some(astr=>astr.toLowerCase().includes(str.toLowerCase()));
 				}
 			));
 		}
@@ -1524,7 +1525,9 @@ function initialize() {
 
 	//id搜索
 	const monstersID = settingBox.querySelector(".row-mon-id .m-id");
-	monstersID.onchange = function() {
+	const btnSearchByString = settingBox.querySelector(".row-mon-id .search-by-string");
+	monstersID.onchange = function(e)
+	{
 		if (/^\d+$/.test(this.value)) {
 			const newId = parseInt(this.value, 10);
 			if (editBox.mid != newId) //避免多次运行oninput、onchange
@@ -1548,11 +1551,23 @@ function initialize() {
 
 				editBoxChangeMonId(newId);
 			}
+			return true;
+		}else
+		{
+			return false;
 		}
-	};
+	}
 	monstersID.oninput = monstersID.onchange;
+	monstersID.onkeydown = function(e) {
+		if (e.key == "Enter")
+		{
+			if (!/^\d+$/.test(this.value) && this.value.length > 0) //如果不是数字，且字符串长度大于0，则进行字符串搜索
+			{
+				btnSearchByString.onclick();
+			}
+		}
+	}
 	//字符串搜索
-	const btnSearchByString = settingBox.querySelector(".row-mon-id .search-by-string");
 	btnSearchByString.onclick = function() {
 		searchByString(monstersID.value);
 	};