fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 10:32:19 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,460 Commits 61 Branches 1,840 Tags
0f60226522a28ff580ef72b8f684794de95c660e
Commit Graph

2420 Commits

Author SHA1 Message Date
DavidWang19
f2788a3463 feat: 合并本次掉落和掉落统计 2022-10-20 17:38:26 +01:00
MistEO
eb8f173ade fix: 修复一些自定义基建的傻逼操作 2022-10-20 22:39:49 +08:00
MistEO
b285b76b36 fix: 修复基建发电站数量不足时后续操作错误 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2330
 2022-10-20 22:39:31 +08:00
MistEO
9ff1d67c87 Merge pull request #2365 from wallsman/dev 
doc: JP Add update line
 2022-10-20 20:18:52 +08:00
uye
931324e8a0 feat: 当材料选择框为"NotSelected"时不过滤材料列表 2022-10-20 19:26:21 +08:00
uye
123bfe363b style: 肉鸽加* 
fix #2347
 2022-10-20 19:11:23 +08:00
Wallsman
5c5cccc75a Doc : Add update line 
Base EN
 2022-10-20 08:45:46 +09:00
MistEO
f3a24449ec Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-10-18 11:18:05 +08:00
MistEO
3708c09749 chore: update translations 2022-10-18 11:17:41 +08:00
MistEO
d7594001c6 Merge pull request #2332 from LittleFall/fix/stop-not-fail 
fix: 修复手动终止任务时有概率出现的“任务出错”
 2022-10-18 00:24:53 +08:00
Horror Proton
887dde6bb0 fix: fix an if branch in asst.py 2022-10-17 20:56:34 +08:00
MistEO
fb9667941e fix: 修复肉鸽战斗中干员名识别错误时，一直点干员的问题 2022-10-16 22:34:35 +08:00
Zhi Qi
68bbb22fe6 fix compile error 2022-10-16 08:24:50 +08:00
Zhi Qi
8bb4f64ae2 fix: 修复手动终止任务时有概率出现的“任务出错” 2022-10-16 08:06:28 +08:00
DavidWang19
6ab371a7da Revert "fix: 修复了肉鸽战斗时一个导致程序崩溃的问题" 
This reverts commit 5871f80af7.
 2022-10-15 22:22:39 +01:00
Horror Proton
ef7e62570e feat: use blue channel image in RoguelikeRecruitImageAnalyzer::match_level 2022-10-15 22:34:37 +08:00
MistEO
0bcfbad87a Merge pull request #2272 from MaaAssistantArknights/refactor/roguelike 
refactor: 重构肉鸽任务并修改回调
 2022-10-15 22:28:00 +08:00
MistEO
b21d0da75a build: Modify CI product name and remove unneeded files from the product package 2022-10-15 22:24:37 +08:00
MistEO
9d4514f44a Merge pull request #2306 from hguandl/feat/macos-app 
feat: 构建 macOS App
 2022-10-15 21:15:58 +08:00
zzyyyl
6e039269e1 perf: 修改部分任务名 2022-10-15 16:32:50 +08:00
zzyyyl
ec21bc401a fix: 修复回调 2022-10-15 16:32:50 +08:00
MistEO
7480808ba7 chore: 删除肉鸽切换主题时的重启提示 2022-10-15 16:32:49 +08:00
MistEO
9691bf975c perf: 统一定义肉鸽主题状态字段 2022-10-15 16:32:49 +08:00
zzyyyl
4cd019a724 feat: 加点日志 
Co-authored-by: MistEO <mistereo@hotmail.com>
 2022-10-15 16:32:49 +08:00
zzyyyl
af4bc4a538 perf: std::move string 
Co-authored-by: MistEO <mistereo@hotmail.com>
 2022-10-15 16:32:49 +08:00
zzyyyl
e9ddaba387 refactor: 重构肉鸽资源加载逻辑和任务流程 2022-10-15 16:32:49 +08:00
zzyyyl
30332b37e0 fix: 修复笔误 2022-10-15 16:32:49 +08:00
MistEO
630cb852f7 perf: 优化任务参数设置 2022-10-15 16:32:49 +08:00
zzyyyl
ef8c07e026 fix: 修复任务特化时 next 等不带前缀的问题 2022-10-15 16:32:48 +08:00
zzyyyl
738b6f928c feat: 增加一些模板任务生成逻辑 
除了 template，其余参数若留空则生成时继承模板任务的参数

Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
 2022-10-15 16:32:40 +08:00
Hao Guan
13b23e8691 feat: App for macOS 2022-10-15 04:45:28 +10:00
DavidWang19
5871f80af7 fix: 修复了肉鸽战斗时一个导致程序崩溃的问题 2022-10-14 19:27:44 +01:00
MistEO
b1fa5754b1 fix: 修复肉鸽没部署也可能识别到cooling干员的问题 2022-10-15 02:22:40 +08:00
MistEO
f311d86628 perf: 优化肉鸽一个没啥用的逻辑 2022-10-15 01:49:52 +08:00
MistEO
fc08cb98ec Merge pull request #2297 from DavidWang19/fix/removeNL 
fix: 移除长夜临光关卡选择
 2022-10-15 00:55:52 +08:00
Horror Proton
ff613d6c1c fix: 公开招募 tag 识别失败后跳过 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2299
 2022-10-13 22:22:25 +08:00
zzyyyl
9dfd239a25 fix: 处理 verify 问题 2022-10-13 14:30:32 +08:00
zzyyyl
7c95b49005 fix: 修复 reduce_other_times 不能正常工作的问题 
perf: 优化回调处理

Co-authored-by: MistEO <mistereo@hotmail.com>
 2022-10-13 14:30:24 +08:00
zzyyyl
b0cfc3d225 style: format 2022-10-13 14:15:46 +08:00
DavidWang19
3eb01b3356 fix: 移除长夜临光关卡选择 2022-10-12 22:51:49 +01:00
MistEO
36e750b57e Merge pull request #2289 from DavidWang19/fix/roguefight 
fix: 修复了远程/近战位干员无空位时不能部署任何干员的问题
 2022-10-12 01:20:55 +08:00
DavidWang19
e1740a3b40 fix: 修复了远程/近战位干员无空位时不能部署任何干员的问题 2022-10-11 18:14:54 +01:00
MistEO
5553112db3 feat: 肉鸽通关时截个图 2022-10-12 00:47:51 +08:00
MistEO
321f4d6816 fix: 修复偶现OCR多一个空格的问题 2022-10-11 23:46:20 +08:00
MistEO
aff8b932d6 fix: 修复肉鸽关卡名识别错误 2022-10-11 23:46:10 +08:00
MistEO
d9eb81c6e8 fix: 修复水月肉鸽中，排异反应干员无法识别的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2177
 2022-10-11 23:03:55 +08:00
MistEO
66beddc896 fix: 修复肉鸽骰子乱放的问题 2022-10-11 20:40:35 +08:00
MistEO
0936704e54 fix: 修复肉鸽选技能太快卡在开始行动界面的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2280
 2022-10-11 20:15:28 +08:00
MistEO
d521015db3 perf: 优化会客室使用线索的逻辑 2022-10-11 19:58:17 +08:00
MistEO
1f750ef965 fix: 修复唤醒任务会返回主界面的问题 2022-10-11 19:42:17 +08:00