From 93dd993e05235c5d9d3b250105cd999e6f40cdcb 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: Sat, 14 Aug 2021 05:44:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=A7=E7=94=9F=E5=AE=9D?=
 =?UTF-8?q?=E7=8F=A0=E8=A6=86=E7=9B=96=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 script-skill-parser.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/script-skill-parser.js b/script-skill-parser.js
index c762cdf9..40dcfbff 100644
--- a/script-skill-parser.js
+++ b/script-skill-parser.js
@@ -127,7 +127,7 @@ class Board
 			{
 				if (ci == 3) ci++;
 				//从数组中随机取出一个
-				if (exclude && exclude.includes([row[ci]])) continue;
+				if (exclude && exclude.includes(row[ci])) continue;
 				row[ci] = o.next().value?.[1] ?? row[ci];
 			}
 		}
@@ -136,13 +136,13 @@ class Board
 		{
 			if (ri == 2) ri++;
 			const row = this.#data[ri];
-			if (exclude && exclude.includes([row[3]])) continue;
+			if (exclude && exclude.includes(row[3])) continue;
 			row[3] = o.next().value?.[1] ?? row[3] ;
 		}
 		const row = this.#data[2];
 		for (let ci=0;ci<row.length;ci++)
 		{
-			if (exclude && exclude.includes([row[ci]])) continue;
+			if (exclude && exclude.includes(row[ci])) continue;
 			row[ci] = o.next().value?.[1] ?? row[ci] ;
 		}
 	}
@@ -151,7 +151,8 @@ class Board
 	{
 		const randomData = [];
 		//将65版之后的的提出来
-		let secondaryData = valueArray.splice((this.#rowCount - 1) * (this.#columnCount - 1));
+		const maxCount = this.#rowCount * this.#columnCount
+		let secondaryData = valueArray.splice((this.#rowCount - 1) * (this.#columnCount - 1) - (maxCount - valueArray.length));
 		
 		while(valueArray.length > 0)
 		{