From e1f95a2ef9bfac8702ff3efa428f7ce1e4b62f47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= <mapaler@163.com>
Date: Mon, 27 Jan 2020 02:43:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8C=E4=BA=BA=E9=98=9F=E4=BC=8D=EF=BC=8C?=
 =?UTF-8?q?=E5=9B=9E=E5=BD=92=E7=AC=AC=E4=B8=80=E4=BD=8D=E6=89=8D=E6=98=AF?=
 =?UTF-8?q?=E9=98=9F=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 multi.html  | 59 +++++++++++++++++++++++++++--------------------------
 script.js   | 28 +++++++++++++++++--------
 solo.html   |  3 ++-
 triple.html |  3 ++-
 4 files changed, 54 insertions(+), 39 deletions(-)

diff --git a/multi.html b/multi.html
index 25582a0e..b8dfb68b 100644
--- a/multi.html
+++ b/multi.html
@@ -29,7 +29,8 @@ var formation = new Formation(teamsCount,5);
 			<button class="btn-clear-data" onclick="clearData();"></button>
 			<button class="btn-show-mon-id" onclick="toggleShowMonId();"></button>
 			<button class="btn-show-mon-skill-cd" onclick="toggleShowMonSkillCd();"></button>
-			<button class="btn-solo-link" onclick="swapSingleMulitple();"></button>
+			<button class="btn-solo-link" onclick="turnPage(1);"></button>
+			<button class="btn-triple-link" onclick="turnPage(3);"></button>
 			<button class="btn-swap-AB-team" onclick="swapABteam();"></button>
 		</div>
 		<div class="status"><span class="icon"></span><span class="text"></span></div>
@@ -322,9 +323,6 @@ var formation = new Formation(teamsCount,5);
 			</li>
 			<li class="team-bigbox team-2 show-team-name-left reverse-member-assist">
 				<ul class="team-ability">
-					<li class="abilitys abilitys-1">
-						<div class="hp"></div><div class="atk"></div><div class="rcv"></div>
-					</li>
 					<li class="abilitys abilitys-2">
 						<div class="hp"></div><div class="atk"></div><div class="rcv"></div>
 					</li>
@@ -337,12 +335,15 @@ var formation = new Formation(teamsCount,5);
 					<li class="abilitys abilitys-5">
 						<div class="hp"></div><div class="atk"></div><div class="rcv"></div>
 					</li>
+					<li class="abilitys abilitys-1">
+						<div class="hp"></div><div class="atk"></div><div class="rcv"></div>
+					</li>
 				</ul>
 				<div class="team-box-name">
 					<div class="team-box">
 						<ul class="team-members">
-							<li class="member member-1 null">
-								<a class="monster" target="_blank" data-team="1" data-assist="0" data-index="0">
+							<li class="member member-2 null">
+								<a class="monster" target="_blank" data-team="1" data-assist="0" data-index="1">
 									<div class="property"></div>
 									<div class="subproperty"></div>
 									<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
@@ -353,8 +354,8 @@ var formation = new Formation(teamsCount,5);
 									<div class="skill"></div>
 								</a>
 							</li>
-							<li class="member member-2 null">
-								<a class="monster" target="_blank" data-team="1" data-assist="0" data-index="1">
+							<li class="member member-3 null">
+								<a class="monster" target="_blank" data-team="1" data-assist="0" data-index="2">
 									<div class="property"></div>
 									<div class="subproperty"></div>
 									<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
@@ -365,8 +366,8 @@ var formation = new Formation(teamsCount,5);
 									<div class="skill"></div>
 								</a>
 							</li>
-							<li class="member member-3 null">
-								<a class="monster" target="_blank" data-team="1" data-assist="0" data-index="2">
+							<li class="member member-4 null">
+								<a class="monster" target="_blank" data-team="1" data-assist="0" data-index="3">
 									<div class="property"></div>
 									<div class="subproperty"></div>
 									<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
@@ -377,8 +378,8 @@ var formation = new Formation(teamsCount,5);
 									<div class="skill"></div>
 								</a>
 							</li>
-							<li class="member member-4 null">
-								<a class="monster" target="_blank" data-team="1" data-assist="0" data-index="3">
+							<li class="member member-5 null">
+								<a class="monster" target="_blank" data-team="1" data-assist="0" data-index="4">
 									<div class="property"></div>
 									<div class="subproperty"></div>
 									<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
