Merge branch 'master' into service-worker

languages/en.js

@@ -58,7 +58,7 @@
 			skill_boost_range: tp`~${'turns'}`,
 			add_combo: tp`Adds ${'value'} combos${'icon'}`,
 			fixed_time: tp`[${'icon'}Fixed orb move time: ${'value'}]`,
-			min_match_length: tp`unable to erase ${'unmatchable'} Orbs or less`, //matchable, unmatchable
+			min_match_length: tp`[Only able to erase ≥${'matchable'} orbs]`, //matchable, unmatchable
 			drop_refresh: tp`Replaces all orbs`,
 			drum: tp`Plus a drumming sound is made when Orbs are moved`,
 			auto_path: tp`Shows 3 combo path (Norm. Dungeon & 3 linked Orbs only)`,
@@ -152,10 +152,13 @@
 			x_awakenings: tp`count of ${'awakenings'} ×${'value'}`,
 		},
 		target: {
+			unknown: tp`Unkown Target`,
 			self: tp`card's`,
-			enemy: tp`Enemy`,
 			team: tp`team`,
 			team_last: tp`the lastest member`,
+			team_leader: tp`leader`,
+			team_sub: tp`sub-monsters`,
+			enemy: tp`Enemy`,
 			enemy_all: tp`all enemys`,
 			enemy_one: tp`1 enemy`,
 			enemy_attr: tp`${'attr'} enemy`,

languages/icon-en.css

@@ -11,9 +11,11 @@
 }
 .latent-icon[data-latent-icon='17']::before,
 .latent-icon[data-latent-icon='37']::before,
-.latent-icon[data-latent-icon='39']::before
+.latent-icon[data-latent-icon='39']::before,
+.team-latents .latent-icon[data-latent-icon='37']+.latent-icon::before,
+.team-latents .latent-icon[data-latent-icon='39']+.latent-icon::before
 {
-	background-position-x: -252px;
+	background-position-x: -32px;
 }
 
 .tIf-total-hp .awoken-bind::before,
@@ -28,5 +30,5 @@
 .icon-skill[data-icon-type="damage-absorb"],
 .icon-skill[data-icon-type="damage-void"]
 {
-	background-position-x: calc(-36px * 1);
+	background-position-x: -36px;
 }

monsters-info/ckey.json

@@ -1 +1 @@
-[{"code":"ja","ckey":{"card":"563f29c4be5e4c52f964936ddafe2803","skill":"88fef10970210f97da73ffa067e66164"},"updateTime":1633692515009},{"code":"en","ckey":{"card":"f10f92e7ff191792c27f0f9f82bd7291","skill":"1d36659ae49f1229620336fe847cfbed"},"updateTime":1633692515009},{"code":"ko","ckey":{"card":"787434b7bda10f53dd32c2791587084b","skill":"5ee0e5b08daefe101248f74a40397ef0"},"updateTime":1633692515009}]
+[{"code":"ja","ckey":{"card":"e272bb34f9cdedc698fa5fbbe0e7e710","skill":"105fa55b18e33690b7559721c2d11224"},"updateTime":1634798910326},{"code":"en","ckey":{"card":"47fa848b4ea328d43a98148ccc94610d","skill":"576311cbfc2dec5d780fd7df63620225"},"updateTime":1634798910326},{"code":"ko","ckey":{"card":"94ec59fd10335cb3e2ac5589bf8c8190","skill":"b54973dbaad4d3ec0ad385d1ac3d8ded"},"updateTime":1634798910326}]

multi.html

@@ -983,8 +983,8 @@ var formation = new Formation(teamsCount,5);
 		<div class="setting-box">
 			<div class="setting-row row-mon-id">
 				<input type="checkbox" class="config-checkbox-ipt" name="real-time-change-card" id="real-time-change-card"><label class="config-checkbox-lbl real-time-change-card-label" for="real-time-change-card"><div class="config-checkbox-lbl-cicle"></div></label>
-				<button class="open-evolutionary-tree"></button>
-				<button class="search-evolution-by-this"><icon class="type-icon" data-type-icon="0"></icon></button>
+				<button class="open-evolutionary-tree display-none"></button>
+				<button class="search-evolution-by-this display-none"><icon class="type-icon" data-type-icon="0"></icon></button>
 				<input type="search" class="m-id" list="monsters-name-list"/><button class="search-by-string"></button>
 				<datalist id="monsters-name-list"></datalist>
 				<ul class="evo-card-list"></ul>

