From c029a25ed7a16ec6a93da790a24f39719acb41e2 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: Thu, 1 Aug 2024 03:26:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=8C=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E6=A1=86=E7=9A=84=E4=B8=80=E4=BA=9B=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 multi.html              | 10 ++++++++--
 service-worker.js       | 10 +++++-----
 solo.html               | 10 ++++++++--
 style-monsterimages.css |  3 ++-
 style.css               | 26 ++++++++++++++++----------
 triple.html             | 10 ++++++++--
 6 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/multi.html b/multi.html
index ddbcb2ba..c4237200 100644
--- a/multi.html
+++ b/multi.html
@@ -82,7 +82,7 @@ const teamsCount = 2;
 		<details class="config-display-list">
 			<summary></summary>
 			<div class="in-card">
-				<div class="monster allowable-assist" title="No.99999 博丽灵梦" style="transform: scale(0.75); margin: calc(-100px * (1 - 0.75) / 2);">
+				<div class="monster allowable-assist" title="No.99999 博丽灵梦">
 					<div class="attrs">
 						<div class="attr" data-attr="0"></div><div class="attr" data-attr="1"></div><div class="attr" data-attr="2"></div><div class="attr" data-attr="3"></div>
 					</div>
@@ -848,7 +848,13 @@ const teamsCount = 2;
 	</div>
 	<div id="rich-text-tools" class="display-none">
 		<button id="set-font-color" title="Set Font Color"></button><input id="color-chooser" type="color" title="Choose Font Color" />
-		<button id="insert-card-avatar" title="Insert Card Avatar"></button>
+		<button id="insert-card-avatar" title="Insert Card Avatar">
+			<div class="monster" data-cardid="23" data-cards-pic-idx="1" data-cards-pic-x="2" data-cards-pic-y="2">
+				<div class="attrs">
+					<div class="attr" data-attr="0"></div>
+				</div>
+			</div>
+		</button>
 		<button id="insert-awoken-icon" title="Insert Awoken Icon"></button>
 		<button id="insert-latent-icon" title="Insert Latent Icon"></button>
 		<button id="insert-type-icon" title="Insert Type Icon"></button>
