Commit Graph

417 Commits

Author SHA1 Message Date
DLmaster361
5db9d934b2 fix: 修复更新器使用mirrorc下载时删除已弃用的文件卡死 2025-04-20 11:07:41 +08:00
DLmaster361
5c8eebf12c fix: 清理debug时的print 2025-04-20 00:18:31 +08:00
DLmaster361
e725f6d2b2 Merge branch 'main' into dev 2025-04-20 00:05:17 +08:00
DLmaster361
494b655156 Merge branch 'dev' v4.3.4-beta.2 v4.3.4-beta.3 v4.3.4-beta.4 v4.3.4-beta.5 v4.3.4-beta.6 v4.3.4-beta.7 2025-04-20 00:02:42 +08:00
DLmaster361
2940f2557c Merge branch 'DLMS_dev' into dev 2025-04-20 00:02:25 +08:00
DLmaster361
5e4660670f chore: 性能优化
- 调度队列历史记录归入配置类管理
- 添加.gitignore
- 工作流删除冗余部分
- 自动代理与人工排查结束后MAA恢复到全局配置 #40
- 网络相关操作由子线程执行
2025-04-20 00:01:49 +08:00
e8d592ae76 refactor(app): 优化关卡掉落物品正则匹配 2025-04-16 16:58:22 +08:00
DLmaster361
97ea51df59 docs: README链接修复 2025-04-16 11:23:24 +08:00
DLmaster361
986061dc97 Merge branch 'DLMS_dev' into dev 2025-04-15 22:34:52 +08:00
DLmaster361
fe1910d16f fix: 修正部分配置项文案 2025-04-15 22:34:37 +08:00
DLmaster361
63cb1aaa74 feat: 自动代理流程优化 2025-04-15 22:15:59 +08:00
49ebd50077 refactor(ui): 优化模拟器老板键设置卡片的提示文本 2025-04-14 16:04:53 +08:00
DLmaster361
4a6f874210 fix: request 添加超时限制 2025-04-14 15:03:29 +08:00
DLmaster
9394c7a9c5 Merge branch 'dev' v4.3.4-beta.1 v4.3.3 2025-04-13 16:52:12 +08:00
DLmaster
7e502420fa fix: 修复更新器无法下载MAA的异常 2025-04-13 16:46:54 +08:00
DLmaster
12f4b764de Merge branch 'dev' v4.3.2 2025-04-13 02:50:34 +08:00
DLmaster
4da4b7d552 fix: 发布到stable 2025-04-13 02:50:23 +08:00
DLmaster
d38abbbaa0 Merge branch 'dev' v4.3.1-beta.1 2025-04-13 00:46:14 +08:00
DLmaster
67bf7f649e fix(utils): 改回单文件打包 2025-04-13 00:45:47 +08:00
DLmaster
acb35403b0 Merge branch 'main' into dev 2025-04-12 23:10:19 +08:00
DLmaster
7d5dccc649 fix(ui): 修复更新器无法启动的异常 2025-04-12 23:09:47 +08:00
DLmaster
a7e0e7b217 Merge branch 'dev' v4.3.1 2025-04-12 21:11:25 +08:00
DLmaster
9ce75b2dda fix(ci): 规避v4.3.0错误包 2025-04-12 21:11:05 +08:00
DLmaster
d2022819f6 Merge branch 'dev' 2025-04-12 19:03:54 +08:00
DLmaster
c8b342ba01 fix(core): 修复版本号问题 2025-04-12 19:03:39 +08:00
DLmaster
63823d5c89 Merge branch 'dev' v4.3.0 2025-04-12 16:54:03 +08:00
DLmaster
cb17cc32da feat(ci): 发布v4.3.0.0 2025-04-12 16:53:40 +08:00
DLmaster
14d0e6d438 fix(ci): 打包流程修复 2025-04-12 12:08:13 +08:00
DLmaster
878fbad06a fix(ci): 打包流程更正 2025-04-12 10:31:00 +08:00
DLmaster
deb0506163 feat(ui): 添加MirrorChyan购买链接 2025-04-12 09:46:29 +08:00
DLmaster
c4aeb673fd fix(ci): 恢复单文件打包方法 2025-04-12 09:38:34 +08:00
DLmaster
915ee59643 fix(core): 清理临时更新器改为主程序退出时进行 2025-04-12 06:43:43 +08:00
DLmaster
1568e120be Merge branch 'user_dashboard_dev' into dev 2025-04-12 06:18:39 +08:00
DLmaster
d19dd3496d feat(gui): 优化与修复
- 添加用户仪表盘子界面
- 更新逻辑修复
- 获取关卡号,用户密码解密逻辑优化
2025-04-12 06:18:20 +08:00
DLmaster
62c86ce477 feat(ci): 重新激活流程 2025-04-11 21:06:35 +08:00
DLmaster
c727eddc54 fix(ci): 添加写权限 v4.2.5-beta.10 2025-04-11 20:56:40 +08:00
DLmaster
9c946ef6dc feat(ci): 适配最新打包代码 2025-04-11 19:10:59 +08:00
DLmaster
38a04fc4b2 Squashed commit of the following:
commit 8724c545a8af8f34565aa71620e66cbd71547f37
Author: DLmaster <DLmaster_361@163.com>
Date:   Fri Apr 11 18:08:28 2025 +0800

    feat(core): 预接入mirrorc

