From 84d2cc457f35ef7b28cf531edeab381a06e53532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= Date: Tue, 16 Mar 2021 21:56:18 +0800 Subject: [PATCH] =?UTF-8?q?76=E6=9D=BF=E8=80=83=E8=99=91=E5=8F=98=E8=BA=AB?= =?UTF-8?q?=E5=89=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script-universal_function.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/script-universal_function.js b/script-universal_function.js index 46445274..c852f495 100644 --- a/script-universal_function.js +++ b/script-universal_function.js @@ -684,8 +684,17 @@ function getActuallySkills(skill, skillTypes, searchRandom = true) { //计算队伍是否为76 function tIf_Effect_76board(leader1id, leader2id) { const searchTypeArray = [162, 186]; - const ls1 = getCardLeaderSkills(Cards[leader1id], searchTypeArray)[0]; - const ls2 = getCardLeaderSkills(Cards[leader2id], searchTypeArray)[0]; + function henshinBase(cardid) + { + let card = Cards[cardid]; + if (card.henshinFrom) + { + card = Cards[card.henshinFrom]; + } + return card; + } + const ls1 = getCardLeaderSkills(henshinBase(leader1id), searchTypeArray)[0]; + const ls2 = getCardLeaderSkills(henshinBase(leader2id), searchTypeArray)[0]; return Boolean(ls1 || ls2); }