From bebe1ebd72b5bf2be411ebdedf0b7b2ffd9bbd3d 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, 16 Nov 2020 19:40:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=88=87=E6=8D=A2=E8=A7=89?=
 =?UTF-8?q?=E9=86=92=E9=9D=A2=E6=9D=BF=E7=9A=84=E4=B8=8D=E5=90=8C=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 languages/en.css    | 3 +++
 languages/ja.css    | 3 +++
 languages/ko.css    | 3 +++
 languages/zh-TW.css | 3 +++
 multi.html          | 1 +
 script.js           | 4 +++-
 solo.html           | 2 +-
 triple.html         | 3 ++-
 8 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/languages/en.css b/languages/en.css
index bc5ccfb1..3afabc4c 100644
--- a/languages/en.css
+++ b/languages/en.css
@@ -312,6 +312,9 @@
 .search-box .include-super-awoken-label::after{
 	content: "Including Super Awoken";
 }
+.search-box .show-official-awoken-sorting-label::after{
+	content: "Use the official Awoken sorting";
+}
 .search-box .sort-div::before{
 	content: "Sort by:";
 }
diff --git a/languages/ja.css b/languages/ja.css
index d251f451..e34d6cd8 100644
--- a/languages/ja.css
+++ b/languages/ja.css
@@ -304,6 +304,9 @@
 .search-box .include-super-awoken-label::after{
 	content: "超覚醒を含む";
 }
+.search-box .show-official-awoken-sorting-label::after{
+	content: "公式の覚醒ソートを使用";
+}
 .search-box .sort-div::before{
 	content: "並べ替え:";
 }
diff --git a/languages/ko.css b/languages/ko.css
index 8db6c315..96094ef7 100644
--- a/languages/ko.css
+++ b/languages/ko.css
@@ -301,6 +301,9 @@
 .search-box .include-super-awoken-label::after{
 	content: "슈퍼 각성 포함";
 }
+.search-box .show-official-awoken-sorting-label::after{
+	content: "공식 각성 순서를 사용합니다";
+}
 .search-box .sort-div::before{
 	content: "정렬:";
 }
diff --git a/languages/zh-TW.css b/languages/zh-TW.css
index 7e9a9d54..b328e137 100644
--- a/languages/zh-TW.css
+++ b/languages/zh-TW.css
@@ -307,6 +307,9 @@
 .search-box .include-super-awoken-label::after{
 	content: "包括超覺醒";
 }
+.search-box .show-official-awoken-sorting-label::after{
+	content: "使用官方覺醒排序";
+}
 .search-box .sort-div::before{
 	content: "排序：";
 }
diff --git a/multi.html b/multi.html
index 5c5a377f..5d1ac19d 100644
--- a/multi.html
+++ b/multi.html
@@ -517,6 +517,7 @@ var formation = new Formation(teamsCount,5);
 				<div class="awoken-option">
 					<input type="checkbox" class="config-checkbox-ipt" name="consider-equivalent-awoken" id="consider-equivalent-awoken" checked><label class="config-checkbox-lbl consider-equivalent-awoken-label" for="consider-equivalent-awoken"><div class="config-checkbox-lbl-cicle"></div></label>
 					<input type="checkbox" class="config-checkbox-ipt" name="include-super-awoken" id="include-super-awoken"><label class="config-checkbox-lbl include-super-awoken-label" for="include-super-awoken"><div class="config-checkbox-lbl-cicle"></div></label>
+					<input type="checkbox" class="config-checkbox-ipt" name="show-official-awoken-sorting" id="show-official-awoken-sorting"><label class="config-checkbox-lbl show-official-awoken-sorting-label" for="show-official-awoken-sorting"><div class="config-checkbox-lbl-cicle"></div></label>
 				</div>
 				<ul class="awoken-ul">
 					<li class="awoken-count zero"><button class="awoken-icon" data-awoken-icon="43"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--7c-->
