From 0aac2f3ac54733d3c5d0b97c02b4eacb1396b4e2 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: Wed, 30 Sep 2020 15:31:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E6=84=9F=E8=B0=A2=E7=A5=AD=E7=9A=84?=
 =?UTF-8?q?=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 script-universal_function.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/script-universal_function.js b/script-universal_function.js
index 07de3e2e..43f8e6b4 100644
--- a/script-universal_function.js
+++ b/script-universal_function.js
@@ -399,8 +399,8 @@ function searchCards(cards,attr1,attr2,fixMainColor,types,typeAndOr,awokens,sawo
 	//属性
 	if (attr1 != null && attr1 ===  attr2)
 	{ //当两个颜色相同时，主副一样颜色的只需判断一次
-		cardsRange = cardsRange.filter(c=>c.attrs[0] == attr1 && c.attrs[1] == attr1);
-	}else if (fixMainColor || attr2 == -1) //如果固定了顺序，或者副属性选的是无
+		cardsRange = cardsRange.filter(c=>c.attrs[0] === attr1 && c.attrs[1] === attr1);
+	}else if (fixMainColor || attr1 === 6 || attr2 === -1) //如果固定了顺序，或者主副属性选的是无
 	{
 		if (attr1 != null)
 		{