取用官方潜觉编号

languages/zh-CN.js

@@ -2146,38 +2146,107 @@ function parseBigNumber(number)
 		{name:"只显示可以做辅助",function:cards=>cards.filter(card=>card.canAssist)},
 		{name:"3个type",function:cards=>cards.filter(card=>card.types.filter(t=>t>=0).length>=3)},
 		{name:"9个觉醒",function:cards=>cards.filter(card=>card.awakenings.length>=9)},
-		{name:"所有潜觉蛋龙",function:cards=>cards.filter(card=>card.latentAwakeningId>0)},
+		{name:"满级不是1级（可强化）",function:cards=>cards.filter(card=>card.maxLevel>1)},
+		{name:"不是武器",function:cards=>cards.filter(card=>!card.awakenings.includes(49))},
+		{name:"所有潜觉蛋龙",function:cards=>cards.filter(card=>card.latentAwakeningId>0).sort((a,b)=>a.latentAwakeningId-b.latentAwakeningId)},
+		{name:"3个相同杀觉醒，或2个杀觉醒并可打相同潜觉",function:cards=>cards.filter(card=>{
+			const hasAwokenKiller = typekiller_for_type.find(type=>card.awakenings.filter(ak=>ak===type.awoken).length>=2);
+			if (hasAwokenKiller)
+			{ //大于2个杀的进行判断
+				if (card.awakenings.filter(ak=>ak===hasAwokenKiller.awoken).length>=3)
+				{ //大于3个杀的直接过
+					return true;
+				}else
+				{ //2个杀的
+					const isAllowLatent = card.types.filter(i=>
+							i>=0 //去掉-1的type
+						).map(type=>
+							type_allowable_latent[type] //得到允许打的潜觉杀
+						).some(ls=>
+							ls.includes(hasAwokenKiller.latent) //判断是否有这个潜觉杀
+						);
+					return isAllowLatent
+				}
+			}else
+			{
+				return false;
+			}
+		})},
+		{name:"3个相同杀觉醒（含超觉），或相同潜觉",function:cards=>cards.filter(card=>{
+			const hasAwokenKiller = typekiller_for_type.find(type=>card.awakenings.filter(ak=>ak===type.awoken).length+(card.superAwakenings.includes(type.awoken)?1:0)>=2);
+			if (hasAwokenKiller)
+			{ //大于2个杀的进行判断
+				if (card.awakenings.filter(ak=>ak===hasAwokenKiller.awoken).length+(card.superAwakenings.includes(hasAwokenKiller.awoken)?1:0)>=3)
+				{ //大于3个杀的直接过
+					return true;
+				}else
+				{ //2个杀的
+					const isAllowLatent = card.types.filter(i=>
+							i>=0 //去掉-1的type
+						).map(type=>
+							type_allowable_latent[type] //得到允许打的潜觉杀
+						).some(ls=>
+							ls.includes(hasAwokenKiller.latent) //判断是否有这个潜觉杀
+						);
+					return isAllowLatent
+				}
+			}else
+			{
+				return false;
+			}
+		})},
+		{name:"4个相同杀觉醒（含超觉），或相同潜觉",function:cards=>cards.filter(card=>{
+			const hasAwokenKiller = typekiller_for_type.find(type=>card.awakenings.filter(ak=>ak===type.awoken).length+(card.superAwakenings.includes(type.awoken)?1:0)>=3);
+			if (hasAwokenKiller)
+			{ //大于2个杀的进行判断
+				if (card.awakenings.filter(ak=>ak===hasAwokenKiller.awoken).length+(card.superAwakenings.includes(hasAwokenKiller.awoken)?1:0)>=4)
+				{ //大于3个杀的直接过
+					return true;
+				}else
+				{ //2个杀的
+					const isAllowLatent = card.types.filter(i=>
+							i>=0 //去掉-1的type
+						).map(type=>
+							type_allowable_latent[type] //得到允许打的潜觉杀
+						).some(ls=>
+							ls.includes(hasAwokenKiller.latent) //判断是否有这个潜觉杀
+						);
+					return isAllowLatent
+				}
+			}else
+			{
+				return false;
+			}
+		})},
 	];
 
 	const searchBox = editBox.querySelector(".search-box");
 	const controlDiv = searchBox.querySelector(".control-div");
 	let fragment = document.createDocumentFragment();
