更改堆叠的英文名

monsters-info/ckey.json

@@ -1 +1 @@
-[{"code":"ja","ckey":{"card":"124681afd00b311e1a9a7bc75b08bfce","skill":"90ffe1f0455cb0d76e000eb7cb901d29"},"updateTime":1669397797939},{"code":"en","ckey":{"card":"50e1ee4013644429c836429a8dbef198","skill":"81090369eff7c516843c20d385d3543c"},"updateTime":1669397797939},{"code":"ko","ckey":{"card":"58390c2dae938c110945ff0c86a1c07d","skill":"29fdbded544c840684c6b19bf085372e"},"updateTime":1669397797939}]
+[{"code":"ja","ckey":{"card":"c6cdc2db4e909d26c3fa2035aab6ed00","skill":"90ffe1f0455cb0d76e000eb7cb901d29"},"updateTime":1669410746308},{"code":"en","ckey":{"card":"211dbc809ef5f4c8445c8bdc42ce46c6","skill":"81090369eff7c516843c20d385d3543c"},"updateTime":1669410746308},{"code":"ko","ckey":{"card":"dd2cf25f57eb7b5aba69cd48cbb30b0b","skill":"29fdbded544c840684c6b19bf085372e"},"updateTime":1669410746308}]

monsters-info/official-API/parseCard.js

@@ -70,12 +70,12 @@ class Card{
 		card.flags = flags; //未知08
 		card.canAssist = Boolean(flags & 1<<0); //是否能当二技
 		card.enabled = Boolean(flags & 1<<1); //是否已启用
+		card.stacking = !Boolean(flags & 1<<3) && //flag有1<<3时，不合并占一格，没有时则根据类型进行合并（目前合并已经不占格子）
+			card.types.some(t=>[0,12,14,15].includes(t)); //0進化用;12能力覺醒用;14強化合成用;15販賣用默认合并
+		card.is8Latent = Boolean(flags & 1<<5); //是否支持8个潜觉
 		card.skillBanner = Boolean(flags & 1<<6); //是否有技能横幅
 		
 		card.types = card.types.filter(t=>t>=0); //type里面去掉-1
-		card.overlay = !Boolean(flags & 1<<3) && //flag有1<<3时，不合并，没有时则判断
-			card.types.some(t=>[0,12,14,15].includes(t)); //0進化用;12能力覺醒用;14強化合成用;15販賣用默认合并
-		card.is8Latent = Boolean(flags & 1<<5); //是否支持8个潜觉
 		card.altName = data[i++].split("|").filter(str=>str.length); //替换名字（分类标签）
 		card.limitBreakIncr = data[i++]; //110级增长
 		card.voiceId = data[i++]; //语音觉醒的ID

monsters-info/official-API/test-mon.html

@@ -92,7 +92,7 @@ fetch("ja-card.json").then(async response=>{
 		card.unk05bin = card.unk05.toString(2);
 		card.unk06bin = card.unk06.toString(2);
 		card.unk07bin = card.unk07.toString(2);
-		card.unk08bin = card.unk08.toString(2); //已知一些flag
+		card.flagsbin = card.flags.toString(2); //已知一些flag
 		return card;
 	});
 });

script-json_data.js