diff --git a/script.js b/script.js
index 8b3bfd47..f61f3b3b 100644
--- a/script.js
+++ b/script.js
@@ -772,11 +772,13 @@ function creatNewUrl(arg) {
 	if (!!(window.history && history.pushState)) { // 支持History API
 		const language_i18n = arg.language || getQueryString("l") || getQueryString("lang"); //获取参数指定的语言
 		const datasource = arg.datasource || getQueryString("s");
-		const outObj = formation.outObj();
+		const outObj = getQueryString("d") ? formation.outObj() : null;
 
 		const newSearch = new URLSearchParams();
 		if (language_i18n) newSearch.set("l", language_i18n);
 		if (datasource && datasource != "ja") newSearch.set("s", datasource);
+		if (getQueryString("guide")) newSearch.set("guide", getQueryString("guide"));
+		if (getQueryString("id")) newSearch.set("id", getQueryString("id"));
 		if (outObj)
 		{
 			const dataJsonStr = JSON.stringify(outObj); //数据部分的字符串
diff --git a/solo.html b/solo.html
index 8cd52157..ac73f0a1 100644
--- a/solo.html
+++ b/solo.html
@@ -466,7 +466,7 @@ var formation = new Formation(teamsCount,6);
 				<button class="awoken-clear"></button>
 				<div class="awoken-option">
 					<input type="checkbox" class="config-checkbox-ipt" name="consider-equivalent-awoken" id="consider-equivalent-awoken" checked><label class="config-checkbox-lbl consider-equivalent-awoken-label" for="consider-equivalent-awoken"><div class="config-checkbox-lbl-cicle"></div></label>
-					<input type="checkbox" class="config-checkbox-ipt" name="include-super-awoken" id="include-super-awoken"><label class="config-checkbox-lbl include-super-awoken-label" for="include-super-awoken"><div class="config-checkbox-lbl-cicle"></div></label>
+					<input type="checkbox" class="config-checkbox-ipt" name="include-super-awoken" id="include-super-awoken" checked><label class="config-checkbox-lbl include-super-awoken-label" for="include-super-awoken"><div class="config-checkbox-lbl-cicle"></div></label>
 					<input type="checkbox" class="config-checkbox-ipt" name="show-official-awoken-sorting" id="show-official-awoken-sorting"><label class="config-checkbox-lbl show-official-awoken-sorting-label" for="show-official-awoken-sorting"><div class="config-checkbox-lbl-cicle"></div></label>
 				</div>
 				<ul class="awoken-ul">
diff --git a/triple.html b/triple.html
index 3fdd400d..307621a6 100644
--- a/triple.html
+++ b/triple.html
@@ -1161,7 +1161,8 @@ var formation = new Formation(teamsCount,6);
 				<button class="awoken-clear"></button>
 				<div class="awoken-option">
 					<input type="checkbox" class="config-checkbox-ipt" name="consider-equivalent-awoken" id="consider-equivalent-awoken" checked><label class="config-checkbox-lbl consider-equivalent-awoken-label" for="consider-equivalent-awoken"><div class="config-checkbox-lbl-cicle"></div></label>
-					<input type="checkbox" class="config-checkbox-ipt" name="include-super-awoken" id="include-super-awoken"><label class="config-checkbox-lbl include-super-awoken-label" for="include-super-awoken"><div class="config-checkbox-lbl-cicle"></div></label>
+					<input type="checkbox" class="config-checkbox-ipt" name="include-super-awoken" id="include-super-awoken" checked><label class="config-checkbox-lbl include-super-awoken-label" for="include-super-awoken"><div class="config-checkbox-lbl-cicle"></div></label>
+					<input type="checkbox" class="config-checkbox-ipt" name="show-official-awoken-sorting" id="show-official-awoken-sorting"><label class="config-checkbox-lbl show-official-awoken-sorting-label" for="show-official-awoken-sorting"><div class="config-checkbox-lbl-cicle"></div></label>
 				</div>
 				<ul class="awoken-ul">
 					<li class="awoken-count zero"><button class="awoken-icon" data-awoken-icon="43"></button><label class="count-symbol"><input type="button" class="count" value="0" /></label></li><!--7c-->