diff --git a/service-worker.js b/service-worker.js
index 6776b82f..64e5ce22 100644
--- a/service-worker.js
+++ b/service-worker.js
@@ -32319,7 +32319,7 @@ const cachesMap = new Map([
 	],
 	[
 		"multi.html",
-		"51f2c471715b6609bcb09441824a5fa4"
+		"1275122ce4b4287900394d699dd760f7"
 	],
 	[
 		"script-custom_elements.js",
@@ -32343,7 +32343,7 @@ const cachesMap = new Map([
 	],
 	[
 		"solo.html",
-		"ac82faacab0d49e4ace3e8485f4fdbe9"
+		"8a18da0a48040e61b869d67d4f635081"
 	],
 	[
 		"style-fix-html2canvas.css",
@@ -32351,11 +32351,11 @@ const cachesMap = new Map([
 	],
 	[
 		"style-monsterimages.css",
-		"15020a2f25262663a81aaa7f9259defc"
+		"ffeb357e1a2adc10d114b90383a9ce90"
 	],
 	[
 		"style.css",
-		"1a761a00d9b9a660e781775f66e03f29"
+		"153be5e23561327940c522899d8d941d"
 	],
 	[
 		"temp.js",
@@ -32363,7 +32363,7 @@ const cachesMap = new Map([
 	],
 	[
 		"triple.html",
-		"95f1ee3675be5e8bbe795e2ad294b191"
+		"036399d2486e04b8066d38a0acf485ce"
 	],
 	[
 		"languages/en.css",
diff --git a/solo.html b/solo.html
index fa37eb0b..157240e7 100644
--- a/solo.html
+++ b/solo.html
@@ -62,7 +62,7 @@ const teamsCount = 1;
 		<details class="config-display-list">
 			<summary></summary>
 			<div class="in-card">
-				<div class="monster allowable-assist" title="No.99999 博丽灵梦" style="transform: scale(0.75); margin: calc(-100px * (1 - 0.75) / 2);">
+				<div class="monster allowable-assist" title="No.99999 博丽灵梦">
 					<div class="attrs">
 						<div class="attr" data-attr="0"></div><div class="attr" data-attr="1"></div><div class="attr" data-attr="2"></div><div class="attr" data-attr="3"></div>
 					</div>
@@ -586,7 +586,13 @@ const teamsCount = 1;
 	</div>
 	<div id="rich-text-tools" class="display-none">
 		<button id="set-font-color" title="Set Font Color"></button><input id="color-chooser" type="color" title="Choose Font Color" />
-		<button id="insert-card-avatar" title="Insert Card Avatar"></button>
+		<button id="insert-card-avatar" title="Insert Card Avatar">
+			<div class="monster" data-cardid="23" data-cards-pic-idx="1" data-cards-pic-x="2" data-cards-pic-y="2">
+				<div class="attrs">
+					<div class="attr" data-attr="0"></div>
+				</div>
+			</div>
+		</button>
 		<button id="insert-awoken-icon" title="Insert Awoken Icon"></button>
 		<button id="insert-latent-icon" title="Insert Latent Icon"></button>
 		<button id="insert-type-icon" title="Insert Type Icon"></button>
diff --git a/style-monsterimages.css b/style-monsterimages.css
index 6d03238a..e68d264e 100644
--- a/style-monsterimages.css
+++ b/style-monsterimages.css
@@ -14,6 +14,7 @@
 }
 .monster .attrs .attr[data-attr='-1'] {
 	background: none; /*无*/
+	display: none;
 }
 .monster .attrs .attr[data-attr='0'] {
 	background-position-x: calc(-102px * 0); /*火*/
@@ -1739,7 +1740,7 @@
 .orb::before,
 .orb::after
 {
-	display: inline-block;
+	display: inline-flex;
 	width: 36px;
 	height: 36px;
 	background-image: url(images/icon-orbs.png);
diff --git a/style.css b/style.css
index 3fea4b48..a9c604f1 100644
--- a/style.css
+++ b/style.css
@@ -176,14 +176,18 @@ label[for="screenshot-transparent"] {
 }
 #rich-text-tools button
 {
-	min-width: 64px;
+	min-width: 50px;
 }
+
 #rich-text-tools button,
-#rich-text-tools input
+#rich-text-tools input[type="color"]
 {
 	height: 40px;
 	vertical-align: middle;
 	text-align: center;
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
 }
 #rich-text-tools button::before {
 	font-family: var(--icon-font-family);
@@ -217,11 +221,8 @@ label[for="siwtch-code-mode"]::after {
 #color-chooser {
 	width: 30px;
 }
-#insert-card-avatar::before {
-	width: 100px;
-	height: 100px;
-	background-image: url(images/CARDFRAME2.PNG), url(images/CARDFRAME2.PNG);
-	background-position: -102px -104px, 0 0;
+#insert-card-avatar .monster
+{
 	transform: scale(calc(32 / 100));
 	margin: calc(-100px * (1 - (32 / 100)) / 2);
 }
@@ -891,8 +892,14 @@ body.show-meter meter+span /*勾选显示计量条则隐藏文字*/
 	display: grid;
 	grid-template-columns: 75px auto;
 }
+.config-display-list .monster{
+	transform: scale(0.75);
+	margin: calc(-100px * (1 - 0.75) / 2);
+}
+
 .config-display-list .in-card .switchs{
 	display: flex;
+	align-content: center;
 	flex-wrap: wrap;
 }
 .config-display-list .in-card .switchs input[type="checkbox"].switch-ipt:checked + label::before{
@@ -1399,7 +1406,7 @@ body:not(.solo) .awoken-icon[data-awoken-icon="64"]::after
 	border-radius: 5px;
 	border-color: rgba(82,82,60,0.5);
 	box-sizing: border-box;
-	display: flex;
+	display: inline-flex;
 	flex-direction: row;
 	justify-content: center;
 	align-items: center;
@@ -1780,7 +1787,7 @@ label[for="search-string"] {
 	vertical-align: top;
 }
 .detail-mon{
-	display: inline-block;
+	display: inline-flex;
 	vertical-align: bottom;
 }
 .edit-box .search-mon-list .monster,
@@ -1835,7 +1842,6 @@ label[for="search-string"] {
 .rich-text .latent-icon {
 	width: 32px;
 	height: 32px;
-	display: inline-block;
 }
 /*搜索结果显示觉醒列表的相关css*/
 .awoken-preview .awoken-ul
diff --git a/triple.html b/triple.html
index fbbd424f..937d5733 100644
--- a/triple.html
+++ b/triple.html
@@ -68,7 +68,7 @@ const teamsCount = 3;
 		<details class="config-display-list">
 			<summary></summary>
 			<div class="in-card">
-				<div class="monster allowable-assist" title="No.99999 博丽灵梦" style="transform: scale(0.75); margin: calc(-100px * (1 - 0.75) / 2);">
+				<div class="monster allowable-assist" title="No.99999 博丽灵梦">
 					<div class="attrs">
 						<div class="attr" data-attr="0"></div><div class="attr" data-attr="1"></div><div class="attr" data-attr="2"></div><div class="attr" data-attr="3"></div>
 					</div>
@@ -1527,7 +1527,13 @@ const teamsCount = 3;
 	</div>
 	<div id="rich-text-tools" class="display-none">
 		<button id="set-font-color" title="Set Font Color"></button><input id="color-chooser" type="color" title="Choose Font Color" />
-		<button id="insert-card-avatar" title="Insert Card Avatar"></button>
+		<button id="insert-card-avatar" title="Insert Card Avatar">
+			<div class="monster" data-cardid="23" data-cards-pic-idx="1" data-cards-pic-x="2" data-cards-pic-y="2">
+				<div class="attrs">
+					<div class="attr" data-attr="0"></div>
+				</div>
+			</div>
+		</button>
 		<button id="insert-awoken-icon" title="Insert Awoken Icon"></button>
 		<button id="insert-latent-icon" title="Insert Latent Icon"></button>
 		<button id="insert-type-icon" title="Insert Type Icon"></button>