From dc28d621dcc733633e915b140cf078945ff968b5 Mon Sep 17 00:00:00 2001
From: HoraceHuang-ui <horacehuang17@gmail.com>
Date: Wed, 1 May 2024 01:28:57 +0800
Subject: [PATCH 01/11] feat: add registry editing

---
 electron-builder.json5          |  7 +++
 electron/main/index.ts          | 76 ++++++++++++++++++++++++++++++---
 electron/preload/index.ts       | 14 ++++++
 package.json                    |  2 +
 src/store/index.ts              |  6 ++-
 src/types/genshin/gsRegInfo.ts  |  7 +++
 src/types/index.d.ts            | 11 +++++
 src/types/starrail/srRegInfo.ts |  7 +++
 8 files changed, 122 insertions(+), 8 deletions(-)
 create mode 100644 src/types/genshin/gsRegInfo.ts
 create mode 100644 src/types/starrail/srRegInfo.ts

diff --git a/electron-builder.json5 b/electron-builder.json5
index 9398de35..2279dea0 100644
--- a/electron-builder.json5
+++ b/electron-builder.json5
@@ -46,5 +46,12 @@
     "src/assets/hi3banner.webp",
     "src/assets/gpIcons/Xbox/*",
     "src/assets/gpIcons/PS/*",
+    {
+      "from": "node_modules/regedit/vbs",
+      "to": "regedit/vbs",
+      "filter": [
+        "**/*",
+      ],
+    },
   ],
 }
diff --git a/electron/main/index.ts b/electron/main/index.ts
index 3419dc46..8b274ee6 100644
--- a/electron/main/index.ts
+++ b/electron/main/index.ts
@@ -15,14 +15,12 @@ import { DynamicTextAssets, EnkaClient, TextAssets } from 'enka-network-api'
 import { promises as fs } from 'fs'
 import { Octokit } from '@octokit/core'
 import path from 'path'
-import { useStore } from '../../src/store'
-import { createPinia } from 'pinia'
-import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
+import regedit, { promisified as reg } from 'regedit'
+import { SrRegInfo } from '../../src/types/starrail/srRegInfo'
+import { GsRegInfo } from '../../src/types/genshin/gsRegInfo'
 
-const pinia = createPinia()
-pinia.use(piniaPluginPersistedstate)
+regedit.setExternalVBSLocation('resources/regedit/vbs')
 
-const store = useStore(pinia)
 const enka = new EnkaClient({
   requestTimeout: 10000,
 })
@@ -316,6 +314,72 @@ async function createWindow() {
     return result
   })
 
+  ipcMain.on('reg:gsSet', (_event, acc: string) => {
+    // await reg.deleteKey(['HKCU\\Software\\miHoYo\\原神'])
+    // await reg.createKey(['HKCU\\Software\\miHoYo\\原神'])
+    const account = JSON.parse(acc)
+
+    reg.putValue({
+      'HKCU\\Software\\miHoYo\\原神': {
+        GENERAL_DATA_h2389025596: {
+          value: account.generalData,
+          type: 'REG_BINARY',
+        },
+        MIHOYOSDK_ADL_PROD_CN_h3123967166: {
+          value: account.mihoyoSdk,
+          type: 'REG_BINARY',
+        },
+      },
+    })
+  })
+
+  ipcMain.on('reg:srSet', (_event, acc: string) => {
+    // await reg.deleteKey(['HKCU\\Software\\miHoYo\\崩坏：星穹铁道'])
+    // await reg.createKey(['HKCU\\Software\\miHoYo\\崩坏：星穹铁道'])
+    const account = JSON.parse(acc)
+
+    reg.putValue({
+      'HKCU\\Software\\miHoYo\\崩坏：星穹铁道': {
+        MIHOYOSDK_ADL_PROD_CN_h3123247166: {
+          value: account.mihoyoSdk,
+          type: 'REG_BINARY',
+        },
+        App_LastUserID_h2841324341: {
+          value: account.lastUserId,
+          type: 'REG_DWORD',
+        },
+      },
+    })
+  })
+
+  ipcMain.handle('reg:gsGet', async (): Promise<GsRegInfo> => {
+    const result = (await reg.list(['HKCU\\Software\\miHoYo\\原神']))[
+      'HKCU\\Software\\miHoYo\\原神'
+    ]
+    return result.exists && result.values
+      ? {
+          name: '',
+          generalData: result.values.GENERAL_DATA_h2389025596.value as number[],
+          mihoyoSdk: result.values.MIHOYOSDK_ADL_PROD_CN_h3123967166
+            .value as number[],
+        }
+      : undefined
+  })
+
+  ipcMain.handle('reg:srGet', async (): Promise<SrRegInfo> => {
+    const result = (await reg.list(['HKCU\\Software\\miHoYo\\崩坏：星穹铁道']))[
+      'HKCU\\Software\\miHoYo\\崩坏：星穹铁道'
+    ]
+    return result.exists && result.values
+      ? {
+          name: '',
+          lastUserId: result.values.App_LastUserID_h2841324341.value as number,
+          mihoyoSdk: result.values.MIHOYOSDK_ADL_PROD_CN_h3123247166
+            .value as number[],
+        }
+      : undefined
+  })
+
   // --------- Window configs ------------
   // win.setWindowButtonVisibility(true)
   // nativeTheme.themeSource = 'light'
diff --git a/electron/preload/index.ts b/electron/preload/index.ts
index fe3e74e1..c6a37c33 100644
--- a/electron/preload/index.ts
+++ b/electron/preload/index.ts
@@ -58,6 +58,20 @@ contextBridge.exposeInMainWorld('github', {
     return await ipcRenderer.invoke('github:getLatestRelease')
   },
 })
+contextBridge.exposeInMainWorld('reg', {
+  gsGet: async () => {
+    return await ipcRenderer.invoke('reg:gsGet')
+  },
+  srGet: async () => {
+    return await ipcRenderer.invoke('reg:srGet')
+  },
+  gsSet: (account: string) => {
+    ipcRenderer.send('reg:gsSet', account)
+  },
+  srSet: (account: string) => {
+    ipcRenderer.send('reg:srSet', account)
+  },
+})
 
 function domReady(
   condition: DocumentReadyState[] = ['complete', 'interactive'],
diff --git a/package.json b/package.json
index 4c14da76..a8f5e855 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
   },
   "devDependencies": {
     "@electron-forge/cli": "^7.3.0",
+    "@types/winreg": "^1.2.36",
     "@vitejs/plugin-vue": "^5.0.4",
     "@vue/eslint-config-typescript": "^10.0.0",
     "autoprefixer": "^10.4.18",
@@ -55,6 +56,7 @@
     "enka-network-api": "^4.3.0",
     "marked": "^12.0.1",
     "path": "^0.12.7",
+    "regedit": "^5.1.3",
     "sass": "^1.72.0",
     "vue-i18n": "^9.10.1"
   }
diff --git a/src/store/index.ts b/src/store/index.ts
index 18303ab8..d0e5a88a 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -2,6 +2,8 @@ import { defineStore } from 'pinia'
 import { DialogStyle } from '../types/dialog/dialog'
 import { Lang } from '../i18n'
 import { FormattedApiInfo } from '../types/starrail/srPlayerInfo'
