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

Delay按钮的bug修复，css小调整

This commit is contained in:
枫谷剑仙 2024-08-12 01:34:20 +08:00
parent 52f258ba7e
commit 61638c4285
4 changed files with 42 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
languages/en.css
View File

@ -1,6 +1,6 @@
@charset "utf-8"; @charset "utf-8";
.monster.delay::before{ .monster.delay::before{
content: "Prevent\A Delay"; content: "Delay\A Leeway";
font-size: 22px; font-size: 22px;
} }
.monster .level.max::after{ .monster .level.max::after{
@ -110,10 +110,10 @@ label[for="merge-skill"]::after{
} }
.edit-box .button-box .button-null::after{ .edit-box .button-box .button-null::after{
content: "Leave a blank"; content: "Set a Blank";
} }
.edit-box .button-box .button-delay::after{ .edit-box .button-box .button-delay::after{
content: "Prevent Delay"; content: "Delay Leeway";
} }
.edit-box .button-box .button-cancel::after{ .edit-box .button-box .button-cancel::after{
content: "Cancel"; content: "Cancel";
@ -121,12 +121,6 @@ label[for="merge-skill"]::after{
.edit-box .button-box .button-done::after{ .edit-box .button-box .button-done::after{
content: "Done"; content: "Done";
} }
.edit-box .button-box .button-null,
.edit-box .button-box .button-delay,
.edit-box .button-box .button-cancel,
.edit-box .button-box .button-done{
font-size: 15px;
}
.edit-box .button-box .button-done.cant-assist::after{ .edit-box .button-box .button-done.cant-assist::after{
content: "Can't be Assist"; content: "Can't be Assist";
} }
@ -215,7 +209,7 @@ label[for="screenshot-transparent"]::after{
content: "Swap Team"; content: "Swap Team";
} }
#lbl-henshin-change::after{ #lbl-henshin-change::after{
content: "Changes"; content: "Transform";
} }
#btn-remove-assist::after{ #btn-remove-assist::after{
content: "Remove Assist"; content: "Remove Assist";

57
script.js
View File

@ -5504,11 +5504,12 @@ function initialize() {
return; return;
} }
const mon = editBox.isAssist ? new MemberAssist() : new MemberTeam(); const mon = editBox.isAssist ? new MemberAssist() : new MemberTeam();
const teamData = formation.teams[editBox.memberIdx[0]]; const [teamIdx, isAssist, memberIdx] = editBox.memberIdx;
const teamBigBox = teamBigBoxs[editBox.memberIdx[0]]; const teamData = formation.teams[teamIdx];
const teamBigBox = teamBigBoxs[teamIdx];
const teamBox = teamBigBox.querySelector(".team-box"); const teamBox = teamBigBox.querySelector(".team-box");
teamData[editBox.memberIdx[1]][editBox.memberIdx[2]] = mon; teamData[isAssist][memberIdx] = mon;
mon.id = editBox.mid; mon.id = editBox.mid;
const card = mon.card || Cards[0]; const card = mon.card || Cards[0];
@ -5540,42 +5541,42 @@ function initialize() {
mon.skilllevel = skillLevelNum; mon.skilllevel = skillLevelNum;
} }
changeid(mon, editBox.monsterHead, changeid(mon, editBox.monsterHead,
editBox.memberIdx[1] ? null : editBox.latentBox, //潜觉Node isAssist ? null : editBox.latentBox, //潜觉Node
editBox.memberIdx[1] ? null : teamData[1][editBox.memberIdx[2]] //assist数据 isAssist ? null : teamData[1][memberIdx] //assist数据
); );
const teamAbilityDom = teamBigBox.querySelector(".team-ability"); const teamAbilityDom = teamBigBox.querySelector(".team-ability");
refreshAbility(teamAbilityDom, teamData, editBox.memberIdx[2]); //本人能力值 refreshAbility(teamAbilityDom, teamData, memberIdx); //本人能力值
let changeAttrTypeWeapon = false; let changeAttrTypeWeapon = false;
let awokens = card.awakenings; let awokens = card.awakenings;
if (!editBox.isAssist) {//如果改的不是辅助 if (!editBox.isAssist) {//如果改的不是辅助
awokens = teamData[editBox.memberIdx[1] + 1][editBox.memberIdx[2]].card.awakenings; awokens = teamData[isAssist + 1][memberIdx].card.awakenings;
} }
if (awokens.includes(49) && awokens.some(ak => ak >= 83 && ak <= 95)) changeAttrTypeWeapon = true; if (awokens.includes(49) && awokens.some(ak => ak >= 83 && ak <= 95)) changeAttrTypeWeapon = true;
//如果是2人协力，且修改的是队长的情况，为了刷新另一个队伍时间计算，直接刷新整个队形 //如果是2人协力，且修改的是队长的情况，为了刷新另一个队伍时间计算，直接刷新整个队形
if (teamsCount === 2 && editBox.memberIdx[2] === 0 || changeAttrTypeWeapon) { if (teamsCount === 2 && memberIdx === 0 || changeAttrTypeWeapon) {
refreshAll(formation); refreshAll(formation);
} else { } else {
const teamTotalInfoDom = teamBigBox.querySelector(".team-total-info"); //队伍能力值合计 const teamTotalInfoDom = teamBigBox.querySelector(".team-total-info"); //队伍能力值合计
if (teamTotalInfoDom) refreshTeamTotalHP(teamTotalInfoDom, teamData, editBox.memberIdx[0]); if (teamTotalInfoDom) refreshTeamTotalHP(teamTotalInfoDom, teamData, teamIdx);
const teamTotalInfoCountDom = teamBigBox.querySelector(".team-total-info-count"); //队伍星级、属性、类型合计 const teamTotalInfoCountDom = teamBigBox.querySelector(".team-total-info-count"); //队伍星级、属性、类型合计
if (teamTotalInfoCountDom) refreshTeamTotalCount(teamTotalInfoCountDom, teamData, editBox.memberIdx[0]); if (teamTotalInfoCountDom) refreshTeamTotalCount(teamTotalInfoCountDom, teamData, teamIdx);
const formationTotalInfoDom = formationBox.querySelector(".formation-total-info"); //所有队伍能力值合计 const formationTotalInfoDom = formationBox.querySelector(".formation-total-info"); //所有队伍能力值合计
if (formationTotalInfoDom) refreshFormationTotalHP(formationTotalInfoDom, formation.teams); if (formationTotalInfoDom) refreshFormationTotalHP(formationTotalInfoDom, formation.teams);
const teamAwokenEffectDom = teamBigBox.querySelector(".team-awoken-effect"); //队伍觉醒效果计算 const teamAwokenEffectDom = teamBigBox.querySelector(".team-awoken-effect"); //队伍觉醒效果计算
if (teamAwokenEffectDom) refreshTeamAwokenEfeect(teamAwokenEffectDom, teamData, editBox.memberIdx[0]); if (teamAwokenEffectDom) refreshTeamAwokenEfeect(teamAwokenEffectDom, teamData, teamIdx);
const teamMemberTypesDom = teamBigBox.querySelector(".team-member-types"); //队员类型 const teamMemberTypesDom = teamBigBox.querySelector(".team-member-types"); //队员类型
if (teamMemberTypesDom) refreshMemberTypes(teamMemberTypesDom, teamData, editBox.memberIdx[2]); //刷新本人觉醒 if (teamMemberTypesDom) refreshMemberTypes(teamMemberTypesDom, teamData, memberIdx); //刷新本人觉醒
const teamMemberAwokenDom = teamBigBox.querySelector(".team-member-awoken"); //队员觉醒 const teamMemberAwokenDom = teamBigBox.querySelector(".team-member-awoken"); //队员觉醒
const teamAssistAwokenDom = teamBigBox.querySelector(".team-assist-awoken"); //辅助觉醒 const teamAssistAwokenDom = teamBigBox.querySelector(".team-assist-awoken"); //辅助觉醒
if (teamMemberAwokenDom && teamAssistAwokenDom) refreshMemberAwoken(teamMemberAwokenDom, teamAssistAwokenDom, teamData, editBox.memberIdx[2]); //刷新本人觉醒 if (teamMemberAwokenDom && teamAssistAwokenDom) refreshMemberAwoken(teamMemberAwokenDom, teamAssistAwokenDom, teamData, memberIdx); //刷新本人觉醒
const teamAwokenDom = teamBigBox.querySelector(".team-awoken"); //队伍觉醒合计 const teamAwokenDom = teamBigBox.querySelector(".team-awoken"); //队伍觉醒合计
if (teamAwokenDom) refreshTeamAwokenCount(teamAwokenDom, teamData); if (teamAwokenDom) refreshTeamAwokenCount(teamAwokenDom, teamData);
@ -5583,7 +5584,7 @@ function initialize() {
if (formationAwokenDom) refreshFormationAwokenCount(formationAwokenDom, formation.teams); if (formationAwokenDom) refreshFormationAwokenCount(formationAwokenDom, formation.teams);
//刷新该队员的CD //刷新该队员的CD
refreshMemberSkillCD(teamBox, teamData, editBox.memberIdx[2]); refreshMemberSkillCD(teamBox, teamData, memberIdx);
} }
createNewUrl(); createNewUrl();
@ -5631,14 +5632,15 @@ function initialize() {
}); });
btnNull.onclick = function() { //空位置 btnNull.onclick = function() { //空位置
const mon = new Member(); const mon = new Member();
const teamBigBox = teamBigBoxs[editBox.memberIdx[0]]; const [teamIdx, isAssist, memberIdx] = editBox.memberIdx;
const teamData = formation.teams[editBox.memberIdx[0]]; const teamBigBox = teamBigBoxs[teamIdx];
teamData[editBox.memberIdx[1]][editBox.memberIdx[2]] = mon; const teamData = formation.teams[teamIdx];
teamData[isAssist][memberIdx] = mon;
changeid(mon, editBox.monsterHead, editBox.latentBox); changeid(mon, editBox.monsterHead, editBox.latentBox);
const teamAbilityDom = teamBigBox.querySelector(".team-ability"); const teamAbilityDom = teamBigBox.querySelector(".team-ability");
refreshAbility(teamAbilityDom, teamData, editBox.memberIdx[2]); //本人能力值 refreshAbility(teamAbilityDom, teamData, memberIdx); //本人能力值
refreshAll(formation); refreshAll(formation);
@ -5647,30 +5649,31 @@ function initialize() {
}; };
btnDelay.onclick = function() { //应对威吓 btnDelay.onclick = function() { //应对威吓
const mon = new MemberDelay(); const mon = new MemberDelay();
const teamBigBox = teamBigBoxs[editBox.memberIdx[0]]; const [teamIdx, isAssist, memberIdx] = editBox.memberIdx;
const teamData = formation.teams[editBox.memberIdx[0]]; const teamBigBox = teamBigBoxs[teamIdx];
teamData[editBox.memberIdx[1]][editBox.memberIdx[2]] = mon; const teamData = formation.teams[teamIdx];
teamData[isAssist][memberIdx] = mon;
changeid(mon, editBox.monsterHead, editBox.latentBox); changeid(mon, editBox.monsterHead, editBox.latentBox);
const teamAbilityDom = teamBigBox.querySelector(".team-ability"); const teamAbilityDom = teamBigBox.querySelector(".team-ability");
refreshAbility(teamAbilityDom, teamData, editBox.memberIdx[2]); //本人能力值 refreshAbility(teamAbilityDom, teamData, memberIdx); //本人能力值
const teamTotalInfoDom = teamBigBox.querySelector(".team-total-info"); //队伍能力值合计 const teamTotalInfoDom = teamBigBox.querySelector(".team-total-info"); //队伍能力值合计
if (teamTotalInfoDom) refreshTeamTotalHP(teamTotalInfoDom, teamData, editBox.memberIdx[0]); if (teamTotalInfoDom) refreshTeamTotalHP(teamTotalInfoDom, teamData, teamIdx);
const teamTotalInfoCountDom = teamBigBox.querySelector(".team-total-info-count"); //队伍星级、属性、类型合计 const teamTotalInfoCountDom = teamBigBox.querySelector(".team-total-info-count"); //队伍星级、属性、类型合计
if (teamTotalInfoCountDom) refreshTeamTotalCount(teamTotalInfoCountDom, teamData, teamNum); if (teamTotalInfoCountDom) refreshTeamTotalCount(teamTotalInfoCountDom, teamData, teamIdx);
const formationTotalInfoDom = formationBox.querySelector(".formation-total-info"); //所有队伍能力值合计 const formationTotalInfoDom = formationBox.querySelector(".formation-total-info"); //所有队伍能力值合计
if (formationTotalInfoDom) refreshFormationTotalHP(formationTotalInfoDom, formation.teams); if (formationTotalInfoDom) refreshFormationTotalHP(formationTotalInfoDom, formation.teams);
const teamMemberTypesDom = teamBigBox.querySelector(".team-member-types"); //队员类型 const teamMemberTypesDom = teamBigBox.querySelector(".team-member-types"); //队员类型
if (teamMemberTypesDom) refreshMemberTypes(teamMemberTypesDom, teamData, editBox.memberIdx[2]); //刷新本人觉醒 if (teamMemberTypesDom) refreshMemberTypes(teamMemberTypesDom, teamData, memberIdx); //刷新本人觉醒
const teamMemberAwokenDom = teamBigBox.querySelector(".team-member-awoken"); //队员觉醒 const teamMemberAwokenDom = teamBigBox.querySelector(".team-member-awoken"); //队员觉醒
const teamAssistAwokenDom = teamBigBox.querySelector(".team-assist-awoken"); //辅助觉醒 const teamAssistAwokenDom = teamBigBox.querySelector(".team-assist-awoken"); //辅助觉醒
if (teamMemberAwokenDom && teamAssistAwokenDom) refreshMemberAwoken(teamMemberAwokenDom, teamAssistAwokenDom, teamData, editBox.memberIdx[2]); //刷新本人觉醒 if (teamMemberAwokenDom && teamAssistAwokenDom) refreshMemberAwoken(teamMemberAwokenDom, teamAssistAwokenDom, teamData, memberIdx); //刷新本人觉醒
const teamAwokenDom = teamBigBox.querySelector(".team-awoken"); //队伍觉醒合计 const teamAwokenDom = teamBigBox.querySelector(".team-awoken"); //队伍觉醒合计
if (teamAwokenDom) refreshTeamAwokenCount(teamAwokenDom, teamData); if (teamAwokenDom) refreshTeamAwokenCount(teamAwokenDom, teamData);
@ -5678,7 +5681,7 @@ function initialize() {
if (formationAwokenDom) refreshFormationAwokenCount(formationAwokenDom, formation.teams); if (formationAwokenDom) refreshFormationAwokenCount(formationAwokenDom, formation.teams);
//刷新改队员的CD //刷新改队员的CD
refreshMemberSkillCD(teamBigBox, teamData, editBox.memberIdx[2]); refreshMemberSkillCD(teamBigBox, teamData, memberIdx);
createNewUrl(); createNewUrl();
editBox.hide(); editBox.hide();

6
service-worker.js
View File

@ -33495,7 +33495,7 @@ const cachesMap = new Map([
], ],
[ [
"script.js", "script.js",
"0757c99429047e0b8d8fcd41f6cbd9a3" "f661d15af65ebeffa8910a28861a559a"
], ],
[ [
"solo.html", "solo.html",
@ -33511,7 +33511,7 @@ const cachesMap = new Map([
], ],
[ [
"style.css", "style.css",
"5684d82fe0c6c270993ae5a42e4feef7" "187cd48b26ec7a287b18f91dc7700066"
], ],
[ [
"temp.js", "temp.js",
@ -33523,7 +33523,7 @@ const cachesMap = new Map([
], ],
[ [
"languages/en.css", "languages/en.css",
"591f2e7ee847345caf198e7a1ed2a3f4" "2c03e0d17df3ac53af445c3a2b4a9b74"
], ],
[ [
"languages/en.js", "languages/en.js",

12
style.css
View File

@ -634,17 +634,18 @@ body.block-width-7 .formation-box{
border: 3px black solid; border: 3px black solid;
} }
.monster.delay::before{ .monster.delay::before{
width: 94px; display: flex;
height: 94px; justify-content: center;
align-items: center;
width: 100%;
height: 100%;
color: black; color: black;
font-size: 30px; font-size: 30px;
line-height: 47px;
text-align: center; text-align: center;
font-weight: bold; font-weight: bold;
/*content: "应 对\A威 吓";*/ /*content: "应 对\A威 吓";*/
font-family: var(--font-family); font-family: var(--font-family);
white-space: pre-wrap; white-space: pre-wrap;
display: inline-block;
} }
/*怪物属性*/ /*怪物属性*/
.monster .attrs { .monster .attrs {
@ -1770,9 +1771,6 @@ label[for="search-string"] {
overflow: hidden; overflow: hidden;
transform: scale(0.9); transform: scale(0.9);
} }
.setting-box .row-mon-id .unable-monster .monster{
filter: brightness(0.5);
}
.setting-box .row-mon-id .search-button{ .setting-box .row-mon-id .search-button{
width: 100%; width: 100%;
height: 40px; height: 40px;