From d31f4ad6a035ca8948070775da663cb6f9fd597d 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: Thu, 28 Nov 2019 00:25:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BD=AC=E7=94=9F=E5=92=8C?=
 =?UTF-8?q?=E8=B6=85=E8=BD=AC=E7=94=9F=E7=9A=848=E4=B8=AA=E6=BD=9C?=
 =?UTF-8?q?=E5=9C=A8=E8=A7=89=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 multi.html | 22 ++++++++++++++++++++++
 script.js  | 32 +++++++++++++++++++++-----------
 solo.html  | 14 ++++++++++++++
 3 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/multi.html b/multi.html
index 9529ab81..8e7d452d 100644
--- a/multi.html
+++ b/multi.html
@@ -94,6 +94,8 @@ var formation = new Formation(2,5);
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
 						</ul>
 					</li>
 					<li class="latents latents-2">
@@ -104,6 +106,8 @@ var formation = new Formation(2,5);
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
 						</ul>
 					</li>
 					<li class="latents latents-3">
@@ -114,6 +118,8 @@ var formation = new Formation(2,5);
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
 						</ul>
 					</li>
 					<li class="latents latents-4">
@@ -124,6 +130,8 @@ var formation = new Formation(2,5);
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
 						</ul>
 					</li>
 					<li class="latents latents-5">
@@ -134,6 +142,8 @@ var formation = new Formation(2,5);
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
 						</ul>
 					</li>
 				</ul>
@@ -264,6 +274,8 @@ var formation = new Formation(2,5);
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
 						</ul>
 					</li>
 					<li class="latents latents-2">
@@ -274,6 +286,8 @@ var formation = new Formation(2,5);
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
 						</ul>
 					</li>
 					<li class="latents latents-3">
@@ -284,6 +298,8 @@ var formation = new Formation(2,5);
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
 						</ul>
 					</li>
 					<li class="latents latents-4">
@@ -294,6 +310,8 @@ var formation = new Formation(2,5);
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
 						</ul>
 					</li>
 					<li class="latents latents-5">
@@ -304,6 +322,8 @@ var formation = new Formation(2,5);
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
 						</ul>
 					</li>
 				</ul>
@@ -449,6 +469,8 @@ var formation = new Formation(2,5);
 					<li class="latent-icon"></li>
 					<li class="latent-icon"></li>
 					<li class="latent-icon"></li>
+					<li class="latent-icon"></li>
+					<li class="latent-icon"></li>
 				</ul>
 				<ul class="m-latent-allowable-ul">
 					<li class="latent-icon latent-icon-1" value="1"></li><!--HP-->
diff --git a/script.js b/script.js
index 4bbeda75..64bde968 100644
--- a/script.js
+++ b/script.js
@@ -115,6 +115,12 @@ Formation.prototype.loadObj= function(f){
 		})
 	});
 }
+//获取最大潜觉数量
+function getMaxLatentCount(id)
+{ //转生2和超转生3为8个格子
+	let m = ms[id],mEvoType = m.evoType;
+	return  (mEvoType == 2 || mEvoType == 3) ? 8 : 6;
+}
 //创建一个新的怪物头像
 function createCardHead(id)
 {
@@ -497,18 +503,19 @@ function initialize()
 	var monEditLatents = Array.prototype.slice.call(monEditLatentUl.querySelectorAll("li"));
 	var monEditLatentAllowableUl = settingBox.querySelector(".m-latent-allowable-ul");
 	var monEditLatentsAllowable = Array.prototype.slice.call(monEditLatentAllowableUl.querySelectorAll("li"));
-	editBox.refreshLatent = function(latent) //刷新潜觉
+	editBox.refreshLatent = function(latent,monid) //刷新潜觉
 	{
 		if (this.value<0) return;
+		let maxLatentCount = getMaxLatentCount(monid); //最大潜觉数量
 		var usedHoleN = usedHole(latent);
-		for (var ai=0;ai<6;ai++)
+		for (var ai=0;ai<monEditLatents.length;ai++)
 		{
 			if (latent[ai])
 			{
 				monEditLatents[ai].className = "latent-icon latent-icon-" + latent[ai];
 				monEditLatents[ai].value = ai;
 			}
-			else if(ai<(6-usedHoleN+latent.length))
+			else if(ai<(maxLatentCount-usedHoleN+latent.length))
 			{
 				monEditLatents[ai].className = "latent-icon";
 				monEditLatents[ai].value = -1;
@@ -526,7 +533,7 @@ function initialize()
 			var aIdx = parseInt(this.value);
 			editBox.latent.splice(aIdx,1);
 			editBox.reCalculateAbility();
-			editBox.refreshLatent(editBox.latent);
+			editBox.refreshLatent(editBox.latent,editBox.mid);
 		}
 	})
 	//可选觉醒的添加
@@ -535,13 +542,14 @@ function initialize()
 			if (this.classList.contains("unselected-latent")) return;
 			var lIdx = parseInt(this.value);
 			var usedHoleN = usedHole(editBox.latent);
-			if (lIdx >= 12 && usedHoleN<=4)
+			let maxLatentCount = getMaxLatentCount(editBox.mid); //最大潜觉数量
+			if (lIdx >= 12 && usedHoleN<=(maxLatentCount-2))
 				editBox.latent.push(lIdx);
-			else if (lIdx < 12 && usedHoleN<=5)
+			else if (lIdx < 12 && usedHoleN<=(maxLatentCount-1))
 				editBox.latent.push(lIdx);
 
 			editBox.reCalculateAbility();
-			editBox.refreshLatent(editBox.latent);
+			editBox.refreshLatent(editBox.latent,editBox.mid);
 		}
 	})
 