script-json_data.js

@@ -165,10 +165,13 @@ let localTranslating = {
 			x_awakenings: tp`${'awakenings'}数量×${'value'}`,
 		},
 		target: {
+			unknown: tp`未知目标`,
 			self: tp`角色自身`,
-			enemy: tp`敌人`,
 			team: tp`队伍`,
 			team_last: tp`队伍最后一位队员`,
+			team_leader: tp`队长`,
+			team_sub: tp`队员`,
+			enemy: tp`敌人`,
 			enemy_all: tp`敌方全体`,
 			enemy_one: tp`敌方1体`,
 			enemy_attr: tp`${'attr'}敌人`,
@@ -436,6 +439,7 @@ const pdcLatentMap = [
 	{pdf:11,pdc:12}, //防坐
 	{pdf:12,pdc:3}, //三维
 	{pdf:13,pdc:35}, //不被换队长
+	{pdf:13,pdc:47}, //不被换队长 ×1.5
 	{pdf:14,pdc:37}, //不掉废
 	{pdf:15,pdc:36}, //不掉毒
 	{pdf:16,pdc:24}, //进化杀
@@ -460,10 +464,15 @@ const pdcLatentMap = [
 	{pdf:35,pdc:31}, //大光盾
 	{pdf:36,pdc:32}, //大暗盾
 	{pdf:37,pdc:33}, //6色破无效
+	{pdf:37,pdc:45}, //6色破无效 ×1.5
 	{pdf:38,pdc:34}, //3色破属吸
+	{pdf:38,pdc:46}, //3色破属吸 ×1.5
 	{pdf:39,pdc:40}, //C珠破吸
+	{pdf:39,pdc:50}, //C珠破吸 ×1.5
 	{pdf:40,pdc:39}, //心横解转转
+	{pdf:40,pdc:49}, //心横解转转 ×1.5
 	{pdf:41,pdc:38}, //U解禁消
+	{pdf:41,pdc:48}, //U解禁消 ×1.5
 	{pdf:42,pdc:41}, //伤害上限解除
 	{pdf:43,pdc:42}, //HP++
 	{pdf:44,pdc:43}, //攻击++
@@ -1859,7 +1868,7 @@ const specialSearchFunctions = (function() {
 					return fragment;
 				}
 			},
-			{name:"ATK rate change(Single)",otLangName:{chs:"单人攻击力 buff"},
+			{name:"ATK rate change(on member)",otLangName:{chs:"队员攻击力 buff"},
 				function:cards=>{
 					const searchTypeArray = [230];
 					return cards.filter(card=>{
@@ -1871,8 +1880,23 @@ const specialSearchFunctions = (function() {
 					const searchTypeArray = [230];
 					const skill = getCardActiveSkill(card, searchTypeArray);
 					const sk = skill.params;
-		
-					return `${sk[2]}%×${sk[0]}T`;
+					let str = '';
+					switch (sk[1]) {
+						case 1: {
+							str+="自身";
+							break;
+						}
+						case 2: {
+							str+="队长";
+							break;
+						}
+						case 8: {
+							str+="队员";
+							break;
+						}
+					}
+					str+=`${sk[2] / 100}倍×${sk[0]}T`;
+					return str;
 			}
 			},
 			{name:"Move time change",otLangName:{chs:"操作时间 buff（顶手指）"},

script-skill-parser.js

@@ -989,7 +989,8 @@ const parsers = {
 	[69](attr, type, mul) { return powerUp([attr], [type], p.mul({ atk: mul })); },
   
 	[71](...attrs) { return boardChange(attrs.filter(attr => attr >= 0)); },
-  
+	//据说是破除敌人的守护盾，但是因为重来没有实装过，所以不知道实际效果
+	[72](turns) { return activeTurns(turns, voidEnemyBuff(['guard'])); },
 	[73](attr, type, mul) { return powerUp([attr], [type], p.mul({ hp: mul, atk: mul })); },
   
 	[75](attr, type, mul) { return powerUp([attr], [type], p.mul({ atk: mul, rcv: mul })); },
@@ -1384,9 +1385,24 @@ const parsers = {
 	[229](attrs, types, hp, atk, rcv) {
 		return powerUp(null, null, p.scaleStateKindCount(null, flags(attrs), flags(types), p.mul({hp: hp, atk: atk, rcv: rcv})));
 	},
-	[230](turns, target, mul) { return activeTurns(turns, powerUp({target: target}, null, p.mul({ atk: mul }))); },
+	[230](turns, target, mul) {
+		/*const targetType = {
+			"self": Boolean(target & 1<<0),
+			"leader": Boolean(target & 1<<1),
+			"sub-monsters": Boolean(target & 1<<3),
+		}*/
+		const targetType = (target=>{
+			switch (target) {
+				case 1: return "self";
+				case 2: return "leader";
+				case 8: return "sub-monsters";
+				default: return target;
+			}
+		})(target);
+		return activeTurns(turns, powerUp({target: targetType}, null, p.mul({ atk: mul })));
+	},
 	[1000](type, pos, ...ids) {
-		let posType = (type=>{
+		const posType = (type=>{
 			switch (type) {
 				case 1: return "after-me";
 				case 2: return "designated-position";
@@ -2063,9 +2079,26 @@ function renderSkill(skill, option = {})
 				targetDict.types = renderTypes(types || [], {affix: true});
 				attrs_types.push(targetDict.types);
 			}
-			if (target == 1)
+			if (target != undefined)
 			{
-				targetDict.target = tsp.target.self();
+				switch (target) {
+					case "self": {
+						targetDict.target = tsp.target.self();
+						break;
+					}
+					case "leader": {
+						targetDict.target = tsp.target.team_leader();
+						break;
+					}
+					case "sub-monsters": {
+						targetDict.target = tsp.target.team_sub();
+						break;
+					}
+					default: {
+						targetDict.target = tsp.target.unknown();
+						break;
+					}
+				}
 				attrs_types.push(targetDict.target);
 			}
 			if (attrs_types.length)

script.js

@@ -1407,7 +1407,7 @@ function pdcFotmationToPdfFotmation(inputString)
 			a.id = member.get(9) || 0; //延迟是-1刚好一样
 			if (member.get(2))
 			{
-				m.latent = member.get(2).map(pdcLatent=>pdcLatentMap.find(latent=>latent.pdc === pdcLatent).pdf);
+				m.latent = member.get(2).map(pdcLatent=>pdcLatentMap.find(latent=>latent.pdc === pdcLatent)?.pdf ?? 0);
 			}
 			m.level = member.get(3) || 1;
 			a.level = member.get(10) || 1;
@@ -3365,7 +3365,8 @@ function initialize(event) {
 
 	//已有觉醒的去除
 	function deleteLatent(e) {
-		const aIdx = editBox.latent.indexOf(parseInt(this.getAttribute("data-latent-icon")));
+		const lIdx = parseInt(this.getAttribute("data-latent-icon"), 10); //潜觉的序号
+		const aIdx = editBox.latent.indexOf(lIdx);
 		if (aIdx >= 0)
 		{
 			editBox.latent.splice(aIdx, 1);
@@ -3412,7 +3413,9 @@ function initialize(event) {
 			awoken: awoken,
 			latent: latent
 		};
+
 		const abilitys = calculateAbility(tempMon, null, solo, teamsCount);
+		toggleDomClassName(level > 110, "level-super-break", monEditLatentUl); //切换潜觉为120级
 
 		monEditHpValue.textContent = abilitys ? abilitys[0][0].toLocaleString() : 0;
 		monEditAtkValue.textContent = abilitys ? abilitys[1][0].toLocaleString() : 0;
@@ -3703,7 +3706,7 @@ function changeid(mon, monDom, latentDom) {
 	}
 	const levelDom = monDom.querySelector(".level");
 	if (levelDom) { //如果提供了等级
-		const level = mon.level || 1;
+		const level = mon.level ?? 1;
 		levelDom.setAttribute(dataAttrName, level);
 
 		toggleDomClassName(level === card.maxLevel, "max", levelDom);
@@ -3766,14 +3769,16 @@ function changeid(mon, monDom, latentDom) {
 	if (latentDom) {
 		if (mon.latent) //如果提供了潜觉
 		{
+			const level = mon.level ?? 1;
 			const latent = mon.latent;
 			if (latent.length < 1) {
 				latentDom.classList.add(className_displayNone);
 			} else {
 				const latentDoms = Array.from(latentDom.querySelectorAll("li"));
-				refreshLatent(latent, mon.id, latentDoms);
+				refreshLatent(latent, mon.id, latentDoms, {sort:true});
 				latentDom.classList.remove(className_displayNone);
 			}
+			toggleDomClassName(level > 110, "level-super-break", latentDom); //切换潜觉为120级
 		} else {
 			latentDom.classList.add(className_displayNone);
 		}
@@ -3820,9 +3825,10 @@ function changeid(mon, monDom, latentDom) {
 	parentNode.appendChild(fragment);
 }
 //刷新潜觉
-function refreshLatent(latent, monid, iconArr) {
+function refreshLatent(latent, monid, iconArr, option) {
 	const maxLatentCount = getMaxLatentCount(monid); //最大潜觉数量
-	latent = latent.concat().sort((a, b) => latentUseHole(b) - latentUseHole(a));
+	latent = latent.concat();
+	if (option?.sort) latent.sort((a, b) => latentUseHole(b) - latentUseHole(a));
 	let latentIndex = 0,
 		usedHoleN = 0;
 	for (let ai = 0; ai < iconArr.length; ai++) {
@@ -3839,8 +3845,8 @@ function refreshLatent(latent, monid, iconArr) {
 			icon.removeAttribute("data-latent-icon");
 		} else if (ai < maxLatentCount) //没有使用的空格觉醒
 		{
-			icon.removeAttribute("data-latent-icon");
 			icon.classList.remove(className_displayNone);
+			icon.removeAttribute("data-latent-icon");
 		} else //不需要显示的部分
 		{
 			icon.classList.add(className_displayNone);
@@ -3920,8 +3926,8 @@ function editMon(teamNum, isAssist, indexInTeam) {
 }
 //编辑窗，修改怪物ID
 function editBoxChangeMonId(id) {
-	const card = Cards[id] || Cards[0]; //怪物固定数据
-	if (card.id == 0) {
+	const card = Cards[id] ?? Cards[0]; //怪物固定数据
+	if (card.id === 0) {
 		id = 0;
 	}
 	//const skill = Skills[card.activeSkillId];

solo.html

@@ -840,8 +840,8 @@ var formation = new Formation(teamsCount,6);
 		<div class="setting-box">
 			<div class="setting-row row-mon-id">
 				<input type="checkbox" class="config-checkbox-ipt" name="real-time-change-card" id="real-time-change-card"><label class="config-checkbox-lbl real-time-change-card-label" for="real-time-change-card"><div class="config-checkbox-lbl-cicle"></div></label>
-				<button class="open-evolutionary-tree"></button>
-				<button class="search-evolution-by-this"><icon class="type-icon" data-type-icon="0"></icon></button>
+				<button class="open-evolutionary-tree display-none"></button>
+				<button class="search-evolution-by-this display-none"><icon class="type-icon" data-type-icon="0"></icon></button>
 				<input type="search" class="m-id" list="monsters-name-list"/><button class="search-by-string"></button>
 				<datalist id="monsters-name-list"></datalist>
 				<ul class="evo-card-list"></ul>

style-monsterimages.css

@@ -701,21 +701,26 @@ icon.type
 /*潜在觉醒*/
 .latent-icon{
 	display:inline-block;
+	text-align: center;
 	background: rgba(33,28,21,0.5);
 	border: 2px ridge rgba(82,82,60,0.5);
 	border-radius: 5px;
 	box-sizing: border-box;
 	box-shadow:inset 0 2px 1px -1px rgba(0,0,0,0.5);
 }
-.latent-icon::before{
-	content: "";
+.latent-icon::before,
+.ds-ja .latent-icon::after /*目前x1.5暂时只有日服支持，美服支持后删除.ds-ja*/
+{
 	display: inline-block;
 	margin: -2px;
 	width: 32px;
 	height: 32px;
-	background-image: url(images/latent.png);
+	background-image: url(images/icon-latent.png);
 	background-repeat: no-repeat;
 }
+.latent-icon::before{
+	content: "";
+}
 .latent-icon.latent-lock::before{
 	background-position-x: -32px;
 }
@@ -727,43 +732,51 @@ icon.type
 .latent-icon[data-latent-icon]::before{
 	background-position-x: 0;
 }
-.latent-icon[data-latent-icon='12']::before,
-.latent-icon[data-latent-icon='16']::before,
-.latent-icon[data-latent-icon='17']::before,
-.latent-icon[data-latent-icon='18']::before,
-.latent-icon[data-latent-icon='19']::before,
-.latent-icon[data-latent-icon='20']::before,
-.latent-icon[data-latent-icon='21']::before,
-.latent-icon[data-latent-icon='22']::before,
-.latent-icon[data-latent-icon='23']::before,
-.latent-icon[data-latent-icon='24']::before,
-.latent-icon[data-latent-icon='25']::before,
-.latent-icon[data-latent-icon='26']::before,
-.latent-icon[data-latent-icon='27']::before,
-.latent-icon[data-latent-icon='28']::before,
-.latent-icon[data-latent-icon='29']::before,
-.latent-icon[data-latent-icon='30']::before,
-.latent-icon[data-latent-icon='31']::before,
-.latent-icon[data-latent-icon='32']::before,
-.latent-icon[data-latent-icon='33']::before,
-.latent-icon[data-latent-icon='34']::before,
-.latent-icon[data-latent-icon='35']::before,
-.latent-icon[data-latent-icon='36']::before,
-.latent-icon[data-latent-icon='43']::before,
-.latent-icon[data-latent-icon='44']::before,
-.latent-icon[data-latent-icon='45']::before
+/* 2格的 潜觉 */
+.m-latent-ul .latent-icon[data-latent-icon='12'],
+.m-latent-ul .latent-icon[data-latent-icon='16'],
+.m-latent-ul .latent-icon[data-latent-icon='17'],
+.m-latent-ul .latent-icon[data-latent-icon='18'],
+.m-latent-ul .latent-icon[data-latent-icon='19'],
+.m-latent-ul .latent-icon[data-latent-icon='20'],
+.m-latent-ul .latent-icon[data-latent-icon='21'],
+.m-latent-ul .latent-icon[data-latent-icon='22'],
+.m-latent-ul .latent-icon[data-latent-icon='23'],
+.m-latent-ul .latent-icon[data-latent-icon='24'],
+.m-latent-ul .latent-icon[data-latent-icon='25'],
+.m-latent-ul .latent-icon[data-latent-icon='26'],
+.m-latent-ul .latent-icon[data-latent-icon='27'],
+.m-latent-ul .latent-icon[data-latent-icon='28'],
+.m-latent-ul .latent-icon[data-latent-icon='29'],
+.m-latent-ul .latent-icon[data-latent-icon='30'],
+.m-latent-ul .latent-icon[data-latent-icon='31'],
+.m-latent-ul .latent-icon[data-latent-icon='32'],
+.m-latent-ul .latent-icon[data-latent-icon='33'],
+.m-latent-ul .latent-icon[data-latent-icon='34'],
+.m-latent-ul .latent-icon[data-latent-icon='35'],
+.m-latent-ul .latent-icon[data-latent-icon='36'],
+.m-latent-ul .latent-icon[data-latent-icon='43'],
+.m-latent-ul .latent-icon[data-latent-icon='44'],
+.m-latent-ul .latent-icon[data-latent-icon='45']
 {
 	width: 76px;
 }
-.latent-icon[data-latent-icon='13']::before,
-.latent-icon[data-latent-icon='14']::before,
-.latent-icon[data-latent-icon='15']::before,
-.latent-icon[data-latent-icon='37']::before,
-.latent-icon[data-latent-icon='38']::before,
-.latent-icon[data-latent-icon='39']::before,
-.latent-icon[data-latent-icon='40']::before,
-.latent-icon[data-latent-icon='41']::before,
-.latent-icon[data-latent-icon='42']::before
+/* 特殊的 三维潜觉 */
+.m-latent-ul .latent-icon[data-latent-icon='12']::before
+{
+	width: 76px;
+	background-position-x: -32px;
+}
+/* 6格的 潜觉 */
+.m-latent-ul .latent-icon[data-latent-icon='13'],
+.m-latent-ul .latent-icon[data-latent-icon='14'],
+.m-latent-ul .latent-icon[data-latent-icon='15'],
+.m-latent-ul .latent-icon[data-latent-icon='37'],
+.m-latent-ul .latent-icon[data-latent-icon='38'],
+.m-latent-ul .latent-icon[data-latent-icon='39'],
+.m-latent-ul .latent-icon[data-latent-icon='40'],
+.m-latent-ul .latent-icon[data-latent-icon='41'],
+.m-latent-ul .latent-icon[data-latent-icon='42']
 {
 	width: 252px;
 }
@@ -902,7 +915,145 @@ icon.type
 .latent-icon[data-latent-icon='45']::before{ /*回复++*/
 	background-position-y: calc(-32px * 45);
 }
-
+/* 队伍界面2格的 潜觉 */
+.team-latents .latent-ul .latent-icon[data-latent-icon='12'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='16'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='17'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='18'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='19'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='20'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='21'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='22'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='23'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='24'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='25'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='26'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='27'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='28'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='29'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='30'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='31'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='32'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='33'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='34'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='35'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='36'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='43'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='44'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='45']
+{
+	width: 70px;
+}
+/* 队伍界面特殊的 三维潜觉 */
+.team-latents .latent-ul .latent-icon[data-latent-icon='12']::before
+{
+	transform: scale(0.9);
+	margin-left: -5px;
+	width: 76px;
+	background-position-x: -32px;
+}
+/* 队伍界面6格的潜觉 */
+.team-latents .latent-ul .latent-icon[data-latent-icon='13'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='14'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='15'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='37'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='38'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='39'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='40'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='41'],
+.team-latents .latent-ul .latent-icon[data-latent-icon='42']
+{
+	width: 146px;
+	margin-left: 0px;
+	border-radius: 5px 5px 5px 0;
+}
+.team-latents .latent-ul .latent-icon[data-latent-icon='13']::before,
+.team-latents .latent-ul .latent-icon[data-latent-icon='14']::before,
+.team-latents .latent-ul .latent-icon[data-latent-icon='15']::before,
+.team-latents .latent-ul .latent-icon[data-latent-icon='37']::before,
+.team-latents .latent-ul .latent-icon[data-latent-icon='38']::before,
+.team-latents .latent-ul .latent-icon[data-latent-icon='39']::before,
+.team-latents .latent-ul .latent-icon[data-latent-icon='40']::before,
+.team-latents .latent-ul .latent-icon[data-latent-icon='41']::before,
+.team-latents .latent-ul .latent-icon[data-latent-icon='42']::before
+{
+	background: none;
+}
+.team-latents .latent-icon[data-latent-icon='13']+.latent-icon,
+.team-latents .latent-icon[data-latent-icon='14']+.latent-icon,
+.team-latents .latent-icon[data-latent-icon='15']+.latent-icon,
+.team-latents .latent-icon[data-latent-icon='37']+.latent-icon,
+.team-latents .latent-icon[data-latent-icon='38']+.latent-icon,
+.team-latents .latent-icon[data-latent-icon='39']+.latent-icon,
+.team-latents .latent-icon[data-latent-icon='40']+.latent-icon,
+.team-latents .latent-icon[data-latent-icon='41']+.latent-icon,
+.team-latents .latent-icon[data-latent-icon='42']+.latent-icon
+{
+	width: 70px;
+	height: 39px;
+	margin-left: 0;
+	margin-right: 6px;
+	margin-bottom: -9px;
+	display: inline-block !important;
+	background: linear-gradient(#2277EE , #1155AA  80%);
+	border-color: #CCEEFF;
+	box-shadow: black 1px 1px 1px;
+	border-radius: 0 0 5px 5px;
+	border-top: none;
+	transform: translatey(-9px);
+}
+.team-latents .latent-icon[data-latent-icon='13']+.latent-icon::before,
+.team-latents .latent-icon[data-latent-icon='14']+.latent-icon::before,
+.team-latents .latent-icon[data-latent-icon='15']+.latent-icon::before,
+.team-latents .latent-icon[data-latent-icon='37']+.latent-icon::before,
+.team-latents .latent-icon[data-latent-icon='38']+.latent-icon::before,
+.team-latents .latent-icon[data-latent-icon='39']+.latent-icon::before,
+.team-latents .latent-icon[data-latent-icon='40']+.latent-icon::before,
+.team-latents .latent-icon[data-latent-icon='41']+.latent-icon::before,
+.team-latents .latent-icon[data-latent-icon='42']+.latent-icon::before
+{
+	transform: scale(1.54) translateY(-7px);
+}
+.team-latents .latent-icon[data-latent-icon='13']+.latent-icon::before{
+	background-position-y: calc(-32px * 13);
+}
+.team-latents .latent-icon[data-latent-icon='14']+.latent-icon::before{
+	background-position-y: calc(-32px * 14);
+}
+.team-latents .latent-icon[data-latent-icon='15']+.latent-icon::before{
+	background-position-y: calc(-32px * 15);
+}
+.team-latents .latent-icon[data-latent-icon='37']+.latent-icon::before{
+	background-position-y: calc(-32px * 37);
+}
+.team-latents .latent-icon[data-latent-icon='38']+.latent-icon::before{
+	background-position-y: calc(-32px * 38);
+}
+.team-latents .latent-icon[data-latent-icon='39']+.latent-icon::before{
+	background-position-y: calc(-32px * 39);
+}
+.team-latents .latent-icon[data-latent-icon='40']+.latent-icon::before{
+	background-position-y: calc(-32px * 40);
+}
+.team-latents .latent-icon[data-latent-icon='41']+.latent-icon::before{
+	background-position-y: calc(-32px * 41);
+}
+.team-latents .latent-icon[data-latent-icon='42']+.latent-icon::before
+{
+	background-position-y: calc(-32px * 42);
+}
+/* 额外有 x1.5 的 6格觉醒 */
+.level-super-break .latent-icon[data-latent-icon='13']::after,
+.level-super-break .latent-icon[data-latent-icon='37']::after,
+.level-super-break .latent-icon[data-latent-icon='38']::after,
+.level-super-break .latent-icon[data-latent-icon='39']::after,
+.level-super-break .latent-icon[data-latent-icon='40']::after,
+.level-super-break .latent-icon[data-latent-icon='41']::after
+{
+	content: "";
+	background-position-x: -32px;
+	background-position-y: calc(-32px * 42);
+}
 /* 徽章背景 */
 .badge{
 	background-image: url(images/badge-bg.png);

style.css

@@ -895,7 +895,7 @@ icon.poison-no-effect::after,
 	display: inline-block;
 	width: 32px;
 	height: 32px;
-	background-image: url(images/latent.png);
+	background-image: url(images/icon-latent.png);
 	background-position-x: -32px;
 	transform: scale(0.5);
 	position: absolute;
@@ -1035,112 +1035,12 @@ icon.inflicts::after
 	/*-152 * (1 - 0.63) + 108 - 152 * 0.63，化简为108 - 152*/
 	min-height: 47px; /* 为了防止只有一层6格大潜觉的时候，被缩减太多的问题*/
 }
-
 .team-latents .latent-icon
 {
 	margin-top: 3px;
-	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='34'],
-.team-latents .latent-icon[data-latent-icon='35'],
-.team-latents .latent-icon[data-latent-icon='36'],
-.team-latents .latent-icon[data-latent-icon='37'],
-.team-latents .latent-icon[data-latent-icon='38'],
-.team-latents .latent-icon[data-latent-icon='39'],
-.team-latents .latent-icon[data-latent-icon='40'],
-.team-latents .latent-icon[data-latent-icon='41'],
-.team-latents .latent-icon[data-latent-icon='42'],
-.team-latents .latent-icon[data-latent-icon='43'],
-.team-latents .latent-icon[data-latent-icon='44'],
-.team-latents .latent-icon[data-latent-icon='45']
-{
-	margin-left: 0;
-	margin-right: 0;
-}
-.team-latents .latent-ul .latent-icon[data-latent-icon='13']::before,
-.team-latents .latent-ul .latent-icon[data-latent-icon='14']::before,
-.team-latents .latent-ul .latent-icon[data-latent-icon='15']::before,
-.team-latents .latent-ul .latent-icon[data-latent-icon='37']::before,
-.team-latents .latent-ul .latent-icon[data-latent-icon='38']::before,
-.team-latents .latent-ul .latent-icon[data-latent-icon='39']::before,
-.team-latents .latent-ul .latent-icon[data-latent-icon='40']::before,
-.team-latents .latent-ul .latent-icon[data-latent-icon='41']::before,
-.team-latents .latent-ul .latent-icon[data-latent-icon='42']::before
-{ /*6格的潜觉*/
-	width: 152px;
-	margin-left: -50px;
-	margin-right: 47px;
-}
-.team-latents .latent-ul .latent-icon[data-latent-icon='13'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='14'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='15'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='37'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='38'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='39'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='40'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='41'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='42']
-{
-	border-radius: 5px 5px 5px 0;
-	box-shadow: black 1px 1px 1px;
-}
-.team-latents .latent-icon[data-latent-icon='13']+.latent-icon,
-.team-latents .latent-icon[data-latent-icon='14']+.latent-icon,
-.team-latents .latent-icon[data-latent-icon='15']+.latent-icon,
-.team-latents .latent-icon[data-latent-icon='37']+.latent-icon,
-.team-latents .latent-icon[data-latent-icon='38']+.latent-icon,
-.team-latents .latent-icon[data-latent-icon='39']+.latent-icon,
-.team-latents .latent-icon[data-latent-icon='40']+.latent-icon,
-.team-latents .latent-icon[data-latent-icon='41']+.latent-icon,
-.team-latents .latent-icon[data-latent-icon='42']+.latent-icon
-{
-	width: 76px;
-	margin-left: 0;
-	margin-right: 0;
-	display: inline-block !important;
-	background: linear-gradient(#2277EE , #1155AA  80%);
-	border-color: #CCEEFF;
-	box-shadow: black 1px 1px 1px;
-	border-radius: 0 0 5px 5px;
-	border-top: none;
-	margin-top: 4px;;
-	transform: translatey(-4px) scaley(1.2);
-}
-.team-latents .latent-icon[data-latent-icon='13']+.latent-icon::before,
-.team-latents .latent-icon[data-latent-icon='14']+.latent-icon::before,
-.team-latents .latent-icon[data-latent-icon='15']+.latent-icon::before,
-.team-latents .latent-icon[data-latent-icon='37']+.latent-icon::before,
-.team-latents .latent-icon[data-latent-icon='38']+.latent-icon::before,
-.team-latents .latent-icon[data-latent-icon='39']+.latent-icon::before,
-.team-latents .latent-icon[data-latent-icon='40']+.latent-icon::before,
-.team-latents .latent-icon[data-latent-icon='41']+.latent-icon::before,
-.team-latents .latent-icon[data-latent-icon='42']+.latent-icon::before
-{
-	background: none;
+	margin-right: 6px;
 }
+
 /*队长的边框*/
 .team-box .team-members .team-leader .monster
 {
@@ -2364,13 +2264,19 @@ icon.inflicts::after
 .m-latent-allowable-ul.hide-less-use-latent .latent-icon[data-latent-icon="24"],
 .m-latent-allowable-ul.hide-less-use-latent .latent-icon[data-latent-icon="25"],
 .m-latent-allowable-ul.hide-less-use-latent .latent-icon[data-latent-icon="26"],
-.m-latent-allowable-ul.hide-less-use-latent .latent-icon[data-latent-icon="27"]
+.m-latent-allowable-ul.hide-less-use-latent .latent-icon[data-latent-icon="27"],
+.m-latent-allowable-ul.hide-less-use-latent .latent-icon[data-latent-icon="13"],
+.m-latent-allowable-ul.hide-less-use-latent .latent-icon[data-latent-icon="14"],
+.m-latent-allowable-ul.hide-less-use-latent .latent-icon[data-latent-icon="15"],
+.m-latent-allowable-ul.hide-less-use-latent .latent-icon[data-latent-icon="37"],
+.m-latent-allowable-ul.hide-less-use-latent .latent-icon[data-latent-icon="38"],
+.m-latent-allowable-ul.hide-less-use-latent .latent-icon[data-latent-icon="39"],
+.m-latent-allowable-ul.hide-less-use-latent .latent-icon[data-latent-icon="40"],
+.m-latent-allowable-ul.hide-less-use-latent .latent-icon[data-latent-icon="41"],
+.m-latent-allowable-ul.hide-less-use-latent .latent-icon[data-latent-icon="42"]
 {
 	display: inline-block;
 }
-.guide-mod .m-latent-allowable-ul.hide-less-use-latent .latent-icon[data-latent-icon="11"]{
-	display: none;
-}
 .hide-less-use-latent-label{
 	margin-left: 5px;
 }
@@ -3552,7 +3458,7 @@ table .orb-icon
 .board .orb
 {
 	transform: unset;
-	margin: unser;
+	margin: unset;
 }
 .board .orb.enhanced::after,
 .board .orb.locked::after,

triple.html

@@ -1779,8 +1779,8 @@ var formation = new Formation(teamsCount,6);
 		<div class="setting-box">
 			<div class="setting-row row-mon-id">
 				<input type="checkbox" class="config-checkbox-ipt" name="real-time-change-card" id="real-time-change-card"><label class="config-checkbox-lbl real-time-change-card-label" for="real-time-change-card"><div class="config-checkbox-lbl-cicle"></div></label>
-				<button class="open-evolutionary-tree"></button>
-				<button class="search-evolution-by-this"><icon class="type-icon" data-type-icon="0"></icon></button>
+				<button class="open-evolutionary-tree display-none"></button>
+				<button class="search-evolution-by-this display-none"><icon class="type-icon" data-type-icon="0"></icon></button>
 				<input type="search" class="m-id" list="monsters-name-list"/><button class="search-by-string"></button>
 				<datalist id="monsters-name-list"></datalist>
 				<ul class="evo-card-list"></ul>