@@ -389,8 +390,8 @@ var formation = new Formation(teamsCount,5);
 									<div class="skill"></div>
 								</a>
 							</li>
-							<li class="member member-5 team-leader null">
-								<a class="monster" target="_blank" data-team="1" data-assist="0" data-index="4">
+							<li class="member member-1 team-leader null">
+								<a class="monster" target="_blank" data-team="1" data-assist="0" data-index="0">
 									<div class="property"></div>
 									<div class="subproperty"></div>
 									<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
@@ -403,7 +404,7 @@ var formation = new Formation(teamsCount,5);
 							</li>
 						</ul>
 						<ul class="team-latents">
-							<li class="latents latents-1">
+							<li class="latents latents-2">
 								<ul class="latent-ul display-none">
 									<li class="latent-icon"></li>
 									<li class="latent-icon"></li>
@@ -415,7 +416,7 @@ var formation = new Formation(teamsCount,5);
 									<li class="latent-icon"></li>
 								</ul>
 							</li>
-							<li class="latents latents-2">
+							<li class="latents latents-3">
 								<ul class="latent-ul display-none">
 									<li class="latent-icon"></li>
 									<li class="latent-icon"></li>
@@ -427,7 +428,7 @@ var formation = new Formation(teamsCount,5);
 									<li class="latent-icon"></li>
 								</ul>
 							</li>
-							<li class="latents latents-3">
+							<li class="latents latents-4">
 								<ul class="latent-ul display-none">
 									<li class="latent-icon"></li>
 									<li class="latent-icon"></li>
@@ -439,7 +440,7 @@ var formation = new Formation(teamsCount,5);
 									<li class="latent-icon"></li>
 								</ul>
 							</li>
-							<li class="latents latents-4">
+							<li class="latents latents-5">
 								<ul class="latent-ul display-none">
 									<li class="latent-icon"></li>
 									<li class="latent-icon"></li>
@@ -451,7 +452,7 @@ var formation = new Formation(teamsCount,5);
 									<li class="latent-icon"></li>
 								</ul>
 							</li>
-							<li class="latents latents-5">
+							<li class="latents latents-1">
 								<ul class="latent-ul display-none">
 									<li class="latent-icon"></li>
 									<li class="latent-icon"></li>
@@ -465,8 +466,8 @@ var formation = new Formation(teamsCount,5);
 							</li>
 						</ul>
 						<ul class="team-assist">
-							<li class="member member-1 null">
-								<a class="monster" target="_blank" data-team="1" data-assist="1" data-index="0">
+							<li class="member member-2 null">
+								<a class="monster" target="_blank" data-team="1" data-assist="1" data-index="1">
 									<div class="property"></div>
 									<div class="subproperty"></div>
 									<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
@@ -476,8 +477,8 @@ var formation = new Formation(teamsCount,5);
 									<div class="skill"></div>
 								</a>
 							</li>
-							<li class="member member-2 null">
-								<a class="monster" target="_blank" data-team="1" data-assist="1" data-index="1">
+							<li class="member member-3 null">
+								<a class="monster" target="_blank" data-team="1" data-assist="1" data-index="2">
 									<div class="property"></div>
 									<div class="subproperty"></div>
 									<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
@@ -487,8 +488,8 @@ var formation = new Formation(teamsCount,5);
 									<div class="skill"></div>
 								</a>
 							</li>
-							<li class="member member-3 null">
-								<a class="monster" target="_blank" data-team="1" data-assist="1" data-index="2">
+							<li class="member member-4 null">
+								<a class="monster" target="_blank" data-team="1" data-assist="1" data-index="3">
 									<div class="property"></div>
 									<div class="subproperty"></div>
 									<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
@@ -498,8 +499,8 @@ var formation = new Formation(teamsCount,5);
 									<div class="skill"></div>
 								</a>
 							</li>
-							<li class="member member-4 null">
-								<a class="monster" target="_blank" data-team="1" data-assist="1" data-index="3">
+							<li class="member member-5 null">
+								<a class="monster" target="_blank" data-team="1" data-assist="1" data-index="4">
 									<div class="property"></div>
 									<div class="subproperty"></div>
 									<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
@@ -509,8 +510,8 @@ var formation = new Formation(teamsCount,5);
 									<div class="skill"></div>
 								</a>
 							</li>
