From c53c828db04beef81980652157cd4454d40bfb4e Mon Sep 17 00:00:00 2001
From: Sakura Knoll <s4kura.knoll@gmail.com>
Date: Sun, 18 Sep 2022 16:16:23 +0900
Subject: [PATCH] Fix default fonts for 7s

---
 public/novels/7s/en-US/bundle.css        |  3 +-
 public/novels/7s/en-US/xml/resources.xml | 58 ++++++++++++------------
 public/novels/7s/ko-KR/bundle.css        |  3 +-
 public/novels/7s/ko-KR/xml/resources.xml | 58 ++++++++++++------------
 4 files changed, 62 insertions(+), 60 deletions(-)

diff --git a/public/novels/7s/en-US/bundle.css b/public/novels/7s/en-US/bundle.css
index cd97df19..9db6e79e 100644
--- a/public/novels/7s/en-US/bundle.css
+++ b/public/novels/7s/en-US/bundle.css
@@ -592,7 +592,8 @@ html {
   position: relative;
   background-color: #000;
   color: #333;
-  font-family: Microsoft YaHei, \\5FAE\8F6F\96C5\9ED1, Arial, sans-serif;
+  font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
+    Ubuntu, 'Helvetica Neue', Oxygen, Cantarell, sans-serif;
 }
 * {
   outline: none;
diff --git a/public/novels/7s/en-US/xml/resources.xml b/public/novels/7s/en-US/xml/resources.xml
index a19973d9..2c621ed0 100644
--- a/public/novels/7s/en-US/xml/resources.xml
+++ b/public/novels/7s/en-US/xml/resources.xml
@@ -1648,34 +1648,34 @@
     <etc type="etc" src="https://uploadstatic.mihoyo.com/contentweb/20191104/2019110416402633412.png" id="飞燕归巢" group="第一章_战斗" src_os="https://uploadstatic-sea.mihoyo.com/galgame/2021/07/12/2019110416402633412.png"></etc>
   </resource>
   <characters>
-    <c id="-1" name=" " color="#FAFAD2" font="楷体"></c>
-    <c id="-2" color="#FFFFFF" font="楷体"></c>
-    <c id="-3" color="#FFFFFF" font="楷体"></c>
-    <c id="000" name="精衛" color="#FAFAD2" font="楷体" key="gal-chara-b3633b43-cebc-44ee-9797-99dd4a479185"></c>
-    <c id="001" name="羅刹人" color="#FAFAD2" font="楷体" key="gal-chara-c53a2487-544b-49a6-afb8-951cba49cd7d"></c>
-    <c id="002" name="Li Sushang" color="#FAFAD2" font="楷体" key="gal-chara-11bce50a-359a-47f3-8e40-dd95fae8d7e9"></c>
-    <c id="003" name="林朝雨" color="#FAFAD2" font="楷体" key="gal-chara-325b918f-950c-40f1-9bb1-0bf06011d073"></c>
-    <c id="004" name="蘇湄" color="#FAFAD2" font="楷体" key="gal-chara-dc3e6eee-5334-4353-8039-45c021217396"></c>
-    <c id="005" name="江婉兮" color="#FAFAD2" font="楷体" key="gal-chara-dce9c071-7ee3-4a55-bb56-cdb5f78d9240"></c>
-    <c id="006" name="江婉如" color="#FAFAD2" font="楷体" key="gal-chara-f2a4bd6e-f8b6-47d9-aa62-6a99ebbbfe9a"></c>
-    <c id="007" name="凌霜" color="#FAFAD2" font="楷体" key="gal-chara-33114304-f510-46f7-9fa7-9bc40bab3553"></c>
-    <c id="008" name="馬非馬" color="#FAFAD2" font="楷体" key="gal-chara-d9f40eef-cabe-41fb-87f1-cdd25caf3f80"></c>
-    <c id="009" name="Qin Suyi" color="#FAFAD2" font="楷体" key="gal-chara-56689f9f-e1e1-4c79-89a9-6e350e95648b"></c>
-    <c id="010" name="Li Shen" color="#FAFAD2" font="楷体" key="gal-chara-296ffd13-1e74-41e3-ad25-3a9b3ec3db39"></c>
-    <c id="011" name="馬彦卿" color="#FAFAD2" font="楷体" key="gal-chara-752ce944-b68c-4e8f-b64c-6cfe74365799"></c>
-    <c id="012" name="枕玉" color="#FAFAD2" font="楷体" key="gal-chara-3b4e99c6-438a-4f5d-81b5-176312af42c5"></c>
-    <c id="013" name="柳君衍" color="#FAFAD2" font="楷体" key="gal-chara-ca6e645f-a563-4f97-928d-acd69fe8bb19"></c>
-    <c id="014" name="閻世羅" color="#FAFAD2" font="楷体" key="gal-chara-1673a1cb-1f6c-4c6a-973c-bc7336ed7073"></c>
-    <c name="「鷹」" id="015" color="#FAFAD2" font="楷体" key="gal-chara-b5567dc6-c1b6-4675-a4ac-36ac2e7a8171"></c>
-    <c id="016" name="カレン" color="#FAFAD2" font="楷体" key="gal-chara-ca29454a-f5a0-4fb1-a195-a8133e49bdfa"></c>
-    <c id="099" name="？？？" color="#FAFAD2" font="楷体" key="gal-chara-5dcdbce9-4dbf-4c1e-8bce-fcf00e588659"></c>
-    <c id="091" name="李素裳" font="楷体" color="#FAFAD2" key="gal-chara-290c2c73-9d41-4a43-8b3a-931e9ba8ec8c"></c>
-    <c id="092" name="羅刹人" color="#FAFAD2" font="楷体" key="gal-chara-5145b071-2899-4a29-8896-71b399179890"></c>
-    <c id="093" name="精衛" color="#FAFAD2" font="楷体" key="gal-chara-8d84841a-2b7a-4812-a3dd-66869ab71d35"></c>
-    <c id="094" name="Man" color="#FAFAD2" font="楷体" key="gal-chara-260ad4bf-c165-436f-a384-cf2546318048"></c>
-    <c id="095" name="Man" color="#FAFAD2" font="楷体" key="gal-chara-a92f73fa-7f86-4815-9fda-e3cee0e29866"></c>
-    <c id="096" name="「鷹」-特" font="楷体" color="#FAFAD2" key="gal-chara-6b73f826-93cd-4f24-9d8b-f602aff4fbc9"></c>
-    <c id="097" name="李素裳-特" color="#FAFAD2" font="楷体" key="gal-chara-e69dc85f-ab45-4269-989d-4703f3ee6781"></c>
-    <c id="100" color="#FAFAD2" font="楷体" name="物品" key="gal-chara-f1f003b5-4c8f-4f15-8bfc-524b7ece78c9"></c>
+    <c id="-1" name=" " color="#FAFAD2" font="'Times New Roman', Times, serif"></c>
+    <c id="-2" color="#FFFFFF" font="'Times New Roman', Times, serif"></c>
+    <c id="-3" color="#FFFFFF" font="'Times New Roman', Times, serif"></c>
+    <c id="000" name="精衛" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-b3633b43-cebc-44ee-9797-99dd4a479185"></c>
+    <c id="001" name="羅刹人" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-c53a2487-544b-49a6-afb8-951cba49cd7d"></c>
+    <c id="002" name="Li Sushang" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-11bce50a-359a-47f3-8e40-dd95fae8d7e9"></c>
+    <c id="003" name="林朝雨" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-325b918f-950c-40f1-9bb1-0bf06011d073"></c>
+    <c id="004" name="蘇湄" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-dc3e6eee-5334-4353-8039-45c021217396"></c>
+    <c id="005" name="江婉兮" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-dce9c071-7ee3-4a55-bb56-cdb5f78d9240"></c>
+    <c id="006" name="江婉如" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-f2a4bd6e-f8b6-47d9-aa62-6a99ebbbfe9a"></c>
+    <c id="007" name="凌霜" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-33114304-f510-46f7-9fa7-9bc40bab3553"></c>
+    <c id="008" name="馬非馬" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-d9f40eef-cabe-41fb-87f1-cdd25caf3f80"></c>
+    <c id="009" name="Qin Suyi" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-56689f9f-e1e1-4c79-89a9-6e350e95648b"></c>
+    <c id="010" name="Li Shen" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-296ffd13-1e74-41e3-ad25-3a9b3ec3db39"></c>
+    <c id="011" name="馬彦卿" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-752ce944-b68c-4e8f-b64c-6cfe74365799"></c>
+    <c id="012" name="枕玉" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-3b4e99c6-438a-4f5d-81b5-176312af42c5"></c>
+    <c id="013" name="柳君衍" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-ca6e645f-a563-4f97-928d-acd69fe8bb19"></c>
+    <c id="014" name="閻世羅" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-1673a1cb-1f6c-4c6a-973c-bc7336ed7073"></c>
+    <c name="「鷹」" id="015" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-b5567dc6-c1b6-4675-a4ac-36ac2e7a8171"></c>
+    <c id="016" name="カレン" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-ca29454a-f5a0-4fb1-a195-a8133e49bdfa"></c>
+    <c id="099" name="？？？" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-5dcdbce9-4dbf-4c1e-8bce-fcf00e588659"></c>
+    <c id="091" name="李素裳" font="'Times New Roman', Times, serif" color="#FAFAD2" key="gal-chara-290c2c73-9d41-4a43-8b3a-931e9ba8ec8c"></c>
+    <c id="092" name="羅刹人" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-5145b071-2899-4a29-8896-71b399179890"></c>
+    <c id="093" name="精衛" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-8d84841a-2b7a-4812-a3dd-66869ab71d35"></c>
+    <c id="094" name="Man" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-260ad4bf-c165-436f-a384-cf2546318048"></c>
+    <c id="095" name="Man" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-a92f73fa-7f86-4815-9fda-e3cee0e29866"></c>
+    <c id="096" name="「鷹」-特" font="'Times New Roman', Times, serif" color="#FAFAD2" key="gal-chara-6b73f826-93cd-4f24-9d8b-f602aff4fbc9"></c>
+    <c id="097" name="李素裳-特" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-e69dc85f-ab45-4269-989d-4703f3ee6781"></c>
+    <c id="100" color="#FAFAD2" font="'Times New Roman', Times, serif" name="物品" key="gal-chara-f1f003b5-4c8f-4f15-8bfc-524b7ece78c9"></c>
   </characters>
 </data>
diff --git a/public/novels/7s/ko-KR/bundle.css b/public/novels/7s/ko-KR/bundle.css
index d49e659c..eeab6c05 100644
--- a/public/novels/7s/ko-KR/bundle.css
+++ b/public/novels/7s/ko-KR/bundle.css
@@ -592,7 +592,8 @@ html {
   position: relative;
   background-color: #000;
   color: #333;
-  font-family: Microsoft YaHei, \\5FAE\8F6F\96C5\9ED1, Arial, sans-serif;
+  font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
+    Ubuntu, 'Helvetica Neue', Oxygen, Cantarell, sans-serif;
 }
 * {
   outline: none;
diff --git a/public/novels/7s/ko-KR/xml/resources.xml b/public/novels/7s/ko-KR/xml/resources.xml
index ccf53bf1..d0cb0bf3 100644
--- a/public/novels/7s/ko-KR/xml/resources.xml
+++ b/public/novels/7s/ko-KR/xml/resources.xml
@@ -1648,34 +1648,34 @@
     <etc type="etc" src="https://uploadstatic.mihoyo.com/contentweb/20191104/2019110416402633412.png" id="飞燕归巢" group="第一章_战斗" src_os="https://uploadstatic-sea.mihoyo.com/galgame/2021/07/12/2019110416402633412.png"></etc>
   </resource>
   <characters>
-    <c id="-1" name=" " color="#FAFAD2" font="楷体"></c>
-    <c id="-2" color="#FFFFFF" font="楷体"></c>
-    <c id="-3" color="#FFFFFF" font="楷体"></c>
-    <c id="000" name="精衛" color="#FAFAD2" font="楷体" key="gal-chara-b3633b43-cebc-44ee-9797-99dd4a479185"></c>
-    <c id="001" name="羅刹人" color="#FAFAD2" font="楷体" key="gal-chara-c53a2487-544b-49a6-afb8-951cba49cd7d"></c>
-    <c id="002" name="李素裳" color="#FAFAD2" font="楷体" key="gal-chara-11bce50a-359a-47f3-8e40-dd95fae8d7e9"></c>
-    <c id="003" name="林朝雨" color="#FAFAD2" font="楷体" key="gal-chara-325b918f-950c-40f1-9bb1-0bf06011d073"></c>
-    <c id="004" name="蘇湄" color="#FAFAD2" font="楷体" key="gal-chara-dc3e6eee-5334-4353-8039-45c021217396"></c>
-    <c id="005" name="江婉兮" color="#FAFAD2" font="楷体" key="gal-chara-dce9c071-7ee3-4a55-bb56-cdb5f78d9240"></c>
-    <c id="006" name="江婉如" color="#FAFAD2" font="楷体" key="gal-chara-f2a4bd6e-f8b6-47d9-aa62-6a99ebbbfe9a"></c>
-    <c id="007" name="凌霜" color="#FAFAD2" font="楷体" key="gal-chara-33114304-f510-46f7-9fa7-9bc40bab3553"></c>
-    <c id="008" name="馬非馬" color="#FAFAD2" font="楷体" key="gal-chara-d9f40eef-cabe-41fb-87f1-cdd25caf3f80"></c>
-    <c id="009" name="秦素衣" color="#FAFAD2" font="楷体" key="gal-chara-56689f9f-e1e1-4c79-89a9-6e350e95648b"></c>
-    <c id="010" name="李紳" color="#FAFAD2" font="楷体" key="gal-chara-296ffd13-1e74-41e3-ad25-3a9b3ec3db39"></c>
-    <c id="011" name="馬彦卿" color="#FAFAD2" font="楷体" key="gal-chara-752ce944-b68c-4e8f-b64c-6cfe74365799"></c>
-    <c id="012" name="枕玉" color="#FAFAD2" font="楷体" key="gal-chara-3b4e99c6-438a-4f5d-81b5-176312af42c5"></c>
-    <c id="013" name="柳君衍" color="#FAFAD2" font="楷体" key="gal-chara-ca6e645f-a563-4f97-928d-acd69fe8bb19"></c>
-    <c id="014" name="閻世羅" color="#FAFAD2" font="楷体" key="gal-chara-1673a1cb-1f6c-4c6a-973c-bc7336ed7073"></c>
-    <c name="「鷹」" id="015" color="#FAFAD2" font="楷体" key="gal-chara-b5567dc6-c1b6-4675-a4ac-36ac2e7a8171"></c>
-    <c id="016" name="カレン" color="#FAFAD2" font="楷体" key="gal-chara-ca29454a-f5a0-4fb1-a195-a8133e49bdfa"></c>
-    <c id="099" name="？？？" color="#FAFAD2" font="楷体" key="gal-chara-5dcdbce9-4dbf-4c1e-8bce-fcf00e588659"></c>
-    <c id="091" name="李素裳" font="楷体" color="#FAFAD2" key="gal-chara-290c2c73-9d41-4a43-8b3a-931e9ba8ec8c"></c>
-    <c id="092" name="羅刹人" color="#FAFAD2" font="楷体" key="gal-chara-5145b071-2899-4a29-8896-71b399179890"></c>
-    <c id="093" name="精衛" color="#FAFAD2" font="楷体" key="gal-chara-8d84841a-2b7a-4812-a3dd-66869ab71d35"></c>
-    <c id="094" name="男" color="#FAFAD2" font="楷体" key="gal-chara-260ad4bf-c165-436f-a384-cf2546318048"></c>
-    <c id="095" name="男" color="#FAFAD2" font="楷体" key="gal-chara-a92f73fa-7f86-4815-9fda-e3cee0e29866"></c>
-    <c id="096" name="「鷹」-特" font="楷体" color="#FAFAD2" key="gal-chara-6b73f826-93cd-4f24-9d8b-f602aff4fbc9"></c>
-    <c id="097" name="李素裳-特" color="#FAFAD2" font="楷体" key="gal-chara-e69dc85f-ab45-4269-989d-4703f3ee6781"></c>
-    <c id="100" color="#FAFAD2" font="楷体" name="物品" key="gal-chara-f1f003b5-4c8f-4f15-8bfc-524b7ece78c9"></c>
+    <c id="-1" name=" " color="#FAFAD2" font="'Times New Roman', Times, serif"></c>
+    <c id="-2" color="#FFFFFF" font="'Times New Roman', Times, serif"></c>
+    <c id="-3" color="#FFFFFF" font="'Times New Roman', Times, serif"></c>
+    <c id="000" name="精衛" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-b3633b43-cebc-44ee-9797-99dd4a479185"></c>
+    <c id="001" name="羅刹人" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-c53a2487-544b-49a6-afb8-951cba49cd7d"></c>
+    <c id="002" name="李素裳" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-11bce50a-359a-47f3-8e40-dd95fae8d7e9"></c>
+    <c id="003" name="林朝雨" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-325b918f-950c-40f1-9bb1-0bf06011d073"></c>
+    <c id="004" name="蘇湄" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-dc3e6eee-5334-4353-8039-45c021217396"></c>
+    <c id="005" name="江婉兮" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-dce9c071-7ee3-4a55-bb56-cdb5f78d9240"></c>
+    <c id="006" name="江婉如" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-f2a4bd6e-f8b6-47d9-aa62-6a99ebbbfe9a"></c>
+    <c id="007" name="凌霜" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-33114304-f510-46f7-9fa7-9bc40bab3553"></c>
+    <c id="008" name="馬非馬" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-d9f40eef-cabe-41fb-87f1-cdd25caf3f80"></c>
+    <c id="009" name="秦素衣" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-56689f9f-e1e1-4c79-89a9-6e350e95648b"></c>
+    <c id="010" name="李紳" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-296ffd13-1e74-41e3-ad25-3a9b3ec3db39"></c>
+    <c id="011" name="馬彦卿" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-752ce944-b68c-4e8f-b64c-6cfe74365799"></c>
+    <c id="012" name="枕玉" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-3b4e99c6-438a-4f5d-81b5-176312af42c5"></c>
+    <c id="013" name="柳君衍" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-ca6e645f-a563-4f97-928d-acd69fe8bb19"></c>
+    <c id="014" name="閻世羅" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-1673a1cb-1f6c-4c6a-973c-bc7336ed7073"></c>
+    <c name="「鷹」" id="015" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-b5567dc6-c1b6-4675-a4ac-36ac2e7a8171"></c>
+    <c id="016" name="カレン" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-ca29454a-f5a0-4fb1-a195-a8133e49bdfa"></c>
+    <c id="099" name="？？？" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-5dcdbce9-4dbf-4c1e-8bce-fcf00e588659"></c>
+    <c id="091" name="李素裳" font="'Times New Roman', Times, serif" color="#FAFAD2" key="gal-chara-290c2c73-9d41-4a43-8b3a-931e9ba8ec8c"></c>
+    <c id="092" name="羅刹人" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-5145b071-2899-4a29-8896-71b399179890"></c>
+    <c id="093" name="精衛" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-8d84841a-2b7a-4812-a3dd-66869ab71d35"></c>
+    <c id="094" name="男" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-260ad4bf-c165-436f-a384-cf2546318048"></c>
+    <c id="095" name="男" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-a92f73fa-7f86-4815-9fda-e3cee0e29866"></c>
+    <c id="096" name="「鷹」-特" font="'Times New Roman', Times, serif" color="#FAFAD2" key="gal-chara-6b73f826-93cd-4f24-9d8b-f602aff4fbc9"></c>
+    <c id="097" name="李素裳-特" color="#FAFAD2" font="'Times New Roman', Times, serif" key="gal-chara-e69dc85f-ab45-4269-989d-4703f3ee6781"></c>
+    <c id="100" color="#FAFAD2" font="'Times New Roman', Times, serif" name="物品" key="gal-chara-f1f003b5-4c8f-4f15-8bfc-524b7ece78c9"></c>
   </characters>
 </data>