调整显示出抽蛋ID

2022-12-19 18:10:29 +08:00 · 2022-12-19 18:10:29 +08:00 · 4552af364a
parent e025516462
commit 4552af364a
8 changed files with 86 additions and 75 deletions
--- a/languages/en.css
+++ b/languages/en.css
@ -69,6 +69,9 @@
 .monsterinfo-box .monster-collabId::before{
 	content: "Collab ID：";
 }
+.monsterinfo-box .monster-gachaId::before{
+	content: "Gacha ID：";
+}
 .monsterinfo-box .monster-altName::before{
 	content: "Tags";
 }
--- a/languages/ja.css
+++ b/languages/ja.css
@ -68,6 +68,9 @@
 .monsterinfo-box .monster-collabId::before{
 	content: "コラボ ID:";
 }
+.monsterinfo-box .monster-gachaId::before{
+	content: "ガチャ ID：";
+}
 .monsterinfo-box .monster-altName::before{
 	content: "タグで";
 }
--- a/languages/ko.css
+++ b/languages/ko.css
@ -65,6 +65,9 @@
 .monsterinfo-box .monster-seriesId::before{
 	content: "시리즈 ID：";
 }
+.monsterinfo-box .monster-gachaId::before{
+	content: "가챠 ID：";
+}
 .monsterinfo-box .monster-collabId::before{
 	content: "콜라보 ID:";
 }
--- a/languages/zh-TW.css
+++ b/languages/zh-TW.css
@ -71,6 +71,9 @@
 .monsterinfo-box .monster-collabId::before{
 	content: "合作ID：";
 }
+.monsterinfo-box .monster-gachaId::before{
+	content: "抽蛋ID：";
+}
 .monsterinfo-box .monster-altName::before{
 	content: "標簽";
 }
--- a/languages/zh.css
+++ b/languages/zh.css
@ -71,6 +71,9 @@
 .monsterinfo-box .monster-collabId::before{
 	content: "合作ID：";
 }
+.monsterinfo-box .monster-gachaId::before{
+	content: "抽蛋ID：";
+}
 .monsterinfo-box .monster-altName::before{
 	content: "標簽";
 }
--- a/script.js
+++ b/script.js
@ -2931,6 +2931,13 @@ function initialize() {
 			showSearch(Cards.filter(card => card.collabId == collabId));
 		}
 	};
+	const mGachaId = monInfoBox.querySelector(".monster-gachaId");
+	mGachaId.onclick = function() { //搜索合作
+		const gachaId = parseInt(this.getAttribute(dataAttrName), 10);
+		if (gachaId > 0); {
+			showSearch(Cards.filter(card => card.gachaId == gachaId));
+		}
+	};
 	//以字符串搜索窗口
 	const stringSearchDialog = settingBox.querySelector(".dialog-search-string");
 	function searchByString(str)
