From 1c95b97fa140f556ee7e84a0785f93329127d33c Mon Sep 17 00:00:00 2001
From: Haoyu Xu <i@halyul.dev>
Date: Mon, 13 Mar 2023 17:20:32 -0400
Subject: [PATCH] feat(showcase): add music resources

---
 README.md                           | 2 +-
 Version                             | 2 +-
 aklive2d.js                         | 3 ---
 directory/Version                   | 2 +-
 directory/src/routes/error-page.jsx | 6 ++----
 directory/src/routes/root.css       | 1 +
 src/components/settings.js          | 3 +--
 7 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 99d8069..67e5253 100644
--- a/README.md
+++ b/README.md
@@ -142,7 +142,7 @@ I'm still struggling to find a command-line tool to extract in-game assets. But
 
 <sup>1</sup>: `portrait_hub` is required to locate the image
 
-<sup>2</sup>: `gamedata/excel/display_meta_table.json`<sup>3</sup> is required to locate the music
+<sup>2</sup>: `gamedata/excel/display_meta_table.json->homeBackgroundData`<sup>3</sup> is required to locate the music. A more detailed mapping can be found at [音乐鉴赏/游戏内音乐一览 - PRTS.wiki](https://prts.wiki/w/%E9%9F%B3%E4%B9%90%E9%89%B4%E8%B5%8F/%E6%B8%B8%E6%88%8F%E5%86%85%E9%9F%B3%E4%B9%90%E4%B8%80%E8%A7%88) and [首页场景一览 - PRTS.wiki](https://prts.wiki/w/%E9%A6%96%E9%A1%B5%E5%9C%BA%E6%99%AF%E4%B8%80%E8%A7%88)
 
 <sup>3</sup>: Data is encryped, decryped version can be obtained from [ArknightsGameData](https://github.com/Kengxxiao/ArknightsGameData)
 
diff --git a/Version b/Version
index ef8c7a2..5328966 100644
--- a/Version
+++ b/Version
@@ -1 +1 @@
-3.3.60
\ No newline at end of file
+3.3.62
\ No newline at end of file
diff --git a/aklive2d.js b/aklive2d.js
index 309594f..38b75a9 100644
--- a/aklive2d.js
+++ b/aklive2d.js
@@ -177,9 +177,6 @@ async function main() {
       {
         key: "link",
         value: __config.operators[OPERATOR_NAME].link
-      }, {
-        key: "version",
-        value: __config.version.showcase
       }, {
         key: "title",
         value: __config.operators[OPERATOR_NAME].title
diff --git a/directory/Version b/directory/Version
index e5a4a5e..8684498 100644
--- a/directory/Version
+++ b/directory/Version
@@ -1 +1 @@
-1.0.9
\ No newline at end of file
+1.0.11
\ No newline at end of file
diff --git a/directory/src/routes/error-page.jsx b/directory/src/routes/error-page.jsx
index 7070af2..b8b1029 100644
--- a/directory/src/routes/error-page.jsx
+++ b/directory/src/routes/error-page.jsx
@@ -19,6 +19,7 @@ import { useHeader } from '@/state/header';
 import useAudio from '@/libs/voice';
 import spine from '!/libs/spine-player'
 import '!/libs/spine-player.css'
+import useUmami from '@parcellab/react-use-umami';
 
 const voiceOnAtom = atomWithStorage('voiceOn', false)
 const config = JSON.parse(import.meta.env.VITE_ERROR_FILES)
@@ -27,6 +28,7 @@ const filename = obj.key.replace("#", "%23")
 const padding = obj.paddings
 
 export default function ErrorPage() {
+  const _trackEvt = useUmami('/error')
   const error = useRouteError();
   const navigate = useNavigate();
   const {
@@ -73,10 +75,6 @@ export default function ErrorPage() {
     play(`/${import.meta.env.VITE_DIRECTORY_FOLDER}/error.ogg`, { overwrite: true })
   }, [play])
 
-  useEffect(() => {
-    if (voiceOn) playVoice()
-  }, [playVoice, voiceOn])
-
   useEffect(() => {
     if (spineRef.current?.children.length === 0 && spineData) {
       new spine.SpinePlayer(spineRef.current, {
diff --git a/directory/src/routes/root.css b/directory/src/routes/root.css
index 25f852d..c092da2 100644
--- a/directory/src/routes/root.css
+++ b/directory/src/routes/root.css
@@ -169,6 +169,7 @@
     flex-direction: row;
     justify-content: flex-end;
     overflow: hidden;
+    z-index: 2;
 }
 
 .main .main-header .main-tab .main-tab-item {
diff --git a/src/components/settings.js b/src/components/settings.js
index 13154b4..607d66a 100644
--- a/src/components/settings.js
+++ b/src/components/settings.js
@@ -41,7 +41,6 @@ export default class Settings {
   #doNotTrack = false
   #lastFunctionInsights = null
 
-
   constructor(el, logoEl) {
     this.isWallpaperEngine = false
     this.#el = el
@@ -79,7 +78,7 @@ export default class Settings {
     this.#isInsightsInited = true
     this.#doNotTrack = doNotTrack
     if (this.#doNotTrack) return
-    window.umami?.trackView(`/${import.meta.env.VITE_LINK}${isWallpaperEngine ? "?steam&" : "?"}version=${import.meta.env.VITE_VERSION}`);
+    window.umami?.trackView(`/${import.meta.env.VITE_LINK}${isWallpaperEngine ? "?steam" : ""}`);
   }
 
   functionInsights(functionName, toSkip = false) {