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

修订同步觉醒与超觉醒不兼容的一些bug

This commit is contained in:
枫谷剑仙 2024-05-22 13:38:23 +08:00
parent ac373d972c
commit 3ca4785417
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
script-universal_function.js
View File

@ -690,7 +690,10 @@ function awokenCountInTeam(team, awokenIndex, solo, teamsCount) {
//启用的觉醒数组片段
let enableAwoken = card.awakenings.slice(0, mon.awoken);
//单人、3人时,大于等于100级且297时增加超觉醒
if ((solo || teamsCount === 3) && mon.sawoken > 0 && mon.level >= 100 && mon.plus.every(p=>p>=99)) {
if ((solo || teamsCount === 3) && mon.sawoken > 0 &&
(mon.level >= 100 && mon.plus.every(p=>p>=99) ||
mon.sawoken === card.syncAwakening)
) {
enableAwoken.push(mon.sawoken);
}
if (assistCard && assistCard.enabled && assistCard.awakenings.includes(49)) { //如果卡片未启用
@ -810,7 +813,10 @@ function calculateAbility(member, assist = null, solo = true, teamsCount = 1) {
//储存点亮的觉醒
let awokenList = memberCard.awakenings.slice(0, member.awoken);
//单人、3人时,大于等于100级且297时增加超觉醒
if ((solo || teamsCount === 3) && member.sawoken > 0 && member.level >= 100 && member.plus.every(p=>p>=99)) {
if ((solo || teamsCount === 3) && member.sawoken > 0 &&
(member.level >= 100 && member.plus.every(p=>p>=99) ||
member.sawoken === memberCard.syncAwakening)
) {
awokenList.push(member.sawoken)
}
//如果有武器还要计算武器的觉醒
@ -1624,7 +1630,10 @@ function countTeamSB(team, solo) {
const memberCard = henshinBase(member);
let enableAwoken = memberCard?.awakenings?.slice(0, member.awoken) || [];
//单人、3人时,大于等于100级且297时增加超觉醒
if ((solo || teamsCount === 3) && member.sawoken > 0 && member.level >= 100 && member.plus.every(p=>p>=99)) {
if ((solo || teamsCount === 3) && member.sawoken > 0 &&
(member.level >= 100 && member.plus.every(p=>p>=99) ||
member.sawoken === memberCard.syncAwakening)
) {
enableAwoken.push(member.sawoken);
}
if (assist.card && assist.card.enabled && assist.card.awakenings.includes(49)) {

11
script.js
View File

@ -733,7 +733,10 @@ Member.prototype.effectiveAwokens = function(assist) {
const memberCard = this.card;
let enableAwoken = memberCard?.awakenings?.slice(0, this.awoken) || [];
//单人、3人时,大于等于100级且297时增加超觉醒
if ((solo || teamsCount === 3) && this.sawoken > 0 && this.level >= 100 && this.plus.every(p=>p>=99)) {
if ((solo || teamsCount === 3) && this.sawoken > 0 &&
(this.level >= 100 && this.plus.every(p=>p>=99) ||
this.sawoken === memberCard.syncAwakening)
) {
enableAwoken.push(this.sawoken);
}
//添加武器
@ -6001,8 +6004,10 @@ function changeid(mon, monDom, latentDom, assist) {
if (sawoken) { //如果存在超觉醒的DOM
if (mon?.sawoken > 0 && //怪物超觉醒编号大于0
//card.superAwakenings.length && //卡片有超觉醒
mon.level >= 100 && //怪物大于100级
(mon.level >= 100 && //怪物大于100级
mon.plus.every(p=>p>=99) //怪物297了
|| mon.sawoken === card.syncAwakening //同步觉醒
)
) {
sawoken.classList.remove(className_displayNone);
const sawokenIcon = sawoken.querySelector(".awoken-icon");
@ -6357,7 +6362,7 @@ function editBoxChangeMonId(id) {
const level = settingBox.querySelector(".row-mon-level .m-level");
const plusArr = [...settingBox.querySelectorAll(".row-mon-plus input[type='number']")];
if (sawoken > 0) {
if (sawoken > 0 && sawoken !== card.syncAwakening) {
//自动100级
if (parseInt(level.value, 10)<100)
{

4
service-worker.js
View File

@ -26259,11 +26259,11 @@ const cachesMap = new Map([
],
[
"script-universal_function.js",
"96e1e745f6a480249a3fea74db16af4a"
"368b8e11f5445f28cb3ffaa422a93cda"
],
[
"script.js",
"f01674aeffe2556f5fbecfe1f801b749"
"b269404bd29aaff02d22a2f4e5abc74f"
],
[
"solo.html",