Merge commit '0572caa528deb72bc97c42e0b169292823b1e8a8' into dev
This commit is contained in:
18
.github/workflows/build-app.yml
vendored
18
.github/workflows/build-app.yml
vendored
@@ -107,7 +107,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
|
api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
|
||||||
organization-id: '787a1d5f-6177-4f30-9559-d2646473584a'
|
organization-id: '787a1d5f-6177-4f30-9559-d2646473584a'
|
||||||
project-slug: 'AUTO_MAA_'
|
project-slug: 'AUTO_MAA'
|
||||||
signing-policy-slug: 'release-signing'
|
signing-policy-slug: 'release-signing'
|
||||||
artifact-configuration-slug: "AUTO_MAA"
|
artifact-configuration-slug: "AUTO_MAA"
|
||||||
github-artifact-id: '${{ steps.upload-unsigned-main-program.outputs.artifact-id }}'
|
github-artifact-id: '${{ steps.upload-unsigned-main-program.outputs.artifact-id }}'
|
||||||
@@ -155,7 +155,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
|
api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
|
||||||
organization-id: '787a1d5f-6177-4f30-9559-d2646473584a'
|
organization-id: '787a1d5f-6177-4f30-9559-d2646473584a'
|
||||||
project-slug: 'AUTO_MAA_'
|
project-slug: 'AUTO_MAA'
|
||||||
signing-policy-slug: 'release-signing'
|
signing-policy-slug: 'release-signing'
|
||||||
artifact-configuration-slug: "AUTO_MAA-Setup"
|
artifact-configuration-slug: "AUTO_MAA-Setup"
|
||||||
github-artifact-id: '${{ steps.upload-unsigned-setup-program.outputs.artifact-id }}'
|
github-artifact-id: '${{ steps.upload-unsigned-setup-program.outputs.artifact-id }}'
|
||||||
@@ -243,7 +243,19 @@ jobs:
|
|||||||
TAGNAME="$(sed 's/\r$//g' <(head -n 1 version_info.txt))"
|
TAGNAME="$(sed 's/\r$//g' <(head -n 1 version_info.txt))"
|
||||||
NOTES_MAIN="$(sed 's/\r$//g' <(tail -n +3 version_info.txt))"
|
NOTES_MAIN="$(sed 's/\r$//g' <(tail -n +3 version_info.txt))"
|
||||||
NOTES="$NOTES_MAIN
|
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)
|
[已有 Mirror酱 CDK ?前往 Mirror酱 高速下载](https://mirrorchyan.com/zh/projects?rid=AUTO_MAA&source=auto_maa-release)
|
||||||
|
|
||||||
\`\`\`本release通过GitHub Actions自动构建\`\`\`"
|
\`\`\`本release通过GitHub Actions自动构建\`\`\`"
|
||||||
|
|||||||
14
README.md
14
README.md
@@ -72,11 +72,23 @@
|
|||||||
|
|
||||||
可在[《AUTO_MAA开发者协作文档》](https://docs.qq.com/aio/DQ3Z5eHNxdmxFQmZX)的`开发任务`页面中查看开发进度。
|
可在[《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) 个人为项目赞助。
|
- 下载服务器:由[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/)。
|
||||||
|
|
||||||
## 贡献者
|
## 贡献者
|
||||||
|
|
||||||
|
|||||||
@@ -576,7 +576,7 @@ class MaaPlanConfig(LQConfig):
|
|||||||
|
|
||||||
class AppConfig(GlobalConfig):
|
class AppConfig(GlobalConfig):
|
||||||
|
|
||||||
VERSION = "4.3.10.0"
|
VERSION = "4.3.12.0"
|
||||||
|
|
||||||
gameid_refreshed = Signal()
|
gameid_refreshed = Signal()
|
||||||
PASSWORD_refreshed = Signal()
|
PASSWORD_refreshed = Signal()
|
||||||
|
|||||||
@@ -156,7 +156,7 @@ class PlanManager(QWidget):
|
|||||||
self.plan_manager.clear_SettingBox()
|
self.plan_manager.clear_SettingBox()
|
||||||
|
|
||||||
shutil.rmtree(Config.plan_dict[name]["Path"])
|
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):
|
for i in range(int(name[3:]) + 1, len(Config.plan_dict) + 1):
|
||||||
if Config.plan_dict[f"计划_{i}"]["Path"].exists():
|
if Config.plan_dict[f"计划_{i}"]["Path"].exists():
|
||||||
Config.plan_dict[f"计划_{i}"]["Path"].rename(
|
Config.plan_dict[f"计划_{i}"]["Path"].rename(
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ psutil
|
|||||||
pywin32
|
pywin32
|
||||||
keyboard
|
keyboard
|
||||||
pycryptodome
|
pycryptodome
|
||||||
|
certifi==2025.4.26
|
||||||
requests
|
requests
|
||||||
markdown
|
markdown
|
||||||
Jinja2
|
Jinja2
|
||||||
|
|||||||
@@ -1,6 +1,16 @@
|
|||||||
{
|
{
|
||||||
"main_version": "4.3.10.0",
|
"main_version": "4.3.12.0",
|
||||||
"version_info": {
|
"version_info": {
|
||||||
|
"4.3.12.0": {
|
||||||
|
"修复BUG": [
|
||||||
|
"固定certifi版本号"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"4.3.11.0": {
|
||||||
|
"修复BUG": [
|
||||||
|
"修复删除计划表引发的错误"
|
||||||
|
]
|
||||||
|
},
|
||||||
"4.3.10.0": {
|
"4.3.10.0": {
|
||||||
"新增功能": [
|
"新增功能": [
|
||||||
"更换全新默认主页图",
|
"更换全新默认主页图",
|
||||||
|
|||||||
Reference in New Issue
Block a user