mapaler
/
PADDashFormation
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

临时解决没有的编号会不断错误的问题

This commit is contained in:
枫谷剑仙 2021-05-28 14:53:13 +08:00
parent 5f8d58a189
commit a96504ed9d
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
script-universal_function.js
View File

@ -573,13 +573,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)); //我方队长技
@ -695,10 +695,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);
}
//查找到真正起作用的那一个技能
@ -726,7 +728,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];
}

9
script.js
View File

@ -3194,13 +3194,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))