-	const specialSearchDiv = fragment.appendChild(document.createElement("div"))
-	const specialSearch1 = document.createElement("select");
-	const specialSearch2 = document.createElement("select");
-	const specialSearch1Label = specialSearchDiv.appendChild(document.createElement("label"));
-	const specialSearch2Label = specialSearchDiv.appendChild(document.createElement("label"));
-	specialSearch1Label.innerHTML = "筛选1：";
-	specialSearch2Label.innerHTML = "筛选2：";
-	specialSearch1Label.appendChild(specialSearch1);
-	specialSearch2Label.appendChild(specialSearch2);
-
-	specialSearchFunctions.forEach((sfunc,idx)=>{
-		specialSearch1.options.add(new Option(sfunc.name,idx));
-		specialSearch2.options.add(new Option(sfunc.name,idx));
+	const specialSearchDiv = fragment.appendChild(document.createElement("ul"))
+	const specialSearchArray = new Array(4).fill(null).map((i,n)=>{
+		const specialSearchLabel = specialSearchDiv.appendChild(document.createElement("li"));
+		specialSearchLabel.innerHTML = `筛选${n+1}:`;
+		const specialSearch = specialSearchLabel.appendChild(document.createElement("select"));
+		specialSearchFunctions.forEach((sfunc,idx)=>{
+			specialSearch.options.add(new Option(sfunc.name,idx));
+		});
+		return specialSearch;
 	});
 	//将搜索按钮强制改成特殊搜索
 	const searchStart = controlDiv.querySelector(".search-start");
 	searchStart.onclick = function(){
 		let result = Cards;
-		result = specialSearchFunctions[parseInt(specialSearch1.value,10)].function(result); //第一遍搜索
-		result = specialSearchFunctions[parseInt(specialSearch2.value,10)].function(result); //第二遍搜索
+		specialSearchArray.forEach(ss=>
+			result = specialSearchFunctions[parseInt(ss.value,10)].function(result)
+		);
 		searchBox.startSearch(result);
 	};
 	controlDiv.insertBefore(fragment,controlDiv.firstElementChild);
 	const searchClear = controlDiv.querySelector(".search-clear");
 	searchClear.addEventListener("click",function(e){
-		specialSearch1.selectedIndex = 0;
-		specialSearch2.selectedIndex = 0;
+		specialSearchArray.forEach(ss=>
+			ss.selectedIndex = 0
+		);
 	});
 })();

multi.html

@@ -770,27 +770,28 @@ var formation = new Formation(teamsCount,5);
 					<li class="latent-icon" data-latent-icon="10"></li><!--暗盾-->
 					<li class="latent-icon" data-latent-icon="11"></li><!--防坐-->
 					<li class="latent-icon" data-latent-icon="12"></li><!--三维-->
-					<li class="latent-icon" data-latent-icon="13"></li><!--进化杀-->
-					<li class="latent-icon" data-latent-icon="14"></li><!--觉醒杀-->
-					<li class="latent-icon" data-latent-icon="15"></li><!--强化杀-->
-					<li class="latent-icon" data-latent-icon="16"></li><!--卖钱杀-->
-					<li class="latent-icon" data-latent-icon="17"></li><!--神杀-->
-					<li class="latent-icon" data-latent-icon="18"></li><!--龙杀-->
-					<li class="latent-icon" data-latent-icon="19"></li><!--恶魔杀-->
-					<li class="latent-icon" data-latent-icon="20"></li><!--机械杀-->
-					<li class="latent-icon" data-latent-icon="21"></li><!--平衡杀-->
-					<li class="latent-icon" data-latent-icon="22"></li><!--攻击杀-->
-					<li class="latent-icon" data-latent-icon="23"></li><!--体力杀-->
-					<li class="latent-icon" data-latent-icon="24"></li><!--回复杀-->
-					<li class="latent-icon" data-latent-icon="25"></li><!--大HP-->
-					<li class="latent-icon" data-latent-icon="26"></li><!--大攻击-->
-					<li class="latent-icon" data-latent-icon="27"></li><!--大回复-->
-					<li class="latent-icon" data-latent-icon="28"></li><!--大手指-->
-					<li class="latent-icon" data-latent-icon="29"></li><!--大火盾-->
-					<li class="latent-icon" data-latent-icon="30"></li><!--大水盾-->
-					<li class="latent-icon" data-latent-icon="31"></li><!--大木盾-->
-					<li class="latent-icon" data-latent-icon="32"></li><!--大光盾-->
-					<li class="latent-icon" data-latent-icon="33"></li><!--大暗盾-->
+					<!--有3个未启用-->
+					<li class="latent-icon" data-latent-icon="16"></li><!--进化杀-->
+					<li class="latent-icon" data-latent-icon="17"></li><!--觉醒杀-->
+					<li class="latent-icon" data-latent-icon="18"></li><!--强化杀-->
+					<li class="latent-icon" data-latent-icon="19"></li><!--卖钱杀-->
+					<li class="latent-icon" data-latent-icon="20"></li><!--神杀-->
+					<li class="latent-icon" data-latent-icon="21"></li><!--龙杀-->
+					<li class="latent-icon" data-latent-icon="22"></li><!--恶魔杀-->
+					<li class="latent-icon" data-latent-icon="23"></li><!--机械杀-->
+					<li class="latent-icon" data-latent-icon="24"></li><!--平衡杀-->
+					<li class="latent-icon" data-latent-icon="25"></li><!--攻击杀-->
+					<li class="latent-icon" data-latent-icon="26"></li><!--体力杀-->
+					<li class="latent-icon" data-latent-icon="27"></li><!--回复杀-->
+					<li class="latent-icon" data-latent-icon="28"></li><!--大HP-->
+					<li class="latent-icon" data-latent-icon="29"></li><!--大攻击-->
+					<li class="latent-icon" data-latent-icon="30"></li><!--大回复-->
+					<li class="latent-icon" data-latent-icon="31"></li><!--大手指-->
+					<li class="latent-icon" data-latent-icon="32"></li><!--大火盾-->
+					<li class="latent-icon" data-latent-icon="33"></li><!--大水盾-->
+					<li class="latent-icon" data-latent-icon="34"></li><!--大木盾-->
+					<li class="latent-icon" data-latent-icon="35"></li><!--大光盾-->
+					<li class="latent-icon" data-latent-icon="36"></li><!--大暗盾-->
 				</ul>
 			</div>
 			<div class="setting-row row-mon-skill">

