fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 17:57:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,491 Commits 61 Branches 1,837 Tags
1ff20bf31cd2daaad2ecbcc825965e856fdcd60e
Commit Graph

2491 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zzyyyl
1ff20bf31c fix: 修复B服卡在隐私协议条款确认界面的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1257
 2022-07-21 11:56:41 +08:00
MistEO
b1caf8b68d docs: update docs about overseas 2022-07-21 11:22:15 +08:00
Qi Chu
d7ae2d552e feat: EN roguelike (#1242) 
* Update tasks.json

* add screenshots

* add ^ $ to some operator names

* Add files via upload

* Add files via upload

* Add files via upload
 2022-07-21 11:17:22 +08:00
MistEO
c70cd90040 docs: 更新CHANGELOG v4.1.0-beta.3 2022-07-21 00:13:05 +08:00
MistEO
21aa232b50 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-21 00:12:08 +08:00
MistEO
598b60c184 fix: 修复肉鸽一直朝右的问题，顺便优化一些代码 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1253

link to https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/1215
 2022-07-21 00:12:03 +08:00
ABA2396
66578e8d2b doc: 关闭作业一群加群链接入口 2022-07-20 23:33:33 +08:00
ABA2396
69486dd77c feat: 关闭作业一群加群链接入口 2022-07-20 23:30:27 +08:00
MistEO
b8810f1ef4 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev v4.1.0-beta.2 2022-07-20 23:27:05 +08:00
MistEO
c2cd025585 docs: 更新CHANGELOG 2022-07-20 23:27:00 +08:00
MistEO
507f34be11 docs: 更新changelog 2022-07-20 23:26:28 +08:00
MistEO
aab6edc314 fix: 删除一个多余的肉鸽识别项 
但并没有什么影响
 2022-07-20 23:22:01 +08:00
MistEO
15c2b67663 Merge pull request #1256 from horror-proton/test/collect_credit 
修复加载信用商店内容卡顿导致的收取信用失败
 2022-07-20 23:17:13 +08:00
MistEO
b64b790238 chore: 整理 filter 2022-07-20 23:10:55 +08:00
Horror Proton
7899d89a15 fix: 修复加载信用商店内容卡顿导致的收取信用失败 2022-07-20 23:01:10 +08:00
ABA2396
132428a097 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-20 22:46:41 +08:00
ABA2396
fcf7b3dc0f fix: 修复某些单字替换问题 2022-07-20 22:46:10 +08:00
MistEO
012570916c fix: 修复偶现掉落识别错误 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1245
 2022-07-20 21:42:17 +08:00
Horror Proton
31b2e54fea fix: remove a C++20 constexpr 2022-07-20 18:40:33 +08:00
zzyyyl
5d9821d979 perf: 注释掉一行没用到的代码，修正错别字 2022-07-20 18:15:47 +08:00
ABA2396
36cf3b9449 feat: 增加选择作业后的提示 2022-07-20 16:29:03 +08:00
ABA2396
bbdc106d00 feat: 调整 自动战斗 Beta 的小提示 2022-07-20 16:15:48 +08:00
MistEO
3e85aacdb5 refactor: 调整 TaskData::get 接口返回模板类型 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1243
 2022-07-20 14:42:24 +08:00
zzyyyl
2da2533220 fix: 修复日服一些数字识别错误 2022-07-20 11:05:11 +08:00
MistEO
6a1022782e Merge pull request #1241 from zzyyyl/fix/rogue 
fix: 修复日服肉鸽一些识别问题
 2022-07-20 10:52:17 +08:00
zzyyyl
6201b0823b fix: 修复日服一些 OcrReplace 2022-07-20 10:18:38 +08:00
zzyyyl
9a94562c33 fix: 修复日服一些 OcrReplace 2022-07-20 10:18:38 +08:00
zzyyyl
da5fa2a882 style: Use spaces instead of tabs 2022-07-20 10:17:37 +08:00
MistEO
8387be47e8 fix: 修复一些数字识别错误 2022-07-20 10:11:06 +08:00
MistEO
32b8cfe6d3 fix: 再次修复肉鸽识别干员等级时的崩溃问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1237
 2022-07-20 09:57:49 +08:00
ABA2396
c1362597fe fix: 风笛识别错误 2022-07-20 00:07:09 +08:00
MistEO
178f375fd1 docs: 更新CHANGELOG v4.1.0-beta.1 2022-07-19 23:45:03 +08:00
MistEO
429402fd67 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-19 23:36:19 +08:00
MistEO
57124714a4 Merge branch 'master' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-19 23:36:12 +08:00
natt3
9c3daea477 feat: 更新日服無限刷肉鴿功能 (#1233) 
* 更新日服無限刷肉鴿功能

* 更新日服無限刷肉鴿功能

* 更新日服無限刷肉鴿功能

* 更新日服無限刷肉鴿功能
 2022-07-19 23:35:31 +08:00
MistEO
4eaaaac7e0 style: make resource formatted 2022-07-19 22:51:54 +08:00
zzyyyl
72edaf786c Revert "feat: 在不勾选吃理智药的情况下不能修改吃石头" 
This reverts commit 1d92fd2174.
 2022-07-19 21:59:30 +08:00
MistEO
2b9681ea06 sytle: 界面加个小提示 2022-07-19 21:35:38 +08:00
MistEO
320199e5de fix: 再次调整下肉鸽的一个roi 2022-07-19 19:03:55 +08:00
MistEO
ed2854249d fix: 修复一个肉鸽模板roi的问题 2022-07-19 19:01:27 +08:00
ABA2396
ce9dceee07 docs: update readme-en 2022-07-19 17:51:05 +08:00
MistEO
194becd854 Merge pull request #1230 from MaaAssistantArknights/dev 
docs: 更新 changelog
 2022-07-19 17:28:36 +08:00
MistEO
583c0c13d2 docs: 更新 changelog 2022-07-19 17:27:50 +08:00
MistEO
8edfee98a2 Merge pull request #1228 from MaaAssistantArknights/dev 
Release v4.0.8
v4.0.8 		2022-07-19 17:15:30 +08:00
MistEO
fa03911181 Merge pull request #1229 from MaaAssistantArknights/master 
fix merge error
 2022-07-19 17:14:45 +08:00
MistEO
5faf195dce Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-19 17:12:01 +08:00
MistEO
f5e722688d chore: 更新 未尽篇章 关卡资源 2022-07-19 17:11:05 +08:00
MistEO
b6b13e292d Merge pull request #1205 from Tastror/master 
为不保存至配置文件的选项添加*号
 2022-07-19 17:08:13 +08:00
MistEO
f5a3bbe8d2 Merge pull request #1225 from zzyyyl/fix/trayicon 
fix: 修复完成任务后的退出不会销毁托盘的问题
 2022-07-19 17:06:33 +08:00
Horror Proton
6ca9a691be fix: a const qualifier in asst::Point 2022-07-19 13:48:46 +08:00