From 09569d1bf2d290d9e722d4662609ce80cfbe63ff 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: Fri, 9 Oct 2020 18:44:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=8D=E8=83=BD=E5=BC=BA?=
 =?UTF-8?q?=E5=88=B6=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/script.js b/script.js
index 889b8fc2..aeb7e6d4 100644
--- a/script.js
+++ b/script.js
@@ -471,7 +471,7 @@ function loadData(force = false)
 
 		if (statusLine) statusLine.classList.remove("loading-check-version");
 		if (statusLine) statusLine.classList.add("loading-mon-info");
-		if (db && currentCkey.ckey.card == lastCurrentCkey.ckey.card) {
+		if (!force && db && currentCkey.ckey.card == lastCurrentCkey.ckey.card) {
 			console.log(`cards_${currentDataSource.code} ckey相等，直接读取已有的数据`, currentCkey.ckey.card);
 			const transaction = db.transaction([`cards`]);
 			const objectStore = transaction.objectStore(`cards`);
@@ -500,7 +500,7 @@ function loadData(force = false)
 		{
 			GM_xmlhttpRequest({
 				method: "GET",
-				url: `${sourceDataFolder}/mon_${currentDataSource.code}.json${force?`?t=${_time}`:''}`, //Cards数据文件
+				url: `${sourceDataFolder}/mon_${currentDataSource.code}.json?t=${_time}`, //Cards数据文件
 				onload: function(response) {
 					console.log(`cards_${currentDataSource.code} ckey变化，储存新数据`, currentCkey.ckey.card);
 					try {
@@ -557,7 +557,7 @@ function loadData(force = false)
 			if (statusLine) statusLine.classList.remove("loading-mon-info");
 
 			if (statusLine) statusLine.classList.add("loading-skill-info");
-			if (db && currentCkey.ckey.skill == lastCurrentCkey.ckey.skill) {
+			if (!force && db && currentCkey.ckey.skill == lastCurrentCkey.ckey.skill) {
 				console.log(`skills_${currentDataSource.code} ckey相等，直接读取已有的数据`, currentCkey.ckey.card);
 				const transaction = db.transaction([`skills`]);
 				const objectStore = transaction.objectStore(`skills`);
@@ -586,7 +586,7 @@ function loadData(force = false)
 			{
 				GM_xmlhttpRequest({
 					method: "GET",
-					url: `${sourceDataFolder}/skill_${currentDataSource.code}.json${force?`?t=${_time}`:''}`, //Skills数据文件
+					url: `${sourceDataFolder}/skill_${currentDataSource.code}.json?t=${_time}`, //Skills数据文件
 					onload: function(response) {
 						console.log(`skills_${currentDataSource.code} ckey变化，储存新数据`, currentCkey.ckey.skill);
 						try {