script-json_data.js

@@ -12,23 +12,32 @@
 		source:"퍼즐앤드래곤"
 	},
 ];
-
-//类型允许的潜觉杀，前面的数字是官方数据的类型编号，后面的杀是自己做的图片中的潜觉序号
-const type_allowable_latent = {
-	"0":[], //0进化
-	"12":[], //12觉醒
-	"14":[], //14强化
-	"15":[], //15卖钱
-	"9":[],//特殊保护
-	"1":[17,18,19,20,21,22,23,24], //1平衡
-	"2":[20,24],//2体力
-	"3":[18,22],//3回复
-	"4":[20,24],//4龙
-	"5":[19],//5神
-	"6":[19,23],//6攻击
-	"7":[17],//7恶魔
-	"8":[17,20,21,24],//8机械
-};
+//类型和觉醒杀和潜觉杀的对应编号，还有类型可以打什么类型的潜觉杀
+const typekiller_for_type = [
+	{type:0,awoken:39,latent:16,typeKiller:[]}, //0进化
+	{type:12,awoken:40,latent:17,typeKiller:[]}, //12觉醒
+	{type:14,awoken:41,latent:18,typeKiller:[]}, //14强化
+	{type:15,awoken:42,latent:19,typeKiller:[]}, //15卖钱
+	{type:5,awoken:32,latent:20,typeKiller:[7]}, //5神
+	{type:4,awoken:31,latent:21,typeKiller:[8,3]}, //4龙
+	{type:7,awoken:33,latent:22,typeKiller:[5]}, //7恶魔
+	{type:8,awoken:34,latent:23,typeKiller:[5,1]}, //8机械
+	{type:1,awoken:35,latent:24,typeKiller:[5,4,7,8,1,6,2,3]}, //1平衡
+	{type:6,awoken:36,latent:25,typeKiller:[7,2]}, //6攻击
+	{type:2,awoken:37,latent:26,typeKiller:[8,3]}, //2体力
+	{type:3,awoken:38,latent:27,typeKiller:[4,6]}, //3回复
+	{type:9,awoken:null,latent:null,typeKiller:[]}, //特殊保护
+];
+typekiller_for_type.forEach(t=>
+	t.typeKiller = t.typeKiller.concat(0,12,14,15) //补充4种特殊杀
+);
+//类型允许的潜觉杀
+const type_allowable_latent = {};
+typekiller_for_type.forEach(t=>
+	type_allowable_latent[t.type] = t.typeKiller.map(tn=>
+		typekiller_for_type.find(_t=>_t.type == tn).latent
+	)
+);
 //等效觉醒列表
 const equivalent_awoken = [
 	{small:10,big:52,times:2}, //防封

script.js

@@ -13,6 +13,7 @@ var formationBox; //储存整个formationBox
 var editBox; //储存整个editBox
 var showSearch; //整个程序都可以用的显示搜索函数
 
+const dataStructure = 3; //阵型输出数据的结构版本
 const className_displayNone = "display-none";
 
 //数组去重
@@ -87,6 +88,7 @@ Member.prototype.loadObj = function(m,dataVersion){
 	}
 	if (!(this.plus instanceof Array)) this.plus = [0,0,0]; //如果加值不是数组，则改变
 	this.latent = dataVersion>1 ? m[4] : m.latent;
+	if (this.latent && dataVersion<=2) this.latent = this.latent.map(l=>l>=13?l+3:l); //修复以前自己编的潜觉编号为官方编号
 	if (!(this.latent instanceof Array)) this.latent = []; //如果潜觉不是数组，则改变
 	this.sawoken = dataVersion>1 ? m[5] : m.sawoken;
 	this.skilllevel = m[6] || null;
@@ -165,31 +167,32 @@ var Formation = function(teamCount,memberCount){
 	}
 };
 Formation.prototype.outObj= function(){
-	let obj = {};
+	const obj = {};
 	if (this.title != undefined && this.title.length>0) obj.t = this.title;
 	if (this.detail != undefined && this.detail.length>0) obj.d = this.detail;
-	obj.f = this.teams.map(function(t){
-			return t.map(function(st){
-				return st.map(function(m){
-					return m.outObj();
-				});
-			});
-		});
+	obj.f = this.teams.map(t=>
+		t.map(st=>
+			st.map(m=>
+				m.outObj()
+			)
+		)
+	);
 	if (this.badge != undefined && this.badge>0) obj.b = this.badge; //徽章
+	obj.v = dataStructure;
 	return obj;
 };
 Formation.prototype.loadObj= function(f){
-	const dataVeision = f.f?2:1; //是第几版格式
+	const dataVeision = f.v?f.v:(f.f?2:1); //是第几版格式
 	this.title = dataVeision>1 ? f.t : f.title;
 	this.detail = dataVeision>1 ? f.d : f.detail;
 	this.badge = f.b ? f.b : 0; //徽章
 	const teamArr = dataVeision>1 ? f.f : f.team;
 	this.teams.forEach(function(t,ti){
-		let tf = teamArr[ti] || [];
+		const tf = teamArr[ti] || [];
 		t.forEach(function(st,sti){
-			let fst = tf[sti] || [];
+			const fst = tf[sti] || [];
 			st.forEach(function(m,mi){
-				let fm = fst[mi];
+				const fm = fst[mi];
 				m.loadObj(fm,dataVeision);
 			});
 		});
@@ -1977,17 +1980,18 @@ function editBoxChangeMonId(id)
 	const monLatentAllowUl = rowLatent.querySelector(".m-latent-allowable-ul");
 	//该宠Type允许的杀,uniq是去重的自定义函数
 	const allowLatent = [].concat(...card.types.filter(i=>i>=0).map(type=>type_allowable_latent[type])).uniq();
-	for(let li=17;li<=24;li++) //显示允许的杀，隐藏不允许的杀
-	{
-		const latentDom = monLatentAllowUl.querySelector(`.latent-icon[data-latent-icon='${li}']`);
-		if (allowLatent.includes(li))
+	typekiller_for_type.forEach(type=>{ //显示允许的杀，隐藏不允许的杀
+		const latentDom = monLatentAllowUl.querySelector(`.latent-icon[data-latent-icon='${type.latent}']`);
+		if (!latentDom) return;
+		if (allowLatent.includes(type.latent))
 		{
-			latentDom.classList.remove("unselected-latent");
+			latentDom.classList.remove("unallowable-latent");
 		}else
 		{
-			latentDom.classList.add("unselected-latent");
+			latentDom.classList.add("unallowable-latent");
 		}
-	}
+	})
+
 	//怪物主动技能
 	const rowSkill = settingBox.querySelector(".row-mon-skill");
 	const skillBox = rowSkill.querySelector(".skill-box");

solo.html

@@ -722,27 +722,28 @@ var formation = new Formation(teamsCount,6);
 					<li class="latent-icon" data-latent-icon="10"></li><!--暗盾-->
 					<li class="latent-icon" data-latent-icon="11"></li><!--防坐-->
 					<li class="latent-icon" data-latent-icon="12"></li><!--三维-->
-					<li class="latent-icon" data-latent-icon="13"></li><!--进化杀-->
-					<li class="latent-icon" data-latent-icon="14"></li><!--觉醒杀-->
-					<li class="latent-icon" data-latent-icon="15"></li><!--强化杀-->
-					<li class="latent-icon" data-latent-icon="16"></li><!--卖钱杀-->
-					<li class="latent-icon" data-latent-icon="17"></li><!--神杀-->
-					<li class="latent-icon" data-latent-icon="18"></li><!--龙杀-->
-					<li class="latent-icon" data-latent-icon="19"></li><!--恶魔杀-->
-					<li class="latent-icon" data-latent-icon="20"></li><!--机械杀-->
-					<li class="latent-icon" data-latent-icon="21"></li><!--平衡杀-->
-					<li class="latent-icon" data-latent-icon="22"></li><!--攻击杀-->
-					<li class="latent-icon" data-latent-icon="23"></li><!--体力杀-->
-					<li class="latent-icon" data-latent-icon="24"></li><!--回复杀-->
-					<li class="latent-icon" data-latent-icon="25"></li><!--大HP-->
-					<li class="latent-icon" data-latent-icon="26"></li><!--大攻击-->
-					<li class="latent-icon" data-latent-icon="27"></li><!--大回复-->
-					<li class="latent-icon" data-latent-icon="28"></li><!--大手指-->
-					<li class="latent-icon" data-latent-icon="29"></li><!--大火盾-->
-					<li class="latent-icon" data-latent-icon="30"></li><!--大水盾-->
-					<li class="latent-icon" data-latent-icon="31"></li><!--大木盾-->
-					<li class="latent-icon" data-latent-icon="32"></li><!--大光盾-->
-					<li class="latent-icon" data-latent-icon="33"></li><!--大暗盾-->
+					<!--有3个未启用-->
+					<li class="latent-icon" data-latent-icon="16"></li><!--进化杀-->
+					<li class="latent-icon" data-latent-icon="17"></li><!--觉醒杀-->
+					<li class="latent-icon" data-latent-icon="18"></li><!--强化杀-->
+					<li class="latent-icon" data-latent-icon="19"></li><!--卖钱杀-->
+					<li class="latent-icon" data-latent-icon="20"></li><!--神杀-->
+					<li class="latent-icon" data-latent-icon="21"></li><!--龙杀-->
+					<li class="latent-icon" data-latent-icon="22"></li><!--恶魔杀-->
+					<li class="latent-icon" data-latent-icon="23"></li><!--机械杀-->
+					<li class="latent-icon" data-latent-icon="24"></li><!--平衡杀-->
+					<li class="latent-icon" data-latent-icon="25"></li><!--攻击杀-->
+					<li class="latent-icon" data-latent-icon="26"></li><!--体力杀-->
+					<li class="latent-icon" data-latent-icon="27"></li><!--回复杀-->
+					<li class="latent-icon" data-latent-icon="28"></li><!--大HP-->
+					<li class="latent-icon" data-latent-icon="29"></li><!--大攻击-->
+					<li class="latent-icon" data-latent-icon="30"></li><!--大回复-->
+					<li class="latent-icon" data-latent-icon="31"></li><!--大手指-->
+					<li class="latent-icon" data-latent-icon="32"></li><!--大火盾-->
+					<li class="latent-icon" data-latent-icon="33"></li><!--大水盾-->
+					<li class="latent-icon" data-latent-icon="34"></li><!--大木盾-->
+					<li class="latent-icon" data-latent-icon="35"></li><!--大光盾-->
+					<li class="latent-icon" data-latent-icon="36"></li><!--大暗盾-->
 				</ul>
 			</div>
 			<div class="setting-row row-mon-skill">

style-monsterimages.css

@@ -646,129 +646,134 @@
 	background-image: url(images/latent.png);
 	background-position-x: 0;
 }
+.latent-icon[data-latent-icon]{
+	width: 76px;
+}
+.latent-icon[data-latent-icon='1'],
+.latent-icon[data-latent-icon='2'],
+.latent-icon[data-latent-icon='3'],
+.latent-icon[data-latent-icon='4'],
+.latent-icon[data-latent-icon='5'],
+.latent-icon[data-latent-icon='6'],
+.latent-icon[data-latent-icon='7'],
+.latent-icon[data-latent-icon='8'],
+.latent-icon[data-latent-icon='9'],
+.latent-icon[data-latent-icon='10'],
+.latent-icon[data-latent-icon='11']
+{
+	width: 32px;
+}
 .latent-icon[data-latent-icon='1']{ /*HP*/
-	background-position-y: -32px;
+	background-position-y: calc(-32px * 1);
 }
 .latent-icon[data-latent-icon='2']{ /*攻击*/
-	background-position-y: -64px;
+	background-position-y: calc(-32px * 2);
 }
 .latent-icon[data-latent-icon='3']{ /*回复*/
-	background-position-y: -96px;
+	background-position-y: calc(-32px * 3);
 }
 .latent-icon[data-latent-icon='4']{ /*手指*/
-	background-position-y: -128px;
+	background-position-y: calc(-32px * 4);
 }
 .latent-icon[data-latent-icon='5']{ /*自回*/
-	background-position-y: -160px;
+	background-position-y: calc(-32px * 5);
 }
 .latent-icon[data-latent-icon='6']{ /*火盾*/
-	background-position-y: -192px;
+	background-position-y: calc(-32px * 6);
 }
 .latent-icon[data-latent-icon='7']{ /*水盾*/
-	background-position-y: -224px;
+	background-position-y: calc(-32px * 7);
 }
 .latent-icon[data-latent-icon='8']{ /*木盾*/
-	background-position-y: -256px;
+	background-position-y: calc(-32px * 8);
 }
 .latent-icon[data-latent-icon='9']{ /*光盾*/
-	background-position-y: -288px;
+	background-position-y: calc(-32px * 9);
 }
 .latent-icon[data-latent-icon='10']{ /*暗盾*/
-	background-position-y: -320px;
+	background-position-y: calc(-32px * 10);
 }
 .latent-icon[data-latent-icon='11']{ /*防坐*/
-	background-position-y: -352px;
+	background-position-y: calc(-32px * 11);
 }
 .latent-icon[data-latent-icon='12']{ /*三维*/
-	background-position-y: -384px;
+	background-position-y: calc(-32px * 12);
 }
-.latent-icon[data-latent-icon='13']{ /*进化杀*/
-	background-position-y: -416px;
+/* 目前暂未启用的潜觉
+.latent-icon[data-latent-icon='13']{
+	background-position-y: calc(-32px * 13);
 }
-.latent-icon[data-latent-icon='14']{ /*觉醒杀*/
-	background-position-y: -448px;
+.latent-icon[data-latent-icon='14']{
+	background-position-y: calc(-32px * 14);
 }
-.latent-icon[data-latent-icon='15']{ /*强化杀*/
-	background-position-y: -480px;
+.latent-icon[data-latent-icon='15']{
+	background-position-y: calc(-32px * 15);
 }
-.latent-icon[data-latent-icon='16']{ /*卖钱杀*/
-	background-position-y: -512px;
+*/
+.latent-icon[data-latent-icon='16']{ /*进化杀*/
+	background-position-y: calc(-32px * 16);
 }
-.latent-icon[data-latent-icon='17']{ /*神杀*/
-	background-position-y: -544px;
+.latent-icon[data-latent-icon='17']{ /*觉醒杀*/
+	background-position-y: calc(-32px * 17);
 }
-.latent-icon[data-latent-icon='18']{ /*龙杀*/
-	background-position-y: -576px;
+.latent-icon[data-latent-icon='18']{ /*强化杀*/
+	background-position-y: calc(-32px * 18);
 }
-.latent-icon[data-latent-icon='19']{ /*恶魔杀*/
-	background-position-y: -608px;
+.latent-icon[data-latent-icon='19']{ /*卖钱杀*/
+	background-position-y: calc(-32px * 19);
 }
-.latent-icon[data-latent-icon='20']{ /*机械杀*/
-	background-position-y: -640px;
+.latent-icon[data-latent-icon='20']{ /*神杀*/
+	background-position-y: calc(-32px * 20);
 }
-.latent-icon[data-latent-icon='21']{ /*平衡杀*/
-	background-position-y: -672px;
+.latent-icon[data-latent-icon='21']{ /*龙杀*/
+	background-position-y: calc(-32px * 21);
 }
-.latent-icon[data-latent-icon='22']{ /*攻击杀*/
-	background-position-y: -704px;
+.latent-icon[data-latent-icon='22']{ /*恶魔杀*/
+	background-position-y: calc(-32px * 22);
 }
-.latent-icon[data-latent-icon='23']{ /*体力杀*/
-	background-position-y: -736px;
+.latent-icon[data-latent-icon='23']{ /*机械杀*/
+	background-position-y: calc(-32px * 23);
 }
-.latent-icon[data-latent-icon='24']{ /*回复杀*/
-	background-position-y: -768px;
+.latent-icon[data-latent-icon='24']{ /*平衡杀*/
+	background-position-y: calc(-32px * 24);
 }
-.latent-icon[data-latent-icon='25']{ /*大HP*/
-	background-position-y: -800px;
+.latent-icon[data-latent-icon='25']{ /*攻击杀*/
+	background-position-y: calc(-32px * 25);
 }
-.latent-icon[data-latent-icon='26']{ /*大攻击*/
-	background-position-y: -832px;
+.latent-icon[data-latent-icon='26']{ /*体力杀*/
+	background-position-y: calc(-32px * 26);
 }
-.latent-icon[data-latent-icon='27']{ /*大回复*/
-	background-position-y: -864px;
+.latent-icon[data-latent-icon='27']{ /*回复杀*/
+	background-position-y: calc(-32px * 27);
 }
-.latent-icon[data-latent-icon='28']{ /*大手指*/
-	background-position-y: -896px;
+.latent-icon[data-latent-icon='28']{ /*大HP*/
+	background-position-y: calc(-32px * 28);
 }
-.latent-icon[data-latent-icon='29']{ /*大火盾*/
-	background-position-y: -928px;
+.latent-icon[data-latent-icon='29']{ /*大攻击*/
+	background-position-y: calc(-32px * 29);
 }
-.latent-icon[data-latent-icon='30']{ /*大水盾*/
-	background-position-y: -960px;
+.latent-icon[data-latent-icon='30']{ /*大回复*/
+	background-position-y: calc(-32px * 30);
 }
-.latent-icon[data-latent-icon='31']{ /*大木盾*/
-	background-position-y: -992px;
+.latent-icon[data-latent-icon='31']{ /*大手指*/
+	background-position-y: calc(-32px * 31);
 }
-.latent-icon[data-latent-icon='32']{ /*大光盾*/
-	background-position-y: -1024px;
+.latent-icon[data-latent-icon='32']{ /*大火盾*/
+	background-position-y: calc(-32px * 32);
 }
-.latent-icon[data-latent-icon='33']{ /*大暗盾*/
-	background-position-y: -1056px;
+.latent-icon[data-latent-icon='33']{ /*大水盾*/
+	background-position-y: calc(-32px * 33);
 }
-.latent-icon[data-latent-icon='12'],
-.latent-icon[data-latent-icon='13'],
-.latent-icon[data-latent-icon='14'],
-.latent-icon[data-latent-icon='15'],
-.latent-icon[data-latent-icon='16'],
-.latent-icon[data-latent-icon='17'],
-.latent-icon[data-latent-icon='18'],
-.latent-icon[data-latent-icon='19'],
-.latent-icon[data-latent-icon='20'],
-.latent-icon[data-latent-icon='21'],
-.latent-icon[data-latent-icon='22'],
-.latent-icon[data-latent-icon='23'],
-.latent-icon[data-latent-icon='24'],
-.latent-icon[data-latent-icon='25'],
-.latent-icon[data-latent-icon='26'],
-.latent-icon[data-latent-icon='27'],
-.latent-icon[data-latent-icon='28'],
-.latent-icon[data-latent-icon='29'],
-.latent-icon[data-latent-icon='30'],
-.latent-icon[data-latent-icon='31'],
-.latent-icon[data-latent-icon='32'],
-.latent-icon[data-latent-icon='33']{
-	width: 76px;
+.latent-icon[data-latent-icon='34']{ /*大木盾*/
+	background-position-y: calc(-32px * 34);
+}
+.latent-icon[data-latent-icon='35']{ /*大光盾*/
+	background-position-y: calc(-32px * 35);
 }
+.latent-icon[data-latent-icon='36']{ /*大暗盾*/
+	background-position-y: calc(-32px * 36);
+}
+
 /*
 var sawokens = [
 	"HP",
@@ -783,6 +788,9 @@ var sawokens = [
 	"暗盾",
 	"防坐",
 	"三维",
+	null,
+	null,
+	null,
 	"进化杀",
 	"觉醒杀",
 	"强化杀",

style.css

@@ -547,35 +547,30 @@ ul{
 	/*-152 * (1 - 0.63) + 108 - 152 * 0.63，化简为108 - 152*/
 }
 
-.team-latents .latent-icon{
+.team-latents .latent-icon
+{
 	margin-left: 3px;
 	margin-right: 3px;
 }
-.team-latents .latent-icon[data-latent-icon='12'],
-.team-latents .latent-icon[data-latent-icon='13'],
-.team-latents .latent-icon[data-latent-icon='14'],
-.team-latents .latent-icon[data-latent-icon='15'],
-.team-latents .latent-icon[data-latent-icon='16'],
-.team-latents .latent-icon[data-latent-icon='17'],
-.team-latents .latent-icon[data-latent-icon='18'],
-.team-latents .latent-icon[data-latent-icon='19'],
-.team-latents .latent-icon[data-latent-icon='20'],
-.team-latents .latent-icon[data-latent-icon='21'],
-.team-latents .latent-icon[data-latent-icon='22'],
-.team-latents .latent-icon[data-latent-icon='23'],
-.team-latents .latent-icon[data-latent-icon='24'],
-.team-latents .latent-icon[data-latent-icon='25'],
-.team-latents .latent-icon[data-latent-icon='26'],
-.team-latents .latent-icon[data-latent-icon='27'],
-.team-latents .latent-icon[data-latent-icon='28'],
-.team-latents .latent-icon[data-latent-icon='29'],
-.team-latents .latent-icon[data-latent-icon='30'],
-.team-latents .latent-icon[data-latent-icon='31'],
-.team-latents .latent-icon[data-latent-icon='32'],
-.team-latents .latent-icon[data-latent-icon='33']
+.team-latents .latent-icon[data-latent-icon]
 {
 	margin: 0;
 }
+.team-latents .latent-icon[data-latent-icon='1'],
+.team-latents .latent-icon[data-latent-icon='2'],
+.team-latents .latent-icon[data-latent-icon='3'],
+.team-latents .latent-icon[data-latent-icon='4'],
+.team-latents .latent-icon[data-latent-icon='5'],
+.team-latents .latent-icon[data-latent-icon='6'],
+.team-latents .latent-icon[data-latent-icon='7'],
+.team-latents .latent-icon[data-latent-icon='8'],
+.team-latents .latent-icon[data-latent-icon='9'],
+.team-latents .latent-icon[data-latent-icon='10'],
+.team-latents .latent-icon[data-latent-icon='11']
+{
+	margin-left: 3px;
+	margin-right: 3px;
+}
 /*队长的边框*/
 .team-box .team-members .team-leader .monster{
 	border-radius: 10px;
@@ -1333,7 +1328,7 @@ ul{
 	cursor: pointer;
 }
 /*不允许使用的潜觉，不是手指，半透明，灰度*/
-.m-latent-allowable-ul .latent-icon.unselected-latent{
+.m-latent-allowable-ul .latent-icon.unallowable-latent{
 	cursor: default;
 	opacity: var(--search-icon-unchecked);
 	filter: grayscale(100%);

triple.html

@@ -1357,27 +1357,28 @@ var formation = new Formation(teamsCount,6);
 					<li class="latent-icon" data-latent-icon="10"></li><!--暗盾-->
 					<li class="latent-icon" data-latent-icon="11"></li><!--防坐-->
 					<li class="latent-icon" data-latent-icon="12"></li><!--三维-->
-					<li class="latent-icon" data-latent-icon="13"></li><!--进化杀-->
-					<li class="latent-icon" data-latent-icon="14"></li><!--觉醒杀-->
-					<li class="latent-icon" data-latent-icon="15"></li><!--强化杀-->
-					<li class="latent-icon" data-latent-icon="16"></li><!--卖钱杀-->
-					<li class="latent-icon" data-latent-icon="17"></li><!--神杀-->
-					<li class="latent-icon" data-latent-icon="18"></li><!--龙杀-->
-					<li class="latent-icon" data-latent-icon="19"></li><!--恶魔杀-->
-					<li class="latent-icon" data-latent-icon="20"></li><!--机械杀-->
-					<li class="latent-icon" data-latent-icon="21"></li><!--平衡杀-->
-					<li class="latent-icon" data-latent-icon="22"></li><!--攻击杀-->
-					<li class="latent-icon" data-latent-icon="23"></li><!--体力杀-->
-					<li class="latent-icon" data-latent-icon="24"></li><!--回复杀-->
-					<li class="latent-icon" data-latent-icon="25"></li><!--大HP-->
-					<li class="latent-icon" data-latent-icon="26"></li><!--大攻击-->
-					<li class="latent-icon" data-latent-icon="27"></li><!--大回复-->
-					<li class="latent-icon" data-latent-icon="28"></li><!--大手指-->
-					<li class="latent-icon" data-latent-icon="29"></li><!--大火盾-->
-					<li class="latent-icon" data-latent-icon="30"></li><!--大水盾-->
-					<li class="latent-icon" data-latent-icon="31"></li><!--大木盾-->
-					<li class="latent-icon" data-latent-icon="32"></li><!--大光盾-->
-					<li class="latent-icon" data-latent-icon="33"></li><!--大暗盾-->
+					<!--有3个未启用-->
+					<li class="latent-icon" data-latent-icon="16"></li><!--进化杀-->
+					<li class="latent-icon" data-latent-icon="17"></li><!--觉醒杀-->
+					<li class="latent-icon" data-latent-icon="18"></li><!--强化杀-->
+					<li class="latent-icon" data-latent-icon="19"></li><!--卖钱杀-->
+					<li class="latent-icon" data-latent-icon="20"></li><!--神杀-->
+					<li class="latent-icon" data-latent-icon="21"></li><!--龙杀-->
+					<li class="latent-icon" data-latent-icon="22"></li><!--恶魔杀-->
+					<li class="latent-icon" data-latent-icon="23"></li><!--机械杀-->
+					<li class="latent-icon" data-latent-icon="24"></li><!--平衡杀-->
+					<li class="latent-icon" data-latent-icon="25"></li><!--攻击杀-->
+					<li class="latent-icon" data-latent-icon="26"></li><!--体力杀-->
+					<li class="latent-icon" data-latent-icon="27"></li><!--回复杀-->
+					<li class="latent-icon" data-latent-icon="28"></li><!--大HP-->
+					<li class="latent-icon" data-latent-icon="29"></li><!--大攻击-->
+					<li class="latent-icon" data-latent-icon="30"></li><!--大回复-->
+					<li class="latent-icon" data-latent-icon="31"></li><!--大手指-->
+					<li class="latent-icon" data-latent-icon="32"></li><!--大火盾-->
+					<li class="latent-icon" data-latent-icon="33"></li><!--大水盾-->
+					<li class="latent-icon" data-latent-icon="34"></li><!--大木盾-->
+					<li class="latent-icon" data-latent-icon="35"></li><!--大光盾-->
+					<li class="latent-icon" data-latent-icon="36"></li><!--大暗盾-->
 				</ul>
 			</div>
 			<div class="setting-row row-mon-skill">