Merge pull request 'lyc-dev' (#66 ) from lyc-dev into main

Merge branch 'main' into lyc-dev
图标
2024-07-26 11:06:46 +08:00 · 2024-07-26 11:06:32 +08:00 · 2024-07-26 11:06:06 +08:00
4 changed files with 4 additions and 4 deletions
--- a/electron-builder-test.yml
+++ b/electron-builder-test.yml
@ -12,7 +12,7 @@ asarUnpack:
  - resources/**
 win:
  executableName: AIx
-  icon: resources/logo.ico
+  icon: resources/logo2.ico
 nsis: 
  oneClick: false
  allowToChangeInstallationDirectory: true
--- a/electron-builder.yml
+++ b/electron-builder.yml
@ -12,7 +12,7 @@ asarUnpack:
  - resources/**
 win:
  executableName: AIx
-  icon: resources/logo.ico
+  icon: resources/logo2.ico
 nsis: 
  oneClick: false
  allowToChangeInstallationDirectory: true
--- a/resources/logo2.ico
+++ b/resources/logo2.ico
--- a/src/main/index.js
+++ b/src/main/index.js
@ -18,7 +18,7 @@ function createLoginWindow() {
    show: false,
    frame: false,
    autoHideMenuBar: true,
-    icon: join(__dirname, '../../resources/logo.ico'),
+    icon: join(__dirname, '../../resources/logo2.ico'),
    ...(process.platform === 'linux' ? { icon } : {}),
    webPreferences: {
      preload: join(__dirname, '../preload/index.js'),
@ -53,7 +53,7 @@ function createMainWindow() {
    show: false,
    frame: false, // 无边框
    autoHideMenuBar: true,
-    icon: join(__dirname, '../../resources/logo.ico'),
+    icon: join(__dirname, '../../resources/logo2.ico'),
    ...(process.platform === 'linux' ? { icon } : {}),
    webPreferences: {
      preload: join(__dirname, '../preload/index.js'),
Author	SHA1	Message	Date
lyc	03bcade299	Merge pull request 'lyc-dev' (#66 ) from lyc-dev into main	2024-07-26 11:06:46 +08:00
lyc	8c7468ef7f	Merge branch 'main' into lyc-dev	2024-07-26 11:06:32 +08:00
lyc	7e3978d532	图标	2024-07-26 11:06:06 +08:00