fix: app icon, build resource error

HoraceHuang-ui · Jul 5, 2024 · 485ecc5 · 485ecc5
1 parent b9c5ed5
commit 485ecc5
Show file tree

Hide file tree

Showing 16 changed files with 97 additions and 14 deletions.
diff --git a/build/icon.ico b/build/icon.ico
diff --git a/build/icon.png b/build/icon.png
diff --git a/electron-builder.json5 b/electron-builder.json5
@@ -20,6 +20,7 @@
   },
   win: {
     requestedExecutionLevel: "requireAdministrator",
+    icon: "build/icon.ico",
     target: [
       {
         target: "nsis",
@@ -41,6 +42,7 @@
     "src/assets/elementIcons/*",
     "src/assets/kleeLoading.gif",
     "src/assets/failedEmojis/*",
+    "src/assets/zzzDialog/*",
     "src/assets/gsbanner.png",
     "src/assets/srbanner.jpg",
     "src/assets/hi3banner.webp",

diff --git a/electron/main/index.ts b/electron/main/index.ts
@@ -19,6 +19,7 @@ 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'
+import { ZZZRegInfo } from '../../src/types/zenless/zzzRegInfo'
 
 regedit.setExternalVBSLocation('resources/regedit/vbs')
 
@@ -38,8 +39,8 @@ const enka = new EnkaClient({
 //
 process.env.DIST_ELECTRON = path.join(__dirname, '..')
 process.env.DIST = path.join(process.env.DIST_ELECTRON, '../dist')
-process.env.BUILD = process.env.VITE_DEV_SERVER_URL
-  ? path.join(process.env.DIST_ELECTRON, '../build')
+process.env.PUBLIC = process.env.VITE_DEV_SERVER_URL
+  ? path.join(process.env.DIST_ELECTRON, '../public')
   : process.env.DIST
 
 // Disable GPU Acceleration for Windows 7
@@ -69,7 +70,7 @@ let tray = null
 //   fs.mkdir(imageFolder);
 // }
 
-const iconPath = path.join(process.env.BUILD, 'icon.png')
+const iconPath = path.join(process.env.PUBLIC, 'favicon.ico')
 const assetsPath = process.env.VITE_DEV_SERVER_URL
   ? '../../src/assets'
   : path.join(__dirname, '../../../src/assets')
@@ -395,6 +396,37 @@ async function createWindow() {
     })
   })
 
+  ipcMain.on('reg:zzzSet', (_event, acc: string) => {
+    const account = JSON.parse(acc)
+
+    reg.putValue({
+      'HKCU\\Software\\miHoYo\\绝区零': {
+        MIHOYOSDK_ADL_PROD_CN_h3123967166: {
+          value: account.mihoyoSdk,
+          type: 'REG_BINARY',
+        },
+      },
+    })
+  })
+
+  ipcMain.handle('reg:zzzGet', async (): Promise<ZZZRegInfo> => {
+    console.log('get111')
+    return new Promise(resolve => {
+      console.log('get222')
+      regedit.list(['HKCU\\Software\\miHoYo\\绝区零']).on('data', entry => {
+        console.log('get333')
+        if (entry.data.exists && entry.data.values) {
+          resolve({
+            name: '',
+            // generalData: result.values.GENERAL_DATA_h2389025596.value as number[],
+            mihoyoSdk: entry.data.values.MIHOYOSDK_ADL_PROD_CN_h3123967166
+              .value as number[],
+          })
+        }
+      })
+    })
+  })
+
   ipcMain.handle('reg:srGet', async (): Promise<SrRegInfo> => {
     return new Promise(resolve => {
       regedit

diff --git a/electron/preload/index.ts b/electron/preload/index.ts
@@ -68,6 +68,9 @@ contextBridge.exposeInMainWorld('reg', {
   hi3Get: async () => {
     return await ipcRenderer.invoke('reg:hi3Get')
   },
+  zzzGet: async () => {
+    return await ipcRenderer.invoke('reg:zzzGet')
+  },
   gsSet: (account: string) => {
     ipcRenderer.send('reg:gsSet', account)
   },
@@ -77,6 +80,9 @@ contextBridge.exposeInMainWorld('reg', {
   hi3Set: (account: string) => {
     ipcRenderer.send('reg:hi3Set', account)
   },
+  zzzSet: (account: string) => {
+    ipcRenderer.send('reg:zzzSet', account)
+  },
 })
 
 function domReady(

diff --git a/index.html b/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/build/icon.png" />
+    <link rel="icon" type="image/svg+xml" href="/build/icon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
     <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'unsafe-eval';" />
     <title>miXeD</title>

diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/src/assets/styles/fonts.css b/src/assets/styles/fonts.css
@@ -18,3 +18,10 @@
   font-weight: normal;
   font-style: normal;
 }
+
+@font-face {
+    font-family: "zzz-font";
+    src: url("./zzz.ttf");
+    font-weight: normal;
+    font-style: normal;
+}
diff --git a/src/components/TopHeader.vue b/src/components/TopHeader.vue
@@ -83,7 +83,7 @@ const winMax = () => {
 <template>
   <div class="drag main-wrapper">
     <div class="title-wrapper">
-      <img src="../../build/icon.png" />
+      <img src="../../build/icon.ico" />
       <div class="title">miXeD · {{ pageNames[selection] }}</div>
     </div>
     <div class="no-drag icons-wrapper">

diff --git a/src/pages/GamePage.vue b/src/pages/GamePage.vue
@@ -28,6 +28,7 @@ import { SrRegInfo } from '../types/starrail/srRegInfo'
 import { GsRegInfo } from '../types/genshin/gsRegInfo'
 import { BgImageInfo } from '../types/launcher/bgImageInfo'
 import ZZZImportDialog from './ZZZPage/Components/ZZZImportDialog.vue'
+import ZZZDialog from './ZZZPage/Components/ZZZDialog.vue'
 
 const store = useStore()
 
@@ -135,7 +136,7 @@ const defDialogComponent = (game: string) => {
       dialogComponent = Honkai3Dialog
       break
     case 'zzz':
-      dialogComponent = ZZZImportDialog
+      dialogComponent = ZZZDialog
       break
     default:
       defDialogComponent(store.settings.appearance.dialogStyle)
@@ -320,7 +321,11 @@ const launchGame = async () => {
       await window.reg.hi3Set(
         JSON.stringify(gameStore.value.accounts[gameStore.value.curAccountId]),
       )
-    }
+    } /* else if (gameNo.value == 3) {
+      await window.reg.zzzSet(
+        JSON.stringify(gameStore.value.accounts[gameStore.value.curAccountId]),
+      )
+    } */
   }
   await window.child.exec(gameStore.value.gamePath!)
   if (store.settings.general.trayOnLaunch) {
@@ -381,13 +386,27 @@ const retrieveAccount = async () => {
               mihoyoSdk: [],
             })
           }
-        }
+        } /* else if (gameNo.value == 3) {
+          const res = await window.reg.zzzGet()
+          if (res) {
+            gameStore.value.accounts.push({
+              name: newAccountName.value,
+              mihoyoSdk: res.mihoyoSdk,
+            })
+          } else {
+            gameStore.value.accounts.push({
+              name: newAccountName.value,
+              mihoyoSdk: [],
+            })
+          }
+        } */
         dispose()
       },
     },
     {
       title: translate('general_addAccountTitle'),
       msg: translate('general_addAccountMsg'),
+      styleType: 'normal',
       showCancel: true,
       closeOnOk: false,
       hScale: hScale,

diff --git a/src/pages/GamepadPage/GamepadPage.vue b/src/pages/GamepadPage/GamepadPage.vue
@@ -180,6 +180,11 @@ const launch = async (game: string, launcher: boolean) => {
     }
   } else {
     gameStore = store.game.zzz
+    // if (gameStore.curAccountId != -1) {
+    //   await window.reg.zzzSet(
+    //     JSON.stringify(gameStore.accounts[gameStore.curAccountId]),
+    //   )
+    // }
   }
 
   await window.child.exec(gameStore.gamePath)

diff --git a/src/pages/ZZZPage/Components/ZZZButton.vue b/src/pages/ZZZPage/Components/ZZZButton.vue
@@ -44,8 +44,8 @@ const backgroundColor: Record<number, string> = {
           class="w-full h-full"
           :src="
             state == 0
-              ? '../../../src/assets/zzzDialog/zzzDialogCancel.png'
-              : '../../../src/assets/zzzDialog/zzzDialogCancelActive.png'
+              ? '../../src/assets/zzzDialog/zzzDialogCancel.png'
+              : '../../src/assets/zzzDialog/zzzDialogCancelActive.png'
           "
         />
       </div>
@@ -63,8 +63,8 @@ const backgroundColor: Record<number, string> = {
           class="w-full h-full"
           :src="
             state == 0
-              ? '../../../src/assets/zzzDialog/zzzDialogOk.png'
-              : '../../../src/assets/zzzDialog/zzzDialogOkActive.png'
+              ? '../../src/assets/zzzDialog/zzzDialogOk.png'
+              : '../../src/assets/zzzDialog/zzzDialogOkActive.png'
           "
         />
       </div>

diff --git a/src/pages/ZZZPage/Components/ZZZDialog.vue b/src/pages/ZZZPage/Components/ZZZDialog.vue
@@ -239,13 +239,13 @@ defineExpose({
   @apply px-6 mx-[8px] mt-[8px];
 
   & > .text {
-    @apply text-center w-full font-bold;
+    @apply text-center w-full font-bold text-white;
     font-size: larger;
   }
 }
 
 .contents-wrapper {
-  @apply px-6 pt-6 pb-4;
+  @apply px-6 pt-6 pb-4 text-white;
 }
 
 .buttons-wrapper {

diff --git a/src/store/index.ts b/src/store/index.ts
@@ -66,6 +66,8 @@ export const useStore = defineStore('userStore', {
         launcherPath: undefined,
         gamePath: undefined,
         upd: false,
+        // accounts: [] as ZZZRegInfo[],
+        // curAccountId: -1,
       },
     } as Record<string, any>,
   }),

diff --git a/src/types/index.d.ts b/src/types/index.d.ts
@@ -1,6 +1,7 @@
 import { GsRegInfo } from './genshin/gsRegInfo'
 import { SrRegInfo } from './starrail/srRegInfo'
 import { Hi3RegInfo } from './honkai3/hi3RegInfo'
+import { ZZZRegInfo } from './zenless/zzzRegInfo'
 
 export {}
 
@@ -53,6 +54,8 @@ export interface IReg {
   srSet: (data: string) => Promise<void>
   hi3Get: () => Promise<Hi3RegInfo | undefined>
   hi3Set: (data: string) => Promise<void>
+  zzzGet: () => Promise<ZZZRegInfo | undefined>
+  zzzSet: (data: string) => Promise<void>
 }
 
 declare global {

diff --git a/src/types/zenless/zzzRegInfo.ts b/src/types/zenless/zzzRegInfo.ts
@@ -0,0 +1,7 @@
+export interface ZZZRegInfo {
+  name: string
+  // GENERAL_DATA_h2389025596
+  // generalData: number[]
+  // MIHOYOSDK_ADL_PROD_CN_h3123967166
+  mihoyoSdk: number[]
+}