Commit Graph

1912 Commits

Author SHA1 Message Date
uye
bbc5e5fdb8 feat: 添加房贷还款 2023-04-16 01:46:44 +08:00
HeroTch
1e61ddf9e3 feat: 伊内斯效率更新(按8小时计算) 2023-04-15 21:57:55 +08:00
uye
0f066efc32 fix: 修复主播u识别错误 2023-04-15 11:54:12 +08:00
uye
5f815ea83c fix: 修复 U-Official 识别错误
fix #4327
2023-04-15 09:33:29 +08:00
uye
22e71d926a fix: 点两次开始行动导致取消吃理智药
fix #4326
2023-04-15 09:20:48 +08:00
DuKong
5b7591c3fd fix: 肉鸽骑士结局无法自动作战,更新了新地图 2023-04-14 22:52:35 +08:00
vonnoq
93c6d5f98c 繁中服 綠野幻夢活動道具 2023-04-14 00:25:04 +08:00
vonnoq
1ce656a78e 繁中服 綠野幻夢活動導航入口/新角色識別 2023-04-14 00:20:43 +08:00
MistEO
de307da1ff chore: 更新游戏数据 2023/4/13 2023-04-13 22:33:28 +08:00
MistEO
15b76b7268 fix: 修复12章活动期间需要确认两次 & StartButton2偶尔点不上 (#4307)
没票子了,玛丽测测()
2023-04-13 22:29:39 +08:00
Roland
6c39d76f0b Merge branch 'dev' of github.com:Roland125/MaaAssistantArknights into dev 2023-04-13 16:35:33 +08:00
Roland
5529e5921f 将Tasks中CheckConnect检测项目改为OcrDetect
删除原来的模板图片
2023-04-13 16:26:53 +08:00
Roland125
5f4edf8b58 Merge branch 'dev' into dev 2023-04-13 14:26:16 +08:00
Roland
64151b4b78 增加一个网络状况检测的Tasks和Tasks所需的图片 2023-04-13 14:14:26 +08:00
uye
87bb7a2805 chore: StartButton1TryAgain添加baseTask 2023-04-13 14:08:14 +08:00
uye
cf2b1b0c42 feat: 更新内置153基建 2023-04-13 13:50:07 +08:00
uye
a479beea05 fix: 修复12章活动期间需要确认两次 & StartButton2偶尔点不上 2023-04-13 13:30:48 +08:00
MistEO
8deb25f4d9 fix: 修复国服没有的材料在外服识别爆炸的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4290
2023-04-12 20:33:22 +08:00
uye
d70667b8d4 feat: 增加开始行动前置延迟 2023-04-12 16:19:15 +08:00
uye
ea2e0d4ee1 fix: 日服关卡导航问题 #4289 2023-04-12 15:01:06 +08:00
Roland
6ecca25626 根据自定义配置修改订单/产物种类
1、新增根据自定义配置改变贸易站订单/制造站产物的函数
2、新增两个相关的GUILog字符串信息,用于检测产物报错后/切换产物后发送GUI Log信息
3、新增Tasks任务和任务所需要的资源,在1的函数中调用
2023-04-12 11:35:31 +08:00
MistEO
1cbfb53684 feat: 将退出时不释放adb作为独立选项 2023-04-12 00:38:41 +08:00
uye
1a268bf082 fix: 尝试修复资源本6识别无代理 #4278 2023-04-11 13:02:50 +08:00
LingXii
5c8f1b1484 Feat: 新增不期而遇插件,优化招募与战斗策略 (#4241)
feat: 新增不期而遇插件,优化招募与作战策略
2023-04-09 20:28:15 +08:00
MistEO
8e44ad5569 perf: 简化肉鸽编队界面的选中识别 (#4246) 2023-04-09 19:04:59 +08:00
MistEO
2cbe1088d7 fix: 修复部署战斗中部署区识别错误
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4197
2023-04-09 19:03:39 +08:00
Horror Proton
af4850bc87 perf: simplify RoguelikeFormation selected_analyze 2023-04-09 18:50:41 +08:00
MistEO
8ecddf7f0b fix: 尝试修复傀影肉鸽不期而遇死循环的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4220
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4189
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3335
2023-04-09 17:45:41 +08:00
MistEO
56ca2ce531 fix: 修复视频识别职业识别错误,并添加一个兜底措施
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4222
2023-04-09 17:25:57 +08:00
MistEO
2f19f2f162 fix: 修复会客室偶现送完线索卡住的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4232
2023-04-09 16:57:10 +08:00
MistEO
e8687792c4 fix: 规避第十二章三倍掉落被上传的可能性 2023-04-09 16:16:36 +08:00
MistEO
3e6a8344ef revert: 回滚战斗干员标记 模板阈值 2023-04-09 15:19:48 +08:00
MistEO
c889529271 feat: 新增mac差异化阈值 2023-04-08 22:43:25 +08:00
MistEO
3fe24d5a0b Revert "fix: 尝试修复mac上肉鸽编队选中状态识别错误的问题"
This reverts commit dcdb0f0bcd.
2023-04-08 22:35:44 +08:00
MistEO
dcdb0f0bcd fix: 尝试修复mac上肉鸽编队选中状态识别错误的问题 2023-04-08 22:23:33 +08:00
uye
d8cf4318cb chore: 扩大识别区域 2023-04-08 15:16:07 +08:00
uye
276d5fe5bf chore: 替换三星判断条件 2023-04-08 15:13:58 +08:00
uye
07a372af90 fix: 修复多余替换 2023-04-08 13:53:21 +08:00
uye
41c9433cc2 chore: 修改 EpisodeOcrReplace 替换内容 2023-04-08 13:42:45 +08:00
uye
0c1ce42ba9 chore: 添加标注 2023-04-08 13:31:27 +08:00
uye
d4e10e6423 fix: 修复美服主线导航问题 #4226 2023-04-08 13:21:30 +08:00
uye
f714e39f42 fix: 修改主线导航替换文本 #4226 2023-04-08 11:47:57 +08:00
uye
1363505a5c fix: 美服主线导航问题 #4224 2023-04-08 09:27:34 +08:00
MistEO
900de07aaa chore: revert tiles data 2023-04-08 03:07:26 +08:00
Hao Guan
341c54d885 fix: 修复iOS识别不到战斗干员 2023-04-08 04:38:30 +10:00
MistEO
fcfb05feb0 refactor: 重构地图加载逻辑,改为惰性加载 2023-04-08 01:58:09 +08:00
uye
923a15f37e fix: 美服主线关卡识别问题
fix #4216
2023-04-08 00:10:38 +08:00
MistEO
fa1b52afb9 chore: 移除“中坚信物”
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/4210
2023-04-07 23:50:34 +08:00
zzyyyl
2237c0c46a feat: 添加主线第十二章导航
close https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4208
2023-04-07 17:09:56 +08:00
MistEO
c777a8ce4c feat: 新增一个不释放adb的连接选项
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3264
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1413
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4165
2023-04-06 23:04:32 +08:00