@@ -826,13 +834,15 @@ function changeid(mon,monDom,latentDom)
 			latentDom.classList.remove("display-none");
 		var latentDoms = Array.prototype.slice.call(latentDom.querySelectorAll("li"));
 		var usedHoleN = usedHole(latent);
-		for (var ai=0;ai<6;ai++)
+		let maxLatentCount = getMaxLatentCount(mon.id); //最大潜觉数量
+		for (var ai=0;ai<latentDoms.length;ai++)
 		{
+			console.log(ai,maxLatentCount,usedHoleN,latent.length)
 			if (latent[ai])
 			{
 				latentDoms[ai].className = "latent-icon latent-icon-" + latent[ai];
 			}
-			else if(ai<(6-usedHoleN+latent.length))
+			else if(ai<(maxLatentCount-usedHoleN+latent.length))
 			{
 				latentDoms[ai].className = "latent-icon";
 			}
@@ -895,7 +905,7 @@ function editMon(AorB,isAssist,tempIdx)
 	if (!isAssist)
 	{
 		editBox.latent = mD.latent?mD.latent.concat():[];
-		editBox.refreshLatent(editBox.latent);
+		editBox.refreshLatent(editBox.latent,mD.id);
 		btnDelay.classList.add("display-none");
 		settingBox.querySelector(".row-mon-latent").classList.remove("display-none");
 		if (ms[mD.id].sAwoken)settingBox.querySelector(".row-mon-super-awoken").classList.remove("display-none");
@@ -1050,7 +1060,7 @@ function editBoxChangeMonId(id)
 		}
 	}
 	editBox.latent.length = 0;
-	editBox.refreshLatent(editBox.latent);
+	editBox.refreshLatent(editBox.latent,id);
 	editBox.reCalculateAbility();
 }
 //刷新整个队伍
diff --git a/solo.html b/solo.html
index 92507b1d..dbb64dd2 100644
--- a/solo.html
+++ b/solo.html
@@ -125,6 +125,8 @@ var formation = new Formation(1,6);
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
 						</ul>
 					</li>
 					<li class="latents latents-2">
@@ -135,6 +137,8 @@ var formation = new Formation(1,6);
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
 						</ul>
 					</li>
 					<li class="latents latents-3">
@@ -145,6 +149,8 @@ var formation = new Formation(1,6);
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
 						</ul>
 					</li>
 					<li class="latents latents-4">
@@ -155,6 +161,8 @@ var formation = new Formation(1,6);
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
 						</ul>
 					</li>
 					<li class="latents latents-5">
@@ -165,6 +173,8 @@ var formation = new Formation(1,6);
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
 						</ul>
 					</li>
 					<li class="latents latents-6">
@@ -175,6 +185,8 @@ var formation = new Formation(1,6);
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
 							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
 						</ul>
 					</li>
 				</ul>
@@ -421,6 +433,8 @@ var formation = new Formation(1,6);
 					<li class="latent-icon"></li>
 					<li class="latent-icon"></li>
 					<li class="latent-icon"></li>
+					<li class="latent-icon"></li>
+					<li class="latent-icon"></li>
 				</ul>
 				<ul class="m-latent-allowable-ul">
 					<li class="latent-icon latent-icon-1" value="1"></li><!--HP-->