diff --git a/images/cards_en/CARDS_054.PNG b/images/cards_en/CARDS_054.PNG index a870e274..793b41b6 100644 Binary files a/images/cards_en/CARDS_054.PNG and b/images/cards_en/CARDS_054.PNG differ diff --git a/images/cards_en/CARDS_057.PNG b/images/cards_en/CARDS_057.PNG index 22b5c7cb..1fc293fc 100644 Binary files a/images/cards_en/CARDS_057.PNG and b/images/cards_en/CARDS_057.PNG differ diff --git a/monsters-info/extractByNode.js b/monsters-info/extractByNode.js index 407807a5..d7b8d5f8 100644 --- a/monsters-info/extractByNode.js +++ b/monsters-info/extractByNode.js @@ -203,16 +203,28 @@ officialAPI.forEach(function(lang){ sm.sAwoken = m.superAwakenings; if (m.limitBreakIncr>0) sm.a110 = m.limitBreakIncr; - if (sm.id != sm.evoRootId && sm.evoType == 0) //不是究极进化的 + if (sm.id != sm.evoRootId) { let parentCard = lang.cards[m.evoBaseId]; //进化前的 - if (parentCard.isUltEvo) //如果父级是究极进化 + let parentParentCard = parentCard?lang.cards[parentCard.evoBaseId]:null; //父级的父级 + if (sm.evoType == 0) //不是究极进化的 { - sm.evoType = 2; //那么这里是转生进化 - }else if (parentCard.evoBaseId != parentCard.id //如果父级还有父级 - && lang.cards[parentCard.evoBaseId].isUltEvo) //父级的父级是究极进化 + if (parentCard.isUltEvo) //如果父级是究极进化 + { + sm.evoType = 2; //那么这里是转生进化 + }else if (parentCard.evoBaseId != parentCard.id //如果父级还有父级 + && parentParentCard.isUltEvo //父级的父级是究极进化 + ) + { + sm.evoType = 3; //那么这里是超转生进化 + } + }else if (sm.evoType == 1 //是究极进化的 + && parentCard.evoBaseId != parentCard.id //如果父级还有父级 + && !parentCard.isUltEvo //父级不是究极进化 + && parentParentCard.isUltEvo //父级的父级是究极进化 + ) { - sm.evoType = 3; //那么这里是超转生进化 + sm.evoType = 21; //那么这里是转生进化后的究进 } } return sm; diff --git a/script.js b/script.js index 4b8de1f5..a1ee0670 100644 --- a/script.js +++ b/script.js @@ -121,11 +121,7 @@ function getMaxLatentCount(id) function is8Latent(id) { let m = ms[id] || ms[0],mEvoType = m.evoType; - if (mEvoType == 2 || mEvoType == 3){return true;} - if (mEvoType == 1) //判断究进之前是不是转生(三神面宙斯等) - { - - } + if (mEvoType == 2 || mEvoType == 3 || mEvoType==21){return true;} return false; } return is8Latent(id) ? 8 : 6;