fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 10:57:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,376 Commits 60 Branches 1,841 Tags
951fa75e15655f0f93d3a72f74dddf643fcac5f5
Commit Graph

2354 Commits

Author SHA1 Message Date
gdlcf88
951fa75e15 Introduce IMainWindowManager and fix the bug of the hotkey not working 2022-10-23 14:14:45 +08:00
MistEO
33a14dd378 fix: 修复基建宿舍未进驻的逻辑，并尽可能将宿舍的人填满 2022-10-23 01:59:03 +08:00
Horror Proton
973d64a113 feat: allow empty confirm list in non-calc_only_task 
fix: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2334
 2022-10-23 00:24:34 +08:00
MistEO
19f4ff80ec feat: 略微延长肉鸽撤退的时间 2022-10-22 21:22:56 +08:00
uye
24b53619b9 feat: DropsItemName默认改为不选择 2022-10-22 21:12:40 +08:00
MistEO
b7c7a43083 fix: 尝试修复外服肉鸽等级识别错误时不招人的问题 2022-10-22 20:59:55 +08:00
uye
125ccb8962 feat: 添加肉鸽主题提示/更新翻译 2022-10-22 20:54:16 +08:00
MistEO
a8f57a2a09 chore: Some clients do not upload drops data to PenguinStats 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2363
 2022-10-22 20:25:52 +08:00
MistEO
89ded9f2c1 Merge pull request #2380 from gdlcf88/hotkeys 
feat: 实现MAA基础热键
 2022-10-22 20:12:44 +08:00
MistEO
2ddba7f54d feat: support drops rec for EN client 2022-10-22 20:04:27 +08:00
Horror Proton
fbe3b4b3e4 feat: add nodiscard 2022-10-22 19:35:14 +08:00
MistEO
9120427650 fix: test caller 2022-10-22 18:10:46 +08:00
MistEO
ad8cc9e0a4 Merge pull request #2353 from MaaAssistantArknights/refactor/break_utils 
refactor: 拆分 `AsstUtils.hpp`
 2022-10-22 16:48:46 +08:00
MistEO
a206754575 fix: 自定义一键强制改变菲亚梅塔的位置，修复技能不生效的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2260
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2335
 2022-10-22 16:46:45 +08:00
MistEO
6c96193f72 fix: 修复基建会客室随时弹出来的线索交流结束导致卡住的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2244
 2022-10-22 16:09:10 +08:00
DavidWang19
e03c184817 fix: 回退为旧版回调函数以提高兼容性 2022-10-21 14:53:20 +01:00
gdlcf88
68910b759b 增加热键修改的 Tips 2022-10-21 21:51:21 +08:00
Horror Proton
543bb05d32 refactor: remove AsstUtils 2022-10-21 21:30:04 +08:00
Horror Proton
59440c7acb refactor: add Time 2022-10-21 21:27:33 +08:00
Horror Proton
f6a7354f4f refactor: move Platform 2022-10-21 21:27:33 +08:00
Horror Proton
77fd1b1186 refactor: move UserDir 2022-10-21 21:27:33 +08:00
Horror Proton
ed8e0b3df1 refactor: add Locale.hpp 2022-10-21 21:27:33 +08:00
Horror Proton
e5f56cb322 refactor: move functions to string misc 2022-10-21 21:27:21 +08:00
gdlcf88
2cc4019779 feat: 实现MAA基础热键 2022-10-21 21:21:43 +08:00
Horror Proton
f05e1ecf85 refactor: move make_rect 2022-10-21 21:17:49 +08:00
zzyyyl
6737267d2d perf: 字符串替换的小优化 2022-10-21 16:46:37 +08:00
zzyyyl
0fe585f731 fix(TaskData): 修复 syntax_check 检查模板类型时无法确定 algorithm 的问题 2022-10-21 16:39:16 +08:00
zzyyyl
2029be5fcc fix(TaskData): 修复一个 with_emplace 的 bug 2022-10-21 16:26:38 +08:00
MistEO
0326465a2d fix: build error 2022-10-21 01:42:14 +08:00
MistEO
559be69a7d feat: 支持企鹅数据的退避策略 2022-10-21 01:29:11 +08:00
DavidWang19
79df443023 Merge pull request #2373 from DavidWang19/feat/logImprove 
feat: 合并本次掉落和掉落统计
 2022-10-20 18:22:36 +01:00
MistEO
11979bf8b0 fix: 修复debug默认下外服加载错误，修复掉落上传服务器错误 2022-10-21 01:08:55 +08:00
MistEO
7a445e8525 fix: 修复肉鸽卡在“误入奇境”的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2367
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2262
 2022-10-21 00:53:51 +08:00
DavidWang19
ab02b4175d feat: 合并本次掉落和掉落统计 2022-10-20 17:38:26 +01:00
MistEO
3a3247cfda fix: 修复一些自定义基建的傻逼操作 2022-10-20 22:39:49 +08:00
MistEO
6ebc2b48c7 fix: 修复基建发电站数量不足时后续操作错误 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2330
 2022-10-20 22:39:31 +08:00
MistEO
e509d36fdc Merge pull request #2365 from wallsman/dev 
doc: JP Add update line
 2022-10-20 20:18:52 +08:00
uye
99eebad482 feat: 当材料选择框为"NotSelected"时不过滤材料列表 2022-10-20 19:26:21 +08:00
uye
ef0cd8efc8 style: 肉鸽加* 
fix #2347
 2022-10-20 19:11:23 +08:00
Wallsman
1946585c1b Doc : Add update line 
Base EN
 2022-10-20 08:45:46 +09:00
MistEO
a63efe1fa9 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-10-18 11:18:05 +08:00
MistEO
f46bb3a03d chore: update translations 2022-10-18 11:17:41 +08:00
MistEO
409fc199e0 Merge pull request #2332 from LittleFall/fix/stop-not-fail 
fix: 修复手动终止任务时有概率出现的“任务出错”
 2022-10-18 00:24:53 +08:00
Horror Proton
f7fefcde9c fix: fix an if branch in asst.py 2022-10-17 20:56:34 +08:00
MistEO
1d3acf411b fix: 修复肉鸽战斗中干员名识别错误时，一直点干员的问题 2022-10-16 22:34:35 +08:00
Zhi Qi
77820b134c fix compile error 2022-10-16 08:24:50 +08:00
Zhi Qi
b450e6f265 fix: 修复手动终止任务时有概率出现的“任务出错” 2022-10-16 08:06:28 +08:00
DavidWang19
cd31802fc7 Revert "fix: 修复了肉鸽战斗时一个导致程序崩溃的问题" 
This reverts commit a687037a36.
 2022-10-15 22:22:39 +01:00
Horror Proton
a421c5c3cb feat: use blue channel image in RoguelikeRecruitImageAnalyzer::match_level 2022-10-15 22:34:37 +08:00
MistEO
9d877b46d9 Merge pull request #2272 from MaaAssistantArknights/refactor/roguelike 
refactor: 重构肉鸽任务并修改回调
 2022-10-15 22:28:00 +08:00