commit d57ebaa281ff7c418aa8f11fe8e8ba260d8dbeca
Author: DLmaster <DLmaster_361@163.com>
Date:   Thu Apr 10 12:37:26 2025 +0800

    chore(core): 基础配置相关内容重构

    - 添加理智药设置选项 #34
    - 输入对话框添加回车键确认能力 #35
    - 用户列表UI改版升级
    - 配置类取消单例限制
    - 配置读取方式与界面渲染方法优化

commit 710542287d04719c8443b91acb227de1dccc20d0
Author: DLmaster <DLmaster_361@163.com>
Date:   Fri Mar 28 23:32:17 2025 +0800

    chore(core): search相关结构重整

commit 8009c69236655e29119ce62ff53a0360abaed2af
Merge: 648f42b 9f88f92
Author: DLmaster <DLmaster_361@163.com>
Date:   Mon Mar 24 15:31:40 2025 +0800

    Merge branch 'dev' into user_list_dev
2025-04-11 18:57:10 +08:00
bded794647 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	.github/workflows/build-app.yml
#	.github/workflows/build-pre.yml
#	app/core/config.py
2025-04-11 10:37:21 +08:00
AoXuan
539cb1de99 Merge pull request #37 from 134820134820/fix(config)-修复统计关卡掉落错误
fix(config):修复相同战斗关卡的掉落物累加问题
v4.2.5-beta.9
2025-04-11 10:22:53 +08:00
2e9ff47dbb fix(config): 移除了剿灭模式的特殊处理逻辑、优化累加掉落数据的效率 2025-04-11 10:18:42 +08:00
MistEO
c01079af1b ci: add mirrorchyan uploading (#38)
* Create mirrorchyan.yml

* Merge pull request #1 from MistEO/patch-2

* Update build-app.yml

* Update build-pre.yml
2025-04-11 09:09:04 +08:00
Dave-Desktop
cca1acb6f6 fix(config):修复相同战斗关卡的掉落物累加问题 2025-04-11 02:12:14 +10:00
DLmaster
d7e502e22f fix(ui): 对win10主题进一步适配 2025-04-09 11:22:50 +08:00
DLmaster
bbeab360bc Merge pull request #36 from Nether-Dream/dev
对主题代码优化,使其尽量适配Win10
2025-04-09 11:08:51 +08:00
Nether-Dream
a78b7fdb29 对主题代码优化,使其尽量适配Win10
因为是Win10环境修改,需要Win11用户进行测试
2025-04-09 10:33:34 +08:00
273fbe2261 fix(MAA): 修复技巧概要·卷1等技能书不能被掉落统计正确统计。 2025-03-26 14:26:06 +08:00
ba9855c616 fix(notify): 修复 ServerChan 消息推送的一个多余的字母 2025-03-25 14:41:18 +08:00
c54f894f4f fix(notify): 修复 ServerChan 消息换行显示异常问题 2025-03-25 14:14:06 +08:00
DLmaster
9f88f92ec0 Merge branch 'notification_dev' into dev 2025-03-24 15:07:07 +08:00