fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 18:01:26 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,679 Commits 61 Branches 1,838 Tags
0c8d0944bb883c052d5cfeafd75fdb2277f8d00f
Commit Graph

2679 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dusk_NM02
751dac7c5a feat: 在程序退出时注销任务栏图标 2022-07-14 14:31:06 +08:00
Dusk_NM02
a17b1542a2 perf: 取消了TrayIcon不必要的继承，添加了Close函数清理资源 2022-07-14 14:27:19 +08:00
zzyyyl
42b2eae07b feat: 给字符串替换增加支持一些 map 类型，尽管它们速度较慢 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/1157#pullrequestreview-1038260917
 2022-07-14 13:56:56 +08:00
zzyyyl
f3ed5aa6b7 perf: 使得不满足生存条件的代码无法通过编译，并且加快速度 2022-07-14 09:35:14 +08:00
MistEO
c3f9146422 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-14 01:29:52 +08:00
MistEO
453d5d234b chore: 修改下demo 2022-07-14 01:29:44 +08:00
Liam Sho
d47a747a28 fix: 修复 checksum.txt 未上传至 Release 的问题 2022-07-14 01:17:35 +08:00
MistEO
7f4e5223a4 Merge branch 'master' into dev v4.0.7-beta.1 2022-07-14 00:49:38 +08:00
MistEO
42eeea4d5f docs: 更新CHANGELOG 2022-07-14 00:48:45 +08:00
MistEO
b8cdae5402 fix: 修复信用购物黑名单不填写时，不进行购物的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1042
 2022-07-14 00:32:41 +08:00
MistEO
15606a9acf fix: 一定程度上修复卡在 今日配给 界面的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1140
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/974
 2022-07-14 00:24:33 +08:00
MistEO
7fe8e5a49c feat: 新增支持肉鸽没选难度的时候自动选择普通难度 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1108
 2022-07-13 23:58:10 +08:00
MistEO
1b0d16c7f0 feat: 新增支持肉鸽撤退干员后仍超时时，自动放弃当局战斗 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1134
 2022-07-13 23:51:41 +08:00
MistEO
b9321d859b Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-13 23:27:35 +08:00
MistEO
969eaaeec1 fix: 修复基建 bskill_ctrl_lda 技能效率计算错误的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1143
 2022-07-13 23:27:01 +08:00
Alisa
ccfed5ef14 Merge pull request #1079 from MaaAssistantArknights/perf/cicd 
调整 CI 构建和 Release 发包配置
 2022-07-13 22:56:09 +08:00
Liam Sho
21413e30c9 docs: 新增下载防呆提醒 2022-07-13 22:37:43 +08:00
Liam Sho
cace3094be chore: 移除无用的资源文件更新日志 2022-07-13 22:33:34 +08:00
Liam Sho
fc10639710 Merge branch 'dev' into perf/cicd 2022-07-13 22:24:44 +08:00
MistEO
f64381bc2a fix: 修复肉鸽放弃行动时卡住的问题 2022-07-13 21:59:21 +08:00
MistEO
930314267b fix: 修复一个roi错误的问题 2022-07-13 21:51:30 +08:00
MistEO
569958f9b0 fix: 修复任务完成后的休眠选项不可用问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1133
 2022-07-13 21:45:55 +08:00
MistEO
3d85713072 perf: 优化一点界面逻辑 2022-07-13 21:42:19 +08:00
MistEO
2c34417b8d fix: 修复部分设备上点开设置界面的崩溃问题 2022-07-13 21:10:23 +08:00
MistEO
e38e8289af fix: 修复基建会上同效果干员的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1156
 2022-07-13 19:23:08 +08:00
zzyyyl
1e836d87a3 perf: 优化字符串替换 2022-07-13 16:26:01 +08:00
MistEO
41ef4809f3 feat: 自动公招默认次数改为 4 次 
不然总有人问为什么空一个
 2022-07-13 11:23:59 +08:00
MistEO
8eac253f2b docs: fix 加群链接 2022-07-12 22:21:39 +08:00
MistEO
c4223e3abc docs: 更新群号 2022-07-12 22:20:16 +08:00
MistEO
a2131785b6 fix: 修复自动战斗编队直接报错的问题 2022-07-12 19:56:10 +08:00
MistEO
ac313cbd6c Merge pull request #1147 from MaaAssistantArknights/dev 
Release v4.0.6
v4.0.6 		2022-07-12 18:21:47 +08:00
MistEO
89c15192cc docs: 更新changelog 2022-07-12 18:19:05 +08:00
MistEO
78c120212b chore: 更新 7/12 资源，绿野幻梦 EX 关卡等 2022-07-12 18:16:24 +08:00
Liam Sho
991c425601 chore: 移除不必要的枚举 2022-07-12 05:54:26 +08:00
Liam Sho
f55a32185c feat: 更新打包工具 2022-07-12 05:42:19 +08:00
Liam Sho
e557609dc3 Merge branch 'dev' into perf/cicd 2022-07-12 02:15:56 +08:00
Horror Proton
b688542b93 style: fix file mode 2022-07-12 00:40:05 +08:00
MistEO
a0c9c54220 chore: 删掉两个没用上的库 2022-07-12 00:31:48 +08:00
Liam Sho
b34d66a6a9 Merge branch 'dev' into perf/cicd 2022-07-11 23:40:01 +08:00
MistEO
a56cdcb30f Merge pull request #1132 from horror-proton/test/logger_template 
在 log 函数的参数中支持 range-expression
 2022-07-11 20:47:41 +08:00
MistEO
8d6ab22fa5 fix: 修复获取系统版本号的错误 2022-07-11 10:27:28 +08:00
Horror Proton
f441d2d6aa fix: update assertion message 2022-07-11 02:15:50 +08:00
Horror Proton
5a427767b9 feat: support range-expressions in log argument 2022-07-10 22:40:49 +08:00
Horror Proton
09a4f13a78 fix: add a left branch 2022-07-10 21:19:14 +08:00
MistEO
85ef8ea149 Merge pull request #1130 from horror-proton/test/logger_tweak 
对 Logger 的一些修改
 2022-07-10 14:09:14 +08:00
MistEO
e11b215949 perf: 优化分辨率获取方式 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1105
 2022-07-10 14:02:18 +08:00
MistEO
6423465108 fix: 将额外的短程滑动改为向上滑，并重构小部分代码 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1129
 2022-07-10 13:38:29 +08:00
Horror Proton
6ab3cd8548 fix. match arg types of printf 2022-07-10 13:32:33 +08:00
MistEO
11d9dd3fbf fix: 修复资源更新工具会让基建技能名重复的问题 2022-07-10 12:23:15 +08:00
Horror Proton
a0e6ea3bb8 fix: remove extra space in log, reopen stream after failure 2022-07-10 11:21:57 +08:00