From e7d0a85ad55618bdd9ed9d702ad29802c832ce03 Mon Sep 17 00:00:00 2001 From: DLmaster361 Date: Mon, 16 Jun 2025 21:24:05 +0800 Subject: [PATCH 1/7] =?UTF-8?q?ci:=20=E4=BF=AE=E6=AD=A3project-slug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-app.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-app.yml b/.github/workflows/build-app.yml index eb1cd4b..422e386 100644 --- a/.github/workflows/build-app.yml +++ b/.github/workflows/build-app.yml @@ -107,7 +107,7 @@ jobs: with: api-token: '${{ secrets.SIGNPATH_API_TOKEN }}' organization-id: '787a1d5f-6177-4f30-9559-d2646473584a' - project-slug: 'AUTO_MAA_' + project-slug: 'AUTO_MAA' signing-policy-slug: 'release-signing' artifact-configuration-slug: "AUTO_MAA" github-artifact-id: '${{ steps.upload-unsigned-main-program.outputs.artifact-id }}' @@ -155,7 +155,7 @@ jobs: with: api-token: '${{ secrets.SIGNPATH_API_TOKEN }}' organization-id: '787a1d5f-6177-4f30-9559-d2646473584a' - project-slug: 'AUTO_MAA_' + project-slug: 'AUTO_MAA' signing-policy-slug: 'release-signing' artifact-configuration-slug: "AUTO_MAA-Setup" github-artifact-id: '${{ steps.upload-unsigned-setup-program.outputs.artifact-id }}' From fb979e5639cd7832f506e52adb3df161fd74d886 Mon Sep 17 00:00:00 2001 From: DLmaster361 Date: Mon, 16 Jun 2025 21:38:25 +0800 Subject: [PATCH 2/7] =?UTF-8?q?docs:=20=E8=A1=A5=E5=85=85=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=AD=BE=E5=90=8D=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-app.yml | 14 +++++++++++++- README.md | 14 +++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-app.yml b/.github/workflows/build-app.yml index 422e386..c29f2cb 100644 --- a/.github/workflows/build-app.yml +++ b/.github/workflows/build-app.yml @@ -243,7 +243,19 @@ jobs: TAGNAME="$(sed 's/\r$//g' <(head -n 1 version_info.txt))" NOTES_MAIN="$(sed 's/\r$//g' <(tail -n +3 version_info.txt))" NOTES="$NOTES_MAIN - + + ## 代码签名策略（Code signing policy） + + Free code signing provided by [SignPath.io](https://signpath.io/), certificate by [SignPath Foundation](https://signpath.org/) + + - 审批人（Approvers）: [DLmaster (@DLmaster361)](https://github.com/DLmaster361) + + ## 隐私政策（Privacy policy） + + 除非用户、安装者或使用者特别要求，否则本程序不会将任何信息传输到其他网络系统。 + + This program will not transfer any information to other networked systems unless specifically requested by the user or the person installing or operating it. + [已有 Mirror酱 CDK ？前往 Mirror酱 高速下载](https://mirrorchyan.com/zh/projects?rid=AUTO_MAA&source=auto_maa-release) \`\`\`本release通过GitHub Actions自动构建\`\`\`" diff --git a/README.md b/README.md index d81c21b..ea0da17 100644 --- a/README.md +++ b/README.md @@ -72,11 +72,23 @@ 可在[《AUTO_MAA开发者协作文档》](https://docs.qq.com/aio/DQ3Z5eHNxdmxFQmZX)的`开发任务`页面中查看开发进度。 +## 代码签名策略（Code signing policy） + +Free code signing provided by [SignPath.io](https://signpath.io/), certificate by [SignPath Foundation](https://signpath.org/) + +- 审批人（Approvers）: [DLmaster (@DLmaster361)](https://github.com/DLmaster361) + +## 隐私政策（Privacy policy） + +除非用户、安装者或使用者特别要求，否则本程序不会将任何信息传输到其他网络系统。 + +This program will not transfer any information to other networked systems unless specifically requested by the user or the person installing or operating it. + ## 特别鸣谢 - 下载服务器：由[AoXuan (@ClozyA)](https://github.com/ClozyA) 个人为项目赞助。 -- EXE签名: Free code signing provided by [SignPath.io](https://signpath.io/), certificate by [SignPath Foundation](https://signpath.org/) +- EXE签名: 由 [SignPath.io](https://signpath.io/)提供免费代码签名，签名来自[SignPath Foundation](https://signpath.org/)。 ## 贡献者 From 1829d1cd0b6f2ee425574b69ef8b49c0027c821d Mon Sep 17 00:00:00 2001 From: DLmaster361 Date: Tue, 17 Jun 2025 00:34:07 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix(ui):=20=E4=BF=AE=E5=A4=8D=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E8=AE=A1=E5=88=92=E8=A1=A8=E5=BC=95=E5=8F=91=E7=9A=84?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/ui/plan_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/ui/plan_manager.py b/app/ui/plan_manager.py index 1d244b2..1a44ce9 100644 --- a/app/ui/plan_manager.py +++ b/app/ui/plan_manager.py @@ -156,7 +156,7 @@ class PlanManager(QWidget): self.plan_manager.clear_SettingBox() shutil.rmtree(Config.plan_dict[name]["Path"]) - Config.change_plan(name, "禁用") + Config.change_plan(name, "固定") for i in range(int(name[3:]) + 1, len(Config.plan_dict) + 1): if Config.plan_dict[f"计划_{i}"]["Path"].exists(): Config.plan_dict[f"计划_{i}"]["Path"].rename( From e746756e56f4834931570889c15e547db475beb1 Mon Sep 17 00:00:00 2001 From: DLmaster361 Date: Tue, 17 Jun 2025 01:14:29 +0800 Subject: [PATCH 4/7] =?UTF-8?q?ci:=20=E4=B8=B4=E6=97=B6=E5=9B=BA=E5=AE=9AN?= =?UTF-8?q?uitka=E6=89=93=E5=8C=85=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-app.yml | 1 + app/core/config.py | 2 +- resources/version.json | 8 +++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-app.yml b/.github/workflows/build-app.yml index c29f2cb..44dc17b 100644 --- a/.github/workflows/build-app.yml +++ b/.github/workflows/build-app.yml @@ -78,6 +78,7 @@ jobs: - name: Nuitka build main program uses: Nuitka/Nuitka-Action@main with: + nuitka-version: 2.7.6 script-name: main.py mode: app enable-plugins: pyside6 diff --git a/app/core/config.py b/app/core/config.py index fc15c7e..e0db6a6 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -576,7 +576,7 @@ class MaaPlanConfig(LQConfig): class AppConfig(GlobalConfig): - VERSION = "4.3.10.0" + VERSION = "4.3.11.0" gameid_refreshed = Signal() PASSWORD_refreshed = Signal() diff --git a/resources/version.json b/resources/version.json index d4e489d..f302487 100644 --- a/resources/version.json +++ b/resources/version.json @@ -1,6 +1,12 @@ { - "main_version": "4.3.10.0", + "main_version": "4.3.11.0", "version_info": { + "4.3.11.0": { + "修复BUG": [ + "临时固定Nuitka打包版本号", + "修复删除计划表引发的错误" + ] + }, "4.3.10.0": { "新增功能": [ "更换全新默认主页图", From c27dc8e3809f9b5e425b6421a9552a3e17825a8c Mon Sep 17 00:00:00 2001 From: DLmaster361 Date: Tue, 17 Jun 2025 02:00:32 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0c2cbd1..1bc3f8f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,5 +9,4 @@ pycryptodome requests markdown Jinja2 -nuitka pillow \ No newline at end of file From 4233040585cdf61cc67a7cc83fc6c7fa75d5ed40 Mon Sep 17 00:00:00 2001 From: DLmaster361 Date: Tue, 17 Jun 2025 02:46:27 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=E5=B0=9D=E8=AF=95=E5=9B=BA=E5=AE=9A?= =?UTF-8?q?certifi=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-app.yml | 1 - requirements.txt | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-app.yml b/.github/workflows/build-app.yml index 44dc17b..c29f2cb 100644 --- a/.github/workflows/build-app.yml +++ b/.github/workflows/build-app.yml @@ -78,7 +78,6 @@ jobs: - name: Nuitka build main program uses: Nuitka/Nuitka-Action@main with: - nuitka-version: 2.7.6 script-name: main.py mode: app enable-plugins: pyside6 diff --git a/requirements.txt b/requirements.txt index 1bc3f8f..28ce2e5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,9 @@ psutil pywin32 keyboard pycryptodome +certifi==2025.4.26 requests markdown Jinja2 +nuitka pillow \ No newline at end of file From 0572caa528deb72bc97c42e0b169292823b1e8a8 Mon Sep 17 00:00:00 2001 From: DLmaster361 Date: Tue, 17 Jun 2025 03:18:55 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=E5=9B=BA=E5=AE=9Acertifi=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/core/config.py | 2 +- resources/version.json | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/core/config.py b/app/core/config.py index e0db6a6..c2b34ed 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -576,7 +576,7 @@ class MaaPlanConfig(LQConfig): class AppConfig(GlobalConfig): - VERSION = "4.3.11.0" + VERSION = "4.3.12.0" gameid_refreshed = Signal() PASSWORD_refreshed = Signal() diff --git a/resources/version.json b/resources/version.json index f302487..6f462af 100644 --- a/resources/version.json +++ b/resources/version.json @@ -1,9 +1,13 @@ { - "main_version": "4.3.11.0", + "main_version": "4.3.12.0", "version_info": { + "4.3.12.0": { + "修复BUG": [ + "固定certifi版本号" + ] + }, "4.3.11.0": { "修复BUG": [ - "临时固定Nuitka打包版本号", "修复删除计划表引发的错误" ] },