分离星级开关

2023-02-22 14:47:40 +08:00 · 2023-02-22 14:47:40 +08:00 · 45d066a4f5
parent 886d10b263
commit 45d066a4f5
12 changed files with 82 additions and 75 deletions
--- a/fonts/fa-solid-900.woff2
+++ b/fonts/fa-solid-900.woff2
--- a/languages/en.css
+++ b/languages/en.css
@ -222,7 +222,7 @@ label[for="merge-skill"]::after{
 	content: "🕹️Data source:";
 }
 .control-box .datasource-updatetime::before{
-	content: "⌚Update Time:";
+	content: "🗓️Update Time:";
 }
 .control-box .btn-solo-link::before{
 	content: "🧑Jump To Solo Mode";
@ -252,19 +252,22 @@ label[for="merge-skill"]::after{
 	content: "🔄Rotating ABC Team";
 }
 .control-box .lbl-henshin-change::before{
-	content: "🕴️Henshin";
+	content: "🦸Henshin";
 }
 .control-box .lbl-remove-assist::before{
 	content: "⛔Remove Assist";
 }
 .control-box .show-mon-id-lbl::after{
-	content:"🆔Show monster ID";
+	content:"🆔Show card's ID";
 }
 .control-box .show-mon-skill-cd-lbl::after{
 	content:"❄️Show skill's cooldown";
 }
+label[for="show-mon-rarity"]::after{
+	content:"⭐️Show Rarity";
+}
 .control-box .show-mon-awoken-lbl::after{
-	content:"👁Show card awoken";
+	content:"👁️Show card awoken";
 }
 .control-box .show-awoken-count-lbl::after{
 	content:"⚔️Show awoken count and ability";
--- a/languages/ja.css
+++ b/languages/ja.css
@ -214,7 +214,7 @@ label[for="merge-skill"]::after{
 	content: "🕹️データ ソース:";
 }
 .control-box .datasource-updatetime::before{
-	content: "⌚更新時刻:";
+	content: "🗓️更新時刻:";
 }
 .control-box .btn-solo-link::before{
 	content: "🧑ソロモードに移動";
@ -244,7 +244,7 @@ label[for="merge-skill"]::after{
 	content: "🔄ローテーションABCチーム";
 }
 .control-box .lbl-henshin-change::before{
-	content: "🕴️変身";
+	content: "🦸変身";
 }
 .control-box .lbl-remove-assist::before{
 	content: "⛔アシストを解除";
@ -255,8 +255,11 @@ label[for="merge-skill"]::after{
 .control-box .show-mon-skill-cd-lbl::after{
 	content:"❄️スキル クールを表示";
 }
+label[for="show-mon-rarity"]::after{
+	content:"⭐️希少性を表示";
+}
 .control-box .show-mon-awoken-lbl::after{
-	content:"👁カードの覚醒を表示";
+	content:"👁️カードの覚醒を表示";
 }
 .control-box .show-awoken-count-lbl::after{
 	content:"⚔️総覚醒と能力値の表示";
--- a/languages/ko.css
+++ b/languages/ko.css
@ -210,7 +210,7 @@ label[for="merge-skill"]::after{
 	content: "🕹️데이터 소스:";
 }
 .control-box .datasource-updatetime::before{
-	content: "⌚업데이트 시간:";
+	content: "🗓️업데이트 시간:";
 }
 .control-box .btn-solo-link::before{
 	content: "🧑1인 모드 이동";
@ -240,7 +240,7 @@ label[for="merge-skill"]::after{
 	content: "🔄로테이션 ABC 팀";
 }
 .control-box .lbl-henshin-change::before{
-	content: "🕴️변신";
+	content: "🦸변신";
 }
 .control-box .lbl-remove-assist::before{
 	content: "⛔보조를 해제합";
@ -251,8 +251,11 @@ label[for="merge-skill"]::after{
 .control-box .show-mon-skill-cd-lbl::after{
 	content:"❄️스킬의 사용 대기 시간 표시";
 }
+label[for="show-mon-rarity"]::after{
+	content:"⭐️희귀도 표시";
+}
 .control-box .show-mon-awoken-lbl::after{
-	content:"👁카드 각성을 표시합";
+	content:"👁️카드 각성을 표시합";
 }
 .control-box .show-awoken-count-lbl::after{
 	content:"⚔️각성 통계 및 기능 값 표시";
--- a/languages/zh-TW.css
+++ b/languages/zh-TW.css
@ -213,13 +213,13 @@ label[for="merge-skill"]::after{
 	content: "特別保護";
 }
 .control-box .languages-label::before{
-	content: "🌐語言：";
+	content: "\f1ab 語言：";
 }
 .control-box .datasource-label::before{
 	content: "🕹️數據來源：";
 }
 .control-box .datasource-updatetime::before{
-	content: "⌚更新時間：";
+	content: "🗓️更新時間：";
 }
 .control-box .btn-solo-link::before{
 	content: "🧑轉到單人遊戲";
@ -250,7 +250,7 @@ label[for="merge-skill"]::after{
 	content: "🔄輪換ABC隊";
 }
 .control-box .lbl-henshin-change::before{
-	content: "🕴️變身";
+	content: "🦸變身";
 }
 .control-box .lbl-remove-assist::before{
 	content: "⛔解除輔助";
@ -261,8 +261,11 @@ label[for="merge-skill"]::after{
 .control-box .show-mon-skill-cd-lbl::after{
 	content:"❄️顯示技能冷卻";
 }
+label[for="show-mon-rarity"]::after{
+	content:"⭐️顯示稀有度";
+}
 .control-box .show-mon-awoken-lbl::after{
-	content:"👁顯示卡片覺醒";
+	content:"👁️顯示卡片覺醒";
 }
 .control-box .show-awoken-count-lbl::after{
 	content:"⚔️顯示覺醒統計和能力值";
--- a/languages/zh.css
+++ b/languages/zh.css
@ -212,13 +212,13 @@ label[for="merge-skill"]::after{
 	content: "特別保護";
 }
 .control-box .languages-label::before{
-	content: "🌐语言：";
+	content: "\f1ab 语言：";
 }
 .control-box .datasource-label::before{
 	content: "🕹️数据来源：";
 }
 .control-box .datasource-updatetime::before{
-	content: "⌚更新时间：";
+	content: "🗓️更新时间：";
 }
 .control-box .btn-solo-link::before{
 	content: "🧑转到单人游戏";
@ -248,7 +248,7 @@ label[for="merge-skill"]::after{
 	content: "🔄轮换ABC队";
 }
 .control-box .lbl-henshin-change::before{
-	content: "🕴️变身";
+	content: "🦸变身";
 }
 .control-box .lbl-remove-assist::before{
 	content: "⛔解除辅助";
@ -259,8 +259,11 @@ label[for="merge-skill"]::after{
 .control-box .show-mon-skill-cd-lbl::after{
 	content:"❄️显示技能冷却";
 }
+label[for="show-mon-rarity"]::after{
+	content:"⭐️显示稀有度";
+}
 .control-box .show-mon-awoken-lbl::after{
-	content:"👁显示卡片觉醒";
+	content:"👁️显示卡片觉醒";
 }
 .control-box .show-awoken-count-lbl::after{
 	content:"⚔️显示觉醒统计和能力值";
--- a/multi.html
+++ b/multi.html
@ -73,6 +73,7 @@ var formation = new Formation(teamsCount,5);
 		<div>
 			<input type="checkbox" class="config-checkbox-ipt" name="show-mon-id" id="show-mon-id"><label class="config-checkbox-lbl show-mon-id-lbl" for="show-mon-id"><div class="config-checkbox-lbl-cicle"></div></label>
 			<input type="checkbox" class="config-checkbox-ipt" name="show-mon-skill-cd" id="show-mon-skill-cd"><label class="config-checkbox-lbl show-mon-skill-cd-lbl" for="show-mon-skill-cd"><div class="config-checkbox-lbl-cicle"></div></label>
+			<input type="checkbox" class="config-checkbox-ipt" name="show-mon-rarity" id="show-mon-rarity"><label class="config-checkbox-lbl" for="show-mon-rarity"><div class="config-checkbox-lbl-cicle"></div></label>
 			<input type="checkbox" class="config-checkbox-ipt" name="show-mon-awoken" id="show-mon-awoken"><label class="config-checkbox-lbl show-mon-awoken-lbl" for="show-mon-awoken"><div class="config-checkbox-lbl-cicle"></div></label>
 		</div>
 		<div class="status"><span class="icon"></span><span class="text"></span></div>
--- a/script.js
+++ b/script.js
@ -1850,58 +1850,48 @@ function initialize() {
 	//▲添加数据来源列表结束

 	//设定初始的显示设置
+	//初始化开关
+	function initializeSwitch(checkbox) {
+		//开关设置的快速保存
+		function switchFastSave(event) {
+			document.body.classList.toggle(this.id, this.checked);
+			if (event instanceof Event) localStorage.setItem(cfgPrefix + this.id, Number(this.checked));
+		}
+		if (!checkbox) return;
+		checkbox.onchange = switchFastSave;
+		checkbox.checked = localStorage_getBoolean(cfgPrefix + checkbox.id, true);
+		checkbox.onchange(false);
+		return checkbox;
+	}
 	//显示ID开关
-	const btnShowMonId = document.getElementById("show-mon-id");
-	btnShowMonId.checked = localStorage_getBoolean(cfgPrefix + btnShowMonId.id, true);
-	btnShowMonId.onchange = function(e){
-		document.body.classList.toggle(this.id, this.checked);
-		if (e) localStorage.setItem(cfgPrefix + this.id, Number(this.checked));
-	};
-	btnShowMonId.onchange(false);
+	const btnShowMonId = initializeSwitch(document.getElementById("show-mon-id"));

 	//显示CD开关
-	const btnShowMonSkillCd = document.getElementById("show-mon-skill-cd");
-	btnShowMonSkillCd.checked = localStorage_getBoolean(cfgPrefix + btnShowMonSkillCd.id, true);
-	btnShowMonSkillCd.onchange = function(e){
-		document.body.classList.toggle(this.id, this.checked);
-		if (e) localStorage.setItem(cfgPrefix + this.id, Number(this.checked));
-	};
-	btnShowMonSkillCd.onchange(false);
+	const btnShowMonSkillCd = initializeSwitch(document.getElementById("show-mon-skill-cd"));
+
+	//显示星级开关
+	const btnShowMonRarity = initializeSwitch(document.getElementById("show-mon-rarity"));

 	//显示卡片觉醒开关
-	const btnShowMonAwoken = document.getElementById("show-mon-awoken");
-	btnShowMonAwoken.checked = localStorage_getBoolean(cfgPrefix + btnShowMonAwoken.id);
-	btnShowMonAwoken.onchange = function(e){
-		document.body.classList.toggle(this.id, this.checked);
-		if (e) localStorage.setItem(cfgPrefix + this.id, Number(this.checked));
-	};
-	btnShowMonAwoken.onchange(false);
+	const btnShowMonAwoken = initializeSwitch(document.getElementById("show-mon-awoken"));
 	
 	//3P显示觉醒统计开关
-	const btnShowAwokenCount = document.getElementById("show-awoken-count");
-	if (btnShowAwokenCount) {
-		btnShowAwokenCount.checked = localStorage_getBoolean(cfgPrefix + btnShowAwokenCount.id, true);
-		btnShowAwokenCount.onchange = function(e){
-			document.body.classList.toggle(this.id, this.checked);
-			if (e) localStorage.setItem(cfgPrefix + this.id, Number(this.checked));
-		};
-		btnShowAwokenCount.onchange(false);
-	}
+	const btnShowAwokenCount = initializeSwitch(document.getElementById("show-awoken-count"));

 	//默认等级
 	const iptDefaultLevel = document.getElementById("default-level");
 	iptDefaultLevel.value = localStorage.getItem(cfgPrefix + iptDefaultLevel.id);
-	iptDefaultLevel.onchange = function(e){
+	iptDefaultLevel.onchange = function(event){
 		let num = Number(this.value);
 		defaultLevel = num || this.placeholder;
-		if (e) localStorage.setItem(cfgPrefix + this.id, this.value);
+		if (event instanceof Event) localStorage.setItem(cfgPrefix + this.id, this.value);
 	}
 	iptDefaultLevel.onchange(false);

 	//触屏使用的切换显示的线条
-	interchangeSVG = document.body.querySelector("#interchange-line");
-	interchangeSVG.line = interchangeSVG.querySelector("g line");
-	interchangeSVG.changePoint = function(p1, p2) {
+	interchangeSvg = document.body.querySelector("#interchange-line");
+	interchangeSvg.line = interchangeSvg.querySelector("g line");
+	interchangeSvg.changePoint = function(p1, p2) {
 		const line = this.line;
 		if (p1 && p1.x != undefined)
 			line.setAttribute("x1", p1.x);
@ -2797,8 +2787,8 @@ function initialize() {
 		const tc = e.changedTouches[0];
 		const pX = tc.pageX,
 			pY = tc.pageY;
-		interchangeSVG.style.display = "none";
-		interchangeSVG.changePoint({ x: pX, y: pY }, { x: pX, y: pY });
+		interchangeSvg.style.display = "none";
+		interchangeSvg.changePoint({ x: pX, y: pY }, { x: pX, y: pY });
 	}
 	//移动端编辑界面每个怪物的头像的移动
 	function touchmoveMonHead(e) {
@ -2811,10 +2801,10 @@ function initialize() {
 		const left = rect.left + document.documentElement.scrollLeft;
 		if ((pY < top) || (pY > (top + rect.height)) ||
 			(pX < left) || (pX > (left + rect.width))) {
-			interchangeSVG.style.display = "block";
-			interchangeSVG.changePoint(null, { x: pX, y: pY });
+			interchangeSvg.style.display = "block";
+			interchangeSvg.changePoint(null, { x: pX, y: pY });
 		} else {
-			interchangeSVG.style.display = "none";
+			interchangeSvg.style.display = "none";
 		}
 	}
 	//移动端编辑界面每个怪物的头像的结束
@ -2823,8 +2813,8 @@ function initialize() {
 		const pX = tc.pageX,
 			pY = tc.pageY;
 		//console.log("移动结束",pX,pY,e,this);
-		interchangeSVG.style.display = "none";
-		interchangeSVG.changePoint(null, { x: pX, y: pY });
+		interchangeSvg.style.display = "none";
+		interchangeSvg.changePoint(null, { x: pX, y: pY });
 		const target = allMembers.find(m => {
 			const rect = m.getBoundingClientRect();
 			const top = rect.top + document.documentElement.scrollTop;
@ -2847,7 +2837,7 @@ function initialize() {
 	}
 	//移动端编辑界面每个怪物的头像的取消
 	function touchcancelMonHead(event) {
-		interchangeSVG.style.display = "none";
+		interchangeSvg.style.display = "none";
 		console.log("移动取消", event, this);
 	}
 	function interchangeCard(formArr, toArr, isCopy) {
@ -4309,7 +4299,6 @@ function initialize() {

 	//显示原文开关
 	const showSkillOriginal = document.getElementById("show-skill-original");
-	console.log(cfgPrefix + showSkillOriginal.id, localStorage_getBoolean(cfgPrefix + showSkillOriginal.id))
 	showSkillOriginal.checked = localStorage_getBoolean(cfgPrefix + showSkillOriginal.id);
 	showSkillOriginal.onchange = function(event) {
 		if (event instanceof Event) localStorage.setItem(cfgPrefix + this.id, Number(this.checked));
--- a/service-worker.js
+++ b/service-worker.js
@ -9611,7 +9611,7 @@ const cachesMap = new Map([
 	],
 	[
 		"fonts/fa-solid-900.woff2",
-		"328a9d0f59f0ebb55cddac6f39995bea"
+		"44f8148f80e6c3d60fa6425b0cbb862a"
 	],
 	[
 		"fonts/FOT-KurokaneStd-EB.woff2",
@ -9631,7 +9631,7 @@ const cachesMap = new Map([
 	],
 	[
 		"multi.html",
-		"cd72a091f109da66e25db1df3cddc855"
+		"5fdc6042df23e33c587453cfabfa469f"
 	],
 	[
 		"script-custom_elements.js",
@ -9651,11 +9651,11 @@ const cachesMap = new Map([
 	],
 	[
 		"script.js",
-		"f556e12815bd8d7978b837708381aa2d"
+		"c57800d8e255d9b1cdafef4e4558cb4f"
 	],
 	[
 		"solo.html",
-		"2b2dfcaf794dea279401396a23a01ec0"
+		"7c18ec418aed94ff27e7de4d82ba56d0"
 	],
 	[
 		"style-monsterimages.css",
@ -9663,7 +9663,7 @@ const cachesMap = new Map([
 	],
 	[
 		"style.css",
-		"603f3a2a43273d3b0aa68a3729fcfb74"
+		"9eeb32d57b153a83dc5100881075dc7a"
 	],
 	[
 		"temp.js",
@ -9671,11 +9671,11 @@ const cachesMap = new Map([
 	],
 	[
 		"triple.html",
-		"cfe810b08daaa0246c3b8c3dbfb26fd2"
+		"ff9cadbdff9e5d0f7de63667fca01c2e"
 	],
 	[
 		"languages/en.css",
-		"976ce0962da5080a1113c57c35a1d5e7"
+		"da4b5bbd42a0618c29fb2fc882613c82"
 	],
 	[
 		"languages/en.js",
@ -9683,7 +9683,7 @@ const cachesMap = new Map([
 	],
 	[
 		"languages/ja.css",
-		"3d16f3e384be4169a980a21d4b553aeb"
+		"3809bd568a273fc3e1dc691c5b683220"
 	],
 	[
 		"languages/ja.js",
@ -9691,7 +9691,7 @@ const cachesMap = new Map([
 	],
 	[
 		"languages/ko.css",
-		"932b9acfd9d1ecc4decc5ba052a23d68"
+		"183ced5795003f513958508015567379"
 	],
 	[
 		"languages/ko.js",
@ -9711,7 +9711,7 @@ const cachesMap = new Map([
 	],
 	[
 		"languages/zh-TW.css",
-		"dd83018ff0f384d126d7595747db34c7"
+		"27b0f499d28648bbb72997233935ec2a"
 	],
 	[
 		"languages/zh-TW.js",
@ -9719,7 +9719,7 @@ const cachesMap = new Map([
 	],
 	[
 		"languages/zh.css",
-		"dc9566b1a82ccd9d22063bb0356d95d3"
+		"301a10b1e5dccf9a42589797e3d58f8d"
 	],
 	[
 		"languages/zh.js",
--- a/solo.html
+++ b/solo.html
@ -56,6 +56,7 @@ var formation = new Formation(teamsCount,6);
 		<div>
 			<input type="checkbox" class="config-checkbox-ipt" name="show-mon-id" id="show-mon-id"><label class="config-checkbox-lbl show-mon-id-lbl" for="show-mon-id"><div class="config-checkbox-lbl-cicle"></div></label>
 			<input type="checkbox" class="config-checkbox-ipt" name="show-mon-skill-cd" id="show-mon-skill-cd"><label class="config-checkbox-lbl show-mon-skill-cd-lbl" for="show-mon-skill-cd"><div class="config-checkbox-lbl-cicle"></div></label>
+			<input type="checkbox" class="config-checkbox-ipt" name="show-mon-rarity" id="show-mon-rarity"><label class="config-checkbox-lbl" for="show-mon-rarity"><div class="config-checkbox-lbl-cicle"></div></label>
 			<input type="checkbox" class="config-checkbox-ipt" name="show-awoken-count" id="show-awoken-count" checked><label class="config-checkbox-lbl show-awoken-count-lbl" for="show-awoken-count"><div class="config-checkbox-lbl-cicle"></div></label>
 			<input type="checkbox" class="config-checkbox-ipt" name="show-mon-awoken" id="show-mon-awoken"><label class="config-checkbox-lbl show-mon-awoken-lbl" for="show-mon-awoken"><div class="config-checkbox-lbl-cicle"></div></label>
 		</div>
--- a/style.css
+++ b/style.css
@ -704,7 +704,7 @@ body:not(.show-mon-skill-cd) .monster .skill-cd.max-skill {
 	display: none;
 }
 /*显示怪物星级*/
-.show-mon-awoken .monster .rarity::before{
+.show-mon-rarity .monster .rarity::before{
 	position: absolute;
 	left: 3px;
 	top: 10px;
@ -2805,7 +2805,7 @@ icon.inflicts::after
 	margin-bottom: 2px;
 }
 .control-box .languages-label::before{
-	content: "🌐Lanuage:";
+	content: "\f1ab Lanuage:";
 }
 .control-box .lbl-henshin-change,
 .help-link
--- a/triple.html
+++ b/triple.html
@ -67,6 +67,7 @@ var formation = new Formation(teamsCount,6);
 		<div>
 			<input type="checkbox" class="config-checkbox-ipt" name="show-mon-id" id="show-mon-id"><label class="config-checkbox-lbl show-mon-id-lbl" for="show-mon-id"><div class="config-checkbox-lbl-cicle"></div></label>
 			<input type="checkbox" class="config-checkbox-ipt" name="show-mon-skill-cd" id="show-mon-skill-cd"><label class="config-checkbox-lbl show-mon-skill-cd-lbl" for="show-mon-skill-cd"><div class="config-checkbox-lbl-cicle"></div></label>
+			<input type="checkbox" class="config-checkbox-ipt" name="show-mon-rarity" id="show-mon-rarity"><label class="config-checkbox-lbl" for="show-mon-rarity"><div class="config-checkbox-lbl-cicle"></div></label>
 			<input type="checkbox" class="config-checkbox-ipt" name="show-awoken-count" id="show-awoken-count" checked><label class="config-checkbox-lbl show-awoken-count-lbl" for="show-awoken-count"><div class="config-checkbox-lbl-cicle"></div></label>
 			<input type="checkbox" class="config-checkbox-ipt" name="show-mon-awoken" id="show-mon-awoken"><label class="config-checkbox-lbl show-mon-awoken-lbl" for="show-mon-awoken"><div class="config-checkbox-lbl-cicle"></div></label>
 		</div>