-							<li class="member member-5 null">
-								<a class="monster" target="_blank" data-team="1" data-assist="1" data-index="4">
+							<li class="member member-1 null">
+								<a class="monster" target="_blank" data-team="1" data-assist="1" data-index="0">
 									<div class="property"></div>
 									<div class="subproperty"></div>
 									<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
diff --git a/script.js b/script.js
index 36ff1d52..2b84852b 100644
--- a/script.js
+++ b/script.js
@@ -219,8 +219,17 @@ function swapABteam()
 	history.go();
 }
 //在单人和多人之间转移数据
-function swapSingleMulitple()
+function turnPage(toPage)
 {
+	switch(toPage)
+	{
+		case 1:
+			break;
+		case 2:
+			break;
+		case 3:
+			break;
+	}
 	if (solo)
 	{
 		//创建第二支队伍，各4个空的
@@ -1743,14 +1752,17 @@ function refreshAll(formationData){
 			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 membersDom = teamBox.querySelector(".team-members");
+		const latentsDom = teamBox.querySelector(".team-latents");
+		const assistsDom = teamBox.querySelector(".team-assist");
 		const teamAbilityDom = teamBigBox.querySelector(".team-ability");
-		for (let ti=0;ti<members.length;ti++)
+		for (let ti=0,ti_len=membersDom.querySelectorAll(".member").length;ti<ti_len;ti++)
 		{
-			changeid(teamData[0][ti],members[ti],latents[ti]); //队员
-			changeid(teamData[1][ti],assist[ti]); //辅助
+			const member = membersDom.querySelector(`.member-${ti+1} .monster`);
+			const latent = latentsDom.querySelector(`.latents-${ti+1} .latent-ul`);
+			const assist = assistsDom.querySelector(`.member-${ti+1} .monster`);
+			changeid(teamData[0][ti],member,latent); //队员
+			changeid(teamData[1][ti],assist); //辅助
 			refreshMemberSkillCD(teamBox,teamData,ti); //技能CD
 			refreshAbility(teamAbilityDom, teamData, ti); //本人能力值
 		}
@@ -1969,7 +1981,7 @@ function refreshFormationTotalHP(totalDom, teams){
 	const tRCV = tRCVArr.reduce(function(value, teamRCV){
 		return [value[0] + teamRCV[0], value[1] + Math.round(teamRCV[0] * (1 + 0.10 * teamRCV[1]))];
 	},[0,0]);
-	console.log(teams,tHPArr)
+
 	if (tHpDom)
 	{
 		tHpDom.innerHTML = tHP[0].toString() + 
diff --git a/solo.html b/solo.html
index 867bf7de..6dac1a67 100644
--- a/solo.html
+++ b/solo.html
@@ -34,7 +34,8 @@ var formation = new Formation(teamsCount,6);
 			<button class="btn-clear-data" onclick="clearData();"></button>
 			<button class="btn-show-mon-id" onclick="toggleShowMonId();"></button>
 			<button class="btn-show-mon-skill-cd" onclick="toggleShowMonSkillCd();"></button>
-			<button class="btn-multi-link" onclick="swapSingleMulitple();"></button>
+			<button class="btn-multi-link" onclick="turnPage(2);"></button>
+			<button class="btn-triple-link" onclick="turnPage(3);"></button>
 		</div>
 		<div class="status"><span class="icon"></span><span class="text"></span></div>
 	</div>
diff --git a/triple.html b/triple.html
index b5caef0d..60c91ba2 100644
--- a/triple.html
+++ b/triple.html
@@ -29,7 +29,8 @@ var formation = new Formation(teamsCount,6);
 			<button class="btn-clear-data" onclick="clearData();"></button>
 			<button class="btn-show-mon-id" onclick="toggleShowMonId();"></button>
 			<button class="btn-show-mon-skill-cd" onclick="toggleShowMonSkillCd();"></button>
-			<button class="btn-solo-link" onclick="swapSingleMulitple();"></button>
+			<button class="btn-solo-link" onclick="turnPage(1);"></button>
+			<button class="btn-multi-link" onclick="turnPage(2);"></button>
 			<button class="btn-swap-AB-team" onclick="swapABteam();"></button>
 		</div>
 		<div class="status"><span class="icon"></span><span class="text"></span></div>