@@ -3679,7 +3679,7 @@ const specialSearchFunctions = (function() {
 			},
 			//{name:"",otLangName:{chs:"非8格潜觉",cht:"非8格潛覺"},function:cards=>cards.filter(card=>!card.is8Latent)},
 			{name:"Reincarnation/Super Re..",otLangName:{chs:"转生、超转生进化",cht:"轉生、超轉生進化"},
-				function:cards=>cards.filter(card=>isReincarnated(card))
+				function:cards=>cards.filter(isReincarnated)
 			}, //evoBaseId可能为0
 			//{name:"",otLangName:{chs:"仅超转生进化",cht:"僅超轉生進化"},function:cards=>cards.filter(card=>isReincarnated(card) && !Cards[card.evoBaseId].isUltEvo)},
 			{name:"Super Ult Evo",otLangName:{chs:"超究极进化",cht:"超究極進化"},
@@ -3835,6 +3835,12 @@ const specialSearchFunctions = (function() {
 			{name:"All Latent TAMADRA",otLangName:{chs:"所有潜觉蛋龙",cht:"所有潛覺蛋龍"},
 				function:cards=>cards.filter(card=>card.latentAwakeningId>0).sort((a,b)=>a.latentAwakeningId-b.latentAwakeningId)
 			},
+			{name:"Stacked material",otLangName:{chs:"堆叠的素材",cht:"堆疊的素材"},
+				function:cards=>cards.filter(card=>card.stacking),
+			},
+			{name:"Not stacked material",otLangName:{chs:"不堆叠的素材",cht:"不堆疊的素材"},
+				function:cards=>cards.filter(card=>!card.stacking && card.types.some(t=>[0,12,14,15].includes(t))),
+			},
 			{name:"Original Name",otLangName:{chs:"怪物原始名称",cht:"怪物原始名稱"},
 				function:cards=>cards,
 				addition:card=>card.name

script-universal_function.js

@@ -654,7 +654,7 @@ function calculateAbility_max(id, solo, teamsCount, maxLevel = 110) {
 	const tempMon = {
 		id: id,
 		level: card.limitBreakIncr ? maxLevel : card.maxLevel,
-		plus: (card.overlay || card.types[0] == 15 && card.types[1] == -1) ? [0, 0, 0] : [99, 99, 99], //当可以叠加时，不能打297
+		plus: (card.stacking || card.types[0] == 15 && card.types[1] == -1) ? [0, 0, 0] : [99, 99, 99], //当可以叠加时，不能打297
 		awoken: card.awakenings.length,
 	};
 	const abilities = calculateAbility(tempMon, null, solo, teamsCount);

script.js

@@ -619,7 +619,7 @@ class PlayerDataCard {
 		//叠加型用他们的经验来表示数量
 		const card = Cards[this.id];
 		this.count = 1;
-		if (card && card.overlay)
+		if (card && card.stacking)
 		{
 			this.count = this.exp;
 			this.exp = 0;
@@ -3827,7 +3827,7 @@ function initialize(event) {
 			mon.sawoken = mSAwokenChoIpt ? parseInt(mSAwokenChoIpt.value, 10) : -1;
 		}
 
-		if (card.overlay || card.types.some(t=>[0,12,14,15].includes(t)) &&
+		if (card.stacking || card.types.some(t=>[0,12,14,15].includes(t)) &&
 			mon.level >= card.maxLevel) { //当4种特殊type的时候是无法297和打觉醒的，但是不能叠加的在未满级时可以
 			mon.plus = [0, 0, 0];
 		} else {
@@ -4483,7 +4483,7 @@ function editBoxChangeMonId(id) {
 	skillDetailOriginal.innerHTML = "";
 	skillDetailOriginal.appendChild(parseSkillDescription(activeskill));
 
-	const t_maxLevel = card.overlay ? 1 : activeskill?.maxLevel; //遇到不能升技的，最大等级强制为1
+	const t_maxLevel = card.stacking ? 1 : activeskill?.maxLevel; //遇到不能升技的，最大等级强制为1
 	skillLevel.max = t_maxLevel;
 	skillLevel.value = t_maxLevel;
 	skillLevel_Max.value = t_maxLevel;
@@ -4509,7 +4509,7 @@ function editBoxChangeMonId(id) {
 	rowSkill.appendChild(frg1);
 	rowLederSkill.appendChild(frg2);
 
-	if (card.overlay || card.types.some(t=>[0,12,14,15].includes(t)) &&
+	if (card.stacking || card.types.some(t=>[0,12,14,15].includes(t)) &&
 		card.maxLevel <= 1) { //当可以叠加时，不能打297和潜觉
 		rowPlus.classList.add("disabled");
 		rowPlus.querySelector(".m-plus-hp").value = 0;

service-worker.js

@@ -6855,7 +6855,7 @@ const cachesMap = new Map([
 	],
 	[
 		"script-json_data.js",
-		"c10b3abf5ec1babb4189e8b2151d1a68"
+		"e2278490e53d95688eb223dd9f9b3ae8"
 	],
 	[
 		"script-skill-parser.js",
@@ -6863,11 +6863,11 @@ const cachesMap = new Map([
 	],
 	[
 		"script-universal_function.js",
-		"24e30b4ba22b0b1c1898983ae56211f9"
+		"90e57ef2c87b5d3b3d0457a12d661e17"
 	],
 	[
 		"script.js",
-		"30a53ec95f26bd6cf638a4d3e0e8d16b"
+		"867ffd4f5f8ae904b02309cbb007f72c"
 	],
 	[
 		"solo.html",
@@ -7119,19 +7119,19 @@ const cachesMap = new Map([
 	],
 	[
 		"monsters-info/ckey.json",
-		"c7994ad07b80f78c42c6b30b88c250c0"
+		"9b3aa24beedf9d78a14922fd84a74329"
 	],
 	[
 		"monsters-info/mon_en.json",
-		"50e1ee4013644429c836429a8dbef198"
+		"211dbc809ef5f4c8445c8bdc42ce46c6"
 	],
 	[
 		"monsters-info/mon_ja.json",
-		"124681afd00b311e1a9a7bc75b08bfce"
+		"c6cdc2db4e909d26c3fa2035aab6ed00"
 	],
 	[
 		"monsters-info/mon_ko.json",
-		"58390c2dae938c110945ff0c86a1c07d"
+		"dd2cf25f57eb7b5aba69cd48cbb30b0b"
 	],
 	[
 		"monsters-info/skill_en.json",