Merge branch 'master' into skillParser

monsters-info/ckey.json

@@ -1 +1 @@
-[{"code":"ja","ckey":{"card":"185b7f5a669fbe0e9864babb1667b8c1","skill":"24cc7521c9973e5b5ae2d0909614de15"},"updateTime":1622117433323},{"code":"en","ckey":{"card":"8f5f7caf7edc1d5975cf521495b15fd3","skill":"f08d827519bac1ae82136e754cf6e3f1"},"updateTime":1621516446591},{"code":"ko","ckey":{"card":"3fd940f80df23cafaaff41185acc4ba7","skill":"c391be53515691e1f5b23d4fc6a0455b"},"updateTime":1621516446591}]
+[{"code":"ja","ckey":{"card":"d0a44e4f4a6ac30454d5f2e39a5cc718","skill":"24cc7521c9973e5b5ae2d0909614de15"},"updateTime":1622180465888},{"code":"en","ckey":{"card":"b5341eecf21fac29395b459adf19be84","skill":"56135d3695cf89fef75d3561a5c4fc3a"},"updateTime":1622180465888},{"code":"ko","ckey":{"card":"aa64f926dfb2f7c4e4a5d61c607ba471","skill":"568c69fa8779d12f175d68135ab49a29"},"updateTime":1622180465888}]

script-universal_function.js

@@ -581,13 +581,13 @@ function getAllowLatent(card) {
 }
 //计算队伍中有多少血量
 function countTeamHp(memberArr, leader1id, leader2id, solo, noAwoken = false) {
-	const ls1 = Skills[Cards[leader1id].leaderSkillId];
-	const ls2 = Skills[Cards[leader2id].leaderSkillId];
+	const ls1 = Skills[(Cards[leader1id] || Cards[0]).leaderSkillId];
+	const ls2 = Skills[(Cards[leader2id] || Cards[0]).leaderSkillId];
 	const mHpArr = memberArr.map(m => {
 		const ability = noAwoken ? m.abilityNoAwoken : m.ability;
 		let hp = ability ? ability[0] : 0;
 		if (!hp) return 0;
-		const card = Cards[m.id];
+		const card = Cards[m.id] || Cards[0];
 		hp = hp1 = Math.round(hp * memberHpMul(card, ls2, memberArr, solo)); //战友队长技
 		hp = hp2 = Math.round(hp * memberHpMul(card, ls1, memberArr, solo)); //我方队长技
 
@@ -703,10 +703,12 @@ function countTeamHp(memberArr, leader1id, leader2id, solo, noAwoken = false) {
 
 //返回卡片的队长技能
 function getCardLeaderSkills(card, skillTypes) {
+	if (!card) return [];
 	return getActuallySkills(Skills[card.leaderSkillId], skillTypes, false);
 }
 //返回卡片的主动技能
 function getCardActiveSkills(card, skillTypes) {
+	if (!card) return [];
 	return getActuallySkills(Skills[card.activeSkillId], skillTypes, false);
 }
 //查找到真正起作用的那一个技能
@@ -734,7 +736,7 @@ function tIf_Effect_76board(leader1id, leader2id) {
 	function henshinBase(cardid)
 	{
 		let card = Cards[cardid];
-		if (card.henshinFrom)
+		if (card && card.henshinFrom)
 		{
 			card = Cards[card.henshinFrom];
 		}

script.js

@@ -860,7 +860,7 @@ function loadData(force = false)
 				checkFormationBox();
 				function checkFormationBox()
 				{
-					if (formationBox)
+					if (formationBox.querySelector('.teams'))
 					{
 						reloadFormationData();
 						clearInterval(formationBoxHook);
@@ -2521,7 +2521,7 @@ function changeid(mon, monDom, latentDom) {
 		awokenIcon.setAttribute(dataAttrName, mon.awoken || 0);
 		if (mon.awoken != null) //如果提供了觉醒
 		{
-			if (mon.awoken == card.awakenings.length) {
+			if (mon.awoken > 0 && mon.awoken == card.awakenings.length) {
 				awokenIcon.classList.add("full-awoken");
 			} else {
 				awokenIcon.classList.remove("full-awoken");
@@ -3203,13 +3203,16 @@ function refreshMenberAwoken(menberAwokenDom, assistAwokenDom, team, idx) {
 
 	const memberData = team[0][idx];
 	const assistData = team[1][idx];
+
+	const memberCard = Cards[memberData.id] || Cards[0];
+	const assistCard = Cards[assistData.id] || Cards[0];
 	//队员觉醒
-	let menberAwokens = Cards[memberData.id].awakenings.slice(0,memberData.awoken);
+	let menberAwokens = memberCard.awakenings.slice(0,memberData.awoken);
 	//单人和三人为队员增加超觉醒
-	if ((solo || teamsCount === 3) && memberData.sawoken >= 0) menberAwokens.push(Cards[memberData.id].superAwakenings[memberData.sawoken]);
+	if ((solo || teamsCount === 3) && memberData.sawoken >= 0) menberAwokens.push(memberCard.superAwakenings[memberData.sawoken]);
 	//menberAwokens.sort();
 	//武器觉醒
-	let assistAwokens = Cards[assistData.id > 0 ? assistData.id : 0].awakenings.slice(0,assistData.awoken);
+	let assistAwokens = assistCard.awakenings.slice(0,assistData.awoken);
 	if (!assistAwokens.includes(49)) assistAwokens = []; //清空非武器的觉醒
 	//assistAwokens.sort();
 	/*if (assistAwokens.includes(49))