2024年5月3日

Mapaler · May 3, 2024 · 24ea4ce · 24ea4ce
1 parent 0537db6
commit 24ea4ce
Show file tree

Hide file tree

Showing 14 changed files with 54 additions and 46 deletions.
diff --git a/images/cards_ja/CARDS_112.PNG b/images/cards_ja/CARDS_112.PNG
diff --git a/languages/en.css b/languages/en.css
@@ -329,7 +329,7 @@ label[for="show-rich-text-tools"]::after{
 }
 
 .search-box>summary::after{
-	content: "Search Cards";
+	content: "🔎Search Cards";
 }
 label[for="fix-main-color"]::after{
 	content: "The order of the attributes is consistent with the order you selected";

diff --git a/languages/ja.css b/languages/ja.css
@@ -323,7 +323,7 @@ label[for="show-rich-text-tools"]::after{
 }
 
 .search-box>summary::after{
-	content: "モンスターの検索";
+	content: "🔎モンスターの検索";
 }
 label[for="fix-main-color"]::after{
 	content: "属性の順序は、選択した順序と一致";

diff --git a/languages/ko.css b/languages/ko.css
@@ -318,7 +318,7 @@ label[for="show-rich-text-tools"]::after{
 }
 
 .search-box>summary::after{
-	content: "몬스터 검색";
+	content: "🔎몬스터 검색";
 }
 label[for="fix-main-color"]::after{
 	content: "속성 순서는 선택한 순서와 일치합니다";

diff --git a/languages/zh-hans.css b/languages/zh-hans.css
@@ -323,7 +323,7 @@ label[for="show-rich-text-tools"]::after{
 }
 
 .search-box>summary::after{
-	content: "搜索怪物";
+	content: "🔎搜索怪物";
 }
 label[for="fix-main-color"]::after{
 	content: "强制属性顺序与选择顺序一致";

diff --git a/languages/zh-hant.css b/languages/zh-hant.css
@@ -324,7 +324,7 @@ label[for="show-rich-text-tools"]::after{
 }
 
 .search-box>summary::after{
-	content: "搜索怪物";
+	content: "🔎搜索怪物";
 }
 label[for="fix-main-color"]::after{
 	content: "強制屬性順序與選擇順序一致";

diff --git a/monsters-info/ckey.json b/monsters-info/ckey.json
@@ -2,10 +2,10 @@
 	{
 		"code": "ja",
 		"ckey": {
-			"card": "39584415111aae11206862ad88125e91",
-			"skill": "5ac8b12635d4295e04971406924741b9"
+			"card": "bfbad8c4c5664dfbd7e14150206fab87",
+			"skill": "4e74422645427add1a5efbfba04a6086"
 		},
-		"updateTime": 1714124666675
+		"updateTime": 1714750609419
 	},
 	{
 		"code": "en",

diff --git a/monsters-info/mon_ja.json b/monsters-info/mon_ja.json
diff --git a/monsters-info/official-API/ja-card.json b/monsters-info/official-API/ja-card.json
diff --git a/monsters-info/official-API/ja-skill.json b/monsters-info/official-API/ja-skill.json
diff --git a/monsters-info/skill_ja.json b/monsters-info/skill_ja.json
diff --git a/script-json_data.js b/script-json_data.js
@@ -1019,7 +1019,7 @@ const specialSearchFunctions = (function() {
 	}
 	function generateOrbsParse(card)
 	{
-		let outArr = [];
+		const outArr = [];
 		const searchTypeArray = [141, 208];
 		const skills = getCardActiveSkills(card, searchTypeArray);
 		if (!skills.length) return outArr;
@@ -1030,20 +1030,20 @@ const specialSearchFunctions = (function() {
 			{
 				outArr.push({
 					count: sk[0],
-					to: Bin.unflags(sk[1] || 1),
-					exclude: Bin.unflags(sk[2]),
+					to: sk[1] || 1,
+					exclude: sk[2],
 				});
 			}else
 			{
 				outArr.push({
 					count: sk[0],
-					to: Bin.unflags(sk[1] || 1),
-					exclude: Bin.unflags(sk[2]),
+					to: sk[1] || 1,
+					exclude: sk[2],
 				});
 				outArr.push({
 					count: sk[3],
-					to: Bin.unflags(sk[4] || 1),
-					exclude: Bin.unflags(sk[5]),
+					to: sk[4] || 1,
+					exclude: sk[5],
 				});
 			}
 		}
@@ -1052,14 +1052,11 @@ const specialSearchFunctions = (function() {
 	function generateOrbs_Addition(card)
 	{
 		const gens = generateOrbsParse(card);
-		const searchTypeArray = [141, 208];
-		const skill = getCardActiveSkill(card, searchTypeArray);
-		if (!skill) return;
-		const sk = skill.params;
+		if (!gens.length) return;
 		const fragment = document.createDocumentFragment();
 		for (const gen of gens)
 		{
-			fragment.appendChild(createOrbsList(gen.to));
+			fragment.appendChild(createOrbsList(Bin.unflags(gen.to)));
 			fragment.appendChild(document.createTextNode(`×${gen.count}`));
 		}
 		return fragment;
@@ -2936,76 +2933,83 @@ const specialSearchFunctions = (function() {
 			},
 		]},
 		{group:true,name:"-----Create Orbs-----",otLangName:{chs:"-----随机产珠类-----",cht:"-----隨機產珠類-----"}, functions: [
-			{name:"Create 30 Orbs",otLangName:{chs:"固定30个产珠",cht:"固定30個產珠"},
+			{name:"Create 15×2 color Orbs",otLangName:{chs:"产珠15个×2色",cht:"產珠15個×2色"},
 				function:cards=>cards.filter(card=>{
-					function is30(sk)
+					function is1515(sk)
 					{
-						return Boolean(Bin.unflags(sk[1]).length * sk[0] == 30);
+						return Boolean(Bin.unflags(sk[1]).length == 2 && sk[0] == 15);
 					}
 					const searchTypeArray = [141];
 					const skill = getCardActiveSkill(card, searchTypeArray);
-					return skill && is30(skill.params);
+					return skill && is1515(skill.params);
 				}),
 				addition:generateOrbs_Addition
 			},
-			{name:"Create 15×2 Orbs",otLangName:{chs:"固定15×2产珠",cht:"固定15×2產珠"},
+			{name:"Create 30 Orbs",otLangName:{chs:"产珠30个",cht:"產珠30個"},
 				function:cards=>cards.filter(card=>{
-					function is1515(sk)
+					function is30(sk)
 					{
-						return Boolean(Bin.unflags(sk[1]).length == 2 && sk[0] == 15);
+						return Boolean(Bin.unflags(sk[1]).length * sk[0] == 30);
 					}
 					const searchTypeArray = [141];
 					const skill = getCardActiveSkill(card, searchTypeArray);
-					return skill && is1515(skill.params);
+					return skill && is30(skill.params);
+				}),
+				addition:generateOrbs_Addition
+			},
+			{name:"Create 6 color Orbs",otLangName:{chs:"产珠-生成-6色",cht:"產珠-生成-6色"},
+				function:cards=>cards.filter(card=>{
+					const gens = generateOrbsParse(card);
+					return gens.some(gen=>(gen.to & 0b111111) === 0b111111);
 				}),
 				addition:generateOrbs_Addition
 			},
 			{name:"Create Fire Orbs",otLangName:{chs:"产珠-生成-火",cht:"產珠-生成-火"},
 				function:cards=>cards.filter(card=>{
 					const gens = generateOrbsParse(card);
-					return gens.some(gen=>gen.to.includes(0));
+					return gens.some(gen=>gen.to & 0b000001);
 				}),
 				addition:generateOrbs_Addition
 			},
 			{name:"Create Water Orbs",otLangName:{chs:"产珠-生成-水",cht:"產珠-生成-水"},
 				function:cards=>cards.filter(card=>{
 					const gens = generateOrbsParse(card);
-					return gens.some(gen=>gen.to.includes(1));
+					return gens.some(gen=>gen.to & 0b000010);
 				}),
 				addition:generateOrbs_Addition
 			},
 			{name:"Create Wood Orbs",otLangName:{chs:"产珠-生成-木",cht:"產珠-生成-木"},
 				function:cards=>cards.filter(card=>{
 					const gens = generateOrbsParse(card);
-					return gens.some(gen=>gen.to.includes(2));
+					return gens.some(gen=>gen.to & 0b000100);
 				}),
 				addition:generateOrbs_Addition
 			},
 			{name:"Create Light Orbs",otLangName:{chs:"产珠-生成-光",cht:"產珠-生成-光"},
 				function:cards=>cards.filter(card=>{
 					const gens = generateOrbsParse(card);
-					return gens.some(gen=>gen.to.includes(3));
+					return gens.some(gen=>gen.to & 0b001000);
 				}),
 				addition:generateOrbs_Addition
 			},
 			{name:"Create Dark Orbs",otLangName:{chs:"产珠-生成-暗",cht:"產珠-生成-暗"},
 				function:cards=>cards.filter(card=>{
 					const gens = generateOrbsParse(card);
-					return gens.some(gen=>gen.to.includes(4));
+					return gens.some(gen=>gen.to & 0b010000);
 				}),
 				addition:generateOrbs_Addition
 			},
 			{name:"Create Heart Orbs",otLangName:{chs:"产珠-生成-心",cht:"產珠-生成-心"},
 				function:cards=>cards.filter(card=>{
 					const gens = generateOrbsParse(card);
-					return gens.some(gen=>gen.to.includes(5));
+					return gens.some(gen=>gen.to & 0b100000);
 				}),
 				addition:generateOrbs_Addition
 			},
 			{name:"Create Jammers/Poison Orbs",otLangName:{chs:"产珠-生成-毒废",cht:"產珠-生成-毒廢"},
 				function:cards=>cards.filter(card=>{
 					const gens = generateOrbsParse(card);
-					return gens.some(gen=>gen.to.includes(6) || gen.to.includes(7) || gen.to.includes(8) || gen.to.includes(9));
+					return gens.some(gen=>gen.to & 0b1111000000);
 				}),
 				addition:generateOrbs_Addition
 			},

diff --git a/service-worker.js b/service-worker.js
@@ -447,7 +447,7 @@ const cachesMap = new Map([
 	],
 	[
 		"images/cards_ja/CARDS_112.PNG",
-		"0e0ee24b4fd20e6998e69ef29d4184bd"
+		"eeaa9790f5aad294e03dab1b22b78ab1"
 	],
 	[
 		"sound/voice/ja/padv001.wav",
@@ -1797,6 +1797,10 @@ const cachesMap = new Map([
 		"sound/voice/ja/padv122.wav",
 		"bd76867897b4217698a823279dbc6c5a"
 	],
+	[
+		"sound/voice/ja/padv1222.wav",
+		"46b23d24d12e28dc838b005fa2ca6585"
+	],
 	[
 		"sound/voice/ja/padv1224.wav",
 		"63342cdbcc799462cf5bf5769e9a7988"
@@ -26199,7 +26203,7 @@ const cachesMap = new Map([
 	],
 	[
 		"script-json_data.js",
-		"8d4c90d1ee840b473c7610819f85d664"
+		"46afe96eba7ba8786e3e82e46241e863"
 	],
 	[
 		"script-skill-parser.js",
@@ -26235,23 +26239,23 @@ const cachesMap = new Map([
 	],
 	[
 		"languages/en.css",
-		"d70cb92c024d42de25bcb564dc78eb2b"
+		"f556f9e1d1d70f8345bd26aef4cdc7f0"
 	],
 	[
 		"languages/en.js",
 		"de3e6b1956d37a8b05a7fca4096ad3ce"
 	],
 	[
 		"languages/ja.css",
-		"d3b1f5d7cb66880833180650f38405db"
+		"a68f5f7f5a391663dd24526ddcc79bb1"
 	],
 	[
 		"languages/ja.js",
 		"563ae58b4ef7d7da1b7cf4885d394964"
 	],
 	[
 		"languages/ko.css",
-		"f8b6f1d4317a5fb942fec02d35be2fbe"
+		"654e43a514aa728bc6352a8ab83a03a4"
 	],
 	[
 		"languages/ko.js",
@@ -26263,15 +26267,15 @@ const cachesMap = new Map([
 	],
 	[
 		"languages/zh-hans.css",
-		"c9c2c2056ecff32200beee8209f0652c"
+		"b97e8c2c173ce608f97bdf55bb94fce6"
 	],
 	[
 		"languages/zh-hans.js",
 		"1cb9427d980613750be284b683b6c965"
 	],
 	[
 		"languages/zh-hant.css",
-		"21de0314dbf99b2201fc7f98d5939447"
+		"65cd9d99929e231abb597ca22b09e5ec"
 	],
 	[
 		"languages/zh-hant.js",

diff --git a/sound/voice/ja/padv1222.wav b/sound/voice/ja/padv1222.wav