From c20362e9b60c4c9956195063d65c0ceb98a70021 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Thu, 5 Sep 2024 14:00:57 +0800 Subject: [PATCH] release: 2.3.0 --- launcher/NapCatWinBootHook.dll | Bin 11264 -> 11264 bytes launcher/NapCatWinBootMain.exe | Bin 22016 -> 22016 bytes launcher/launcher-win10.bat | 39 +++++++++++++++++++++++++++++++++ manifest.json | 2 +- package.json | 2 +- src/common/version.ts | 2 +- src/webui/ui/NapCat.ts | 2 +- static/assets/renderer.js | 2 +- 8 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 launcher/launcher-win10.bat diff --git a/launcher/NapCatWinBootHook.dll b/launcher/NapCatWinBootHook.dll index ee797fc92bf6887017f045278b866fb48cc86898..4f03788bc0e5c50ffb89fc47f7e5577a0622dd53 100644 GIT binary patch delta 23 ccmZpOXo#5bgL#(w&5gfzN`UCi+a*1P0E=M@4gdfE delta 23 ccmZpOXo#5bgE=Ap#>U?}B|!A%?UJ5C0EtZs=l}o! diff --git a/launcher/NapCatWinBootMain.exe b/launcher/NapCatWinBootMain.exe index 509927021df4ba7f8fcc1476b6dca313ba491e03..be02e30ecb0b591758b832a80cef68221d226979 100644 GIT binary patch delta 6094 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 p!xbp~^C^iq)0t3nEh5pnul 2>&1 +if %errorLevel% == 0 ( + echo Administrator mode detected. +) else ( + echo Please run this script in administrator mode. + powershell -Command "Start-Process 'cmd.exe' -ArgumentList '/c cd /d \"%cd%\" && \"%~f0\"' -Verb runAs" + exit +) + +set NAPCAT_PATCH_PATH=%cd%\patchNapCat.js +set NAPCAT_LOAD_PATH=%cd%\loadNapCat.js +set NAPCAT_INJECT_PATH=%cd%\NapCatWinBootHook.dll +set NAPCAT_LAUNCHER_PATH=%cd%\NapCatWinBootMain.exe +set NAPCAT_MAIN_PATH=%cd%\napcat.mjs +:loop_read +for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do ( + set RetString=%%b + goto :napcat_boot +) + +:napcat_boot +for %%a in (%RetString%) do ( + set "pathWithoutUninstall=%%~dpa" +) + +SET QQPath=%pathWithoutUninstall%QQ.exe + +REM 拿不到QQ路径则退出 +if not exist "%QQpath%" ( + echo provided QQ path is invalid: %QQpath% + pause + exit /b +) +set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/% +echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > %NAPCAT_LOAD_PATH% + +"%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" \ No newline at end of file diff --git a/manifest.json b/manifest.json index a01452e1..8d322fc5 100644 --- a/manifest.json +++ b/manifest.json @@ -4,7 +4,7 @@ "name": "NapCatQQ", "slug": "NapCat.Framework", "description": "高性能的 OneBot 11 协议实现", - "version": "2.2.47", + "version": "2.3.0", "icon": "./logo.png", "authors": [ { diff --git a/package.json b/package.json index 78d802a1..c7c3631e 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "napcat", "private": true, "type": "module", - "version": "2.2.47", + "version": "2.3.0", "scripts": { "build:framework": "vite build --mode framework", "build:shell": "vite build --mode shell", diff --git a/src/common/version.ts b/src/common/version.ts index 3c1caf38..c849f8ee 100644 --- a/src/common/version.ts +++ b/src/common/version.ts @@ -1 +1 @@ -export const napCatVersion = '2.2.47'; +export const napCatVersion = '2.3.0'; diff --git a/src/webui/ui/NapCat.ts b/src/webui/ui/NapCat.ts index 3f77f79b..5206028b 100644 --- a/src/webui/ui/NapCat.ts +++ b/src/webui/ui/NapCat.ts @@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) { SettingItem( 'Napcat', undefined, - SettingButton('V2.2.47', 'napcat-update-button', 'secondary'), + SettingButton('V2.3.0', 'napcat-update-button', 'secondary'), ), ]), SettingList([ diff --git a/static/assets/renderer.js b/static/assets/renderer.js index 7df30e44..820815dd 100644 --- a/static/assets/renderer.js +++ b/static/assets/renderer.js @@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) { SettingItem( 'Napcat', void 0, - SettingButton("V2.2.47", "napcat-update-button", "secondary") + SettingButton("V2.3.0", "napcat-update-button", "secondary") ) ]), SettingList([