diff --git a/README.md b/README.md index fe6e90e9..6767e387 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ English | [简体中文](./README.zh-CN.md)
- +
diff --git a/README.zh-CN.md b/README.zh-CN.md index fe67bc96..2f7fbbbb 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -2,10 +2,9 @@
- +
-

Rubick

@@ -14,7 +13,7 @@ release - building + building npm diff --git a/build/icons/256x256.png b/build/icons/256x256.png deleted file mode 100644 index 65efaa3d..00000000 Binary files a/build/icons/256x256.png and /dev/null differ diff --git a/build/icons/icon.icns b/build/icons/icon.icns deleted file mode 100644 index 84b688d6..00000000 Binary files a/build/icons/icon.icns and /dev/null differ diff --git a/build/icons/icon.ico b/build/icons/icon.ico deleted file mode 100644 index b7d05bd5..00000000 Binary files a/build/icons/icon.ico and /dev/null differ diff --git a/feature/public/package.json b/feature/public/package.json index 890a1eb1..4e0c6ee8 100644 --- a/feature/public/package.json +++ b/feature/public/package.json @@ -3,7 +3,7 @@ "pluginName": "系统菜单", "description": "系统菜单", "main": "index.html", - "logo": "https://pic1.zhimg.com/80/v2-c09780808301668a82e6646cb42f0806_720w.png", + "logo": "https://pic1.zhimg.com/80/v2-29152fe716010751db835adf591421f8_720w.png", "version": "0.0.0", "preload":"preload.js", "pluginType": "ui", diff --git a/feature/src/assets/logo.png b/feature/src/assets/logo.png index acdbc8cc..d258ec89 100644 Binary files a/feature/src/assets/logo.png and b/feature/src/assets/logo.png differ diff --git a/package.json b/package.json index 63d403e9..d4c9d247 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rubick", - "version": "4.1.7", + "version": "4.2.0-beta.1", "author": "muwoo <2424880409@qq.com>", "private": true, "scripts": { diff --git a/public/feature/package.json b/public/feature/package.json index 890a1eb1..4e0c6ee8 100644 --- a/public/feature/package.json +++ b/public/feature/package.json @@ -3,7 +3,7 @@ "pluginName": "系统菜单", "description": "系统菜单", "main": "index.html", - "logo": "https://pic1.zhimg.com/80/v2-c09780808301668a82e6646cb42f0806_720w.png", + "logo": "https://pic1.zhimg.com/80/v2-29152fe716010751db835adf591421f8_720w.png", "version": "0.0.0", "preload":"preload.js", "pluginType": "ui", diff --git a/public/icons/256x256.png b/public/icons/256x256.png index 65efaa3d..d258ec89 100644 Binary files a/public/icons/256x256.png and b/public/icons/256x256.png differ diff --git a/public/icons/icon.icns b/public/icons/icon.icns index 84b688d6..61e33a8e 100644 Binary files a/public/icons/icon.icns and b/public/icons/icon.icns differ diff --git a/public/icons/icon.ico b/public/icons/icon.ico index b7d05bd5..2c9c4347 100644 Binary files a/public/icons/icon.ico and b/public/icons/icon.ico differ diff --git a/public/icons/icon@2x.png b/public/icons/icon@2x.png index c792ff8d..0d054bcc 100644 Binary files a/public/icons/icon@2x.png and b/public/icons/icon@2x.png differ diff --git a/public/icons/icon@3x.png b/public/icons/icon@3x.png deleted file mode 100644 index acdbc8cc..00000000 Binary files a/public/icons/icon@3x.png and /dev/null differ diff --git a/public/icons/iconTemplate@2x.png b/public/icons/iconTemplate@2x.png new file mode 100644 index 00000000..cba3654f Binary files /dev/null and b/public/icons/iconTemplate@2x.png differ diff --git a/public/logo.png b/public/logo.png index 65efaa3d..d258ec89 100644 Binary files a/public/logo.png and b/public/logo.png differ diff --git a/src/common/constans/defaultConfig.ts b/src/common/constans/defaultConfig.ts index 464e8312..1acaa1a0 100644 --- a/src/common/constans/defaultConfig.ts +++ b/src/common/constans/defaultConfig.ts @@ -1,5 +1,5 @@ export default { - version: 4, + version: 6, perf: { custom: { theme: 'SPRING', diff --git a/src/main/common/tray.ts b/src/main/common/tray.ts index 0bedd4b0..c7dff046 100644 --- a/src/main/common/tray.ts +++ b/src/main/common/tray.ts @@ -9,7 +9,7 @@ function createTray(window: BrowserWindow): Promise { return new Promise((resolve) => { let icon; if (commonConst.macOS()) { - icon = './icons/icon@3x.png'; + icon = './icons/iconTemplate@2x.png'; } else if (commonConst.windows()) { icon = parseInt(os.release()) < 10 diff --git a/src/renderer/assets/logo.png b/src/renderer/assets/logo.png index 65efaa3d..d258ec89 100644 Binary files a/src/renderer/assets/logo.png and b/src/renderer/assets/logo.png differ diff --git a/vue.config.js b/vue.config.js index cc34fa25..50387441 100644 --- a/vue.config.js +++ b/vue.config.js @@ -102,7 +102,9 @@ module.exports = { include: 'public/installer.nsh', }, linux: { - icon: 'build/icons/', + icon: 'public/icons/', + publish: ['github'], + target: 'deb', }, }, },