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

# Conflicts:
#	monsters-info/ckey.json
#	monsters-info/mon_ja.json

languages/zh-CN.js

@@ -1137,7 +1137,7 @@ function parseSkillDescription(skill) {
 			else if(sk[0] == 31) str += `5色`;
 			str += `同时攻击时`;
 			if (sk[2] && sk[2] !== 100 || sk[4]) str += `，所有宠物的攻击力×${sk[2]/100}倍`;
-			if (sk[4]) str += `，每多1种属性+${sk[4]/100}倍，最大${sk[1] + (sk[5] - 1)}种属性时${(sk[5] - 1) * sk[4]/100 + sk[2]/100}倍。`;
+			if (sk[4]) str += `，每多1种属性+${sk[4]/100}倍，最大${sk[1] + (sk[5] - 1)}种属性时${(sk[5] - 1) * sk[4]/100 + sk[2]/100}倍`;
 			if (sk[3]) str += `，受到的伤害减少${sk[3]}%`;
 			break;
 		case 171:
@@ -1279,7 +1279,7 @@ function parseSkillDescription(skill) {
 			if (sk[3]) str += `，结算时连击数+${sk[3]}`;
 			break;
 		case 193:
-			str = `以L字形消除5个${getOrbsAttrString(sk[0])}宝珠时`;
+			str = `以L字形消除5个${getOrbsAttrString(sk[0], true)}宝珠时`;
 			if (sk[1] && sk[1] != 100 || sk[2] && sk[2] != 100) str+=`，所有宠物的${getFixedHpAtkRcvString({atk:sk[1],rcv:sk[2]})}`;
 			if (sk[3]) str+=`，受到的伤害减少${sk[3]}%`;
 			break;
@@ -3677,7 +3677,7 @@ function parseSkillDescription(skill) {
 				}
 			}),addition:card=>{
 				const searchTypeArray = [0,1,2,35,37,42,58,59,84,85,86,87,110,115,143,144];
-				const skill = getCardSkill(card, searchTypeArray);
+				const skill = getCardActiveSkill(card, searchTypeArray);
 				const sk = skill.params;
 	
 				const colors = [getCannonAttr(skill)];

monsters-info/ckey.json

@@ -1 +1 @@
-[{"code":"ja","ckey":{"card":"1b5b01b3382492f8c612858bb1317f76","skill":"8fc4957b023a5cf7db65eb75cabcf635"},"updateTime":1620389887484},{"code":"en","ckey":{"card":"069a15bce7895f2d806aebada5837001","skill":"947ada64ee17e8fc6414fa8552a1229d"},"updateTime":1620389887484},{"code":"ko","ckey":{"card":"6057ebce5101441e75b74638df08b02b","skill":"10cfd160607440cb4dd1c04c38b972e5"},"updateTime":1620389887484}]
+[{"code":"ja","ckey":{"card":"d02adea400cf75d000b299f0453d8b8e","skill":"8fc4957b023a5cf7db65eb75cabcf635"},"updateTime":1620390138256},{"code":"en","ckey":{"card":"069a15bce7895f2d806aebada5837001","skill":"947ada64ee17e8fc6414fa8552a1229d"},"updateTime":1620389887484},{"code":"ko","ckey":{"card":"6057ebce5101441e75b74638df08b02b","skill":"10cfd160607440cb4dd1c04c38b972e5"},"updateTime":1620389887484}]

multi.html

@@ -164,7 +164,7 @@ var formation = new Formation(teamsCount,5);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -176,7 +176,7 @@ var formation = new Formation(teamsCount,5);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -188,7 +188,7 @@ var formation = new Formation(teamsCount,5);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -200,7 +200,7 @@ var formation = new Formation(teamsCount,5);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -212,7 +212,7 @@ var formation = new Formation(teamsCount,5);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -289,7 +289,7 @@ var formation = new Formation(teamsCount,5);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -302,7 +302,7 @@ var formation = new Formation(teamsCount,5);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -315,7 +315,7 @@ var formation = new Formation(teamsCount,5);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -328,7 +328,7 @@ var formation = new Formation(teamsCount,5);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -341,7 +341,7 @@ var formation = new Formation(teamsCount,5);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -362,7 +362,7 @@ var formation = new Formation(teamsCount,5);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -375,7 +375,7 @@ var formation = new Formation(teamsCount,5);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -388,7 +388,7 @@ var formation = new Formation(teamsCount,5);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -401,7 +401,7 @@ var formation = new Formation(teamsCount,5);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -414,7 +414,7 @@ var formation = new Formation(teamsCount,5);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -490,7 +490,7 @@ var formation = new Formation(teamsCount,5);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -502,7 +502,7 @@ var formation = new Formation(teamsCount,5);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -514,7 +514,7 @@ var formation = new Formation(teamsCount,5);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -526,7 +526,7 @@ var formation = new Formation(teamsCount,5);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -538,7 +538,7 @@ var formation = new Formation(teamsCount,5);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>

script.js

@@ -3031,10 +3031,14 @@ function refreshAll(formationData) {
 			const memberLi = membersDom.querySelector(`.member-${ti+1}`);
 			const latentLi = latentsDom.querySelector(`.latents-${ti+1}`);
 			const assistsLi = assistsDom.querySelector(`.member-${ti+1}`);
-			const teamAbilityLi = teamAbilityDom.querySelector(`.abilitys-${ti+1}`);
-			const teamMenberAwokenLi = teamMenberAwokenDom.querySelector(`.menber-awoken-${ti+1}`);
-			const teamAssistAwokenLi = teamAssistAwokenDom.querySelector(`.menber-awoken-${ti+1}`);
+			const teamAbilityLi = teamAbilityDom ? teamAbilityDom.querySelector(`.abilitys-${ti+1}`) : undefined;
+			const teamMenberAwokenLi = teamAbilityDom ? teamMenberAwokenDom.querySelector(`.menber-awoken-${ti+1}`) : undefined;
+			const teamAssistAwokenLi = teamAbilityDom ? teamAssistAwokenDom.querySelector(`.menber-awoken-${ti+1}`) : undefined;
 			[memberLi,latentLi,assistsLi,teamAbilityLi,teamMenberAwokenLi,teamAssistAwokenLi].forEach(dom=>{
+				if (!dom)
+				{
+					return;
+				}
 				if (leaderIdx > 0 && ti == 0)
 				{
 					dom.style.transform = `translateX(${leaderIdx*108}px)`;

triple.html

@@ -125,7 +125,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -137,7 +137,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -149,7 +149,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -161,7 +161,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -173,7 +173,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -185,7 +185,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -274,7 +274,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -287,7 +287,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -300,7 +300,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -313,7 +313,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -326,7 +326,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -339,7 +339,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -558,7 +558,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -570,7 +570,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -582,7 +582,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -594,7 +594,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -606,7 +606,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -618,7 +618,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -707,7 +707,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -720,7 +720,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -733,7 +733,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -746,7 +746,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -759,7 +759,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -772,7 +772,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -991,7 +991,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -1003,7 +1003,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -1015,7 +1015,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -1027,7 +1027,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -1039,7 +1039,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -1051,7 +1051,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="awoken-count-num"></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -1140,7 +1140,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -1153,7 +1153,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -1166,7 +1166,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -1179,7 +1179,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -1192,7 +1192,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>
@@ -1205,7 +1205,7 @@ var formation = new Formation(teamsCount,6);
 									<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 									<div class="level"></div>
 									<div class="id"></div>
-									<div class="skill"></div>
+									<div class="skill-cd"></div>
 									<div class="switch-leader display-none"></div>
 								</a>
 							</li>