+import { GsRegInfo } from '../types/genshin/gsRegInfo'
+import { SrRegInfo } from '../types/starrail/srRegInfo'
 
 export const useStore = defineStore('userStore', {
   state: () => ({
@@ -35,18 +37,18 @@ export const useStore = defineStore('userStore', {
     },
     game: {
       gs: {
-        // gs
         launcherPath: undefined as string | undefined,
         gamePath: undefined as string | undefined,
         upd: false,
         playerInfo: undefined as any,
+        accounts: [] as GsRegInfo[],
       },
       sr: {
-        // sr
         launcherPath: undefined as string | undefined,
         gamePath: undefined as string | undefined,
         upd: false,
         playerInfo: undefined as FormattedApiInfo | undefined,
+        accounts: [] as SrRegInfo[],
       },
       hi3: {
         // hi3
diff --git a/src/types/genshin/gsRegInfo.ts b/src/types/genshin/gsRegInfo.ts
new file mode 100644
index 00000000..4a0f210f
--- /dev/null
+++ b/src/types/genshin/gsRegInfo.ts
@@ -0,0 +1,7 @@
+export interface GsRegInfo {
+  name: string
+  // GENERAL_DATA_h2389025596
+  generalData: number[]
+  // MIHOYOSDK_ADL_PROD_CN_h3123967166
+  mihoyoSdk: number[]
+}
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
index 72e53d17..2bf4a943 100644
--- a/src/types/index.d.ts
+++ b/src/types/index.d.ts
@@ -1,3 +1,6 @@
+import { GsRegInfo } from './genshin/gsRegInfo'
+import { SrRegInfo } from './starrail/srRegInfo'
+
 export {}
 
 // export * from './starrail/srPlayerInfo'
@@ -42,6 +45,13 @@ export interface IGithub {
   getLatestRelease: () => Promise<any>
 }
 
+export interface IReg {
+  gsGet: () => Promise<GsRegInfo | undefined>
+  gsSet: (data: string) => Promise<void>
+  srGet: () => Promise<SrRegInfo | undefined>
+  srSet: (data: string) => Promise<void>
+}
+
 declare global {
   interface Window {
     child: IChild
@@ -52,5 +62,6 @@ declare global {
     axios: IAxios
     electron: IElectron
     github: IGithub
+    reg: IReg
   }
 }
diff --git a/src/types/starrail/srRegInfo.ts b/src/types/starrail/srRegInfo.ts
new file mode 100644
index 00000000..baa40177
--- /dev/null
+++ b/src/types/starrail/srRegInfo.ts
@@ -0,0 +1,7 @@
+export interface SrRegInfo {
+  name: string
+  // App_LastUserID_h2841324341
+  lastUserId: number
+  // MIHOYOSDK_ADL_PROD_CN_h3123247166
+  mihoyoSdk: number[]
+}

From c3950ed470915039491fef1a31797c0694de2be4 Mon Sep 17 00:00:00 2001
From: HoraceHuang-ui <horacehuang17@gmail.com>
Date: Sun, 5 May 2024 10:37:23 +0800
Subject: [PATCH 02/11] feat: add account switching for genshin & star rail

---
 electron/main/index.ts                        |   9 +-
 src/pages/GamePage.vue                        | 238 +++++++++++++++---
 .../Components/GenshinInfoCard.vue            |   4 +-
 .../Components/StarRailDialog.vue             |   4 -
 .../Components/StarRailInfoCard.vue           |   2 +-
 src/store/index.ts                            |   2 +
 src/types/starrail/srRegInfo.ts               |   4 +-
 7 files changed, 219 insertions(+), 44 deletions(-)

diff --git a/electron/main/index.ts b/electron/main/index.ts
index 8b274ee6..a45aa6ff 100644
--- a/electron/main/index.ts
+++ b/electron/main/index.ts
@@ -340,11 +340,11 @@ async function createWindow() {
 
     reg.putValue({
       'HKCU\\Software\\miHoYo\\崩坏：星穹铁道': {
-        MIHOYOSDK_ADL_PROD_CN_h3123247166: {
+        MIHOYOSDK_ADL_PROD_CN_h3123967166: {
           value: account.mihoyoSdk,
           type: 'REG_BINARY',
         },
-        App_LastUserID_h2841324341: {
+        App_LastUserID_h2841727341: {
           value: account.lastUserId,
           type: 'REG_DWORD',
         },
@@ -370,11 +370,12 @@ async function createWindow() {
     const result = (await reg.list(['HKCU\\Software\\miHoYo\\崩坏：星穹铁道']))[
       'HKCU\\Software\\miHoYo\\崩坏：星穹铁道'
     ]
+    console.log(result)
     return result.exists && result.values
       ? {
           name: '',
-          lastUserId: result.values.App_LastUserID_h2841324341.value as number,
-          mihoyoSdk: result.values.MIHOYOSDK_ADL_PROD_CN_h3123247166
+          lastUserId: result.values.App_LastUserID_h2841727341.value as number,
+          mihoyoSdk: result.values.MIHOYOSDK_ADL_PROD_CN_h3123967166
             .value as number[],
         }
       : undefined
diff --git a/src/pages/GamePage.vue b/src/pages/GamePage.vue
index 92c63558..6c8509b7 100644
--- a/src/pages/GamePage.vue
+++ b/src/pages/GamePage.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { Component, computed, inject, onMounted, Ref, ref } from 'vue'
+import { Component, computed, h, inject, onMounted, ref, Ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { translate } from '../i18n'
 import { LauncherInfo, PostInfo } from '../types/launcher/launcherInfo'
@@ -15,6 +15,8 @@ import SRImportDialog from './StarRailPage/Components/SRImportDialog.vue'
 import HI3ImportDialog from './Honkai3Page/Components/HI3ImportDialog.vue'
 import StarRailInfoCard from './StarRailPage/Components/StarRailInfoCard.vue'
 import { useStore } from '../store'
+import { SrRegInfo } from '../types/starrail/srRegInfo'
+import { GsRegInfo } from '../types/genshin/gsRegInfo'
 
 const store = useStore()
 
@@ -91,6 +93,7 @@ const hideElements = ref(false)
 const scrollBarRef = ref()
 
 const postTypeMap = new Map<string, PostInfo[]>()
+const newAccountName = ref('')
 
 onMounted(async () => {
   switch (game) {
@@ -240,14 +243,104 @@ const importButtonClick = () => {
 }
 
 const launchGame = async () => {
+  if (gameStore.value.curAccountId != -1) {
+    if (gameNo.value == 0) {
+      await window.reg.gsSet(
+        JSON.stringify(gameStore.value.accounts[gameStore.value.curAccountId]),
+      )
+    } else if (gameNo.value == 1) {
+      await window.reg.srSet(
+        JSON.stringify(gameStore.value.accounts[gameStore.value.curAccountId]),
+      )
+    }
+  }
   await window.child.exec(gameStore.value.gamePath!)
   if (store.settings.general.trayOnLaunch) {
     window.win.tray()
   }
 }
 
+const retrieveAccount = async () => {
+  newAccountName.value = ''
+  useDialog(
+    dialogComponent,
+    {
+      async onOk(dispose: () => void) {
+        if (gameNo.value == 0) {
+          const res = await window.reg.gsGet()
+          console.log(res)
+          if (res) {
+            gameStore.value.accounts.push({
+              name: newAccountName.value,
+              mihoyoSdk: res.mihoyoSdk,
+              generalData: res.generalData,
+            })
+          } else {
+            gameStore.value.accounts.push({
+              name: newAccountName.value,
+              mihoyoSdk: [],
+              generalData: [],
+            })
+          }
+        } else if (gameNo.value == 1) {
+          const res = await window.reg.srGet()
+          console.log(res)
+          if (res) {
+            gameStore.value.accounts.push({
+              name: newAccountName.value,
+              mihoyoSdk: res.mihoyoSdk,
+              lastUserId: res.lastUserId,
+            })
+          } else {
+            gameStore.value.accounts.push({
+              name: newAccountName.value,
+              mihoyoSdk: [],
+              lastUserId: 0,
+            })
+          }
+        }
+        dispose()
+      },
+    },
+    {
+      title: '添加游戏账号',
+      msg: '请命名当前账号',
+      showCancel: true,
+      vnode: () =>
+        h(
+          'div',
+          {
+            class: 'flex flex-row justify-center w-full mt-2',
+          },
+          [
+            h('input', {
+              type: 'text',
+              class: 'rounded-full w-[80%] px-2 py-1 text-center',
+              value: newAccountName.value,
+              onInput: (e: Event) => {
+                newAccountName.value = (e.target as HTMLInputElement).value
+              },
+              style:
+                gameNo.value == 1
+                  ? {
+                      background: 'white',
+                      border: '1px solid gray',
+                    }
+                  : undefined,
+            }),
+          ],
+        ),
+    },
+  )
+}
+
 const handleCommand = (idx: number) => {
-  const commands = ['openLauncher', 'clearPath', 'clearPlayerinfo']
+  const commands = [
+    'openLauncher',
+    'clearPath',
+    'clearPlayerinfo',
+    'clearAccounts',
+  ]
 
   switch (commands[idx]) {
     case 'openLauncher':
@@ -261,9 +354,17 @@ const handleCommand = (idx: number) => {
       gameStore.value.playerInfo = undefined
       refresh()
       break
+    case 'clearAccounts':
+      gameStore.value.accounts = []
+      gameStore.value.curAccountId = -1
+      break
   }
 }
 
+const switchAccount = (idx: number) => {
+  gameStore.value.curAccountId = idx - 1
+}
+
 const handleScroll = ({ top }: Record<string, number>) => {
   hideElements.value = top > 0
 }
@@ -354,35 +455,86 @@ const refresh = () => {
         <div class="launch-area-wrapper">
           <div class="h-[9vh] my-[2vh]" />
           <div
+            class="right"
             v-if="gameStore.gamePath"
-            class="launch-button-wrapper"
-            :class="[{ scrolled: hideElements }, prefFont]"
+            :class="{ scrolled: hideElements }"
           >
-            <button
-              @click="launchGame"
-              class="launch-button"
-              :style="`font-size: calc(min(60px, 25px * min(${hScale}, ${vScale})))`"
-            >
-              {{ $t('general_launchGame') }}
-            </button>
-            <MyDropdown
-              class="launch-dropdown"
-              @command="handleCommand"
-              placement="top"
-              :items="[
-                $t('general_openOfficialLauncher'),
-                $t('general_clearGamePath'),
-                $t('general_clearProfileInfo'),
-              ]"
-              middle
+            <div
+              class="account-wrapper"
+              v-if="
+                !hideElements && 'accounts' in gameStore && gameStore.gamePath
+              "
+              :style="`font-size: calc(20px * min(${hScale}, ${vScale}));
+                margin-top: calc(10vh - 28px * min(${hScale}, ${vScale}))`"
             >
+              <div
+                class="retrieve-account"
+                :style="`padding: calc(4px * min(${hScale}, ${vScale})) calc(8px * min(${hScale}, ${vScale}))`"
+                @click="retrieveAccount"
+              >
+                <i class="bi bi-plus-lg" />
+              </div>
+              <MyDropdown
+                :items="[
+                  '维持当前',
+                  ...gameStore.accounts.map(
+                    (acc: GsRegInfo | SrRegInfo) => acc.name,
+                  ),
+                ]"
+                class="account-info"
+                :class="prefFont"
+                item-class="text-black px-2 dark:text-white"
+                :style="`padding: calc(4px * min(${hScale}, ${vScale})) calc(8px * min(${hScale}, ${vScale}))`"
+                middle
+                placement="top"
+                @command="switchAccount"
+              >
+                <i class="bi bi-person-circle" />
+                <span>
+                  {{
+                    gameStore.accounts.length > 0 &&
+                    gameStore.curAccountId != -1
+                      ? gameStore.accounts[gameStore.curAccountId].name
+                      : '维持当前'
+                  }}
+                </span>
+              </MyDropdown>
+            </div>
+            <div class="launch-button-wrapper" :class="prefFont">
               <button
-                class="font-gs dropdown-trigger"
-                :style="`font-size: calc(min(60px, 25px * min(${hScale}, ${vScale})));`"
+                @click="launchGame"
+                class="launch-button"
+                :style="`font-size: calc(min(60px, 25px * min(${hScale}, ${vScale})))`"
               >
-                …
+                {{ $t('general_launchGame') }}
               </button>
-            </MyDropdown>
+              <MyDropdown
+                class="launch-dropdown"
+                @command="handleCommand"
+                placement="top"
+                :items="
+                  gameNo == 2
+                    ? [
+                        $t('general_openOfficialLauncher'),
+                        $t('general_clearGamePath'),
+                      ]
+                    : [
+                        $t('general_openOfficialLauncher'),
+                        $t('general_clearGamePath'),
+                        $t('general_clearProfileInfo'),
+                        '清除游戏账号',
+                      ]
+                "
+                middle
+              >
+                <button
+                  class="font-gs dropdown-trigger"
+                  :style="`font-size: calc(min(60px, 25px * min(${hScale}, ${vScale})));`"
+                >
+                  …
+                </button>
+              </MyDropdown>
+            </div>
           </div>
           <button
             v-else
@@ -488,20 +640,44 @@ const refresh = () => {
 
 .launch-area-wrapper {
   @apply w-full flex flex-row relative;
+
+  & .right {
+    @apply absolute right-0 transition-all;
+    @apply flex flex-row;
+    transition-duration: 500ms;
+
+    &.scrolled {
+      @apply right-1/2 translate-x-1/2;
+    }
+  }
+}
+
+.account-wrapper {
+  @apply flex flex-row justify-end text-white;
+}
+
+.retrieve-account {
+  @apply rounded-full bg-black bg-opacity-30;
+  @apply h-min cursor-pointer;
+  @apply transition-all hover:bg-gray-600 hover:bg-opacity-30;
+}
+
+.account-info {
+  @apply rounded-full bg-black bg-opacity-30;
+  @apply mx-2 h-min cursor-pointer;
+  @apply transition-all hover:bg-gray-600 hover:bg-opacity-30;
+
+  & span {
+    @apply ml-2 mr-1 font-sans;
+  }
 }
 
 .launch-button-wrapper {
-  @apply absolute right-0 transition-all;
   @apply flex flex-row mx-[0.67vw] mt-[2vh] rounded-full bg-yellow-400;
-  transition-duration: 500ms;
 
   .dark & {
     @apply bg-yellow-700;
   }
-
-  &.scrolled {
-    @apply right-1/2 translate-x-1/2;
-  }
 }
 
 .launch-button {
diff --git a/src/pages/GenshinPage/Components/GenshinInfoCard.vue b/src/pages/GenshinPage/Components/GenshinInfoCard.vue
index d40c6bde..3ad56829 100644
--- a/src/pages/GenshinPage/Components/GenshinInfoCard.vue
+++ b/src/pages/GenshinPage/Components/GenshinInfoCard.vue
@@ -1242,14 +1242,14 @@ const countRolledSubstat = (stats: any[], prop: string) => {
     </div>
     <div
       v-else-if="!playerInfo"
-      class="mt-4 mb-4"
+      class="pt-2 pb-4"
       :style="`font-size: calc(max(14px * min(${hScale}, ${vScale}), 16px))`"
     >
       {{ $t('gs_emptyPlayerTip') }}
     </div>
     <div
       v-else
-      class="mt-4 mb-4"
+      class="pt-2 pb-4"
       :style="`font-size: calc(max(14px * min(${hScale}, ${vScale}), 16px))`"
     >
       {{ $t('gs_showcaseTip') }}
diff --git a/src/pages/StarRailPage/Components/StarRailDialog.vue b/src/pages/StarRailPage/Components/StarRailDialog.vue
index 1798e21c..17278705 100644
--- a/src/pages/StarRailPage/Components/StarRailDialog.vue
+++ b/src/pages/StarRailPage/Components/StarRailDialog.vue
@@ -251,10 +251,6 @@ div {
   @apply bg-white;
   border-radius: 5px 20px 0 0;
   transform: translate(5px, -5px);
-
-  .dark & {
-    @apply bg-gray-100;
-  }
 }
 
 .title-wrapper {
diff --git a/src/pages/StarRailPage/Components/StarRailInfoCard.vue b/src/pages/StarRailPage/Components/StarRailInfoCard.vue
index 2898f567..6728e234 100644
--- a/src/pages/StarRailPage/Components/StarRailInfoCard.vue
+++ b/src/pages/StarRailPage/Components/StarRailInfoCard.vue
@@ -1205,7 +1205,7 @@ const showCharDetails = (index: number) => {
     </div>
     <div
       v-else
-      class="mt-4 mb-4"
+      class="pt-2 pb-4"
       :style="`font-size: calc(max(14px * min(${hScale}, ${vScale}), 16px))`"
     >
       {{ $t('gs_emptyPlayerTip') }}
diff --git a/src/store/index.ts b/src/store/index.ts
index d0e5a88a..52333962 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -42,6 +42,7 @@ export const useStore = defineStore('userStore', {
         upd: false,
         playerInfo: undefined as any,
         accounts: [] as GsRegInfo[],
+        curAccountId: -1,
       },
       sr: {
         launcherPath: undefined as string | undefined,
@@ -49,6 +50,7 @@ export const useStore = defineStore('userStore', {
         upd: false,
         playerInfo: undefined as FormattedApiInfo | undefined,
         accounts: [] as SrRegInfo[],
+        curAccountId: -1,
       },
       hi3: {
         // hi3
diff --git a/src/types/starrail/srRegInfo.ts b/src/types/starrail/srRegInfo.ts
index baa40177..87a594ab 100644
--- a/src/types/starrail/srRegInfo.ts
+++ b/src/types/starrail/srRegInfo.ts
@@ -1,7 +1,7 @@
 export interface SrRegInfo {
   name: string
-  // App_LastUserID_h2841324341
+  // App_LastUserID_h2841727341
   lastUserId: number
-  // MIHOYOSDK_ADL_PROD_CN_h3123247166
+  // MIHOYOSDK_ADL_PROD_CN_h3123967166
   mihoyoSdk: number[]
 }

From 53770995240383b3d32bb97d098e93bb6cb3927a Mon Sep 17 00:00:00 2001
From: HoraceHuang-ui <horacehuang17@gmail.com>
Date: Sun, 5 May 2024 20:03:09 +0800
Subject: [PATCH 03/11] fix: skip current update

---
 src/components/UpdateDialogContent.vue | 19 ++++++-------------
 src/pages/GamePage.vue                 | 15 ++++++++++++---
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/components/UpdateDialogContent.vue b/src/components/UpdateDialogContent.vue
index 88b57942..82dc1f5d 100644
--- a/src/components/UpdateDialogContent.vue
+++ b/src/components/UpdateDialogContent.vue
@@ -2,7 +2,7 @@
 import { marked } from 'marked'
 import { translate } from '../i18n'
 import MyCheckbox from './MyCheckbox.vue'
-import { computed, PropType, ref } from 'vue'
+import { computed, PropType } from 'vue'
 import ScrollWrapper from './ScrollWrapper.vue'
 
 const props = defineProps({
@@ -14,22 +14,16 @@ const props = defineProps({
     type: Object,
     required: true,
   },
-  showSkipCurrent: {
-    type: Boolean,
-    default: true,
-  },
-  skipCurrent: {
-    type: Boolean,
-    default: false,
-  },
   gameStyle: {
     type: String as PropType<'gs' | 'sr' | 'hi3'>,
     default: 'gs',
   },
 })
-defineEmits(['update:skipCurrent'])
 
-const skip = ref(props.skipCurrent)
+const skipCurrent = defineModel({
+  type: Boolean,
+  required: true,
+})
 
 const updDialogContent = marked(props.updInfo.body)
 
@@ -83,8 +77,7 @@ const colorClass = computed(() => {
       {{ translate('updDialog_footerText') }}
     </div>
     <MyCheckbox
-      v-if="showSkipCurrent"
-      v-model="skip"
+      v-model="skipCurrent"
       :text="translate('updDialog_skipCurrent')"
       :on-color="onColor"
       :off-color="offColor"
diff --git a/src/pages/GamePage.vue b/src/pages/GamePage.vue
index 6c8509b7..717c39fb 100644
--- a/src/pages/GamePage.vue
+++ b/src/pages/GamePage.vue
@@ -153,6 +153,8 @@ onMounted(async () => {
           }),
           msgCenter: false,
           showCancel: true,
+          hScale: hScale,
+          vScale: vScale,
         },
       )
     } else if (timeDelta.value > 0 && timeDelta.value < 3) {
@@ -176,6 +178,8 @@ onMounted(async () => {
           }),
           msgCenter: false,
           showCancel: true,
+          hScale: hScale,
+          vScale: vScale,
         },
       )
     } else if (timeDelta.value == 0) {
@@ -198,6 +202,8 @@ onMounted(async () => {
           }),
           msgCenter: false,
           showCancel: true,
+          hScale: hScale,
+          vScale: vScale,
         },
       )
     }
@@ -304,8 +310,9 @@ const retrieveAccount = async () => {
     },
     {
       title: '添加游戏账号',
-      msg: '请命名当前账号',
+      msg: `请命名当前账号`,
       showCancel: true,
+      closeOnOk: false,
       vnode: () =>
         h(
           'div',
@@ -314,6 +321,8 @@ const retrieveAccount = async () => {
           },
           [
             h('input', {
+              hScale: hScale,
+              vScale: vScale,
               type: 'text',
               class: 'rounded-full w-[80%] px-2 py-1 text-center',
               value: newAccountName.value,
@@ -476,7 +485,7 @@ const refresh = () => {
               </div>
               <MyDropdown
                 :items="[
-                  '维持当前',
+                  '不作修改',
                   ...gameStore.accounts.map(
                     (acc: GsRegInfo | SrRegInfo) => acc.name,
                   ),
@@ -495,7 +504,7 @@ const refresh = () => {
                     gameStore.accounts.length > 0 &&
                     gameStore.curAccountId != -1
                       ? gameStore.accounts[gameStore.curAccountId].name
-                      : '维持当前'
+                      : '不作修改'
                   }}
                 </span>
               </MyDropdown>

From 66632694266ed209ba91aa5e2e04cd479a432758 Mon Sep 17 00:00:00 2001
From: HoraceHuang-ui <horacehuang17@gmail.com>
Date: Sun, 5 May 2024 21:08:08 +0800
Subject: [PATCH 04/11] refactor: update account dialog message

---
 src/pages/GamePage.vue | 78 ++++++++++++++++++++++++------------------
 1 file changed, 45 insertions(+), 33 deletions(-)

diff --git a/src/pages/GamePage.vue b/src/pages/GamePage.vue
index 717c39fb..b278086a 100644
--- a/src/pages/GamePage.vue
+++ b/src/pages/GamePage.vue
@@ -272,6 +272,10 @@ const retrieveAccount = async () => {
     dialogComponent,
     {
       async onOk(dispose: () => void) {
+        if (newAccountName.value === '') {
+          return
+        }
+
         if (gameNo.value == 0) {
           const res = await window.reg.gsGet()
           console.log(res)
@@ -310,35 +314,38 @@ const retrieveAccount = async () => {
     },
     {
       title: '添加游戏账号',
-      msg: `请命名当前账号`,
+      msg: `点击确定后将从系统注册表中读取游戏中当前登录的账号信息，后续可快速从此账号启动。请注意甄别是否有重复命名。`,
       showCancel: true,
       closeOnOk: false,
+      hScale: hScale,
+      vScale: vScale,
       vnode: () =>
-        h(
-          'div',
-          {
-            class: 'flex flex-row justify-center w-full mt-2',
-          },
-          [
-            h('input', {
-              hScale: hScale,
-              vScale: vScale,
-              type: 'text',
-              class: 'rounded-full w-[80%] px-2 py-1 text-center',
-              value: newAccountName.value,
-              onInput: (e: Event) => {
-                newAccountName.value = (e.target as HTMLInputElement).value
-              },
-              style:
-                gameNo.value == 1
-                  ? {
-                      background: 'white',
-                      border: '1px solid gray',
-                    }
-                  : undefined,
-            }),
-          ],
-        ),
+        h('div', [
+          h(
+            'div',
+            {
+              class: 'flex flex-row justify-center w-full mt-3',
+            },
+            [
+              h('input', {
+                type: 'text',
+                class: 'rounded-full w-[80%] px-2 py-1 text-center',
+                value: newAccountName.value,
+                placeholder: '请命名当前账号',
+                onInput: (e: Event) => {
+                  newAccountName.value = (e.target as HTMLInputElement).value
+                },
+                style:
+                  gameNo.value == 1
+                    ? {
+                        background: 'white',
+                        border: '1px solid gray',
+                      }
+                    : undefined,
+              }),
+            ],
+          ),
+        ]),
     },
   )
 }
@@ -492,19 +499,24 @@ const refresh = () => {
                 ]"
                 class="account-info"
                 :class="prefFont"
-                item-class="text-black px-2 dark:text-white"
-                :style="`padding: calc(4px * min(${hScale}, ${vScale})) calc(8px * min(${hScale}, ${vScale}))`"
+                item-class="text-gray-800 px-2 dark:text-gray-200"
+                :style="`padding: calc(4px * min(${hScale}, ${vScale})) calc(9px * min(${hScale}, ${vScale})) calc(1px * min(${hScale}, ${vScale})) calc(9px * min(${hScale}, ${vScale}))`"
                 middle
                 placement="top"
                 @command="switchAccount"
               >
-                <i class="bi bi-person-circle" />
-                <span>
+                <i
+                  class="bi bi-person-circle"
+                  :style="`font-size: calc(22px * min(${hScale}, ${vScale}))`"
+                />
+                <span
+                  v-if="gameStore.curAccountId != -1"
+                  :style="`margin-left: calc(6px * min(${hScale}, ${vScale}))`"
+                >
                   {{
-                    gameStore.accounts.length > 0 &&
-                    gameStore.curAccountId != -1
+                    gameStore.accounts.length > 0
                       ? gameStore.accounts[gameStore.curAccountId].name
-                      : '不作修改'
+                      : ''
                   }}
                 </span>
               </MyDropdown>

From 691762b2edd427a445f58345dc45c5871e3edcf5 Mon Sep 17 00:00:00 2001
From: HoraceHuang-ui <horacehuang17@gmail.com>
Date: Sun, 5 May 2024 21:15:09 +0800
Subject: [PATCH 05/11] refactor: set account on launch at main page

---
 src/pages/MainPage.vue | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/pages/MainPage.vue b/src/pages/MainPage.vue
index 9671120d..13fe09db 100644
--- a/src/pages/MainPage.vue
+++ b/src/pages/MainPage.vue
@@ -94,8 +94,23 @@ onMounted(async () => {
   }, 50)
 })
 
-const launch = async (path: string) => {
-  await window.child.exec(path)
+const launch = async (game: 'gs' | 'sr' | 'hi3') => {
+  let gameStore: any
+  if (game === 'gs') {
+    gameStore = store.game.gs
+    if (gameStore.curAccountId != -1) {
+      await window.reg.gsSet(gameStore.accounts[gameStore.curAccountId])
+    }
+  } else if (game === 'sr') {
+    gameStore = store.game.sr
+    if (gameStore.curAccountId != -1) {
+      await window.reg.srSet(gameStore.accounts[gameStore.curAccountId])
+    }
+  } else {
+    gameStore = store.game.hi3
+  }
+
+  await window.child.exec(gameStore.gamePath)
   if (store.settings.general.trayOnLaunch) {
     await window.win.tray()
   }
@@ -149,21 +164,21 @@ const resetPic = () => {
       </h1>
       <button
         v-if="store.game.gs.gamePath"
-        @click="launch(store.game.gs.gamePath)"
+        @click="launch('gs')"
         class="game-button"
       >
         {{ translate('mainpage_buttonText', { game: $t('general_gsShort') }) }}
       </button>
       <button
         v-if="store.game.sr.gamePath"
-        @click="launch(store.game.sr.gamePath)"
+        @click="launch('sr')"
         class="game-button"
       >
         {{ translate('mainpage_buttonText', { game: $t('general_srShort') }) }}
       </button>
       <button
         v-if="store.game.hi3.gamePath"
-        @click="launch(store.game.hi3.gamePath)"
+        @click="launch('hi3')"
         class="game-button"
       >
         {{ translate('mainpage_buttonText', { game: $t('general_hi3Short') }) }}

From ea5717e3b8e79aa4dbb48be3ed49609a56d70121 Mon Sep 17 00:00:00 2001
From: HoraceHuang-ui <horacehuang17@gmail.com>
Date: Sun, 5 May 2024 23:08:33 +0800
Subject: [PATCH 06/11] feat: account switching in gamepad mode

---
 src/components/MyDropdown.vue         |   9 +-
 src/pages/GamepadPage/GamepadPage.vue | 251 +++++++++++++++++++++++++-
 src/pages/MainPage.vue                |   8 +-
 3 files changed, 254 insertions(+), 14 deletions(-)

diff --git a/src/components/MyDropdown.vue b/src/components/MyDropdown.vue
index 5a0f5cc3..bd6a2aeb 100644
--- a/src/components/MyDropdown.vue
+++ b/src/components/MyDropdown.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, PropType, ref } from 'vue'
+import { computed, defineModel, PropType, ref } from 'vue'
 
 const props = defineProps({
   items: {
@@ -31,6 +31,10 @@ const props = defineProps({
   },
 })
 
+const showDropdown = defineModel({
+  default: false,
+})
+
 const emit = defineEmits(['command'])
 
 const wrapperStyles: Record<string, any> = {
@@ -80,6 +84,7 @@ const transform = computed(() => {
 })
 
 const hideMenu = () => {
+  showDropdown.value = false
   showMenu.value = false
   clearTimeout(timer)
   timer = undefined
@@ -130,7 +135,7 @@ const sendCommand = (idx: number) => {
       <div
         class="dropdown-wrapper"
         :style="{ ...wrapperStyles[placement], width: width }"
-        v-if="showMenu"
+        v-if="showMenu || showDropdown"
         ref="dropdownRef"
       >
         <div
diff --git a/src/pages/GamepadPage/GamepadPage.vue b/src/pages/GamepadPage/GamepadPage.vue
index f2a9ef09..b1650c00 100644
--- a/src/pages/GamepadPage/GamepadPage.vue
+++ b/src/pages/GamepadPage/GamepadPage.vue
@@ -10,6 +10,9 @@ import StarRailInfoCard from '../StarRailPage/Components/StarRailInfoCard.vue'
 import MyTextSwitch from '../../components/MyTextSwitch.vue'
 import { useStore } from '../../store'
 import LoadingIcon from '../../components/LoadingIcon.vue'
+import { GsRegInfo } from '../../types/genshin/gsRegInfo'
+import { SrRegInfo } from '../../types/starrail/srRegInfo'
+import MyDropdown from '../../components/MyDropdown.vue'
 
 type Mode =
   | 'main'
@@ -18,6 +21,7 @@ type Mode =
   | 'gs-player'
   | 'sr-player'
   | 'dialog'
+  | 'accounts'
   | 'out'
 type GamePath = {
   game: string
@@ -51,6 +55,8 @@ let gp: Gamepad | null = null
 const selectedGameIndex = ref(0)
 const selectedSettingsCardIndex = ref(0)
 const selectedSettingsItemIndex = ref(0)
+const selectedAccountIndex = ref(-1)
+const showAccountsDropdown = ref(false)
 const launchingGame = ref(-1)
 
 const hScale = inject<Ref<number>>('hScale')
@@ -141,9 +147,35 @@ const leaveGamepadClick = () => {
   leaveGamepad!()
 }
 
-const launch = async (path: string) => {
+const launch = async (game: string, launcher: boolean) => {
   launchingGame.value = selectedGameIndex.value
-  await window.child.exec(path)
+  if (launcher) {
+    await window.child.exec(
+      importedGames.value[selectedGameIndex.value].launcherPath,
+    )
+    return
+  }
+
+  let gameStore: any
+  if (game === 'gs') {
+    gameStore = store.game.gs
+    if (gameStore.curAccountId != -1) {
+      await window.reg.gsSet(
+        JSON.stringify(gameStore.accounts[gameStore.curAccountId]),
+      )
+    }
+  } else if (game === 'sr') {
+    gameStore = store.game.sr
+    if (gameStore.curAccountId != -1) {
+      await window.reg.srSet(
+        JSON.stringify(gameStore.accounts[gameStore.curAccountId]),
+      )
+    }
+  } else {
+    gameStore = store.game.hi3
+  }
+
+  await window.child.exec(gameStore.gamePath)
 }
 
 const winClose = async () => {
@@ -304,7 +336,7 @@ const gameLoop = () => {
   // [MAIN] A: Launch Game
   if (mode.value === 'main' && gp.buttons[0].pressed) {
     if (!inThrottle) {
-      launch(importedGames.value[selectedGameIndex.value].path)
+      launch(importedGames.value[selectedGameIndex.value].game, false)
       inThrottle = true
       setTimeout(() => {
         inThrottle = false
@@ -315,7 +347,21 @@ const gameLoop = () => {
   // [MAIN] X: Official Launcher
   if (mode.value === 'main' && gp.buttons[2].pressed) {
     if (!inThrottle) {
-      launch(importedGames.value[selectedGameIndex.value].launcherPath)
+      launch(importedGames.value[selectedGameIndex.value].game, true)
+      inThrottle = true
+      setTimeout(() => {
+        inThrottle = false
+      }, 300)
+    }
+  }
+
+  // [MAIN] Y: Select Accounts
+  if (mode.value === 'main' && gp.buttons[3].pressed) {
+    if (!inThrottle) {
+      if (importedGames.value[selectedGameIndex.value].game !== 'hi3') {
+        showAccountsDropdown.value = true
+        mode.value = 'accounts'
+      }
       inThrottle = true
       setTimeout(() => {
         inThrottle = false
@@ -396,8 +442,8 @@ const gameLoop = () => {
 
   // [SETTINGS] LS / DIR_v: Select Settings Item
   if (
-    (mode.value === 'settings' && gp.axes[1] < -0.9) ||
-    gp.buttons[12].pressed
+    mode.value === 'settings' &&
+    (gp.axes[1] < -0.9 || gp.buttons[12].pressed)
   ) {
     if (!inThrottle) {
       if (selectedSettingsItemIndex.value === 0) {
@@ -418,8 +464,8 @@ const gameLoop = () => {
     }
   }
   if (
-    (mode.value === 'settings' && gp.axes[1] > 0.9) ||
-    gp.buttons[13].pressed
+    mode.value === 'settings' &&
+    (gp.axes[1] > 0.9 || gp.buttons[13].pressed)
   ) {
     if (!inThrottle) {
       if (
@@ -534,9 +580,90 @@ const gameLoop = () => {
     }
   }
 
+  // [ACCOUNTS] B: Back to Main
+  if (mode.value === 'accounts' && gp.buttons[1].pressed) {
+    if (!inThrottle) {
+      mode.value = 'main'
+      showAccountsDropdown.value = false
+      inThrottle = true
+      setTimeout(() => {
+        inThrottle = false
+      }, 300)
+    }
+  }
+
+  // [ACCOUNTS] LS_v/DIR_v: Select Account
+  if (
+    mode.value === 'accounts' &&
+    (gp.axes[1] < -0.9 || gp.buttons[12].pressed)
+  ) {
+    if (!inThrottle) {
+      selectedAccountIndex.value =
+        selectedAccountIndex.value === -1
+          ? store.game[importedGames.value[selectedGameIndex.value].game]
+              .accounts.length - 1
+          : selectedAccountIndex.value - 1
+      inThrottle = true
+      setTimeout(() => {
+        inThrottle = false
+      }, 150)
+    }
+  }
+  if (
+    mode.value === 'accounts' &&
+    (gp.axes[1] > 0.9 || gp.buttons[13].pressed)
+  ) {
+    if (!inThrottle) {
+      selectedAccountIndex.value =
+        selectedAccountIndex.value ===
+        store.game[importedGames.value[selectedGameIndex.value].game].accounts
+          .length -
+          1
+          ? -1
+          : selectedAccountIndex.value + 1
+      inThrottle = true
+      setTimeout(() => {
+        inThrottle = false
+      }, 150)
+    }
+  }
+
+  // [ACCOUNTS] A: Confirm Select Account
+  if (mode.value === 'accounts' && gp.buttons[0].pressed) {
+    if (!inThrottle) {
+      switchAccount(selectedAccountIndex.value + 1)
+      inThrottle = true
+      setTimeout(() => {
+        inThrottle = false
+      }, 300)
+    }
+  }
+
   rAF(gameLoop)
 }
 
+const switchAccount = (idx: number) => {
+  store.game[importedGames.value[selectedGameIndex.value].game].curAccountId =
+    idx - 1
+  selectedAccountIndex.value = idx - 1
+  showAccountsDropdown.value = false
+  mode.value = 'main'
+}
+
+watch(selectedGameIndex, () => {
+  switch (importedGames.value[selectedGameIndex.value].game) {
+    case 'gs':
+      selectedAccountIndex.value = store.game.gs.curAccountId
+      break
+    case 'sr':
+      selectedAccountIndex.value = store.game.sr.curAccountId
+      break
+    case 'hi3':
+      selectedAccountIndex.value = -1
+      break
+  }
+})
+
 onMounted(async () => {
   for (const game of games) {
     const path = store.game[game].gamePath
@@ -550,6 +677,8 @@ onMounted(async () => {
     }
   }
 
+  selectedAccountIndex.value = store.game.gs.curAccountId
+
   rAF(gameLoop)
 
   setInterval(() => {
@@ -599,11 +728,18 @@ onMounted(async () => {
             </div>
             <div
               class="bar-item hoverable"
-              @click="launch(importedGames[selectedGameIndex].launcherPath)"
+              @click="launch(importedGames[selectedGameIndex].game, true)"
             >
               <GamepadIcon icon="X" />
               <span>{{ $t('gamepad_officialLauncher') }}</span>
             </div>
+            <div
+              class="bar-item hoverable"
+              @click="launch(importedGames[selectedGameIndex].game, true)"
+            >
+              <GamepadIcon icon="Y" />
+              <span>账号</span>
+            </div>
             <div class="bar-item hoverable" @click="mode = 'gs-player'">
               <GamepadIcon icon="LS" />
               <span>{{ $t('gamepad_playerInfo') }}</span>
@@ -670,6 +806,34 @@ onMounted(async () => {
               }}</span>
             </div>
           </div>
+          <div
+            class="absolute left-0 left no-drag"
+            v-else-if="mode === 'accounts'"
+          >
+            <div
+              class="bar-item hoverable"
+              @click="
+                () => {
+                  mode = 'main'
+                  showAccountsDropdown = false
+                }
+              "
+            >
+              <GamepadIcon icon="B" />
+              <span>{{ $t('general_cancel') }}</span>
+            </div>
+            <div class="bar-item">
+              <GamepadIcon icon="LS_v" />
+              <span>选择账号</span>
+            </div>
+            <div
+              class="bar-item hoverable"
+              @click="switchAccount(selectedAccountIndex)"
+            >
+              <GamepadIcon icon="A" />
+              <span>{{ $t('general_confirm') }}</span>
+            </div>
+          </div>
         </Transition>
         <Transition name="swipe-bottom">
           <div
@@ -723,6 +887,52 @@ onMounted(async () => {
       </div>
     </Transition>
 
+    <Transition name="fade">
+      <div
+        class="account-wrapper"
+        :class="{ toolbar: store.settings.gamepad.showToolbar }"
+        v-if="
+          importedGames.length > 0 &&
+          'curAccountId' in store.game[importedGames[selectedGameIndex].game] &&
+          store.game[importedGames[selectedGameIndex].game].accounts.length > 0
+        "
+      >
+        <MyDropdown
+          :items="[
+            '不作修改',
+            ...store.game[importedGames[selectedGameIndex].game].accounts.map(
+              (acc: GsRegInfo | SrRegInfo) => acc.name,
+            ),
+          ]"
+          class="account-info"
+          item-class="text-gray-800 px-2 dark:text-gray-200"
+          middle
+          placement="bottom"
+          @command="switchAccount"
+          :selected="selectedAccountIndex + 1"
+          v-model="showAccountsDropdown"
+        >
+          <i class="bi bi-person-circle" />
+          <span
+            v-if="
+              store.game[importedGames[selectedGameIndex].game].curAccountId !=
+              -1
+            "
+          >
+            {{
+              store.game[importedGames[selectedGameIndex].game].accounts
+                .length > 0
+                ? store.game[importedGames[selectedGameIndex].game].accounts[
+                    store.game[importedGames[selectedGameIndex].game]
+                      .curAccountId
+                  ].name
+                : ''
+            }}
+          </span>
+        </MyDropdown>
+      </div>
+    </Transition>
+
     <div
       class="launch-area-wrapper"
       :class="{ toolbar: store.settings.gamepad.showToolbar }"
@@ -732,10 +942,11 @@ onMounted(async () => {
       </h1>
       <button
         v-for="(game, idx) in importedGames"
-        @click="launch(game.path)"
+        @click="launch(game.game, false)"
         class="game-button"
         :class="{ focus: selectedGameIndex == idx }"
         :key="idx"
+        @mouseenter="selectedGameIndex = idx"
       >
         <div class="flex flex-row transition-all">
           <GamepadIcon
@@ -973,6 +1184,26 @@ onMounted(async () => {
   }
 }
 
+.account-wrapper {
+  @apply absolute top-[0.7vw] left-1/2 -translate-x-1/2;
+  @apply flex flex-row justify-end text-white;
+  font-size: 22px;
+
+  &.toolbar {
+    @apply top-[1.5vw];
+  }
+}
+
+.account-info {
+  @apply rounded-full bg-black bg-opacity-50;
+  @apply mx-2 h-min cursor-pointer px-[6px] backdrop-blur-md;
+  @apply transition-all hover:bg-gray-600 hover:bg-opacity-50;
+
+  & span {
+    @apply ml-2 mr-1 font-sans;
+  }
+}
+
 .launch-area-wrapper {
   @apply absolute z-10 left-1/2 -translate-x-1/2;
   @apply backdrop-blur-xl p-6 rounded-2xl;
diff --git a/src/pages/MainPage.vue b/src/pages/MainPage.vue
index 13fe09db..a8399801 100644
--- a/src/pages/MainPage.vue
+++ b/src/pages/MainPage.vue
@@ -99,12 +99,16 @@ const launch = async (game: 'gs' | 'sr' | 'hi3') => {
   if (game === 'gs') {
     gameStore = store.game.gs
     if (gameStore.curAccountId != -1) {
-      await window.reg.gsSet(gameStore.accounts[gameStore.curAccountId])
+      await window.reg.gsSet(
+        JSON.stringify(gameStore.accounts[gameStore.curAccountId]),
+      )
     }
   } else if (game === 'sr') {
     gameStore = store.game.sr
     if (gameStore.curAccountId != -1) {
-      await window.reg.srSet(gameStore.accounts[gameStore.curAccountId])
+      await window.reg.srSet(
+        JSON.stringify(gameStore.accounts[gameStore.curAccountId]),
+      )
     }
   } else {
     gameStore = store.game.hi3

From 3f6fe5381c4b13a146e12456a5a51e376c4a4731 Mon Sep 17 00:00:00 2001
From: HoraceHuang-ui <horacehuang17@gmail.com>
Date: Mon, 6 May 2024 00:37:45 +0800
Subject: [PATCH 07/11] feat: i18n for new strings in account switching

---
 src/i18n/en_US.json    | 10 +++++++++-
 src/i18n/fr_FR.json    | 10 +++++++++-
 src/i18n/ja_JP.json    | 10 +++++++++-
 src/i18n/ru_RU.json    | 10 +++++++++-
 src/i18n/zh_CN.json    | 10 +++++++++-
 src/i18n/zh_TW.json    | 10 +++++++++-
 src/pages/GamePage.vue | 22 ++++++++++++++++------
 7 files changed, 70 insertions(+), 12 deletions(-)

diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json
index 5c66077f..59e5e13a 100644
--- a/src/i18n/en_US.json
+++ b/src/i18n/en_US.json
@@ -31,10 +31,17 @@
   "general_gameImportTitle": "Select {game} executable",
   "general_openOfficialLauncher": "Open official launcher",
   "general_clearGamePath": "Clear game path",
-  "general_clearProfileInfo": "Clear profile info",
+  "general_clearProfileInfo": "Clear player info",
+  "general_clearAccounts": "Clear accounts",
   "general_loadingFailed": "Error Loading Page",
   "general_back": "Back",
   "general_refresh": "Refresh",
+  "general_account": "Account",
+  "general_doNotModify": "Do Not Modify",
+  "general_addAccountTitle": "Add Account",
+  "general_addAccountMsg": "After clicking Confirm, the current logged-in account information in game will be read from system registry, and you can quickly launch from this account later. Please distinguish carefully if there are duplicate names.",
+  "general_addAccountWarning": "Available for Mainland CN server only!!!",
+  "general_addAccountPlaceholder": "Please name the current account",
   "POST_TYPE_INFO": "Info",
   "POST_TYPE_ANNOUNCE": "Announce",
   "POST_TYPE_ACTIVITY": "Activity",
@@ -109,6 +116,7 @@
   "gamepad_init": "Gamepad Mode",
   "gamepad_selectGame": "Select Game",
   "gamepad_officialLauncher": "Official Launcher",
+  "gamepad_selectAccount": "Select Account",
   "gamepad_selectSettingItem": "Settings Item",
   "gamepad_selectSettingCard": "Category",
   "gamepad_playerInfo": "Player Info",
diff --git a/src/i18n/fr_FR.json b/src/i18n/fr_FR.json
index 702bdf4c..b1a35deb 100644
--- a/src/i18n/fr_FR.json
+++ b/src/i18n/fr_FR.json
@@ -31,10 +31,17 @@
   "general_gameImportTitle": "Sélectionnez l'exécutable {game}",
   "general_openOfficialLauncher": "Ouvrir le lanceur officiel",
   "general_clearGamePath": "Effacer le chemin de jeu",
-  "general_clearProfileInfo": "Effacer les informations du profil",
+  "general_clearProfileInfo": "Effacer les info sur le joueur",
+  "general_clearAccounts": "Effacer les comptes",
   "general_loadingFailed": "Erreur lors du chargement de la page",
   "general_back": "Retour",
   "general_refresh": "Rafraîchir",
+  "general_account": "Compte",
+  "general_doNotModify": "Pas de Modifications",
+  "general_addAccountTitle": "Ajouter un Compte",
+  "general_addAccountMsg": "Après avoir cliqué sur Confirmer, les informations du compte actuellement connecté au jeu seront lues à partir du registre système et vous pourrez rapidement lancer à partir de ce compte plus tard. Veuillez distinguer soigneusement s'il existe des noms en double.",
+  "general_addAccountWarning": "Disponible uniquement pour le serveur de Chine continentale!!!",
+  "general_addAccountPlaceholder": "Veuillez nommer le compte courant",
   "POST_TYPE_INFO": "Infos",
   "POST_TYPE_ANNOUNCE": "Annonce",
   "POST_TYPE_ACTIVITY": "Activité",
@@ -111,6 +118,7 @@
   "gamepad_character": "Personnage",
   "gamepad_selectGame": "Sélectionnez un jeu",
   "gamepad_officialLauncher": "Lanceur Officiel",
+  "gamepad_selectAccount": "Sélectionnez un compte",
   "gamepad_selectSettingItem": "élément",
   "gamepad_selectSettingCard": "catégorie",
   "gamepad_autoEnterGamepad": "Saisie automatique lorsque connecté",
diff --git a/src/i18n/ja_JP.json b/src/i18n/ja_JP.json
index cf337d4e..ccba8041 100644
--- a/src/i18n/ja_JP.json
+++ b/src/i18n/ja_JP.json
@@ -31,10 +31,17 @@
   "general_gameImportTitle": "{game} の実行可能ファイルを選択",
   "general_openOfficialLauncher": "公式ランチャーを開く",
   "general_clearGamePath": "ゲームのパスを消去",
-  "general_clearProfileInfo": "プロフィール情報を消去",
+  "general_clearProfileInfo": "プレイヤー情報をクリアする",
+  "general_clearAccounts": "アカウントをクリアする",
   "general_loadingFailed": "今、ページ読み込みエラー",
   "general_back": "戻る",
   "general_refresh": "リフレッシュ",
+  "general_account": "アカウント",
+  "general_doNotModify": "変更しないでください",
+  "general_addAccountTitle": "アカウントを追加する",
+  "general_addAccountMsg": "[確認] をクリックすると、ゲーム内で現在ログインしているアカウント情報がシステム レジストリから読み取られ、後でこのアカウントからすぐに起動できるようになります。 名前が重複している場合は、慎重に区別してください。",
+  "general_addAccountWarning": "中国本土サーバーのみで利用可能!!!",
+  "general_addAccountPlaceholder": "アカウントの命名",
   "POST_TYPE_INFO": "情報",
   "POST_TYPE_ANNOUNCE": "お知らせ",
   "POST_TYPE_ACTIVITY": "イベント",
@@ -109,6 +116,7 @@
   "gamepad_init": "ゲームパッドモード",
   "gamepad_selectGame": "ゲームを選択",
   "gamepad_officialLauncher": "公式ランチャー",
+  "gamepad_selectAccount": "アカウントの選択",
   "gamepad_selectSettingItem": "項目",
   "gamepad_selectSettingCard": "カテゴリ",
   "gamepad_playerInfo": "プレーヤー情報",
diff --git a/src/i18n/ru_RU.json b/src/i18n/ru_RU.json
index 4f2a2342..dd22efff 100644
--- a/src/i18n/ru_RU.json
+++ b/src/i18n/ru_RU.json
@@ -31,10 +31,17 @@
   "general_gameImportTitle": "Выберите исполняемый файл {game}",
   "general_openOfficialLauncher": "Открыть официальный лаунчер",
   "general_clearGamePath": "Очистить путь к игре",
-  "general_clearProfileInfo": "Очистить информацию о профиле",
+  "general_clearProfileInfo": "Очистить информацию об игроке",
+  "general_clearAccounts": "Очистить счета",
   "general_loadingFailed": "Ошибка загрузки страницы",
   "general_back": "Назад",
   "general_refresh": "Обновить",
+  "general_account": "Счет",
+  "general_doNotModify": "Не изменять",
+  "general_addAccountTitle": "Добавить аккаунт",
+  "general_addAccountMsg": "После нажатия кнопки «Подтвердить» данные текущей учетной записи в игре будут прочитаны из системного реестра, и вы сможете позже быстро запустить ее из этой учетной записи. Пожалуйста, внимательно различайте, если есть повторяющиеся имена.",
+  "general_addAccountWarning": "Доступно только для серверов материкового Китая!!!",
+  "general_addAccountPlaceholder": "Назовите текущий счет",
   "POST_TYPE_INFO": "Инфо",
   "POST_TYPE_ANNOUNCE": "Объявления",
   "POST_TYPE_ACTIVITY": "Мероприятия",
@@ -109,6 +116,7 @@
   "gamepad_init": "Режим геймпада",
   "gamepad_selectGame": "Выберите игру",
   "gamepad_officialLauncher": "Официальный лаунчер",
+  "gamepad_selectAccount": "Выберите учетную запись",
   "gamepad_selectSettingItem": "карточку",
   "gamepad_selectSettingCard": "категорию",
   "gamepad_playerInfo": "Информация об игроке",
diff --git a/src/i18n/zh_CN.json b/src/i18n/zh_CN.json
index 468198b0..49ea510b 100644
--- a/src/i18n/zh_CN.json
+++ b/src/i18n/zh_CN.json
@@ -31,10 +31,17 @@
   "general_gameImportTitle": "选择{game}本体程序",
   "general_openOfficialLauncher": "打开官方启动器",
   "general_clearGamePath": "清除游戏路径",
-  "general_clearProfileInfo": "清除账号数据",
+  "general_clearProfileInfo": "清除玩家信息",
+  "general_clearAccounts": "清除游戏账号",
   "general_loadingFailed": "加载失败",
   "general_back": "返回",
   "general_refresh": "刷新",
+  "general_account": "账号",
+  "general_doNotModify": "不作修改",
+  "general_addAccountTitle": "添加游戏账号",
+  "general_addAccountMsg": "点击确定后将从系统注册表中读取游戏中当前登录的账号信息，后续可快速从此账号启动。请注意甄别是否有重复命名。",
+  "general_addAccountWarning": "仅限国服可用！！！",
+  "general_addAccountPlaceholder": "请命名当前帐号",
   "POST_TYPE_INFO": "资讯",
   "POST_TYPE_ANNOUNCE": "公告",
   "POST_TYPE_ACTIVITY": "活动",
@@ -109,6 +116,7 @@
   "gamepad_init": "手柄模式",
   "gamepad_selectGame": "选择游戏",
   "gamepad_officialLauncher": "官方启动器",
+  "gamepad_selectAccount": "选择账号",
   "gamepad_playerInfo": "玩家信息",
   "gamepad_character": "角色",
   "gamepad_selectSettingItem": "设置项",
diff --git a/src/i18n/zh_TW.json b/src/i18n/zh_TW.json
index bcbe42ef..859debec 100644
--- a/src/i18n/zh_TW.json
+++ b/src/i18n/zh_TW.json
@@ -31,10 +31,17 @@
   "general_gameImportTitle": "選擇{game}本體執行程式",
   "general_openOfficialLauncher": "打開官方啓動器",
   "general_clearGamePath": "清除游戲路徑",
-  "general_clearProfileInfo": "清除賬號數據",
+  "general_clearProfileInfo": "清除玩家訊息",
+  "general_clearAccounts": "清除游戲賬戶",
   "general_loadingFailed": "載入頁面失敗",
   "general_back": "返回",
   "general_refresh": "刷新",
+  "general_account": "賬戶",
+  "general_doNotModify": "不作修改",
+  "general_addAccountTitle": "添加游戲賬戶",
+  "general_addAccountMsg": "點擊確定后將從系統注冊表中讀取游戲中當前登錄的賬戶訊息，後續可快速從此賬戶啓動。請注意甄別是否有重複命名。",
+  "general_addAccountWarning": "仅限中國大陸服可用！！！",
+  "general_addAccountPlaceholder": "請命名當前賬戶",
   "POST_TYPE_INFO": "資訊",
   "POST_TYPE_ANNOUNCE": "公告",
   "POST_TYPE_ACTIVITY": "活動",
@@ -109,6 +116,7 @@
   "gamepad_init": "手柄模式",
   "gamepad_selectGame": "選擇遊戲",
   "gamepad_officialLauncher": "官方啟動器",
+  "gamepad_selectAccount": "選擇賬戶",
   "gamepad_playerInfo": "玩家信息",
   "gamepad_character": "角色",
   "gamepad_selectSettingItem": "設置條目",
diff --git a/src/pages/GamePage.vue b/src/pages/GamePage.vue
index b278086a..bfe851b8 100644
--- a/src/pages/GamePage.vue
+++ b/src/pages/GamePage.vue
@@ -313,8 +313,8 @@ const retrieveAccount = async () => {
       },
     },
     {
-      title: '添加游戏账号',
-      msg: `点击确定后将从系统注册表中读取游戏中当前登录的账号信息，后续可快速从此账号启动。请注意甄别是否有重复命名。`,
+      title: translate('general_addAccountTitle'),
+      msg: translate('general_addAccountMsg'),
       showCancel: true,
       closeOnOk: false,
       hScale: hScale,
@@ -324,14 +324,24 @@ const retrieveAccount = async () => {
           h(
             'div',
             {
-              class: 'flex flex-row justify-center w-full mt-3',
+              class: 'w-full text-center mt-3 ' + prefFont.value,
+              style: {
+                fontSize: 'larger',
+              },
+            },
+            translate('general_addAccountWarning'),
+          ),
+          h(
+            'div',
+            {
+              class: 'flex flex-row justify-center w-full mt-1',
             },
             [
               h('input', {
                 type: 'text',
                 class: 'rounded-full w-[80%] px-2 py-1 text-center',
                 value: newAccountName.value,
-                placeholder: '请命名当前账号',
+                placeholder: translate('general_addAccountPlaceholder'),
                 onInput: (e: Event) => {
                   newAccountName.value = (e.target as HTMLInputElement).value
                 },
@@ -492,7 +502,7 @@ const refresh = () => {
               </div>
               <MyDropdown
                 :items="[
-                  '不作修改',
+                  $t('general_doNotModify'),
                   ...gameStore.accounts.map(
                     (acc: GsRegInfo | SrRegInfo) => acc.name,
                   ),
@@ -543,7 +553,7 @@ const refresh = () => {
                         $t('general_openOfficialLauncher'),
                         $t('general_clearGamePath'),
                         $t('general_clearProfileInfo'),
-                        '清除游戏账号',
+                        $t('general_clearAccounts'),
                       ]
                 "
                 middle

From 58b6466f3ea58d0255cead163c2437aefe7601be Mon Sep 17 00:00:00 2001
From: HoraceHuang-ui <horacehuang17@gmail.com>
Date: Mon, 6 May 2024 01:21:37 +0800
Subject: [PATCH 08/11] fix: compilation error

---
 src/App.vue                             | 19 ++++++++++---------
 src/components/UpdateDialogContent.vue  | 12 +++++++-----
 src/pages/SettingsPage/SettingsPage.vue | 18 +++++++++---------
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 36324b82..b3d0bde9 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -171,15 +171,16 @@ onMounted(async () => {
             {
               title: translate('updDialog_title'),
               showCancel: true,
-              vnode: h(UpdateDialogContent, {
-                appVer: appVer,
-                updInfo: updInfo.value,
-                skipCurrent: skipCurrent.value,
-                'onUpdate:skipCurrent': (value: boolean) => {
-                  skipCurrent.value = value
-                },
-                gameStyle: store.settings.appearance.dialogStyle,
-              }),
+              vnode: () =>
+                h(UpdateDialogContent, {
+                  appVer: appVer,
+                  updInfo: updInfo.value,
+                  skipCurrent: skipCurrent.value,
+                  'onUpdate:skipCurrent': (value: boolean) => {
+                    skipCurrent.value = value
+                  },
+                  gameStyle: store.settings.appearance.dialogStyle,
+                }),
             },
           )
         }
diff --git a/src/components/UpdateDialogContent.vue b/src/components/UpdateDialogContent.vue
index 82dc1f5d..7e66e82b 100644
--- a/src/components/UpdateDialogContent.vue
+++ b/src/components/UpdateDialogContent.vue
@@ -18,12 +18,13 @@ const props = defineProps({
     type: String as PropType<'gs' | 'sr' | 'hi3'>,
     default: 'gs',
   },
+  skipCurrent: {
+    type: Boolean,
+    required: true,
+  },
 })
 
-const skipCurrent = defineModel({
-  type: Boolean,
-  required: true,
-})
+defineEmits(['update:skipCurrent'])
 
 const updDialogContent = marked(props.updInfo.body)
 
@@ -77,7 +78,8 @@ const colorClass = computed(() => {
       {{ translate('updDialog_footerText') }}
     </div>
     <MyCheckbox
-      v-model="skipCurrent"
+      :model-value="skipCurrent"
+      @update:model-value="(nv: boolean) => $emit('update:skipCurrent', nv)"
       :text="translate('updDialog_skipCurrent')"
       :on-color="onColor"
       :off-color="offColor"
diff --git a/src/pages/SettingsPage/SettingsPage.vue b/src/pages/SettingsPage/SettingsPage.vue
index 7d3cd333..a0efd79f 100644
--- a/src/pages/SettingsPage/SettingsPage.vue
+++ b/src/pages/SettingsPage/SettingsPage.vue
@@ -109,15 +109,15 @@ const checkUpdates = () => {
           {
             title: translate('updDialog_title'),
             showCancel: true,
-            vnode: h(UpdateDialogContent, {
-              appVer: appVer.value,
-              updInfo: updInfo.value,
-              showSkipCurrent: false,
-              gameStyle: store.settings.appearance.dialogStyle,
-              style: {
-                height: `calc(50vh / min(${hScale?.value}, ${vScale?.value}))`,
-              },
-            }),
+            vnode: () =>
+              h('UpdateDialogContent', {
+                appVer: appVer.value,
+                updInfo: updInfo.value,
+                gameStyle: store.settings.appearance.dialogStyle,
+                style: {
+                  height: `calc(50vh / min(${hScale?.value}, ${vScale?.value}))`,
+                },
+              }),
             hScale: hScale,
             vScale: vScale,
           },

From 401dd2d36071b07ab8c6c546098e6d151d00f0d3 Mon Sep 17 00:00:00 2001
From: HoraceHuang-ui <horacehuang17@gmail.com>
Date: Mon, 6 May 2024 14:50:06 +0800
Subject: [PATCH 09/11] refactor: optimize operations of switching account

---
 src/pages/GamePage.vue                               | 1 +
 src/pages/GamepadPage/GamepadPage.vue                | 9 ++++++---
 src/pages/GenshinPage/Components/GenshinInfoCard.vue | 1 -
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/pages/GamePage.vue b/src/pages/GamePage.vue
index bfe851b8..ea31ae5a 100644
--- a/src/pages/GamePage.vue
+++ b/src/pages/GamePage.vue
@@ -513,6 +513,7 @@ const refresh = () => {
                 :style="`padding: calc(4px * min(${hScale}, ${vScale})) calc(9px * min(${hScale}, ${vScale})) calc(1px * min(${hScale}, ${vScale})) calc(9px * min(${hScale}, ${vScale}))`"
                 middle
                 placement="top"
+                :selected="gameStore.curAccountId + 1"
                 @command="switchAccount"
               >
                 <i
diff --git a/src/pages/GamepadPage/GamepadPage.vue b/src/pages/GamepadPage/GamepadPage.vue
index b1650c00..a3bc889b 100644
--- a/src/pages/GamepadPage/GamepadPage.vue
+++ b/src/pages/GamepadPage/GamepadPage.vue
@@ -580,8 +580,11 @@ const gameLoop = () => {
     }
   }
 
-  // [ACCOUNTS] B: Back to Main
-  if (mode.value === 'accounts' && gp.buttons[1].pressed) {
+  // [ACCOUNTS] Y / B: Back to Main
+  if (
+    mode.value === 'accounts' &&
+    (gp.buttons[1].pressed || gp.buttons[3].pressed)
+  ) {
     if (!inThrottle) {
       mode.value = 'main'
       showAccountsDropdown.value = false
@@ -592,7 +595,7 @@ const gameLoop = () => {
     }
   }
 
-  // [ACCOUNTS] LS_v/DIR_v: Select Account
+  // [ACCOUNTS] LS_v / DIR_v: Select Account
   if (
     mode.value === 'accounts' &&
     (gp.axes[1] < -0.9 || gp.buttons[12].pressed)
diff --git a/src/pages/GenshinPage/Components/GenshinInfoCard.vue b/src/pages/GenshinPage/Components/GenshinInfoCard.vue
index 3ad56829..bcba7cbd 100644
--- a/src/pages/GenshinPage/Components/GenshinInfoCard.vue
+++ b/src/pages/GenshinPage/Components/GenshinInfoCard.vue
@@ -195,7 +195,6 @@ const gameLoop = () => {
   ) {
     if (!inThrottle) {
       inThrottle = true
-      console.log(artifactIdx.value)
       if (artifactIdx.value == 0) {
         artifactIdx.value =
           playerInfo.value.characters[showcaseIdx.value].artifacts.length - 1

From a8cf2f0eeb529c31903ac0c0b8e6e808be59f5e5 Mon Sep 17 00:00:00 2001
From: HoraceHuang-ui <horacehuang17@gmail.com>
Date: Tue, 7 May 2024 19:23:56 +0800
Subject: [PATCH 10/11] feat: add honkai 3 account switching

---
 electron/main/index.ts                | 47 +++++++++++++++++-----
 electron/preload/index.ts             |  6 +++
 src/pages/GamePage.vue                | 56 +++++++++++++++++++++------
 src/pages/GamepadPage/GamepadPage.vue | 13 +++----
 src/store/index.ts                    |  3 ++
 src/types/genshin/gsRegInfo.ts        |  2 +-
 src/types/honkai3/hi3RegInfo.ts       |  5 +++
 src/types/index.d.ts                  |  3 ++
 src/types/starrail/srRegInfo.ts       |  2 +-
 9 files changed, 106 insertions(+), 31 deletions(-)
 create mode 100644 src/types/honkai3/hi3RegInfo.ts

diff --git a/electron/main/index.ts b/electron/main/index.ts
index a45aa6ff..1c0666c2 100644
--- a/electron/main/index.ts
+++ b/electron/main/index.ts
@@ -18,6 +18,7 @@ import path from 'path'
 import regedit, { promisified as reg } from 'regedit'
 import { SrRegInfo } from '../../src/types/starrail/srRegInfo'
 import { GsRegInfo } from '../../src/types/genshin/gsRegInfo'
+import { Hi3RegInfo } from '../../src/types/honkai3/hi3RegInfo'
 
 regedit.setExternalVBSLocation('resources/regedit/vbs')
 
@@ -321,10 +322,10 @@ async function createWindow() {
 
     reg.putValue({
       'HKCU\\Software\\miHoYo\\原神': {
-        GENERAL_DATA_h2389025596: {
-          value: account.generalData,
-          type: 'REG_BINARY',
-        },
+        // GENERAL_DATA_h2389025596: {
+        //   value: account.generalData,
+        //   type: 'REG_BINARY',
+        // },
         MIHOYOSDK_ADL_PROD_CN_h3123967166: {
           value: account.mihoyoSdk,
           type: 'REG_BINARY',
@@ -344,10 +345,10 @@ async function createWindow() {
           value: account.mihoyoSdk,
           type: 'REG_BINARY',
         },
-        App_LastUserID_h2841727341: {
-          value: account.lastUserId,
-          type: 'REG_DWORD',
-        },
+        // App_LastUserID_h2841727341: {
+        //   value: account.lastUserId,
+        //   type: 'REG_DWORD',
+        // },
       },
     })
   })
@@ -359,7 +360,33 @@ async function createWindow() {
     return result.exists && result.values
       ? {
           name: '',
-          generalData: result.values.GENERAL_DATA_h2389025596.value as number[],
+          // generalData: result.values.GENERAL_DATA_h2389025596.value as number[],
+          mihoyoSdk: result.values.MIHOYOSDK_ADL_PROD_CN_h3123967166
+            .value as number[],
+        }
+      : undefined
+  })
+
+  ipcMain.on('reg:hi3Set', (_event, acc: string) => {
+    const account = JSON.parse(acc)
+
+    reg.putValue({
+      'HKCU\\Software\\miHoYo\\崩坏3': {
+        MIHOYOSDK_ADL_PROD_CN_h3123967166: {
+          value: account.mihoyoSdk,
+          type: 'REG_BINARY',
+        },
+      },
+    })
+  })
+
+  ipcMain.handle('reg:hi3Get', async (): Promise<Hi3RegInfo> => {
+    const result = (await reg.list(['HKCU\\Software\\miHoYo\\崩坏3']))[
+      'HKCU\\Software\\miHoYo\\崩坏3'
+    ]
+    return result.exists && result.values
+      ? {
+          name: '',
           mihoyoSdk: result.values.MIHOYOSDK_ADL_PROD_CN_h3123967166
             .value as number[],
         }
@@ -374,7 +401,7 @@ async function createWindow() {
     return result.exists && result.values
       ? {
           name: '',
-          lastUserId: result.values.App_LastUserID_h2841727341.value as number,
+          // lastUserId: result.values.App_LastUserID_h2841727341.value as number,
           mihoyoSdk: result.values.MIHOYOSDK_ADL_PROD_CN_h3123967166
             .value as number[],
         }
diff --git a/electron/preload/index.ts b/electron/preload/index.ts
index c6a37c33..590584e1 100644
--- a/electron/preload/index.ts
+++ b/electron/preload/index.ts
@@ -65,12 +65,18 @@ contextBridge.exposeInMainWorld('reg', {
   srGet: async () => {
     return await ipcRenderer.invoke('reg:srGet')
   },
+  hi3Get: async () => {
+    return await ipcRenderer.invoke('reg:hi3Get')
+  },
   gsSet: (account: string) => {
     ipcRenderer.send('reg:gsSet', account)
   },
   srSet: (account: string) => {
     ipcRenderer.send('reg:srSet', account)
   },
+  hi3Set: (account: string) => {
+    ipcRenderer.send('reg:hi3Set', account)
+  },
 })
 
 function domReady(
diff --git a/src/pages/GamePage.vue b/src/pages/GamePage.vue
index ea31ae5a..d02f20a4 100644
--- a/src/pages/GamePage.vue
+++ b/src/pages/GamePage.vue
@@ -1,5 +1,14 @@
 <script setup lang="ts">
-import { Component, computed, h, inject, onMounted, ref, Ref } from 'vue'
+import {
+  Component,
+  computed,
+  h,
+  inject,
+  onMounted,
+  ref,
+  Ref,
+  toValue,
+} from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { translate } from '../i18n'
 import { LauncherInfo, PostInfo } from '../types/launcher/launcherInfo'
@@ -258,6 +267,10 @@ const launchGame = async () => {
       await window.reg.srSet(
         JSON.stringify(gameStore.value.accounts[gameStore.value.curAccountId]),
       )
+    } else if (gameNo.value == 2) {
+      await window.reg.hi3Set(
+        JSON.stringify(gameStore.value.accounts[gameStore.value.curAccountId]),
+      )
     }
   }
   await window.child.exec(gameStore.value.gamePath!)
@@ -278,34 +291,45 @@ const retrieveAccount = async () => {
 
         if (gameNo.value == 0) {
           const res = await window.reg.gsGet()
-          console.log(res)
           if (res) {
             gameStore.value.accounts.push({
               name: newAccountName.value,
               mihoyoSdk: res.mihoyoSdk,
-              generalData: res.generalData,
+              // generalData: res.generalData,
             })
           } else {
             gameStore.value.accounts.push({
               name: newAccountName.value,
               mihoyoSdk: [],
-              generalData: [],
+              // generalData: [],
             })
           }
         } else if (gameNo.value == 1) {
           const res = await window.reg.srGet()
-          console.log(res)
           if (res) {
             gameStore.value.accounts.push({
               name: newAccountName.value,
               mihoyoSdk: res.mihoyoSdk,
-              lastUserId: res.lastUserId,
+              // lastUserId: res.lastUserId,
+            })
+          } else {
+            gameStore.value.accounts.push({
+              name: newAccountName.value,
+              mihoyoSdk: [],
+              // lastUserId: 0,
+            })
+          }
+        } else if (gameNo.value == 2) {
+          const res = await window.reg.hi3Get()
+          if (res) {
+            gameStore.value.accounts.push({
+              name: newAccountName.value,
+              mihoyoSdk: res.mihoyoSdk,
             })
           } else {
             gameStore.value.accounts.push({
               name: newAccountName.value,
               mihoyoSdk: [],
-              lastUserId: 0,
             })
           }
         }
@@ -345,13 +369,21 @@ const retrieveAccount = async () => {
                 onInput: (e: Event) => {
                   newAccountName.value = (e.target as HTMLInputElement).value
                 },
-                style:
-                  gameNo.value == 1
-                    ? {
+                style: toValue(() => {
+                  switch (gameNo.value) {
+                    case 0:
+                      return undefined
+                    case 1:
+                      return {
                         background: 'white',
                         border: '1px solid gray',
                       }
-                    : undefined,
+                    case 2:
+                      return {
+                        background: '#222',
+                      }
+                  }
+                }),
               }),
             ],
           ),
@@ -521,6 +553,7 @@ const refresh = () => {
                   :style="`font-size: calc(22px * min(${hScale}, ${vScale}))`"
                 />
                 <span
+                  class="font-normal"
                   v-if="gameStore.curAccountId != -1"
                   :style="`margin-left: calc(6px * min(${hScale}, ${vScale}))`"
                 >
@@ -549,6 +582,7 @@ const refresh = () => {
                     ? [
                         $t('general_openOfficialLauncher'),
                         $t('general_clearGamePath'),
+                        $t('general_clearAccounts'),
                       ]
                     : [
                         $t('general_openOfficialLauncher'),
diff --git a/src/pages/GamepadPage/GamepadPage.vue b/src/pages/GamepadPage/GamepadPage.vue
index a3bc889b..0cd4fc71 100644
--- a/src/pages/GamepadPage/GamepadPage.vue
+++ b/src/pages/GamepadPage/GamepadPage.vue
@@ -662,7 +662,7 @@ watch(selectedGameIndex, () => {
       selectedAccountIndex.value = store.game.sr.curAccountId
       break
     case 'hi3':
-      selectedAccountIndex.value = -1
+      selectedAccountIndex.value = store.game.hi3.curAccountId
       break
   }
 })
@@ -736,12 +736,9 @@ onMounted(async () => {
               <GamepadIcon icon="X" />
               <span>{{ $t('gamepad_officialLauncher') }}</span>
             </div>
-            <div
-              class="bar-item hoverable"
-              @click="launch(importedGames[selectedGameIndex].game, true)"
-            >
+            <div class="bar-item">
               <GamepadIcon icon="Y" />
-              <span>账号</span>
+              <span>{{ $t('general_account') }}</span>
             </div>
             <div class="bar-item hoverable" @click="mode = 'gs-player'">
               <GamepadIcon icon="LS" />
@@ -827,7 +824,7 @@ onMounted(async () => {
             </div>
             <div class="bar-item">
               <GamepadIcon icon="LS_v" />
-              <span>选择账号</span>
+              <span>{{ $t('gamepad_selectAccount') }}</span>
             </div>
             <div
               class="bar-item hoverable"
@@ -902,7 +899,7 @@ onMounted(async () => {
       >
         <MyDropdown
           :items="[
-            '不作修改',
+            $t('general_doNotModify'),
             ...store.game[importedGames[selectedGameIndex].game].accounts.map(
               (acc: GsRegInfo | SrRegInfo) => acc.name,
             ),
diff --git a/src/store/index.ts b/src/store/index.ts
index 52333962..990568ce 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -4,6 +4,7 @@ import { Lang } from '../i18n'
 import { FormattedApiInfo } from '../types/starrail/srPlayerInfo'
 import { GsRegInfo } from '../types/genshin/gsRegInfo'
 import { SrRegInfo } from '../types/starrail/srRegInfo'
+import { Hi3RegInfo } from '../types/honkai3/hi3RegInfo'
 
 export const useStore = defineStore('userStore', {
   state: () => ({
@@ -57,6 +58,8 @@ export const useStore = defineStore('userStore', {
         launcherPath: undefined as string | undefined,
         gamePath: undefined as string | undefined,
         upd: false,
+        accounts: [] as Hi3RegInfo[],
+        curAccountId: -1,
       },
     } as Record<string, any>,
   }),
diff --git a/src/types/genshin/gsRegInfo.ts b/src/types/genshin/gsRegInfo.ts
index 4a0f210f..1d0438c8 100644
--- a/src/types/genshin/gsRegInfo.ts
+++ b/src/types/genshin/gsRegInfo.ts
@@ -1,7 +1,7 @@
 export interface GsRegInfo {
   name: string
   // GENERAL_DATA_h2389025596
-  generalData: number[]
+  // generalData: number[]
   // MIHOYOSDK_ADL_PROD_CN_h3123967166
   mihoyoSdk: number[]
 }
diff --git a/src/types/honkai3/hi3RegInfo.ts b/src/types/honkai3/hi3RegInfo.ts
new file mode 100644
index 00000000..d4ebdde1
--- /dev/null
+++ b/src/types/honkai3/hi3RegInfo.ts
@@ -0,0 +1,5 @@
+export interface Hi3RegInfo {
+  name: string
+  // MIHOYOSDK_ADL_PROD_CN_h3123967166
+  mihoyoSdk: number[]
+}
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
index 2bf4a943..9f65c0f3 100644
--- a/src/types/index.d.ts
+++ b/src/types/index.d.ts
@@ -1,5 +1,6 @@
 import { GsRegInfo } from './genshin/gsRegInfo'
 import { SrRegInfo } from './starrail/srRegInfo'
+import { Hi3RegInfo } from './honkai3/hi3RegInfo'
 
 export {}
 
@@ -50,6 +51,8 @@ export interface IReg {
   gsSet: (data: string) => Promise<void>
   srGet: () => Promise<SrRegInfo | undefined>
   srSet: (data: string) => Promise<void>
+  hi3Get: () => Promise<Hi3RegInfo | undefined>
+  hi3Set: (data: string) => Promise<void>
 }
 
 declare global {
diff --git a/src/types/starrail/srRegInfo.ts b/src/types/starrail/srRegInfo.ts
index 87a594ab..088c3952 100644
--- a/src/types/starrail/srRegInfo.ts
+++ b/src/types/starrail/srRegInfo.ts
@@ -1,7 +1,7 @@
 export interface SrRegInfo {
   name: string
   // App_LastUserID_h2841727341
-  lastUserId: number
+  // lastUserId: number
   // MIHOYOSDK_ADL_PROD_CN_h3123967166
   mihoyoSdk: number[]
 }

From e2cfd42c25d1b38ce4fad02cd5f51cd3f3704d2a Mon Sep 17 00:00:00 2001
From: HoraceHuang-ui <horacehuang17@gmail.com>
Date: Thu, 9 May 2024 01:21:03 +0800
Subject: [PATCH 11/11] Bump version to 2.6.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a8f5e855..b222c7f1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "miXeD",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "main": "dist-electron/main/index.js",
   "description": "All-in-one miHoYo game launcher",
   "author": "HoraceHYY <horacehuang17@gmail.com>",