diff --git a/languages/zh-CN.css b/languages/zh-CN.css
index fb7144b7..43ec6c5e 100644
--- a/languages/zh-CN.css
+++ b/languages/zh-CN.css
@@ -207,10 +207,16 @@
.control-box .btn-show-mon-skill-cd::before{
content: "❄️显示已满技能冷却";
}
-.tIf-total-hp::before{
+.team-total-info .tIf-total-hp::before{
+ content: "队伍HP(队伍觉醒和徽章)：";
+}
+.team-total-info .tIf-total-rcv::before{
+ content: "队伍回复(队伍觉醒和徽章)：";
+}
+.formation-total-info .tIf-total-hp::before{
content: "总HP(队伍觉醒和徽章)：";
}
-.tIf-total-rcv::before{
+.formation-total-info .tIf-total-rcv::before{
content: "总回复(队伍觉醒和徽章)：";
}
diff --git a/multi.html b/multi.html
index daa7bb81..25582a0e 100644
--- a/multi.html
+++ b/multi.html
@@ -39,6 +39,84 @@ var formation = new Formation(teamsCount,5);
-
+
+
+
+
+
@@ -224,8 +302,42 @@ var formation = new Formation(teamsCount,5);
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
-
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
@@ -411,6 +523,84 @@ var formation = new Formation(teamsCount,5);
+
+
+
+
+
+
@@ -495,7 +685,7 @@ var formation = new Formation(teamsCount,5);
-
+
@@ -572,7 +762,7 @@ var formation = new Formation(teamsCount,5);
-
+
diff --git a/script.js b/script.js
index ff450631..f79f94b7 100644
--- a/script.js
+++ b/script.js
@@ -22,7 +22,6 @@ var interchangePath; //储存划线的线
var controlBox; //储存整个controlBox
var formationBox; //储存整个formationBox
var teamBigBoxs; //储存全部teamBigBox
-var teamBoxs; //储存全部teamBox
var allMembers = []; //储存所有成员，包含辅助
var editBox; //储存整个editBox
var showSearch; //整个程序都可以用的显示搜索函数
@@ -453,11 +452,11 @@ function initialize()
};
teamBigBoxs = Array.prototype.slice.call(formationBox.querySelectorAll(".team-bigbox"));
- teamBoxs = teamBigBoxs.map(tbb=>{return tbb.querySelector(".team-box");});
//将所有怪物头像添加到全局数组
- teamBoxs.forEach(tb=>{
- const menbers = Array.prototype.slice.call(tb.querySelectorAll(".team-members .monster"));
- const assist = Array.prototype.slice.call(tb.querySelectorAll(".team-assist .monster"));
+ teamBigBoxs.forEach(teamBigBox=>{
+ const teamBox = teamBigBox.querySelector(".team-box");
+ const menbers = Array.prototype.slice.call(teamBox.querySelectorAll(".team-members .monster"));
+ const assist = Array.prototype.slice.call(teamBox.querySelectorAll(".team-assist .monster"));
menbers.forEach(m=>{
allMembers.push(m);
});
@@ -950,7 +949,7 @@ function initialize()
const mon = editBox.isAssist?new MemberAssist():new MemberTeam();
const teamData = formation.teams[editBox.memberIdx[0]];
const teamBigBox = teamBigBoxs[editBox.memberIdx[0]];
- const teamBox = teamBoxs[editBox.memberIdx[0]];
+ const teamBox = teamBigBox.querySelector(".team-box");
teamData[editBox.memberIdx[1]][editBox.memberIdx[2]] = mon;
@@ -999,20 +998,17 @@ function initialize()
changeid(mon,editBox.monsterHead,editBox.memberIdx[1] ? null : editBox.latentBox);
const teamAbilityDom = teamBigBox.querySelector(".team-ability");
- if (teamAbilityDom)
- {
- refreshAbility(teamAbilityDom, teamData, editBox.memberIdx[2]); //本人能力值
+ refreshAbility(teamAbilityDom, teamData, editBox.memberIdx[2]); //本人能力值
- const teamTotalInfoDom = teamBigBox.querySelector(".team-total-info"); //队伍能力值合计
- if (teamTotalInfoDom) refreshTeamTotalHP(teamTotalInfoDom,teamData);
- const formationTotalInfoDom = formationBox.querySelector(".formation-total-info"); //所有队伍能力值合计
- if (formationTotalInfoDom) refreshFormationTotalHP(formation.teams);
+ const teamTotalInfoDom = teamBigBox.querySelector(".team-total-info"); //队伍能力值合计
+ if (teamTotalInfoDom) refreshTeamTotalHP(teamTotalInfoDom,teamData);
+ const formationTotalInfoDom = formationBox.querySelector(".formation-total-info"); //所有队伍能力值合计
+ if (formationTotalInfoDom) refreshFormationTotalHP(formation.teams);
- const teamAwokenDom = teamBigBox.querySelector(".team-awoken"); //队伍觉醒合计
- if (teamAwokenDom) refreshTeamAwokenCount(teamAwokenDom,teamData);
- const formationAwokenDom = formationBox.querySelector(".formation-awoken"); //所有队伍觉醒合计
- if (formationAwokenDom) refreshFormationAwokenCount(formation.teams);
- }
+ const teamAwokenDom = teamBigBox.querySelector(".team-awoken"); //队伍觉醒合计
+ if (teamAwokenDom) refreshTeamAwokenCount(teamAwokenDom,teamData);
+ const formationAwokenDom = formationBox.querySelector(".formation-awoken"); //所有队伍觉醒合计
+ if (formationAwokenDom) refreshFormationAwokenCount(formation.teams);
//刷新改队员的CD
refreshMemberSkillCD(teamBox,teamData,editBox.memberIdx[2]);
@@ -1410,10 +1406,9 @@ function editMon(teamNum,isAssist,indexInTeam)
//数据
const mon = formation.teams[teamNum][isAssist][indexInTeam];
const card = Cards[mon.id] || Cards[0];
- //对应的Dom
- const formationBox = document.querySelector(".formation-box .formation-"+(teamNum?"B":"A")+"-box");
//const teamBigBox =
- const teamBox = teamBoxs[teamNum];
+ const teamBigBox = teamBigBoxs[teamNum];
+ const teamBox = teamBigBox.querySelector(".team-box");
const memberBox = teamBox.querySelector(isAssist?".team-assist":".team-members");
const memberLi = memberBox.querySelector(`.member-${indexInTeam+1}`);
@@ -1704,6 +1699,8 @@ function refreshAll(formationData){
const titleBox = fragment.appendChild(formationBox.querySelector(".title-box"));
const awokenTotalBox = formationBox.querySelector(".awoken-total-box");
const detailBox = formationBox.querySelector(".detail-box");
+ const formationTotalInfoDom = formationBox.querySelector(".formation-total-info"); //所有队伍能力值合计
+ const formationAwokenDom = formationBox.querySelector(".formation-awoken"); //所有队伍觉醒合计
for (let ni=0; ni < formationBox.childNodes.length; ni++)
{
@@ -1719,133 +1716,130 @@ function refreshAll(formationData){
const teamBox = teamBigBox.querySelector(".team-box");
const teamData = formationData.teams[teamNum];
const badgeBox = teamBigBox.querySelector(".team-badge");
- //const badges = Array.prototype.slice.call(badgeBox.querySelectorAll(".badge-radio"));
- const badge = badgeBox.querySelector(`#team-${teamNum}-badge-${formationData.badge}`);
- badge.checked = true;
+ if (badgeBox)
+ {
+ const badge = badgeBox.querySelector(`#team-${teamNum}-badge-${formationData.badge}`);
+ badge.checked = true;
+ }
const members = teamBox.querySelectorAll(".team-members .monster");
const latents = teamBox.querySelectorAll(".team-latents .latent-ul");
const assist = teamBox.querySelectorAll(".team-assist .monster");
- const teamAbilityDom = teamBox.querySelector(".team-ability");
+ const teamAbilityDom = teamBigBox.querySelector(".team-ability");
for (let ti=0;ti=0) //属于大觉醒
{
continue;
}else
{
- setCount(ai,awokenCountInFormation(teams,ai,solo));
+ setCount(aicon,awokenCountInTeam(team,ai,solo));
}
}
- awokenTotalBox.appendChild(awokenUL);
+ awokenDom.appendChild(fragment);
}
//刷新几个队伍觉醒统计
-function refreshFormationAwokenCount(teams){
- return;
+function refreshFormationAwokenCount(awokenDom,teams){
let fragment = document.createDocumentFragment(); //创建节点用的临时空间
- const awokenTotalBox = formationBox.querySelector(".awoken-total-box");
- const awokenUL = fragment.appendChild(awokenTotalBox.querySelector(".awoken-ul"));
- function setCount(idx,number){
- var aicon = awokenUL.querySelector(".awoken-" + idx);
+ const awokenUL = fragment.appendChild(awokenDom.querySelector(".awoken-ul"));
+ function setCount(aicon,number){
if (!aicon) return; //没有这个觉醒就撤回
- var ali = aicon.parentNode;
- var countDom = ali.querySelector(".count");
+ const ali = aicon.parentNode;
+ const countDom = ali.querySelector(".count");
countDom.innerHTML = number;
if (number)
ali.classList.remove("display-none");
else
ali.classList.add("display-none");
}
- var bigAwoken = [52,53,56,68,69,70]; //等于几个小觉醒的大觉醒
+ const bigAwoken = [52,53,56,68,69,70]; //等于几个小觉醒的大觉醒
for (var ai=1;ai<=72;ai++)
{
+ const aicon = awokenUL.querySelector(".awoken-" + ai);
+ if (!aicon) continue;
if (ai == 10) //防封
{
- setCount(ai,awokenCountInFormation(teams,ai,solo)+awokenCountInFormation(teams,52,solo)*2);
+ setCount(aicon,awokenCountInFormation(teams,ai,solo)+awokenCountInFormation(teams,52,solo)*2);
}else if (ai == 11) //防暗
{
- setCount(ai,awokenCountInFormation(teams,ai,solo)+awokenCountInFormation(teams,68,solo)*5);
+ setCount(aicon,awokenCountInFormation(teams,ai,solo)+awokenCountInFormation(teams,68,solo)*5);
}else if (ai == 12) //防废
{
- setCount(ai,awokenCountInFormation(teams,ai,solo)+awokenCountInFormation(teams,69,solo)*5);
+ setCount(aicon,awokenCountInFormation(teams,ai,solo)+awokenCountInFormation(teams,69,solo)*5);
}else if (ai == 13) //防毒
{
- setCount(ai,awokenCountInFormation(teams,ai,solo)+awokenCountInFormation(teams,70,solo)*5);
+ setCount(aicon,awokenCountInFormation(teams,ai,solo)+awokenCountInFormation(teams,70,solo)*5);
}else if (ai == 19) //手指
{
- setCount(ai,awokenCountInFormation(teams,ai,solo)+awokenCountInFormation(teams,53,solo)*2);
+ setCount(aicon,awokenCountInFormation(teams,ai,solo)+awokenCountInFormation(teams,53,solo)*2);
}else if (ai == 21) //SB
{
- setCount(ai,awokenCountInFormation(teams,ai,solo)+awokenCountInFormation(teams,56,solo)*2);
+ setCount(aicon,awokenCountInFormation(teams,ai,solo)+awokenCountInFormation(teams,56,solo)*2);
}else if (bigAwoken.indexOf(ai)>=0) //属于大觉醒
{
continue;
}else
{
- setCount(ai,awokenCountInFormation(teams,ai,solo));
+ setCount(aicon,awokenCountInFormation(teams,ai,solo));
}
}
- awokenTotalBox.appendChild(awokenUL);
+ awokenDom.appendChild(fragment);
}
//刷新能力值
function refreshAbility(abilityDom,team,idx){
@@ -1871,6 +1865,7 @@ function refreshAbility(abilityDom,team,idx){
}
}
}
+ if (!abilityDom) return; //如果没有dom，直接跳过
const abilityLi = abilityDom.querySelector(".abilitys-" + (idx+1));
const hpDom = abilityLi.querySelector(".hp");
const atkDom = abilityLi.querySelector(".atk");
@@ -1889,73 +1884,84 @@ function refreshAbility(abilityDom,team,idx){
}
//刷新队伍能力值合计
function refreshTeamTotalHP(totalDom,team){
- return;
//计算总的生命值
- const teamInfo = formationBox.querySelector(".team-total-info");
- if (!teamInfo) return;
- const tHpDom = teamInfo.querySelector(".tIf-total-hp");
- const tRcvDom = teamInfo.querySelector(".tIf-total-rcv");
+ if (!totalDom) return;
+ const tHpDom = totalDom.querySelector(".tIf-total-hp");
+ const tRcvDom = totalDom.querySelector(".tIf-total-rcv");
+
const tHP = team[0].reduce(function(value,mon){ //队伍计算的总HP
return value += mon.ability ? mon.ability[0] : 0;
},0);
- const teamHPAwoken = awokenCountInTeam(team,46,solo); //全队血包个数
- //let tHPwithAwoken = Math.round(tHP * (1 + awokenCountInTeam(team,46,solo) * 0.05)); //全队血包
+ const teamHPAwoken = awokenCountInTeam(team,46,solo); //全队大血包个数
+
let badgeHPScale = 1; //徽章倍率
- if (formation.badge == 4)
+ if (formation.badge == 4 && solo)
{
badgeHPScale = 1.05;
- }else if (formation.badge == 11)
+ }else if (formation.badge == 11 && solo)
{
badgeHPScale = 1.15;
}
const tRCV = team[0].reduce(function(value,mon){ //队伍计算的总回复
return value += mon.ability ? mon.ability[2] : 0;
},0);
- const teamRCVAwoken = awokenCountInTeam(team,47,solo); //全队回复个数
- //let tRCVwithAwoken = Math.round(tRCV * (1 + awokenCountInTeam(team,47,solo) * 0.10)); //全队回复
+ const teamRCVAwoken = awokenCountInTeam(team,47,solo); //全队大回复个数
+
let badgeRCVScale = 1; //徽章倍率
- if (formation.badge == 3)
+ if (formation.badge == 3 && solo)
{
badgeRCVScale = 1.25;
- }else if (formation.badge == 10)
+ }else if (formation.badge == 10 && solo)
{
badgeRCVScale = 1.35;
}
- tHpDom.innerHTML = tHP.toString() +
- (teamHPAwoken>0||badgeHPScale>1 ?
- ("("+Math.round(tHP * (1 + 0.05 * teamHPAwoken)*badgeHPScale).toString()+")") :
- "");
- tRcvDom.innerHTML = tRCV.toString() +
- (teamRCVAwoken>0||badgeRCVScale>1 ?
- ("("+Math.round(tRCV * (1 + 0.10 * teamRCVAwoken)*badgeRCVScale).toString()+")") :
- "");
+ if (tHpDom)
+ {
+ tHpDom.innerHTML = tHP.toString() +
+ (teamHPAwoken>0||badgeHPScale!=1 ?
+ ("("+Math.round(tHP * (1 + 0.05 * teamHPAwoken)*badgeHPScale).toString()+")") :
+ "");
+ }
+ if (tRcvDom)
+ {
+ tRcvDom.innerHTML = tRCV.toString() +
+ (teamRCVAwoken>0||badgeRCVScale!=1 ?
+ ("("+Math.round(tRCV * (1 + 0.10 * teamRCVAwoken)*badgeRCVScale).toString()+")") :
+ "");
+ }
}
//刷新所有队伍能力值合计
-function refreshFormationTotalHP(teams){
- return;
+function refreshFormationTotalHP(totalDom, teams){
//计算总的生命值
- const teamInfo = formationBox.querySelector(".team-total-info");
- if (!teamInfo) return;
- const tHpDom = teamInfo.querySelector(".tIf-total-hp");
- const tRcvDom = teamInfo.querySelector(".tIf-total-rcv");
- const tHP = team[0].reduce(function(value,mon){ //队伍计算的总HP
- return value += mon.ability ? mon.ability[0] : 0;
+ if (!totalDom) return;
+ const tHpDom = totalDom.querySelector(".tIf-total-hp");
+ const tRcvDom = totalDom.querySelector(".tIf-total-rcv");
+
+ const tHP = teams.reduce(function(value, team){
+ const teamTHP = team[0].reduce(function(value,mon){ //队伍计算的总HP
+ return value += mon.ability ? mon.ability[0] : 0;
+ },0);
+ return value + teamTHP;
},0);
- const teamHPAwoken = awokenCountInTeam(team,46,solo); //全队血包个数
- //let tHPwithAwoken = Math.round(tHP * (1 + awokenCountInTeam(team,46,solo) * 0.05)); //全队血包
+
+ const teamHPAwoken = awokenCountInFormation(teams,46,solo); //全队大血包个数
+
let badgeHPScale = 1; //徽章倍率
- if (formation.badge == 4)
+ if (formation.badge == 4 && solo)
{
badgeHPScale = 1.05;
- }else if (formation.badge == 11)
+ }else if (formation.badge == 11 && solo)
{
badgeHPScale = 1.15;
}
- const tRCV = team[0].reduce(function(value,mon){ //队伍计算的总回复
- return value += mon.ability ? mon.ability[2] : 0;
+ const tRCV = teams.reduce(function(value, team){
+ const teamTRCV = team[0].reduce(function(value,mon){ //队伍计算的总回复
+ return value += mon.ability ? mon.ability[2] : 0;
+ },0);
+ return value + teamTRCV;
},0);
- const teamRCVAwoken = awokenCountInTeam(team,47,solo); //全队回复个数
- //let tRCVwithAwoken = Math.round(tRCV * (1 + awokenCountInTeam(team,47,solo) * 0.10)); //全队回复
+ const teamRCVAwoken = awokenCountInFormation(teams,47,solo); //全队大回复个数
+
let badgeRCVScale = 1; //徽章倍率
if (formation.badge == 3)
{
@@ -1964,14 +1970,20 @@ function refreshFormationTotalHP(teams){
{
badgeRCVScale = 1.35;
}
- tHpDom.innerHTML = tHP.toString() +
- (teamHPAwoken>0||badgeHPScale>1 ?
- ("("+Math.round(tHP * (1 + 0.05 * teamHPAwoken)*badgeHPScale).toString()+")") :
- "");
- tRcvDom.innerHTML = tRCV.toString() +
- (teamRCVAwoken>0||badgeRCVScale>1 ?
- ("("+Math.round(tRCV * (1 + 0.10 * teamRCVAwoken)*badgeRCVScale).toString()+")") :
- "");
+ if (tHpDom)
+ {
+ tHpDom.innerHTML = tHP.toString() +
+ (teamHPAwoken>0||badgeHPScale!=1 ?
+ ("("+Math.round(tHP * (1 + 0.05 * teamHPAwoken)*badgeHPScale).toString()+")") :
+ "");
+ }
+ if (tRcvDom)
+ {
+ tRcvDom.innerHTML = tRCV.toString() +
+ (teamRCVAwoken>0||badgeRCVScale!=1 ?
+ ("("+Math.round(tRCV * (1 + 0.10 * teamRCVAwoken)*badgeRCVScale).toString()+")") :
+ "");
+ }
}
//刷新单人技能CD
function refreshMemberSkillCD(teamDom,team,idx){
diff --git a/solo.html b/solo.html
index f0ebbbc8..867bf7de 100644
--- a/solo.html
+++ b/solo.html
@@ -277,28 +277,28 @@ var formation = new Formation(teamsCount,6);
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
-
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
@@ -448,7 +448,7 @@ var formation = new Formation(teamsCount,6);
-
+
@@ -525,7 +525,7 @@ var formation = new Formation(teamsCount,6);
-
+
diff --git a/style.css b/style.css
index b89a6b7a..40d85f21 100644
--- a/style.css
+++ b/style.css
@@ -19,6 +19,7 @@
}
body{
font-family: "Microsoft Yahei","Source Han Sans",Arial, Helvetica, sans-serif, "Malgun Gothic", "맑은 고딕", "Gulim", AppleGothic;
+ --head-block-width: 108px;
--search-icon-unchecked: 0.4;
--team-1-bgcolor : pink;
--team-2-bgcolor : lightblue;
@@ -281,7 +282,7 @@ ul{
.member, .acquisitus-awoken-icon{
display: inline-block;
position: relative;
- width: 108px;
+ width: var(--head-block-width);
}
.formation-box .monster{
margin: 4px; /*留给队长边框的*/
@@ -345,8 +346,7 @@ ul{
line-height: 50px;
white-space: pre-wrap;
display: none;
- width: 108px;
- height: 108px;
+ width: var(--head-block-width);
}
.show-team-name-left .team-box-name::before{
display: inline-block;
@@ -389,7 +389,7 @@ ul{
.team-box .team-assist .member::after,
.team-box .team-assist .member::before
{
- width: 108px;
+ width: var(--head-block-width);
text-align: center;
font-size: 18px;
font-weight: bold;
@@ -431,7 +431,7 @@ ul{
*/
/*队伍的潜觉*/
.team-latents .latents{
- width: 108px;
+ width: var(--head-block-width);
/*float:left;*/
margin-bottom: -20px;
display: inline-block;
@@ -489,14 +489,35 @@ ul{
}
/*三维计算值*/
-.team-ability .abilitys{
+.team-ability::after,
+.team-ability::before,
+.team-ability .abilitys
+{
padding-left: 5px;
box-sizing: border-box;
font-size: 15px;
- width: 108px;
+ width: var(--head-block-width);
+}
+.team-ability .abilitys
+{
+ display: inline-block;
+}
+.team-ability::after,
+.team-ability::before
+{
+ display: none;
+ content: "";
+}
+.show-team-name-left .team-ability::before{
display: inline-block;
}
-.abilitys .hp::before,.abilitys .atk::before,.abilitys .rcv::before{
+.show-team-name-right .team-ability::after{
+ display: inline-block;
+}
+.abilitys .hp::before,
+.abilitys .atk::before,
+.abilitys .rcv::before
+{
width: 45px;
display: inline-block;
}
@@ -683,7 +704,7 @@ ul{
width: 55px;
height: 30px;
}
-.attrs .attr-list input:checked~label{
+.attrs .attr-list input:checked+label{
background-color:#8C4242;
box-shadow: inset black 0 0 5px;
cursor: auto;
@@ -714,7 +735,7 @@ ul{
padding: 0;
float: right;
}
-.search-box .awoken-list button{
+.search-box .awoken-ul button{
border: none;
background-color: unset;
font-family: 'FOT-KurokaneStd-EB', "Malgun Gothic", "맑은 고딕", "Gulim", AppleGothic;
@@ -723,28 +744,28 @@ ul{
font-size: 16px;
padding: 0;
}
-.search-box .awoken-list .awoken-count.zero{
+.search-box .awoken-ul .awoken-count.zero{
opacity: var(--search-icon-unchecked);
}
-.search-box .awoken-list .count{
+.search-box .awoken-ul .count{
width: 30px;
}
-.search-box .awoken-list .awoken-count .awoken-icon{
+.search-box .awoken-ul .awoken-count .awoken-icon{
cursor: pointer;
}
-.search-box .awoken-list .awoken-count .count{
+.search-box .awoken-ul .awoken-count .count{
cursor: pointer;
}
-.search-box .awoken-list .awoken-count.zero .count{
+.search-box .awoken-ul .awoken-count.zero .count{
cursor: auto;
}
/*.search-box .sawoken-div::before{
content: "超觉醒";
}*/
-.sawoken-div .sawoken-list li label{
+.sawoken-div .sawoken-ul li label{
opacity: var(--search-icon-unchecked);
}
-.sawoken-div .sawoken-list input:checked~label{
+.sawoken-div .sawoken-ul input:checked+label{
opacity: 1;
}
@@ -1145,24 +1166,23 @@ ul{
.detail-box{
margin-top:5px;
}
-.awoken-total-box .awoken-ul .awoken-count,
-.search-box .awoken-list .awoken-count{
+.awoken-ul .awoken-count
+{
font-size: 16px;
line-height: 32px;
font-family: 'FOT-KurokaneStd-EB',"Malgun Gothic", "맑은 고딕", "Gulim", AppleGothic;
- float: left;
+ display: inline-block;
margin-right: 3px;
}
-.awoken-total-box .awoken-ul .count,
-.search-box .awoken-list .count{
+.awoken-ul .count
+{
height: 32px;
width: 37px;
display: inline-block;
vertical-align: middle;
}
-.awoken-total-box .awoken-ul .count::before,
-.search-box .awoken-list .count::before{
+.awoken-ul .count::before{
content: "×";
}
/*控制框*/
diff --git a/triple.html b/triple.html
index 93c51078..b5caef0d 100644
--- a/triple.html
+++ b/triple.html
@@ -259,6 +259,26 @@ var formation = new Formation(teamsCount,6);
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
@@ -494,6 +514,26 @@ var formation = new Formation(teamsCount,6);
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
@@ -729,6 +769,26 @@ var formation = new Formation(teamsCount,6);
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
@@ -813,7 +873,7 @@ var formation = new Formation(teamsCount,6);
-
+
@@ -890,7 +950,7 @@ var formation = new Formation(teamsCount,6);
-
+
diff --git a/universal_function.js b/universal_function.js
index 627aee41..b3519b7f 100644
--- a/universal_function.js
+++ b/universal_function.js
@@ -87,43 +87,48 @@ function usedHole(latent)
},0);
}
//计算所有队伍中有多少个该觉醒
-function awokenCountInFormation(formationTeam,ak,solo)
+function awokenCountInFormation(formationTeams,awokenIndex,solo)
{
- var allAwokenCount = formationTeam.reduce(function(fc,fm){
- return fc + awokenCountInTeam(fm,ak,solo);
+ var formationAwokenCount = formationTeams.reduce(function(previous,team){
+ return previous + awokenCountInTeam(team,awokenIndex,solo);
},0);
- return allAwokenCount;
+ return formationAwokenCount;
}
//计算单个队伍中有多少个该觉醒
function awokenCountInTeam(team,awokenIndex,solo)
{
- var formationAwokenCount = team.reduce(function(tc,tm,isAssist){
- var teamAwokenCount = tm.reduce(function(c,m){
- const Card = Cards[m.id] || Cards[0];
- if (m.id<=0)
- { //如果是特殊情况的
- return c;
- }
- const cdAwoken = Card.awakenings; //这个怪物的觉醒数据
- const cdSAwoken = Card.superAwakenings; //这个怪物的超觉醒数据
- if ((!cdAwoken && !cdSAwoken) || (isAssist && cdAwoken.indexOf(49)<0))
- { //如果没有觉醒和超觉醒 || （如果是辅助队 &&第一个不是武器觉醒）
- return c;
- }
- //启用的觉醒数组片段
- const enableAwoken = cdAwoken.slice(0,m.awoken);
- //相同的觉醒数
- let hasAwoken = enableAwoken.filter(function(a){return a == awokenIndex;}).length;
- //如果是单人，有超觉醒，且超觉醒id和计数的id相同
- if (solo && cdSAwoken && (cdSAwoken[m.sawoken] == awokenIndex))
- {
- hasAwoken++;
- }
- return c + hasAwoken;
- },0);
- return tc + teamAwokenCount;
+ const memberArray = team[0];
+ const assistArray = team[1];
+
+ const teamAwokenCount = memberArray.reduce(function(previous,mon,idx){
+ if (mon.id<=0)
+ { //如果是delay和null
+ return previous;
+ }
+ const card = Cards[mon.id];
+ if (!card || !card.enabled)
+ { //如果卡片未启用
+ return previous;
+ }
+
+ const assist = assistArray[idx];
+ const assistCard = Cards[assist.id];
+ //启用的觉醒数组片段
+ let enableAwoken = card.awakenings.slice(0, mon.awoken);
+ if (solo) //单人增加超觉醒
+ {
+ enableAwoken = enableAwoken.concat(card.superAwakenings[mon.sawoken]);
+ }
+ if (assistCard && assistCard.enabled && assistCard.awakenings.indexOf(49)>=0)
+ { //如果卡片未启用
+ enableAwoken = enableAwoken.concat(assistCard.awakenings);
+ }
+
+ //相同的觉醒数
+ const hasAwoken = enableAwoken.filter(ak=>{return ak == awokenIndex;}).length;
+ return previous + hasAwoken;
},0);
- return formationAwokenCount;
+ return teamAwokenCount;
}
//返回可用的怪物名称
function returnMonsterNameArr(card, lsList, defaultCode)