diff --git a/app/ui/main_window.py b/app/ui/main_window.py index 05378e9..47a5a22 100644 --- a/app/ui/main_window.py +++ b/app/ui/main_window.py @@ -186,6 +186,9 @@ class AUTO_MAA(MSFluentWindow): # 检查密码 self.setting.check_PASSWORD() + # 获取公告 + self.setting.show_notice(if_show=False) + # 检查更新 if Config.global_config.get(Config.global_config.update_IfAutoUpdate): result = self.setting.get_update_info() diff --git a/app/ui/setting.py b/app/ui/setting.py index 1562ff8..33c0bca 100644 --- a/app/ui/setting.py +++ b/app/ui/setting.py @@ -43,6 +43,7 @@ from qfluentwidgets import ( ExpandGroupSettingCard, PushSettingCard, ) +from datetime import datetime import json import subprocess import time @@ -385,41 +386,52 @@ class Setting(QWidget): self.close() QApplication.quit() - def show_notice(self): + def show_notice(self, if_show: bool = True): """显示公告""" # 从远程服务器获取最新版本信息 for _ in range(3): try: response = requests.get( - "https://gitee.com/DLmaster_361/AUTO_MAA/raw/main/resources/version.json" + "https://gitee.com/DLmaster_361/AUTO_MAA/raw/main/resources/notice.json" ) - version_remote = response.json() + notice = response.json() break except Exception as e: err = e time.sleep(0.1) else: logger.warning(f"获取最新公告时出错：\n{err}") - choice = Dialog( - "网络错误", - f"获取最新公告时出错：\n{err}", - self, - ) + if if_show: + choice = Dialog( + "网络错误", + f"获取最新公告时出错：\n{err}", + self, + ) + choice.cancelButton.hide() + choice.buttonLayout.insertStretch(1) + choice.exec() + return None + + if (Config.app_path / "resources/notice.json").exists(): + with (Config.app_path / "resources/notice.json").open( + mode="r", encoding="utf-8" + ) as f: + notice_local = json.load(f) + time_local = datetime.strptime(notice_local["time"], "%Y-%m-%d %H:%M") + else: + time_local = datetime.strptime("2000-01-01 00:00", "%Y-%m-%d %H:%M") + + if if_show or datetime.strptime(notice["time"], "%Y-%m-%d %H:%M") > time_local: + + choice = Dialog("公告", notice["content"], self) choice.cancelButton.hide() choice.buttonLayout.insertStretch(1) if choice.exec(): - return None - - if "notice" in version_remote: - notice = version_remote["notice"] - else: - notice = "暂无公告~" - - choice = Dialog("公告", notice, self) - choice.cancelButton.hide() - choice.buttonLayout.insertStretch(1) - choice.exec() + with (Config.app_path / "resources/notice.json").open( + mode="w", encoding="utf-8" + ) as f: + json.dump(notice, f, ensure_ascii=False, indent=4) class FunctionSettingCard(HeaderCardWidget): diff --git a/requirements.txt b/requirements.txt index 7d543dd..a07d74e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,7 @@ plyer PySide6 PySide6-Fluent-Widgets[full] psutil +opencv-python pywin32 pyautogui pycryptodome diff --git a/resources/audio/3星结束行动.wav b/resources/audio/3星结束行动.wav new file mode 100644 index 0000000..1769d44 Binary files /dev/null and b/resources/audio/3星结束行动.wav differ diff --git a/resources/audio/交谈1.wav b/resources/audio/交谈1.wav new file mode 100644 index 0000000..93fdef6 Binary files /dev/null and b/resources/audio/交谈1.wav differ diff --git a/resources/audio/交谈2.wav b/resources/audio/交谈2.wav new file mode 100644 index 0000000..d22984f Binary files /dev/null and b/resources/audio/交谈2.wav differ diff --git a/resources/audio/交谈3.wav b/resources/audio/交谈3.wav new file mode 100644 index 0000000..461a5e0 Binary files /dev/null and b/resources/audio/交谈3.wav differ diff --git a/resources/audio/任命助理.wav b/resources/audio/任命助理.wav new file mode 100644 index 0000000..1e80f09 Binary files /dev/null and b/resources/audio/任命助理.wav differ diff --git a/resources/audio/任命队长.wav b/resources/audio/任命队长.wav new file mode 100644 index 0000000..3f7765c Binary files /dev/null and b/resources/audio/任命队长.wav differ diff --git a/resources/audio/作战中1.wav b/resources/audio/作战中1.wav new file mode 100644 index 0000000..178c862 Binary files /dev/null and b/resources/audio/作战中1.wav differ diff --git a/resources/audio/作战中2.wav b/resources/audio/作战中2.wav new file mode 100644 index 0000000..a68eef9 Binary files /dev/null and b/resources/audio/作战中2.wav differ diff --git a/resources/audio/作战中3.wav b/resources/audio/作战中3.wav new file mode 100644 index 0000000..3dab79a Binary files /dev/null and b/resources/audio/作战中3.wav differ diff --git a/resources/audio/作战中4.wav b/resources/audio/作战中4.wav new file mode 100644 index 0000000..172612e Binary files /dev/null and b/resources/audio/作战中4.wav differ diff --git a/resources/audio/信赖提升后交谈1.wav b/resources/audio/信赖提升后交谈1.wav new file mode 100644 index 0000000..4bb56cb Binary files /dev/null and b/resources/audio/信赖提升后交谈1.wav differ diff --git a/resources/audio/信赖提升后交谈2.wav b/resources/audio/信赖提升后交谈2.wav new file mode 100644 index 0000000..aefc75d Binary files /dev/null and b/resources/audio/信赖提升后交谈2.wav differ diff --git a/resources/audio/信赖提升后交谈3.wav b/resources/audio/信赖提升后交谈3.wav new file mode 100644 index 0000000..dbab117 Binary files /dev/null and b/resources/audio/信赖提升后交谈3.wav differ diff --git a/resources/audio/信赖触摸.wav b/resources/audio/信赖触摸.wav new file mode 100644 index 0000000..80c6717 Binary files /dev/null and b/resources/audio/信赖触摸.wav differ diff --git a/resources/audio/周年庆典.wav b/resources/audio/周年庆典.wav new file mode 100644 index 0000000..6380ff9 Binary files /dev/null and b/resources/audio/周年庆典.wav differ diff --git a/resources/audio/完成高难行动.wav b/resources/audio/完成高难行动.wav new file mode 100644 index 0000000..75007d7 Binary files /dev/null and b/resources/audio/完成高难行动.wav differ diff --git a/resources/audio/干员报到.wav b/resources/audio/干员报到.wav new file mode 100644 index 0000000..a6057f5 Binary files /dev/null and b/resources/audio/干员报到.wav differ diff --git a/resources/audio/戳一下.wav b/resources/audio/戳一下.wav new file mode 100644 index 0000000..f24790e Binary files /dev/null and b/resources/audio/戳一下.wav differ diff --git a/resources/audio/新年祝福.wav b/resources/audio/新年祝福.wav new file mode 100644 index 0000000..6adafc6 Binary files /dev/null and b/resources/audio/新年祝福.wav differ diff --git a/resources/audio/晋升后交谈1.wav b/resources/audio/晋升后交谈1.wav new file mode 100644 index 0000000..05aa36f Binary files /dev/null and b/resources/audio/晋升后交谈1.wav differ diff --git a/resources/audio/晋升后交谈2.wav b/resources/audio/晋升后交谈2.wav new file mode 100644 index 0000000..a29ace0 Binary files /dev/null and b/resources/audio/晋升后交谈2.wav differ diff --git a/resources/audio/标题.wav b/resources/audio/标题.wav new file mode 100644 index 0000000..e392c40 Binary files /dev/null and b/resources/audio/标题.wav differ diff --git a/resources/audio/生日.wav b/resources/audio/生日.wav new file mode 100644 index 0000000..6239884 Binary files /dev/null and b/resources/audio/生日.wav differ diff --git a/resources/audio/精英化晋升1.wav b/resources/audio/精英化晋升1.wav new file mode 100644 index 0000000..7bcc14e Binary files /dev/null and b/resources/audio/精英化晋升1.wav differ diff --git a/resources/audio/精英化晋升2.wav b/resources/audio/精英化晋升2.wav new file mode 100644 index 0000000..c9d135b Binary files /dev/null and b/resources/audio/精英化晋升2.wav differ diff --git a/resources/audio/编入队伍.wav b/resources/audio/编入队伍.wav new file mode 100644 index 0000000..37abd01 Binary files /dev/null and b/resources/audio/编入队伍.wav differ diff --git a/resources/audio/行动出发.wav b/resources/audio/行动出发.wav new file mode 100644 index 0000000..24d326a Binary files /dev/null and b/resources/audio/行动出发.wav differ diff --git a/resources/audio/行动失败.wav b/resources/audio/行动失败.wav new file mode 100644 index 0000000..31a7666 Binary files /dev/null and b/resources/audio/行动失败.wav differ diff --git a/resources/audio/行动开始.wav b/resources/audio/行动开始.wav new file mode 100644 index 0000000..9857957 Binary files /dev/null and b/resources/audio/行动开始.wav differ diff --git a/resources/audio/观看作战记录.wav b/resources/audio/观看作战记录.wav new file mode 100644 index 0000000..16ddf2d Binary files /dev/null and b/resources/audio/观看作战记录.wav differ diff --git a/resources/audio/进驻设施.wav b/resources/audio/进驻设施.wav new file mode 100644 index 0000000..689f7b4 Binary files /dev/null and b/resources/audio/进驻设施.wav differ diff --git a/resources/audio/选中干员1.wav b/resources/audio/选中干员1.wav new file mode 100644 index 0000000..91191d0 Binary files /dev/null and b/resources/audio/选中干员1.wav differ diff --git a/resources/audio/选中干员2.wav b/resources/audio/选中干员2.wav new file mode 100644 index 0000000..4b9cfa9 Binary files /dev/null and b/resources/audio/选中干员2.wav differ diff --git a/resources/audio/部署1.wav b/resources/audio/部署1.wav new file mode 100644 index 0000000..d6f11b1 Binary files /dev/null and b/resources/audio/部署1.wav differ diff --git a/resources/audio/部署2.wav b/resources/audio/部署2.wav new file mode 100644 index 0000000..da427ae Binary files /dev/null and b/resources/audio/部署2.wav differ diff --git a/resources/audio/问候.wav b/resources/audio/问候.wav new file mode 100644 index 0000000..b4eec06 Binary files /dev/null and b/resources/audio/问候.wav differ diff --git a/resources/audio/闲置.wav b/resources/audio/闲置.wav new file mode 100644 index 0000000..be0f142 Binary files /dev/null and b/resources/audio/闲置.wav differ diff --git a/resources/audio/非3星结束行动.wav b/resources/audio/非3星结束行动.wav new file mode 100644 index 0000000..2b765ab Binary files /dev/null and b/resources/audio/非3星结束行动.wav differ diff --git a/resources/notice.json b/resources/notice.json new file mode 100644 index 0000000..d1bc7d9 --- /dev/null +++ b/resources/notice.json @@ -0,0 +1,4 @@ +{ + "content": "公告系统测试中~", + "time": "2025-01-27 17:00" +} \ No newline at end of file diff --git a/resources/version.json b/resources/version.json index 9acd203..4e3d045 100644 --- a/resources/version.json +++ b/resources/version.json @@ -1,8 +1,7 @@ { "main_version": "4.2.1.1", "updater_version": "1.1.0.1", - "announcement": "\n## 新增功能\n- 调度队列上线，支持MAA多开\n## 修复BUG\n- 添加了一堆BUG（确信）\n## 程序优化\n- 界面重构，引入`QFluentWidgets`美化界面", - "notice": "公告系统测试中~", + "announcement": "\n## 新增功能\n- 调度队列上线，支持MAA多开\n- 公告系统上线\n## 修复BUG\n- 添加了一堆BUG（确信）\n## 程序优化\n- 界面重构，引入`QFluentWidgets`美化界面", "proxy_list": [ "", "https://gitproxy.click/",