@ -4669,14 +4676,17 @@ function editBoxChangeMonId(id) {
 	const mSeriesId = monInfoBox.querySelector(".monster-seriesId");
 	mSeriesId.textContent = card.seriesId;
 	mSeriesId.setAttribute(dataAttrName, card.seriesId);
-
-	mSeriesId.classList.toggle(className_displayNone, !card.seriesId);;
+	mSeriesId.classList.toggle(className_displayNone, !card.seriesId);

 	const mCollabId = monInfoBox.querySelector(".monster-collabId");
 	mCollabId.textContent = card.collabId;
 	mCollabId.setAttribute(dataAttrName, card.collabId);
+	mCollabId.classList.toggle(className_displayNone, !card.collabId);

-	mCollabId.classList.toggle(className_displayNone, !card.collabId);;
+	const mGachaId = monInfoBox.querySelector(".monster-gachaId");
+	mGachaId.textContent = card.gachaId;
+	mGachaId.setAttribute(dataAttrName, card.gachaId);
+	mGachaId.classList.toggle(className_displayNone, !card.gachaId);

 	const mAltName = monInfoBox.querySelector(".monster-altName");
 	//没有合作名就隐藏
--- a/solo.html
+++ b/solo.html
@ -957,11 +957,6 @@ var formation = new Formation(teamsCount,6);
 				<ul class="monster-type">
 					<li class="type-name"><span class="type-icon"></span></li><li class="type-name"><span class="type-icon"></span></li><li class="type-name"><span class="type-icon"></span></li>
 				</ul>
-				<div class="monsterinfo-cell">
-					<div class="monster-seriesId"></div>
-					<div class="monster-collabId"></div>
-					<div class="monster-altName"></div>
-				</div>
 			</div>
 			<div class="monsterinfo-line line4 row-awoken-sawoken">
 				<div class="row-mon-awoken">
@ -991,6 +986,12 @@ var formation = new Formation(teamsCount,6);
 					<template id="sawoken-option-icon"><input type="radio" name="sawoken-choice" class="sawoken-choice" /><label class="awoken-icon"></label></template>
 				</div>
 			</div>
+			<div class="monsterinfo-groupId">
+				<div class="monster-seriesId"></div>
+				<div class="monster-collabId"></div>
+				<div class="monster-gachaId"></div>
+				<div class="monster-altName"></div>
+			</div>
 		</div>
 		<div class="setting-box">
 			<div class="setting-row row-mon-id">
--- a/style.css
+++ b/style.css
@ -1361,46 +1361,6 @@ icon.inflicts::after
 .edit-box .edit-box-title.edit-box-title-assist::before{
 	content: "修改辅助";
 }*/
-.edit-box .monsterinfo-box{
-	display: grid;
-	grid-auto-rows: min-content;
-	grid-template-columns: 100px auto;
-	gap: 5px;
-	font-family: var(--game-font-family);
-	color: white;
-	text-shadow: black 2px 2px 0;
-	min-height: 100px;
-	background-image: linear-gradient(#798421,#394914);
-	border-top: #B1BB39 solid 4px;
-	border-bottom: #72941D ridge 7px;
-	box-shadow: black 0 3px 3px;
-	padding: 5px 10px;
-	position: sticky;
-	top: 0;
-	z-index: 1;
-}
-.monsterinfo-box .monster-head {
-	grid-row: 1 / 4;
-}
-.monsterinfo-box .monsterinfo-line {
-	display: flex;
-}
-.monsterinfo-box .row-awoken-sawoken {
-	grid-column: 1 / 3;
-	display: flex;
-	gap: 5px;
-	flex-wrap: wrap;
-}
-.row-awoken-sawoken .awoken-ul,
-.row-awoken-sawoken .current-super-awoken
-{
-	display: inline-flex;
-	vertical-align: top;
-}
-.row-awoken-sawoken .current-super-awoken::before{
-	content:"+";
-	line-height: 25px;
-}

 .edit-box .search-box,
 .edit-box .setting-box{
@ -2106,36 +2066,62 @@ icon.inflicts::after
 .edit-box .setting-row{
 	width: 100%;
 }
-.monsterinfo-box .monsterinfo-line{
+.edit-box .monsterinfo-box{
+	display: grid;
+	grid-auto-rows: min-content;
+	grid-template-columns: 100px auto 140px;
+	gap: 5px;
+	font-family: var(--game-font-family);
+	color: white;
 	font-size: 22px;
-	line-height: 30px;
+	line-height: 22px;
+	text-shadow: black 2px 2px 0;
+	background-image: linear-gradient(#798421,#394914);
+	border-top: #B1BB39 solid 4px;
+	border-bottom: #72941D ridge 7px;
+	box-shadow: black 0 3px 3px;
+	padding: 5px 10px;
+	position: sticky;
+	top: 0;
+	z-index: 1;
 }
-.monsterinfo-box .monsterinfo-line .monsterinfo-cell{
-	display:inline-block;
-}
-.monsterinfo-box .monster-id{
-	width:120px;
-}
-.monsterinfo-box :is(
-	.monster-seriesId,
-	.monster-collabId,
-	.monster-altName,
-)
+.row-awoken-sawoken .awoken-ul,
+.row-awoken-sawoken .current-super-awoken
 {
-	cursor: pointer;
+	display: inline-flex;
+	vertical-align: top;
+}
+.row-awoken-sawoken .current-super-awoken::before{
+	content:"+";
+	line-height: 25px;
+}
+.monsterinfo-box .monster-head {
+	grid-row: 1 / 4;
+}
+.monsterinfo-box .monsterinfo-line {
+	display: flex;
+}
+.monsterinfo-box .row-awoken-sawoken {
+	grid-column: 1 / 4;
+	display: flex;
+	gap: 5px;
+	flex-wrap: wrap;
+}
+.monsterinfo-groupId{
+	grid-row: 1 / 3;
+	grid-column: 3;
+	display: flex;
+	flex-direction: column;
 	font-size: 14px;
 	line-height: 16px;
-	vertical-align: bottom;
-	max-width: 270px;
+}
+.monsterinfo-groupId div{
+	cursor: pointer;
 	white-space:nowrap;
 	text-overflow:ellipsis;
 	overflow:hidden;
 }
-.monsterinfo-box :is(
-	.monster-seriesId,
-	.monster-collabId,
-	.monster-altName,
-):hover::after
+.monsterinfo-groupId div:hover::after
 {
 	content: "🔍";
 }
@ -2143,6 +2129,9 @@ icon.inflicts::after
 	content: "No.";
 }*/

+.monsterinfo-box .monster-id{
+	width:120px;
+}
 .monsterinfo-box .monster-rare{
 	width: 100px;
 }
@ -2157,6 +2146,7 @@ icon.inflicts::after
 	display: inline-block;
 	width: 30px;
 	text-align: right;
+	vertical-align: top;
 }
 .monster-rare[data-rarity='1']::after{content: "★";}
 .monster-rare[data-rarity='2']::after{content: "★★";}
@ -2188,7 +2178,7 @@ icon.inflicts::after
 }

 .monsterinfo-box .monster-type {
-	display: inline;
+	display: flex;
 }
 .monsterinfo-box .monster-type .type-name{
 	display:inline-block;
@ -2197,11 +2187,6 @@ icon.inflicts::after
 .monsterinfo-box .monster-type .type-icon{
 	margin-right:3px;
 }
-.monsterinfo-box .monster-type .type-name::after{
-	vertical-align: middle;
-	font-size: 22px;
-	line-height: 22px;
-}

 /*
 .edit-box .setting-box .row-mon-awoken::before{