Compare commits

...

384 Commits

Author SHA1 Message Date
MistEO
023d3685fc Merge pull request #1394 from MaaAssistantArknights/dev
Release v4.2.0-beta.1
2022-07-31 21:41:57 +08:00
MistEO
35e513deda docs: 更新 CHANGELOG 2022-07-31 21:41:33 +08:00
MistEO
9f9dda00ae perf: 调整肉鸽招募优先级 2022-07-31 21:32:19 +08:00
lhhxxxxx
2199112a39 fix. update .gitignore 2022-07-31 21:16:26 +08:00
lhhxxxxx
0afff07787 style. typo大修正 2022-07-31 20:47:58 +08:00
MistEO
43219f31b9 fix: 修复运行报错 2022-07-31 20:39:48 +08:00
MistEO
9737aa38c5 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-31 20:32:13 +08:00
MistEO
490b4a5da7 feat: 肉鸽商店购物支持按稀有度计算具体的晋升等级,修改相关资源及解析 2022-07-31 20:31:59 +08:00
Helloworld
4cee6f208b Merge pull request #1393 from MaaAssistantArknights/docs/doc
docs: 漏网之鱼
2022-07-31 20:26:13 +08:00
MistEO
3ce039cc87 feat: 召唤不要首选令了 2022-07-31 20:18:42 +08:00
Helloworld
8694ab0c5d docs: 漏网之鱼 2022-07-31 20:18:38 +08:00
MistEO
6f4ca63076 feat: 简单加个肉鸽商店是否买个晋升类物品的判断逻辑 2022-07-31 20:16:26 +08:00
MistEO
13fd3d48b7 Merge pull request #1385 from horror-proton/test/recruit_mech
自动公招相关的调整
2022-07-31 20:11:13 +08:00
Helloworld
b726323c02 Merge pull request #1390 from MaaAssistantArknights/docs/i18n
i18n: 修正笔误
2022-07-31 20:09:43 +08:00
Helloworld
8f1e487548 i18n: 修正笔误 2022-07-31 19:37:07 +08:00
lhhxxxxx
9827d8b78f Merge pull request #1389 from MaaAssistantArknights/docs/doc
添加文档注释
2022-07-31 19:31:24 +08:00
Helloworld
022bdb0076 Merge branch 'dev' into docs/doc 2022-07-31 19:24:05 +08:00
lhhxxxxx
93383c3126 Merge remote-tracking branch 'origin/dev' into dev 2022-07-31 18:50:58 +08:00
lhhxxxxx
2d642fc7c5 style. 部分typo修正及翻译修正 2022-07-31 18:50:31 +08:00
uye
eb289b5695 feat: 重新添加源石锭额外掉落藏品的属性 2022-07-31 18:32:19 +08:00
uye
00396b3ca4 feat: 更新肉鸽商店购买列表 2022-07-31 18:23:35 +08:00
Helloworld
cb6d772c85 docs: UserControl 2022-07-31 17:43:00 +08:00
zzyyyl
b58e86263d style: 对齐一下被 code tidy 打乱的注释 2022-07-31 17:39:57 +08:00
Helloworld
29f9d865e4 docs: Bootstrapper 2022-07-31 17:38:16 +08:00
Helloworld
a8afd335ee docs: ViewModels 2022-07-31 17:32:56 +08:00
zzyyyl
221a56062a fix: 修复 c++17 没有但是 c++20 有的 errors 2022-07-31 16:43:45 +08:00
Helloworld
eaec55c0b6 docs: Helper 2022-07-31 16:43:13 +08:00
MistEO
7dfea3d416 perf: 优化肉鸽购物逻辑,将职业改为数组,并新增 chars 字段 2022-07-31 16:20:55 +08:00
Helloworld
83c265d8e0 docs: AsstProxy 2022-07-31 16:13:26 +08:00
Helloworld
adb299a948 修复格式 2022-07-31 15:34:17 +08:00
MistEO
be3d7656ef fix: 增加一下额外滑动距离,不知道对基建误触有没有改善 2022-07-31 15:29:33 +08:00
MistEO
e8c49c6d1b Merge pull request #1387 from et2012/dev
feat: 肉鸽招募券支持翻页
2022-07-31 15:14:58 +08:00
MistEO
22bfecdedd fix: 修复肉鸽干员重复开技能的问题 2022-07-31 14:56:16 +08:00
MistEO
039b3ef3e7 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-31 14:48:28 +08:00
MistEO
512cc97d55 fix: 修复肉鸽信用商店购买完招募相关物品后直接离开商店的问题 2022-07-31 14:48:20 +08:00
lhhxxxxx
f1b676f58e style. use _v instead of ::value 2022-07-31 13:15:35 +08:00
lhhxxxxx
d9039f0dc7 style. typo fix 2022-07-31 13:09:22 +08:00
uye
cd8dcf973c fix: 修复一个笔误引起的提示错误 2022-07-31 12:42:44 +08:00
et
965ac5d525 feat: 肉鸽招募券支持翻页 2022-07-31 12:36:40 +08:00
Horror Proton
683332b3cb fix: update auto recruit mech 2022-07-31 10:53:04 +08:00
Horror Proton
855f214d75 perf: use functional tools in recruit config 2022-07-31 10:51:25 +08:00
lhhxxxxx
de288b8759 Merge pull request #1374 from lhhxxxxx/dev
Code Tidy
2022-07-31 03:20:24 +08:00
MistEO
1f8cad0cc6 Merge pull request #1384 from MaaAssistantArknights/dev
Release v4.2.0-alpha.4
2022-07-31 03:10:27 +08:00
MistEO
ef9069eab8 docs: 更新CHANGELOG 2022-07-31 03:10:07 +08:00
MistEO
5002b7504d style: 傻逼VS怎么又给我瞎格式化 2022-07-31 03:03:10 +08:00
MistEO
3c6b822fc6 feat: 支持肉鸽商店根据当前已有干员区分是否购买;支持购买金酒之杯后不再额外消耗源石锭 2022-07-31 03:01:56 +08:00
MistEO
4efa10a37c fix: 修复肉鸽商店购买收藏品时卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1380
2022-07-31 01:04:11 +08:00
MistEO
5056d6a86b perf: 调整肉鸽干员的技能 2022-07-31 01:04:11 +08:00
lhhxxxxx
cdc98eefe8 Merge remote-tracking branch 'myfork/dev' into dev 2022-07-30 18:25:32 +08:00
lhhxxxxx
a579d8b944 perf. c++ code tidy
style. typo fixed
2022-07-30 18:24:31 +08:00
lhhxxxxx
cdb2238e5b Merge remote-tracking branch 'origin/dev' into dev 2022-07-30 18:22:10 +08:00
lhhxxxxx
e7658a83a2 Merge remote-tracking branch 'origin/dev' into dev 2022-07-30 18:21:33 +08:00
Horror Proton
6cf5bf0e01 fix: remove a fake error in auto recruit task 2022-07-30 15:57:20 +08:00
MistEO
5565d5ad0a fix: 修复战斗中干员 cooling 状态偶现识别错误问题 2022-07-30 15:55:17 +08:00
zzyyyl
d134905e4f fix: 修复公招文本 出现错误 的本地化问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1379
2022-07-30 15:45:27 +08:00
uye
9fcedbab66 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-30 10:22:57 +08:00
uye
cf124965d7 feat: 添加连接设置提示 2022-07-30 10:20:05 +08:00
uye
a417152a6b feat: 更新作业群 2022-07-30 10:06:37 +08:00
Horror Proton
874e06ccb8 fix: fix wrong behavior when recruit permit ran out 2022-07-30 10:01:59 +08:00
lhhxxxxx
2f5bc53544 revert. add asst:: 2022-07-30 06:18:55 +08:00
lhhxxxxx
5658a630bd revert. add asst:: 2022-07-30 06:18:47 +08:00
lhhxxxxx
cc17d30e9f revert. add std:: 2022-07-30 06:18:25 +08:00
lhhxxxxx
35b91cd217 revert. delete [[nodiscard]] 2022-07-30 06:11:56 +08:00
lhhxxxxx
8a3c5c37da Merge remote-tracking branch 'origin/dev' into dev_
# Conflicts:
#	src/MeoAsstGui/ViewModels/VersionUpdateViewModel.cs
2022-07-30 05:33:11 +08:00
lhhxxxxx
af1c051522 perf. c++ code tidy 2022-07-30 05:31:19 +08:00
MistEO
5168abf0c8 perf: 优化肉鸽压轴登场摆放 2022-07-30 05:04:20 +08:00
MistEO
780e1487fe Merge branch 'dev' 2022-07-30 03:06:49 +08:00
MistEO
b91a3f1812 fix: 修复自选干员重装和术师不选的问题 2022-07-30 03:04:38 +08:00
MistEO
ccd7a34ceb Merge pull request #1372 from MaaAssistantArknights/dev
Release v4.2.0-alpha.2
2022-07-30 02:37:30 +08:00
MistEO
b6c0a7dc6f docs: 更新CHANGELOG 2022-07-30 02:36:47 +08:00
MistEO
147b87c187 fix: 修复界面检查更新错误 2022-07-30 02:36:12 +08:00
zzyyyl
79b26af92c feat: 优化更新时的 Changelog 弹窗样式 (#1373)
* feat: 优化贡献者名字显示

但是好丑

* feat: 换了个玛丽说好看的 Markdown
2022-07-30 02:31:14 +08:00
MistEO
09df3c902f feat: 肉鸽下干员等等费用,不急着下 2022-07-30 02:30:55 +08:00
MistEO
5d2935b005 feat: 肉鸽不在需求内的干员排个序(招精二也要优先招等级高的!) 2022-07-30 01:32:38 +08:00
MistEO
7ae266e245 perf: 调整肉鸽一些阈值参数等 2022-07-30 01:18:51 +08:00
MistEO
94a96f7abc fix: 修复肉鸽干员优先级排序错误 2022-07-30 01:18:36 +08:00
MistEO
519dd4b4e1 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-30 00:34:06 +08:00
MistEO
b2cde7665a fix: 修复自定义干员不选的问题,修复临时招募的精二干员不选的问题 2022-07-30 00:33:59 +08:00
MistEO
88fc9ef6fb fix: 修复肉鸽第二次进入商店无法投资时,任务失败的问题 2022-07-30 00:23:37 +08:00
Horror Proton
ba23af1588 fix: fix post processing for recruit min level 2022-07-30 00:10:09 +08:00
lhhxxxxx
61a5d5ba7a Merge pull request #1370 from lhhxxxxx/dev
style. fix typo
2022-07-30 00:05:34 +08:00
lhhxxxxx
1c7ef396c2 perf. c# code tidy
style. typo fixed
2022-07-30 00:00:45 +08:00
MistEO
04e2723611 fix: 将肉鸽商店购买改成子串匹配即可,防止一些识别错误 2022-07-29 23:35:27 +08:00
lhhxxxxx
a39fec7c37 style. fix typo 2022-07-29 23:01:27 +08:00
MistEO
d91a5439dc style: 添加一个界面小提示 2022-07-29 22:59:56 +08:00
MistEO
56ac2ae2aa Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-29 22:40:31 +08:00
MistEO
c1f4e7f33e fix: 尝试修复肉鸽购买收藏品干员时卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1364
2022-07-29 22:40:15 +08:00
MistEO
66a1a28d55 fix: 修复肉鸽收藏品购买时卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1367
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1363
2022-07-29 22:23:28 +08:00
Helloworld
e03282772c docs: README 居中 2022-07-29 22:01:43 +08:00
Helloworld
c9bdde497e docs: 一些小细节 2022-07-29 22:00:29 +08:00
Helloworld
208200e112 docs: README ja-jp 2022-07-29 21:54:47 +08:00
Helloworld
b8e63a1223 styling: C# 代码格式化 (#1368)
* Add stylecop package

* Reset .editorconfig

* Suppress unnecessary rules

* Replace header

* Fix AsstProxy

* styling: 格式化剩余的文件

* 啊,不对,这才是组织名

* 修复格式
2022-07-29 21:35:35 +08:00
uye
f59f3d5b41 feat: 商店名单支持多种分隔符 2022-07-29 19:34:25 +08:00
uye
576cf6202c style: 修改部分英文描述 2022-07-29 18:20:37 +08:00
MistEO
5fc56281ba Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-29 17:15:35 +08:00
MistEO
89b1a37972 style: fix traslation. 2022-07-29 17:15:13 +08:00
uye
b671be11f4 feat: 更新肉鸽商品购买优先级顺序 2022-07-29 17:13:55 +08:00
MistEO
974933ba73 merge dev 2022-07-29 17:07:45 +08:00
MistEO
c49c61cd08 style: want a drunk? 2022-07-29 17:06:34 +08:00
uye
1ff174084d fix: 修复一个托盘语言设置界面的bug 2022-07-29 16:19:36 +08:00
MistEO
08d16ae05b perf: 优化肉鸽家门替换 2022-07-29 13:38:37 +08:00
uye
9d6079deff style: 稍微糊一下界面 2022-07-29 04:16:07 +08:00
MistEO
2e9ad73b95 fix: 修复肉鸽干员名不全匹配的问题 2022-07-29 02:12:06 +08:00
Liam Sho
94e79032dc chore: revert #1320 2022-07-29 01:46:51 +08:00
MistEO
3e6dbcfc9b Merge pull request #1359 from MaaAssistantArknights/dev
Release v4.2.0-alpha.1
2022-07-29 01:28:40 +08:00
MistEO
209f555a14 Merge pull request #1344 from MaaAssistantArknights/feat/custom_roguelike
feat: custom roguelike
2022-07-29 01:27:36 +08:00
MistEO
985abc7078 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-29 01:27:12 +08:00
MistEO
86ce47b468 docs: update changelog 2022-07-29 01:27:07 +08:00
MistEO
f028e3222b style: add a tip 2022-07-29 01:09:00 +08:00
MistEO
6918225a80 feat: 主页清空按钮也会清掉肉鸽的选择 2022-07-29 01:06:06 +08:00
MistEO
44c599e843 merge: merge dev 2022-07-29 01:05:50 +08:00
MistEO
9ec3b9bb60 feat: 修改界面,适配新肉鸽参数 2022-07-29 00:57:54 +08:00
Alisa
e03f2eed73 Merge pull request #1358 from MaaAssistantArknights/feat/release-simulation
[CI] Release Simulation workflow
2022-07-29 00:55:50 +08:00
MistEO
227a3d2af3 feat: 肉鸽商店支持按优先级购买 2022-07-29 00:37:27 +08:00
bakashigure
6c45b02132 chore: 修改NoAvx包名 2022-07-28 23:53:28 +08:00
Liam Sho
29a1b1fbc3 fix: 修复版本号丢失问题
笨逼操作又来了(
2022-07-28 23:26:05 +08:00
Liam Sho
e8982c78c1 chore: 更新 Workflow 2022-07-28 23:11:43 +08:00
Liam Sho
89381b7926 feat: 支持手动触发构建 Release 包 2022-07-28 23:10:21 +08:00
Helloworld
ece8ec7099 i18n: 修正错字 2022-07-28 22:25:28 +08:00
MistEO
4fa3e60150 perf: 优化肉鸽干员攻击范围计算、及一些部署逻辑等 2022-07-28 22:24:02 +08:00
Helloworld
d090a27275 不好意思忘了加链接了 2022-07-28 21:54:47 +08:00
MistEO
d9837786fb perf: 删除所有肉鸽中不好用的干员 2022-07-28 21:54:42 +08:00
Helloworld
65fa3a89c3 i18n: README zh-TW 2022-07-28 21:50:54 +08:00
Helloworld
3f17fa9027 i18n: 修改README文件后缀 2022-07-28 21:10:38 +08:00
Helloworld
311518a5bf i18n: 一些小修改 2022-07-28 20:52:46 +08:00
Helloworld
4cca3898ae Merge remote-tracking branch 'origin/dev' into dev 2022-07-28 20:47:32 +08:00
Helloworld
aa7502ec5a ko-kr localization (100%) 2022-07-28 20:46:45 +08:00
MistEO
61580ea1c5 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-28 20:36:37 +08:00
MistEO
c9eb0aeb1a fix: 修复会客室传递线索时卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1307
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1175
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/768
2022-07-28 20:36:26 +08:00
MistEO
3cdead1ade Merge pull request #1327 from horror-proton/test/recruit_task
重构公招相关的部分代码
2022-07-28 19:03:22 +08:00
MistEO
c58026055d style: fix translation 2022-07-28 18:49:05 +08:00
ABA2396
4f4b36336a feat: 删除无用的模板图片 2022-07-28 18:01:58 +08:00
ABA2396
825aec81b5 feat: 删除不必要的滑动 2022-07-28 17:56:42 +08:00
ABA2396
60d7055eaf Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-28 17:49:36 +08:00
ABA2396
84130ca426 feat: 支持主线全章节导航 2022-07-28 17:41:29 +08:00
Alisa
d8c1414d98 Merge pull request #1345 from MaaAssistantArknights/fix/release-checksum
修改 Checksum 的计算方式
2022-07-28 17:30:07 +08:00
ABA2396
839b5234b5 fix: 修复一个牛牛引起的错误(x) 2022-07-28 16:57:27 +08:00
ABA2396
686836247d feat: Drink drink 2022-07-28 15:34:08 +08:00
uye
3d85a67a00 Update README.md 2022-07-28 12:08:15 +08:00
uye
a4f090d68d Update README-en.md 2022-07-28 12:06:48 +08:00
ABA2396
0bdec005f9 style: 肉鸽任务中的拼写错误 2022-07-28 11:45:36 +08:00
ABA2396
d77392365f style: Format XAML again 2022-07-28 11:14:57 +08:00
ABA2396
5d9f9ede24 style: Fromat XAML 2022-07-28 11:05:54 +08:00
ABA2396
5f7df65b0d style: 更改FightSettings控件布局 2022-07-28 10:55:13 +08:00
Liam Sho
12425d2977 fix: 统一 MD5 校验码大小写 2022-07-28 05:14:38 +08:00
Liam Sho
ba4a05b58a feat: 修改 Checksum 文件
fix: #1341
2022-07-28 04:41:24 +08:00
ABA2396
9250f6d2f4 style: GUISetting 2022-07-28 02:31:20 +08:00
ABA2396
0435c9a3da style: StartSetting 2022-07-28 02:08:41 +08:00
ABA2396
52506a76c3 style: ConnectSetting 2022-07-28 02:02:06 +08:00
ABA2396
d798a1f7b2 style: MallSetting 2022-07-28 01:48:54 +08:00
ABA2396
da7fce722b style: AutoRecruitSetting 2022-07-28 01:39:07 +08:00
ABA2396
938ab1308e style: RougleliekSetting (什么奇怪的拼写) 2022-07-28 01:14:27 +08:00
ABA2396
2a2666a35c style: FightSetting 2022-07-28 00:50:19 +08:00
MistEO
8d0b2b1e85 feat: 完成自定义核心干员选择 2022-07-28 00:37:20 +08:00
MistEO
562ede03bf feat: 添加战斗资源读取 2022-07-27 23:15:39 +08:00
Helloworld
012dc56989 Merge remote-tracking branch 'origin/dev' into dev 2022-07-27 23:01:06 +08:00
Helloworld
1ccbfb4622 ko-kr localization (70%) 2022-07-27 23:01:00 +08:00
MistEO
2602eda49c fix: 修复已修改的语言设置显示不正确的问题 2022-07-27 22:42:10 +08:00
MistEO
a018a63bf4 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-27 22:39:16 +08:00
MistEO
77cc6cfaec style: 牛牛喝酒 2022-07-27 22:39:10 +08:00
Helloworld
56d4b99ed9 ko-kr localization (60%) 2022-07-27 22:31:55 +08:00
Helloworld
358aa534f5 ko-kr localization (40%) 2022-07-27 21:51:52 +08:00
Helloworld
b04e72892f ko-kr localization (20%) 2022-07-27 21:04:16 +08:00
Liam Sho
c6b7ce97ba chore: 文件整理 2022-07-27 21:03:54 +08:00
Horror Proton
2b5c38b492 fix: add workaround for issues/1336 2022-07-27 20:58:11 +08:00
Horror Proton
74cef5eee7 perf: remove an unused task, etc. 2022-07-27 20:17:12 +08:00
ABA2396
1eb9d65931 style: 修改美服控件格式 2022-07-27 19:43:29 +08:00
ABA2396
2e8c63ae66 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-27 19:34:00 +08:00
ABA2396
38f11abcaf style: 尝试对齐各版本控件 2022-07-27 19:33:43 +08:00
MistEO
e28ad1744d style: KR, help us! 2022-07-27 19:01:07 +08:00
ABA2396
3a40890603 style: 修改部分翻译描述 2022-07-27 16:52:46 +08:00
ABA2396
ff1a81c3af feat: 添加台服翻譯 2022-07-27 16:17:33 +08:00
ABA2396
5306a54b8f style: 修复copilot界面显示不全的问题 2022-07-27 15:59:26 +08:00
Tastror
0c8d0944bb feat: add ja-jp translation (#1340)
* add ja-jp

* ja-jp debug
2022-07-27 15:40:46 +08:00
MistEO
13088751de Merge pull request #1339 from MistEO/dev-1
fix translation
2022-07-27 14:45:36 +08:00
MistEO
e0330f158f Merge branch 'dev' into dev-1 2022-07-27 14:34:58 +08:00
ABA2396
b2537d0f36 style: en-us 2022-07-27 14:32:56 +08:00
MistEO
befdd26422 style: fix translation 2022-07-27 14:32:02 +08:00
uye
dfc1fdf75f Merge pull request #1338 from cloakWatcher/dev
英文翻译
2022-07-27 14:30:20 +08:00
cloakWatcher
8207b337fa Merge branch 'dev' of https://github.com/cloakWatcher/MaaAssistantArknights into dev 2022-07-27 00:09:08 -06:00
cloakWatcher
8197cde605 添加英文翻译参考 2022-07-27 00:08:27 -06:00
ABA2396
f431303fec style: style了个我也看不懂的东西 2022-07-27 13:58:43 +08:00
ABA2396
4468432c3e fix: xml错误 2022-07-27 13:54:56 +08:00
ABA2396
202bd77b81 fix: 字段名错误 2022-07-27 13:48:02 +08:00
ABA2396
4c67f710ee Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-27 13:31:52 +08:00
ABA2396
e65308e23e feat: 韩语翻译(完全机翻) 2022-07-27 13:31:36 +08:00
MistEO
a5ee4cc447 docs: fix translation 2022-07-27 13:11:47 +08:00
MistEO
539dda5a7d Merge branch 'feature/doc-i18n' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-27 13:09:58 +08:00
MistEO
aef7160c54 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-27 11:26:12 +08:00
MistEO
a6f4bf4d1d style: Add KR and JP language supports, but not complete. And fix some translation 2022-07-27 11:25:54 +08:00
ABA2396
1d5451d3a6 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-27 11:21:09 +08:00
ABA2396
d497f69fee style: 修改一些描述 2022-07-27 11:21:02 +08:00
MistEO
47a2288c12 style: fix a translation 2022-07-27 11:14:16 +08:00
ABA2396
31661912d1 feat: 更改一些英文翻译 2022-07-27 11:13:47 +08:00
MistEO
f13c7b3f41 style: add space 2022-07-27 11:11:56 +08:00
MistEO
5f6da1991f Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-27 11:07:02 +08:00
MistEO
290a1ddd9e style: add some space 2022-07-27 11:06:39 +08:00
ABA2396
826e4e9eb1 fix: 修复一个拼写错误 2022-07-27 11:01:08 +08:00
Horror Proton
91c1eb9513 fix: update recruit retry mech 2022-07-27 10:33:35 +08:00
MistEO
56ddba33b6 feat: 新增战斗中的干员数据 2022-07-27 00:08:24 +08:00
MistEO
0807103c43 feat: 完成肉鸽分队自定义 2022-07-27 00:07:55 +08:00
MistEO
d43a2f74cf Merge branch 'master' into dev 2022-07-26 22:26:19 +08:00
MistEO
42862f7218 Merge pull request #1334 from MaaAssistantArknights/release/v4.1.2
chore: 更新复刻活动 `多索雷斯假日` 关卡资源
2022-07-26 22:25:46 +08:00
MistEO
f3a6ddf844 docs: 更新CHANGELOG 2022-07-26 22:25:11 +08:00
MistEO
fcde190373 fix: 再次修复掉落识别错误 2022-07-26 22:21:10 +08:00
MistEO
098726d145 fix: 简单修复一些击杀数识别错误的问题 2022-07-26 22:20:17 +08:00
Alex Zhang
de32d7e2da fix: fixed linux build errors 2022-07-26 21:39:30 +08:00
MistEO
239303b74c Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-26 21:30:32 +08:00
MistEO
a1e9525206 fix: fix build error on linux again 2022-07-26 21:30:24 +08:00
_ChingC
b4da616c8b Merge commit '3ff908f0d4407ee08d80bbb19ea844fe8fe8fe6c' into dev 2022-07-26 21:25:28 +08:00
_ChingC
26139bf776 fix: 修复一些i18n问题 2022-07-26 21:23:48 +08:00
MistEO
3ff908f0d4 fix: fix build error on Linux 2022-07-26 21:11:08 +08:00
_ChingC
5b3edb2b20 fix: 修复格式化字符串错误 2022-07-26 20:25:05 +08:00
MistEO
782f47f366 fix: 调整掉落识别模板匹配阈值为 0.61 2022-07-26 19:51:52 +08:00
ABA2396
598565902b feat: 增加「多索雷斯假日」复刻活动关卡导航 2022-07-26 16:53:25 +08:00
MistEO
55684e987f chore: 更新复刻活动 多索雷斯假日 关卡资源 2022-07-26 16:36:23 +08:00
ChingC
b63aac5765 Merge commit 'cb91ad4f7e1685b90401a847cff2258007de4fb9' into dev 2022-07-26 16:34:34 +08:00
ChingC
03ed2193ab feat: SettingView part translation completed 2022-07-26 16:34:22 +08:00
ABA2396
cb91ad4f7e feat: AutoRecruitSettings translation completed 2022-07-26 16:24:13 +08:00
ABA2396
41e12d9075 feat: AboutUserControl translation completed 2022-07-26 15:33:47 +08:00
ChingC
f615f66c11 Merge commit '47103efa246f69bf1acbd6fc212a2202e7ba2c1c' into dev 2022-07-26 15:03:58 +08:00
ChingC
3bf92330d6 feat: Complete the SettingView module enUS translation 2022-07-26 15:03:08 +08:00
ABA2396
47103efa24 feat: TrayIcon translation completed 2022-07-26 14:54:56 +08:00
ABA2396
2395ded07a Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-26 14:44:29 +08:00
ABA2396
12e691bfa9 feat: AsstProxy translation completed 2022-07-26 14:44:16 +08:00
ChingC
52b2ffdd40 feat: Complete the SettingView module translation 2022-07-26 14:38:30 +08:00
Horror Proton
830d2f3e3c fix: use member variable as recruit counter to allow retrying as AbstractTask 2022-07-26 14:02:21 +08:00
Horror Proton
1be6c4387c fix: make "RecruitTagsRefreshed" count from one 2022-07-26 11:58:26 +08:00
MistEO
289c2ff2e9 style: add some space 2022-07-26 10:38:34 +08:00
MistEO
855336ecb6 Merge pull request #1328 from AkarinVS/patch/stuck-at-reward-claiming
YoStarEN: fix stuck at reward claiming screen
2022-07-26 09:39:04 +08:00
Arkarin
ecae7833a2 fix stuck at reward claiming screen 2022-07-26 09:41:59 +09:00
Horror Proton
6434796522 fix: fix a json value, language tidy 2022-07-26 02:08:39 +08:00
MistEO
78a64efc5a feat: 新增支持部分肉鸽自定义字段(还没做完) 2022-07-26 01:07:10 +08:00
ABA2396
1e01fe5ee8 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-26 00:12:01 +08:00
ABA2396
275463bec5 feat: Complete the CopilotView module translation 2022-07-26 00:11:45 +08:00
ABA2396
94cfcf9cc9 feat: Complete the RecruitView module translation 2022-07-25 22:51:35 +08:00
MistEO
86ded093bc Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-25 22:47:05 +08:00
MistEO
d74faf0692 feat: support switching language in tray menu 2022-07-25 22:47:02 +08:00
ABA2396
07aa6372e6 feat: Hover prompts translation 2022-07-25 22:41:58 +08:00
Helloworld
874c27e0c5 docs: 填上UI对应内容 2022-07-25 22:27:06 +08:00
MistEO
84991f14bd fix: 处理 i18n 的一些特殊 case 2022-07-25 22:19:04 +08:00
MistEO
f66a69d727 feat: 根据用户系统语言设置默认语言,重构小部分代码 2022-07-25 22:11:26 +08:00
MistEO
1237a7caa7 feat: set default language to zh-cn 2022-07-25 21:52:52 +08:00
MistEO
51cb30cfd8 fix: 修复默认关卡不正确的问题 2022-07-25 21:40:32 +08:00
MistEO
bb07197823 feat: 默认关卡改为当前关卡/上次关卡自动识别 2022-07-25 21:38:36 +08:00
Horror Proton
8a2183e4c7 fix: fix calc_only_task 2022-07-25 21:27:16 +08:00
Horror Proton
55f44fe4ec doc: add some comments, etc 2022-07-25 21:27:16 +08:00
Horror Proton
64618e5ebb refactor: clean up, remove unused files 2022-07-25 21:27:16 +08:00
Horror Proton
6fbe265d3d refactor: clean up code 2022-07-25 21:27:16 +08:00
Horror Proton
30e1ba0f44 temp: bypass AutoRecruitTask::calc_and_recruit 2022-07-25 21:27:16 +08:00
Horror Proton
13e54e418a fix: fix recruit min max level 2022-07-25 21:27:06 +08:00
Horror Proton
4e1ce9d6e8 temp: bypass recruit calc only task 2022-07-25 21:27:06 +08:00
Horror Proton
97c10f5206 feat: add miscellaneous functions for recruit calc 2022-07-25 21:27:05 +08:00
ABA2396
6d1a45846a style: rename 2022-07-25 20:11:46 +08:00
ABA2396
6c72b07426 feat: Complete the translation of TaskQueue module except for dropped items 2022-07-25 19:56:54 +08:00
ABA2396
642b6b4deb style: stage renaming 2022-07-25 18:23:30 +08:00
ABA2396
d184491478 feat: stage translation 2022-07-25 18:02:40 +08:00
ABA2396
fbcb3e1b60 feat: Copilot module translation 2022-07-25 17:12:56 +08:00
ABA2396
aa6677df07 feat: RecruitViewModel Module translation 2022-07-25 16:41:31 +08:00
ABA2396
04dccc8ba9 feat: FightSettingsUserContral module translation 2022-07-25 16:00:13 +08:00
ABA2396
71a968d193 feat: TaskQueue module translation 2022-07-25 15:05:02 +08:00
zzyyyl
6ca5cf1a31 chore: 优化识别贡献者名字的正则表达式 2022-07-25 11:01:36 +08:00
yuanyan3060
656bf52c1e feat: 增加rust绑定和http服务器实现捏 (#1321)
* 增加maa-core的rust绑定

* Update Readme.md

* update Readme
2022-07-25 10:30:22 +08:00
MistEO
8f8b05ec32 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-25 00:48:41 +08:00
MistEO
f3543e8521 fix: 修复界面 l10n 的一点小问题 2022-07-25 00:48:33 +08:00
MistEO
148a54ab48 Merge pull request #1320 from zzyyyl/chore/addlink
chore: 使 CHANGELOG 里的贡献者名字自动带上链接
2022-07-25 00:41:43 +08:00
MistEO
8218e7fb4d revert: 回滚错误提交的文件 2022-07-25 00:41:20 +08:00
MistEO
c6b32629f4 fix: 修复 core get接口错误 2022-07-25 00:39:54 +08:00
MistEO
0c366d282c Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-25 00:28:27 +08:00
MistEO
89ff550c89 fix: 修复掉落识别错误,重写部分基线识别算法
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1318
2022-07-25 00:28:14 +08:00
_ChingC
c9bfa8beb1 feat: 添加多语言本地化
- TODO: 需要翻译
2022-07-25 00:03:57 +08:00
zzyyyl
a3990f35bb chore: 给自动带上贡献者链接加个小异常处理 2022-07-24 23:27:26 +08:00
zzyyyl
f31947d049 chore: 给自动带上贡献者链接修个小 bug 2022-07-24 23:15:37 +08:00
zzyyyl
19886d983e chore: 使 CHANGELOG 里的贡献者名字自动带上链接 2022-07-24 23:04:10 +08:00
MistEO
74ec0a43f7 fix: fix build error 2022-07-24 21:40:34 +08:00
MistEO
718a92d798 chore: remove useless macro 2022-07-24 21:30:49 +08:00
MistEO
c6db555f1c feat: core 新增 GetNullSize 接口 2022-07-24 21:29:53 +08:00
MistEO
e830564103 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-24 21:27:28 +08:00
MistEO
f639cc4d3a fix: core 的 get 接口失败时返回 -1 2022-07-24 21:27:23 +08:00
Helloworld
0b85cb8e9e docs. 添加干员术语表生成器 2022-07-24 20:29:08 +08:00
Helloworld
7f6ac1da93 docs. 干员术语表 2022-07-24 19:16:45 +08:00
Helloworld
337c3b7e87 Merge branch 'docs/glossary' into dev 2022-07-24 18:13:08 +08:00
Helloworld
d8ed63e940 docs. 物品术语表 2022-07-24 18:12:51 +08:00
MistEO
a0f65684c1 docs: 移除对中文目录的要求 2022-07-24 17:32:03 +08:00
MistEO
35c41b36fc Merge branch 'master' into dev 2022-07-24 17:31:28 +08:00
MistEO
5f6e7a13a7 feat: 将自动战斗选择作业改成实时更新的 2022-07-24 17:30:44 +08:00
MistEO
d90789bc33 docs: 移除对中文目录的要求 2022-07-24 17:30:11 +08:00
MistEO
ec0d5aa4fb feat: 将自动战斗选择作业改成实时更新的 2022-07-24 17:29:25 +08:00
Helloworld
bd188760af Merge pull request #1316 from MaaAssistantArknights/docs/glossary
添加术语表
2022-07-24 17:25:30 +08:00
Helloworld
f7e49af2fe Merge branch 'dev' into docs/glossary 2022-07-24 17:23:36 +08:00
Helloworld
a46c44d252 docs. 添加物品术语表 2022-07-24 17:23:31 +08:00
MistEO
7ffcc2ca54 Merge pull request #1315 from MaaAssistantArknights/dev
revert: 回滚误提交的 debug 任务相关内容
2022-07-24 17:16:13 +08:00
MistEO
ab0b704352 revert: 回滚误提交的 debug 任务相关内容 2022-07-24 17:15:51 +08:00
MistEO
7740f35f0a Merge pull request #1314 from MaaAssistantArknights/dev
Release v4.1.1
2022-07-24 17:10:28 +08:00
MistEO
ecf16c425d docs: 补充CHANGELOG 2022-07-24 17:08:58 +08:00
MistEO
79fda42106 docs: 更新外服支持相关文档 2022-07-24 17:08:03 +08:00
MistEO
543f25d42c docs: fix typo 2022-07-24 17:00:38 +08:00
MistEO
81378be27e docs: 更新CHANGELOG 2022-07-24 16:57:28 +08:00
MistEO
847270cd78 fix: 修复自动战斗在干员过多(14个及以上)时的崩溃问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1122
2022-07-24 16:51:24 +08:00
MistEO
fc3915a6ed fix: 修复肉鸽凌晨 4 点更新后不能回去接着打的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1260
2022-07-24 16:41:58 +08:00
MistEO
f36e1a7a78 fix: 修复自动战斗选择了删除编队时,编队出错的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1266
2022-07-24 16:37:42 +08:00
MistEO
d2190d6e24 fix: 修复肉鸽编队不能识别精二干员的问题 2022-07-24 16:27:07 +08:00
Helloworld
b4c0209e21 docs. 添加术语表 2022-07-24 16:24:27 +08:00
MistEO
ffededc589 feat: core 新增 GetUUID 和 GetTasksList 接口 2022-07-24 15:59:45 +08:00
Helloworld
707b1f3aa6 docs. 我尽力了,你随意 2022-07-24 15:48:08 +08:00
MistEO
10291bfa3d fix: 修复EN服肉鸽安全屋无法进入的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1302
2022-07-24 15:42:37 +08:00
MistEO
1fd69bb680 fix: 尝试修复肉鸽战斗画面识别错误的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1299
2022-07-24 15:18:47 +08:00
MistEO
4fdd38f4bd fix: 修复肉鸽领取关卡奖励时卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1300
2022-07-24 15:05:41 +08:00
MistEO
8393a48f5e fix: 修复肉鸽战斗中掉线后,无法继续的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1303
2022-07-24 14:40:40 +08:00
MistEO
377bd50566 fix: 修复肉鸽重新编队时的排序问题 2022-07-24 04:44:45 +08:00
MistEO
37cbbfac75 fix: 修复肉鸽重新编队时确认按钮点不上的问题 2022-07-24 04:38:56 +08:00
zzyyyl
628af3ea85 docs: 修复需求建议 issue 模板不带 label 的问题 2022-07-23 18:42:51 +08:00
MistEO
1153e63814 fix: 修复掉落识别错误,调整阈值
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1295
2022-07-23 17:39:08 +08:00
MistEO
855706ce39 fix: 再次修复EN服肉鸽卡在招募界面的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1289
2022-07-23 17:02:33 +08:00
MistEO
a8bf1d970d fix: 再次修复主界面顺序问题导致的崩溃
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1292
2022-07-23 16:54:37 +08:00
MistEO
91c3bc8375 fix: 删除繁中服一些重复的模板图片 2022-07-23 11:47:08 +08:00
MistEO
ca57c495a4 Merge pull request #1276 from rockerhank/dev
Dev feat. 新增繁中服自動公招
2022-07-23 11:42:13 +08:00
MistEO
9c800d8bd1 fix: remove useless seg 2022-07-23 11:41:41 +08:00
MistEO
6cb8bf9bd8 fix: 修复界面调整字段顺序后的崩溃问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1292
2022-07-23 11:37:51 +08:00
MistEO
76052cd59f fix: 尝试修复 EN 肉鸽无法选人的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1289
2022-07-23 11:23:28 +08:00
MistEO
a31ff2429e Merge pull request #1288 from MaaAssistantArknights/dev
Release v4.1.0
2022-07-23 02:11:28 +08:00
MistEO
5389681ba3 fix: 修复CHANGELOG弹窗
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/968
2022-07-23 02:10:05 +08:00
MistEO
7b6de23cd6 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-23 01:32:23 +08:00
MistEO
c0773a3824 Merge branch 'master' into dev 2022-07-23 01:32:14 +08:00
MistEO
f900a8c2f2 docs: 更新CHANGELOG 2022-07-23 01:31:50 +08:00
MistEO
436725e954 Merge pull request #1278 from zzyyyl/feat/rogue_recruit
feat: 修复几个肉鸽干员等级错误,增加新干员的信息
2022-07-23 01:08:09 +08:00
MistEO
b0b11f4d2a style: 肉鸽不无限了x 2022-07-23 01:06:16 +08:00
MistEO
8cbd7f2c79 feat: 肉鸽模式支持设置开始次数、投资次数、投满停止 2022-07-23 01:05:18 +08:00
MistEO
dedd186a0f fix: 修复连接信息uuid为空的问题,并修复一个命名问题 2022-07-23 00:18:51 +08:00
zzyyyl
c4226c6a5e docs: 更新 issue 模板细节 2022-07-22 19:40:16 +08:00
zzyyyl
92e57dc197 style: 统一全角括号 2022-07-22 19:40:16 +08:00
zzyyyl
7f465fc6aa chore: 修改注释,优化代码 2022-07-22 19:18:06 +08:00
zzyyyl
472ed6fb1d chore: 删除一些冗余代码 2022-07-22 15:27:23 +08:00
zzyyyl
f4bfa619c8 chore: 把肉鸽招募数据的生成集成到 ResourceUpdater 里 2022-07-22 15:25:57 +08:00
MistEO
6e257d1870 docs: 再次更新 issue 模板小细节 2022-07-22 14:21:07 +08:00
MistEO
475cc3ab1b docs: 更新 Issue 模板 2022-07-22 14:13:18 +08:00
MistEO
9c4f50c966 docs: 更新 issue 模板 (#1281)
* docs: remove ori template of bug report

* docs: 更新 issue 模板

Thanks for https://github.com/LmeSzinc/AzurLaneAutoScript

* docs: 更新 issue 模板

* docs: 更新 issue 模板

* docs: rename

* docs: 更新 feature request 模板

Thanks for https://github.com/LmeSzinc/AzurLaneAutoScript

* docs: 更新 FQ 模板

* docs: fix typo
2022-07-22 13:52:46 +08:00
zzyyyl
f9e6840e7e feat: 修复几个肉鸽干员等级错误,增加新干员的信息 2022-07-22 12:05:28 +08:00
zzyyyl
d7471c0b1f chore: 优化肉鸽招募数据的生成 2022-07-22 12:04:54 +08:00
zzyyyl
3bd4d40e82 chore: 把生成肉鸽招募数据的乱七八糟的py文件先传一下 2022-07-22 12:04:54 +08:00
ABA2396
8b6e612f14 style: 玛丽的少女心(bushi 2022-07-22 12:00:51 +08:00
ABA2396
8007c61fc3 feat: 添加CopilotView鼠标悬停描述 2022-07-22 11:45:15 +08:00
ABA2396
72c5c05904 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-22 01:34:41 +08:00
ABA2396
8d84609096 feat: 添加鼠标悬停描述 2022-07-22 01:33:59 +08:00
rockerhank
7e981583ca feat: 新增繁中服自動公招功能
task內新增繁中服公招tags的OCR辨識字
2022-07-22 00:51:36 +08:00
rockerhank
24c2a53060 Merge branch 'MaaAssistantArknights:dev' into dev 2022-07-22 00:45:21 +08:00
rockerhank
370c727b12 feat. 繁中服自動公招和公招識別的圖片
新增繁中服自動公招和公招識別功能  這些為功能需求的圖片
2022-07-22 00:44:06 +08:00
rockerhank
5453476f0f create. 新增繁中服公招功能
task內增加繁中服的tags的OCR辨識
2022-07-22 00:33:00 +08:00
MistEO
042e35dceb Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-22 00:30:05 +08:00
MistEO
3c9dff260d docs: 更新文档及CHANGELOG 2022-07-22 00:30:02 +08:00
MistEO
0259b768eb Merge pull request #1275 from natt3/dev
feat: 更新日服刷理智的關卡選擇及自動公招
2022-07-22 00:25:16 +08:00
MistEO
feeb26d9b4 docs: zzzq 2022-07-22 00:22:58 +08:00
MistEO
c128cd8be1 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-22 00:22:14 +08:00
MistEO
a2e3edbf18 docs: 更新CHANGELOG 2022-07-22 00:22:00 +08:00
MistEO
663612fb5b Merge pull request #1272 from horror-proton/test/roguelike_battle_task
简化肉鸽干员朝向评分等
2022-07-22 00:21:22 +08:00
natt3
8a5c16db6a Merge branch 'MaaAssistantArknights:dev' into dev 2022-07-22 00:19:29 +08:00
natt3
91e94bc968 feat: 更新日服刷理智的關卡選擇功能及自動公招功能 2022-07-22 00:18:37 +08:00
natt3
c437052772 feat: 更新日服刷理智的關卡選擇功能 2022-07-22 00:17:51 +08:00
natt3
11f2c4c60d fix: 修復日服訪問好友只訪問一次的錯誤 2022-07-22 00:16:24 +08:00
natt3
e9bef1bf51 feat: 更新日服自動公招功能 2022-07-22 00:15:23 +08:00
natt3
8da7549374 fix: 修復日服公招識別自動設置時間錯誤 2022-07-22 00:13:37 +08:00
MistEO
3a8183bf07 feat: 没练度的干员不选了 2022-07-22 00:12:55 +08:00
MistEO
e6bce9fb80 feat: 肉鸽支持从已选择关卡的界面继续任务,调整少部分图的替换家门 2022-07-21 23:59:11 +08:00
MistEO
2124d9022b feat: 肉鸽支持重新编队 2022-07-21 23:58:41 +08:00
MistEO
9ee81133f9 feat: 支持 en 服肉鸽全部关卡名替换 2022-07-21 22:38:07 +08:00
Horror Proton
94ea769238 fix: 简化和调整干员部署操作 2022-07-21 21:13:44 +08:00
Horror Proton
d22c592cd4 feat: 增加 asst::Point 的一些工具函数 2022-07-21 21:13:44 +08:00
Horror Proton
e162ddd4af perf: 简化肉鸽干员朝向评分 2022-07-21 21:13:44 +08:00
Horror Proton
2acd83c714 feat: add binary operators and argumented assignment operators for asst::Point 2022-07-21 21:13:44 +08:00
ABA2396
172db7fa17 doc: update README-en 2022-07-21 16:25:10 +08:00
ABA2396
794758c7f0 style: 修改鼠标悬停描述 2022-07-21 15:09:51 +08:00
ABA2396
ef753491be Merge pull request #1258 from lhhxxxxx/dev
feat. 添加鼠标悬停提示
2022-07-21 14:54:45 +08:00
ABA2396
772f5c8933 Merge pull request #1269 from LeoQ7/dev
fix: 修复关卡选择时间错误
2022-07-21 14:51:52 +08:00
Q7
1a10eeaa92 fix: 修复关卡选择时间错误
Signed-off-by: Q7 <q71998@gmail.com>
2022-07-21 00:25:25 -05:00
zzyyyl
aeb4c83054 fix: 修复B服因图片大小引起的登录错误
bilibili 你瞎改什么 ui
2022-07-21 11:56:41 +08:00
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
lhhxxxxx
9040072b05 feat. 添加鼠标悬停提示 2022-07-21 03:17:27 +08:00
MistEO
c70cd90040 docs: 更新CHANGELOG 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
382 changed files with 49404 additions and 5451 deletions

View File

@@ -1,18 +0,0 @@
---
name: 问题反馈Bug report
about: 识别错误、操作异常、连接错误等
title: ''
labels: bug
assignees: ''
---
<!-- 请尽可能详细的描述你遇到的问题,并附上本软件目录下的 `asst.log` 日志文件 -->
<!-- !!!没有日志文件的 bug 反馈我们会直接关掉!!! -->
<!-- 日志文件是可以直接拖拽进来的,请尽量附上完整的文件(而非自己截取的片段),若文件过大可以压缩一下 -->
<!-- 最好再能说明下使用的模拟器、并附上出错时的游戏和软件的截图要是没截到就算啦_(:з」∠)_ -->
<!-- Thanks ♪(・ω・)ノ -->

View File

@@ -0,0 +1,51 @@
name: 问题反馈Bug report
description: 识别错误、操作异常、连接错误等
labels: ['bug']
body:
- type: checkboxes
id: checks
attributes:
label: 在提问之前...
options:
- label: 我理解 Issue 是用于反馈和解决问题的,而非吐槽评论区,且会尽可能提供更多信息帮助问题解决
required: true
- label: 我在提问题之前至少花费了 5 分钟来思考和准备
required: true
- label: 我已经阅读了文档中的常见问题、详细使用说明等,认为这大概率是一个 bug 而非设计如此
required: true
- label: 我已查看最新测试版本的更新内容,并未提及该 bug 已被修复的情况
required: true
- type: textarea
id: describe
attributes:
label: 问题描述
description: 尽可能详细描述你的问题
validations:
required: true
- type: textarea
id: logs
attributes:
label: 日志文件
description: |
上传软件目录下的 `asst.log` 日志文件,并说明问题出现的大致时间点
请直接将完整的文件拖拽进来,而非自己裁切的片段;若文件体积过大可压缩后再上传
validations:
required: true
- type: textarea
id: screenshots
attributes:
label: 截图
description: |
如果有,添加屏幕截图以帮助解释你的问题,包括但不限于 MAA 软件截图、游戏画面截图
若是识别相关问题,请帮忙提供模拟器自带的截图工具截取的原图(或通过 adb 截取原图)
validations:
required: false
- type: textarea
id: others
attributes:
label: 还有别的吗?
description: |
使用的模拟器?操作系统?相关的配置?链接?参考资料?
任何能让我们对你所遇到的问题有更多了解的东西
validations:
required: false

View File

@@ -1,10 +0,0 @@
---
name: 需求建议Feature request
about: 新功能、建议等
title: ''
labels: enhancement
assignees: ''
---

View File

@@ -0,0 +1,23 @@
name: 需求建议Feature request
description: 新功能、建议等
labels: ['enhancement']
body:
- type: textarea
id: describe
attributes:
label: 说说你遇到的问题?
validations:
required: false
- type: textarea
id: solution
attributes:
label: 有什么好的想法?
validations:
required: false
- type: textarea
id: additional
attributes:
label: 其他内容
description: 关于该需求建议的任何其他背景或屏幕截图。
validations:
required: false

View File

@@ -1,5 +1,5 @@
---
name: 其他Others)
name: 其他Others
about: 其他议题
title: ''
labels: ''

View File

@@ -44,13 +44,16 @@ on:
Reason:
description: "Reason"
required: true
ReleaseSimulation:
description: "Release Simulation"
required: true
jobs:
windows-latest:
name: windows-latest
runs-on: windows-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- name: Cache .nuke/temp, ~/.nuget/packages
uses: actions/cache@v2
with:
@@ -62,6 +65,7 @@ jobs:
run: ./build.cmd DevBuild
env:
Reason: ${{ github.event.inputs.Reason }}
ReleaseSimulation: ${{ github.event.inputs.ReleaseSimulation }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/upload-artifact@v1
with:

View File

@@ -26,7 +26,7 @@ jobs:
name: windows-latest
runs-on: windows-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- name: Cache .nuke/temp, ~/.nuget/packages
uses: actions/cache@v2
with:

1
.gitignore vendored
View File

@@ -74,6 +74,7 @@ bld/
[Oo]bj/
[Ll]og/
[Ll]ogs/
cmake-build-debug/
# Visual Studio 2015/2017 cache/options directory
.vs/

View File

@@ -21,6 +21,7 @@
"AppVeyor",
"AzurePipelines",
"Bamboo",
"Bitbucket",
"Bitrise",
"GitHubActions",
"GitLab",
@@ -65,6 +66,8 @@
"enum": [
"Default",
"DevBuild",
"DevBuildDefault",
"DevBuildReleaseSimulation",
"ReleaseMaa",
"SetMaaChangeLog",
"SetPackageBundled",
@@ -76,6 +79,7 @@
"UseMaaRelease",
"UsePublishArtifact",
"UsePublishRelease",
"UseRsVersion",
"UseTagVersion",
"WithCompileCoreRelease",
"WithCompileWpfRelease"
@@ -90,6 +94,8 @@
"enum": [
"Default",
"DevBuild",
"DevBuildDefault",
"DevBuildReleaseSimulation",
"ReleaseMaa",
"SetMaaChangeLog",
"SetPackageBundled",
@@ -101,6 +107,7 @@
"UseMaaRelease",
"UsePublishArtifact",
"UsePublishRelease",
"UseRsVersion",
"UseTagVersion",
"WithCompileCoreRelease",
"WithCompileWpfRelease"

View File

@@ -102,12 +102,12 @@ namespace json
template <typename Type = value>
std::optional<Type> find(size_t pos) const
{
return is_array() ? as_array().find<Type>(pos) : std::nullopt;
return is_array() ? as_array().template find<Type>(pos) : std::nullopt;
}
template <typename Type = value>
std::optional<Type> find(const std::string& key) const
{
return is_object() ? as_object().find<Type>(key) : std::nullopt;
return is_object() ? as_object().template find<Type>(key) : std::nullopt;
}
bool as_boolean() const;

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,5 @@
- 修复日服肉鸽招募时偶现崩溃问题
- 修复日服肉鸽招募时干员等级识别错误
- 修复偶现掉落识别错误
- 修复偶现不收信用问题
- 优化界面提示
- 重写并优化 肉鸽 信用商店购物逻辑 @MistEO @ABA2396
- 优化 肉鸽 干员招募逻辑,现在支持翻页了 @et2012
- 修复 公招 的一些问题 @horror-proton
- 修复 肉鸽 干员 `山` 重复开技能的问题 @MistEO
- 项目代码清理 @lhhxxxxx @LiamSho @zzyyyl

View File

@@ -17,7 +17,7 @@ if (WIN32)
endif ()
add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/W4;/WX>")
add_compile_options("$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall;-Wextra;-Wpedantic;-Werror>")
add_compile_options("$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall;-Wextra;-Wpedantic>")
add_definitions(-DASST_DLL_EXPORTS)

View File

@@ -0,0 +1,15 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/UserDictionary/Words/=Arknights/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Bilibili/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Infrast/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=oper/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=opers/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Pallas/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Pormpt/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Rougelike/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=templ/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=thres/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Todays/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=txwy/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=vuvm/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=XYAZ/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

View File

@@ -18,7 +18,7 @@
</div>
<br>
[README in English](README-en.md)
[中文(简体)](README.md) | [中文(繁體)](README_zh-TW.md) | [English](README_en-US.md) | [日本語](README_ja-JP.md)
MAA 的意思是 MAA Assistant Arknights
@@ -41,8 +41,8 @@ MAA 的意思是 MAA Assistant Arknights
话不多说,看图!
![image](https://user-images.githubusercontent.com/99072975/177110402-513b8267-380f-47b2-aeb3-04d8d1e1c850.png)
![image](https://user-images.githubusercontent.com/99072975/177110410-ad4f84f5-e94f-49aa-954b-25d49aa7f6f9.png)
![image](https://user-images.githubusercontent.com/99072975/181418126-54d3d50e-f405-4edd-a426-a27e9a465286.png)
![image](https://user-images.githubusercontent.com/99072975/181418131-f4eefa07-6623-470e-ba4a-0ad15cb8aa91.png)
![image](https://user-images.githubusercontent.com/99072975/172045163-e9ead337-eb62-4f9f-a354-9e302f767a52.png)
@@ -69,8 +69,7 @@ MAA 的意思是 MAA Assistant Arknights
1. 请根据 [模拟器支持情况](docs/模拟器支持.md),进行对应的操作。
2. 修改模拟器分辨率为 `16:9` 比例,最低 `1280 * 720`, 更高不限。
3. 解压压缩包,到没有中文或特殊符号的文件夹路径。
4. Enjoy it!
3. 开始使用吧!
更多使用说明请参考 [详细介绍](docs/详细介绍.md)
@@ -86,13 +85,13 @@ MAA 的意思是 MAA Assistant Arknights
## 外服支持
- 国际服(美服)
支持基本的刷理智、公招识别、访问好友、领取奖励功能,请参考 [说明](resource/global/YoStarEN/readme.md)
支持基本的刷理智、访问好友、领取奖励、自动肉鸽(测试版本)、公招识别,请参考 [说明](resource/global/YoStarEN/readme.md)
- 日服
支持基本的刷理智、公招识别、访问好友、领取奖励功能,支持肉鸽功能(测试版本),请参考 [说明](resource/global/YoStarJP/readme.md)
支持基本的刷理智、自动公招、访问好友、领取奖励、自动肉鸽(测试版本)、公招识别,请参考 [说明](resource/global/YoStarJP/readme.md)
- 韩服
支持基本的刷理智功能,请参考 [说明](resource/global/YoStarKR/readme.md)
- 繁中服
支持基本的刷理智功能,请参考 [说明](resource/global/txwy/readme.md)
支持基本的刷理智、自动公招、公招识别功能,请参考 [说明](resource/global/txwy/readme.md)
由于外服用户较少及项目人手不足的问题,外服目前都仅适配了基本的功能。若您有强需求,欢迎在 [讨论区](https://github.com/MaaAssistantArknights/MaaAssistantArknights/discussions) 催更,~~或加入我们一起建设 MAA~~
@@ -152,6 +151,7 @@ MAA 的意思是 MAA Assistant Arknights
- [Golang 接口](src/Golang/maa/)[集成示例](src/Golang/cli.go)(已停止维护 orz
- [Dart 接口](src/dart/)
- [Java 接口](src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MeoAssistant.java)[集成示例](src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java)
- [Rust 接口](src/Rust/src/maa_sys/)[HTTP 接口](src/Rust)
- [HTTP 接口](src/Java/Maaj/Readme.md)
- [集成文档](docs/集成文档.md)
- [回调消息协议](docs/回调消息协议.md)
@@ -170,7 +170,7 @@ MAA 的意思是 MAA Assistant Arknights
## 广告
[用户交流群Telegram 群)](https://t.me/+Mgc2Zngr-hs3ZjU1)
自动战斗 JSON 作业分享: <https://www.prts.plus> , [QQ 一群](https://jq.qq.com/?_wv=1027&k=1giyMpPb)(已满),[QQ 二群](https://jq.qq.com/?_wv=1027&k=R3oleoKc)[QQ 三群](https://jq.qq.com/?_wv=1027&k=mKdOnhWV)
自动战斗 JSON 作业分享: <https://www.prts.plus> , QQ 一群(已满),[QQ 二群](https://jq.qq.com/?_wv=1027&k=R3oleoKc)[QQ 三群](https://jq.qq.com/?_wv=1027&k=mKdOnhWV)
[Bilibili 直播间](https://live.bilibili.com/2808861):每晚直播敲代码,近期很长一段时间应该都是在写本软件~
[舟无关技术交流 & 吹水群QQ 群)](https://jq.qq.com/?_wv=1027&k=ypbzXcA2):内卷地狱!
[开发者群QQ 群)](https://jq.qq.com/?_wv=1027&k=JM9oCk3C)

View File

@@ -18,7 +18,7 @@
</div>
<br>
[中文版本 README](README.md)
[中文(简体)](README.md) | [中文(繁體)](README_zh-TW.md) | [English](README_en-US.md) | [日本語](README_ja-JP.md)
MAA means MAA Assistant Arknights
@@ -41,9 +41,10 @@ Development in progress ✿✿ヽ(°▽°)ノ✿
Talk is cheap. Show me the pictures!
![image](https://user-images.githubusercontent.com/99072975/172044929-3aae01a1-6c6d-4a9a-a7a8-ae753679b9ce.png)
![image](https://user-images.githubusercontent.com/99072975/172045492-698ab7fd-0413-4b08-aad7-0176f9480c05.png)
![image](https://user-images.githubusercontent.com/99072975/172045163-e9ead337-eb62-4f9f-a354-9e302f767a52.png)
![image](https://user-images.githubusercontent.com/99072975/181417856-0fb1ac8b-c0f6-4c67-904c-1c3ea2c309a8.png)
![image](https://user-images.githubusercontent.com/99072975/181417869-bb312d7e-f867-45c6-84b9-d18c583232d5.png)
![image](https://user-images.githubusercontent.com/99072975/181417872-563afc09-e610-45f5-8762-dbf69018a329.png)
## Download
@@ -58,8 +59,7 @@ Talk is cheap. Show me the pictures!
1. Follow the [Emulator Support](docs/en/EMULATOR_SUPPORTS.md) to configure your emulator.
2. Change your emulator resolution to `1280 * 720` or higher with `16:9` aspect ratio.
3. Unzip the archive file to an ASCII-only directory
4. Enjoy it!
3. Enjoy it!
See also: [User Manual](docs/en/USER_MANUAL.md)
@@ -75,9 +75,9 @@ Please refer to: [FAQ](docs/en/FAQ.md)
## Supports for overseas clients
- Global(EN) Client
Supports basic features like Combat, Recruiting, Visiting, Collocting, etc. See also [README](resource/global/YoStarEN/readme.md)
Supports basic features like Combat, Visiting, Collocting, Auto Roguelike(beta), Recruitment calculate, etc. See also [README](resource/global/YoStarEN/readme.md)
- JP Client
Supports basic features like Combat, Recruiting, Visiting, Collocting, Auot Roguelike(beta), etc. See also [README](resource/global/YoStarJP/readme.md)
Supports basic features like Combat, Auto Recruiting, Visiting, Collocting, Auto Roguelike(beta), Recruitment calculate, etc. See also [README](resource/global/YoStarJP/readme.md)
- KR Client
Supports basic features like Combat, etc. See also [README](resource/global/YoStarKR/readme.md)
- ZH_CHT Client
@@ -141,6 +141,7 @@ Please refer to [Linux Tutorial](docs/en/LINUX_TUTORIAL.md)
- [Golang interface](src/Golang/maa/): [Integration Example](src/Golang/cli.go) (deprecated)
- [Dart interface](src/dart/)
- [Java interface](src/Java/Maaj)[Integration Example](src/Java/Maaj/src/main/java/com/iguigui/maaj/MaaJavaSample.java)
- [Rust interface](src/Rust/src/maa_sys/)[HTTP api](src/Rust)
- [Integration Documentation](docs/en/INTEGRATION.md)
- [Callback Schema](docs/en/CALLBACK_SCHEMA.md)
- [Task Schema](docs/en/TASK_SCHEMA.md)

178
README_ja-JP.md Normal file
View File

@@ -0,0 +1,178 @@
<div align="center">
<img alt="LOGO" src="https://user-images.githubusercontent.com/18511905/148931479-23aef436-2fc1-4c1e-84c9-bae17be710a5.png" width=360 height=270/>
# MaaAssistantArknights
<br>
<div>
<img alt="C++" src="https://img.shields.io/badge/c++-17-%2300599C?logo=cplusplus">
</div>
<div>
<img alt="platform" src="https://img.shields.io/badge/platform-Windows%20%7C%20Linux%20%7C%20macOS-blueviolet">
</div>
<div>
<img alt="license" src="https://img.shields.io/github/license/MaaAssistantArknights/MaaAssistantArknights">
<img alt="commit" src="https://img.shields.io/github/commit-activity/m/MaaAssistantArknights/MaaAssistantArknights?color=%23ff69b4">
<img alt="stars" src="https://img.shields.io/github/stars/MaaAssistantArknights/MaaAssistantArknights?style=social">
</div>
<br>
[中文(简体)](README.md) | [中文(繁體)](README_zh-TW.md) | [English](README_en-US.md) | [日本語](README_ja-JP.md)
MAAは、MAA Assistant Arknightsです。
アークナイツゲームアシスタント
画像認識技術に基づいて、ワンクリックですべてのデイリーリクエストを完了します!
絶賛開発中 ✿✿ヽ(°▽°)ノ✿
</div>
## 機能一覧
- 自動作戦、ドロップ認識および[PenguinStats](https://penguin-stats.cn/)へデータアップロード
- 自動基地シフト、オペレーター効率計算、単一設備内に最適なソリューション
- 自動公開求人、緊急招集票を使う、使い切るのもサポート
- 戦友訪問、FP収集、買い物、デイリーレワード収集、ワンクリックして全自動操作
- 統合戦略自動作戦、オペレーターとレベルの自動認識
- **新機能作業JSONファイルをインポートし、自動操作するのは可能** [ビデオデモ](https://www.bilibili.com/video/BV14u411673q/)
見ればわかる!
![image](https://user-images.githubusercontent.com/99072975/181418126-54d3d50e-f405-4edd-a426-a27e9a465286.png)
![image](https://user-images.githubusercontent.com/99072975/181418131-f4eefa07-6623-470e-ba4a-0ad15cb8aa91.png)
![image](https://user-images.githubusercontent.com/99072975/172045163-e9ead337-eb62-4f9f-a354-9e302f767a52.png)
## ダウンロードリンク
***初めて使用する場合 `MaaBundle-vX.Y.Z.zip`をダウンロードしてください***
***初めて使用する場合 `MaaBundle-vX.Y.Z.zip`をダウンロードしてください***
***初めて使用する場合 `MaaBundle-vX.Y.Z.zip`をダウンロードしてください***
[安定版](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases/latest)
[ベータ版](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases)
ダウンロードが遅いfastgit ミラーを試してください
[fastgit ミラー安定版](https://hub.fastgit.xyz/MaaAssistantArknights/MaaAssistantArknights/releases/latest)
[fastgit ミラーベータ版](https://hub.fastgit.xyz/MaaAssistantArknights/MaaAssistantArknights/releases)
## マニュアル
### 基本設定
1. この[サポートされているエミュレータ(英語)](docs/en/EMULATOR_SUPPORTS.md)を参照して、対応する操作に進んでください。
2. エミュレータ解像度を`16:9``1280 * 720`以上に変更してください。それより大きい解像度も大丈夫です。
3. ゲームスタート!
詳しいマニュアルは[ユーザーマニュアル(英語)](docs/en/USER_MANUAL.md)を参照してください。
## よくある質問
- 起動するとき、ソフトウェアがクラッシュしました
- 接続エラー、adbパスが知らない場合
- 認識エラー、またはオペレーション開始したあとで反応が出ない
- カスタムポート設定について
[FAQ英語](docs/en/FAQ.md)を参照してください。
## サーバーに応じてサポートされる機能
- アメリカサーバー
作戦、戦友訪問、レワード収集、統合戦略(ベータ版)、公開求人認識の機能がサポートされている。[README](resource/global/YoStarEN/readme.md)を参照してください。
- 日本サーバー
作戦、自動公開求人、戦友訪問、レワード収集、統合戦略(ベータ版)、公開求人認識の機能がサポートされている。[README](resource/global/YoStarJP/readme.md)を参照してください。
- 韓国サーバー
基本的な作戦機能がサポートされている。[README](resource/global/YoStarKR/readme.md)を参照してください。
- TXWYサーバー
基本的な作戦、自動公開求人、公開求人認識の機能がサポートされている。[README](resource/global/txwy/readme.md)を参照してください。
海外サーバーのユーザーがふそくですから、基本的な機能しかサポートされていません。要件があれば[提案](https://github.com/MaaAssistantArknights/MaaAssistantArknights/discussions)ページで提案を差し出してください。~~いっしょにMAAの開発に協力しましょう~~
## 主な関連プロジェクト
- 新しいGUI: [MaaAsstElectronUI](https://github.com/MaaAssistantArknights/MaaAsstElectronUI) (開発中、貢献することを歓迎します!)
- 更新サーバー: [MaaDownloadServer](https://github.com/MaaAssistantArknights/MaaDownloadServer)
- 公式ウェブサイト <https://www.maa.plus>: [maa-website](https://github.com/MaaAssistantArknights/maa-website)
- 作業シェアサイト <https://www.prts.plus>: [フロントエンド](https://github.com/MaaAssistantArknights/maa-copilot-frontend) , [バックエンド](https://github.com/MaaAssistantArknights/MaaCopilotServer)
## 謝辞
### オープンソースライブラリ
- 画像認識ライブラリ:[opencv](https://github.com/opencv/opencv.git)
- ~~テキスト認識ライブラリ:[chineseocr_lite](https://github.com/DayBreak-u/chineseocr_lite.git)~~
- テキスト認識ライブラリ:[PaddleOCR](https://github.com/PaddlePaddle/PaddleOCR)
- ~~ステージドロップ認識:[PenguinStats認識](https://github.com/penguin-statistics/recognizer)~~
- マップタイル認識:[Arknights-Tile-Pos](https://github.com/yuanyan3060/Arknights-Tile-Pos)
- C++ JSONライブラリ[meojson](https://github.com/MistEO/meojson.git)
- C++ オペレーターパーサー:[calculator](https://github.com/kimwalisch/calculator)
- ~~C++ base64エンコードとデコード[cpp-base64](https://github.com/ReneNyffenegger/cpp-base64)~~
- C++ 圧縮・解凍ライブラリ:[zlib](https://github.com/madler/zlib)
- C++ Gzipカプセル化ライブラリ[gzip-hpp](https://github.com/mapbox/gzip-hpp)
- WPF MVVWフレームワーク[Stylet](https://github.com/canton7/Stylet)
- WPFコントロールライブラリ[HandyControl](https://github.com/HandyOrg/HandyControl)
- C# JSONライブラリ: [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json)
- ダウンローダー:[aria2](https://github.com/aria2/aria2)
### データソース
- ~~公開求人データ:[アークナイツツール](https://www.bigfun.cn/tools/aktools/hr)~~
- オペレーターおよび基地データ:[PRTSアークナイツ中国語WIKI](http://prts.wiki/)
- ステージデータ:[PenguinStatsデータ統計](https://penguin-stats.cn/)
- ゲームデータとリソース:[アークナイツbotリソース](https://github.com/yuanyan3060/Arknights-Bot-Resource)
### 貢献/協力者
MAAをより良くするために開発・テストに貢献してくれたすべての友達に感謝します (*´▽`)
[![Contributors](https://contributors-img.web.app/image?repo=MaaAssistantArknights/MaaAssistantArknights)](https://github.com/MaaAssistantArknights/MaaAssistantArknights/graphs/contributors)
## 開発について
### Windows
Visual Studio 2019 ~~または以上のバージョン~~で`MeoAssistantArknights.sln`を開きます。すべての構成が正しいはずです。
### Linux | macOS
[Linuxチュートリアル](docs/en/LINUX_TUTORIAL.md)を参照してください。
### API
- [C インターフェース](include/AsstCaller.h)[統合例](tools/TestCaller/main.cpp)
- [Python インターフェース](src/Python/asst.py)[統合例](src/Python/sample.py)
- [Golang インターフェース](src/Golang/maa/)[統合例](src/Golang/cli.go)(メンテナンスが停止しました orz
- [Dart インターフェース](src/dart/)
- [Java インターフェース](src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MeoAssistant.java)[統合例](src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java)
- [Rust インターフェース](src/Rust/src/maa_sys/)[HTTP インターフェース](src/Rust)
- [HTTP インターフェース](src/Java/Maaj/Readme.md)
- [統合ドキュメント(英語)](docs/en/INTEGRATION.md)
- [コールバックメッセージスキーマ(英語)](docs/en/CALLBACK_SCHEMA.md)
- [タスクスキーマ(英語)](docs/en/TASK_SCHEMA.md)
- [自動作戦スキーマ(英語)](docs/en/COPILOT_SCHEMA.md)
### 開発に参加したいですけど、GitHubの使い方がよくわかりません
[Github Pull Requestプロセス概要英語](docs/en/CONTRIBUTING.md)
## 免責事項
- 本ソフトウェアのロゴは、AGPL 3.0ライセンスを使用してオープンソースではなく、絵師[耗毛](https://weibo.com/u/3251357314)および本ソフトウェアのすべての開発者がすべての権利を留保しています。「AGPL 3.0ライセンスに基づいて許可されている」という理由で、許可がない場合に本ソフトウェアのロゴを無断で使用することは禁止です。許可がない場合に商業目的で本ソフトウェアのロゴを無断で使用することも禁止です。
- 本ソフトウェアはオープンソースで無料であり、学習と研究のみの目的としています。販売者が本ソフトウェアの料金を請求する場合は、デバイスや時間の料金である可能性があります。発生した問題と結果は、本ソフトウェアとは一切関係ありません。
## 広告
[ユーザー研究グループTelegram](https://t.me/+Mgc2Zngr-hs3ZjU1)
自動作戦JSON作業シェア: <https://www.prts.plus> , QQグループ満員[QQグループ](https://jq.qq.com/?_wv=1027&k=R3oleoKc)[QQグループ](https://jq.qq.com/?_wv=1027&k=mKdOnhWV)
[ビリビリ生放送](https://live.bilibili.com/2808861):毎晩ライブでコーディングします、最近はずっとこのソフトウェアのプログラミングすることばかりです~
[アークナイツ無関係技術研究 & チャットグループQQ](https://jq.qq.com/?_wv=1027&k=ypbzXcA2):インボリューション・ヘル!
[開発者グループQQ](https://jq.qq.com/?_wv=1027&k=JM9oCk3C)
ソフトウェアが役立つと思うなら、Starページの右上隅にある星をクリックしてください それは私たちにとって最高のサポートです

178
README_zh-TW.md Normal file
View File

@@ -0,0 +1,178 @@
<div align="center">
<img alt="LOGO" src="https://user-images.githubusercontent.com/18511905/148931479-23aef436-2fc1-4c1e-84c9-bae17be710a5.png" width=360 height=270/>
# MaaAssistantArknights
<br>
<div>
<img alt="C++" src="https://img.shields.io/badge/c++-17-%2300599C?logo=cplusplus">
</div>
<div>
<img alt="platform" src="https://img.shields.io/badge/platform-Windows%20%7C%20Linux%20%7C%20macOS-blueviolet">
</div>
<div>
<img alt="license" src="https://img.shields.io/github/license/MaaAssistantArknights/MaaAssistantArknights">
<img alt="commit" src="https://img.shields.io/github/commit-activity/m/MaaAssistantArknights/MaaAssistantArknights?color=%23ff69b4">
<img alt="stars" src="https://img.shields.io/github/stars/MaaAssistantArknights/MaaAssistantArknights?style=social">
</div>
<br>
[中文(简体)](README.md) | [中文(繁體)](README_zh-TW.md) | [English](README_en-US.md) | [日本語](README_ja-JP.md)
MAA 的意思是 MAA Assistant Arknights
一款明日方舟遊戲小助手
基於圖像辨識技術,一鍵完成全部日常任務!
絕讚更新中 ✿✿ヽ(°▽°)ノ✿
</div>
## 亮點功能
- 刷理智,掉落辨識及上傳 [企鵝物流](https://penguin-stats.cn/)
- 智能基建換班,自動計算幹員效率,單設施內最優解
- 自動公招,可選使用加急許可,一次全部刷完
- 訪問好友、收取信用及購物、領取日常獎勵等。一鍵全日常自動長草!
- 肉鴿全自動刷源石錠和蠟燭,自動辨識幹員及練度
- **新功能!導入作業 JSON 檔案,自動抄作業!** [影片演示](https://www.bilibili.com/video/BV14u411673q/)
話不多說,看圖!
![image](https://user-images.githubusercontent.com/99072975/181418126-54d3d50e-f405-4edd-a426-a27e9a465286.png)
![image](https://user-images.githubusercontent.com/99072975/181418131-f4eefa07-6623-470e-ba4a-0ad15cb8aa91.png)
![image](https://user-images.githubusercontent.com/99072975/172045163-e9ead337-eb62-4f9f-a354-9e302f767a52.png)
## 下載連結
***第一次使用請下載 `MaaBundle-vX.Y.Z.zip`***
***第一次使用請下載 `MaaBundle-vX.Y.Z.zip`***
***第一次使用請下載 `MaaBundle-vX.Y.Z.zip`***
[穩定版](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases/latest)
[測試版](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases)
下載太慢?嘗試使用 fastgit 鏡像
[fastgit 鏡像穩定版](https://hub.fastgit.xyz/MaaAssistantArknights/MaaAssistantArknights/releases/latest)
[fastgit 鏡像測試版](https://hub.fastgit.xyz/MaaAssistantArknights/MaaAssistantArknights/releases)
## 使用說明
### 基本說明
1. 請根据 [模擬器支援情況](docs/模拟器支持.md),進行對應的操作。
2. 修改模擬器解析度為 `16:9` 比例,最低 `1280 * 720`, 更高不限。
3. 開始使用吧!
更多使用說明請參考 [詳細介紹](docs/详细介绍.md)
## 常見問題
- 軟體一打開就閃退
- 連接錯誤、不知道 adb 路徑怎麼填寫
- 辨識錯誤/任務開始後一直不動、沒有反應
- 如何連接自定義通訊埠
請參考 [常見問題](docs/常见问题.md)
## 外服支援
- 國際服(美服)
支援基本的刷理智、訪問好友、領取獎勵、自動肉鴿(測試版本)、公招辨識,請參考 [說明](resource/global/YoStarEN/readme.md)
- 日服
支援基本的刷理智、自動公招、訪問好友、領取獎勵、自動肉鴿(測試版本)、公招辨識,請參考 [說明](resource/global/YoStarJP/readme.md)
- 韓服
支援基本的刷理智功能,請參考 [說明](resource/global/YoStarKR/readme.md)
- 繁中服
支援基本的刷理智、自動公招、公招辨識功能,請參考 [說明](resource/global/txwy/readme.md)
由於外服使用者較少及項目人手不足的問題,外服目前都僅適配了基本的功能。若您有強需求,歡迎在 [討論區](https://github.com/MaaAssistantArknights/MaaAssistantArknights/discussions) 催更,~~或加入我們一起建設 MAA~~
## 主要關聯項目
- 全新 GUI: [MaaAsstElectronUI](https://github.com/MaaAssistantArknights/MaaAsstElectronUI) (正在開發中,歡迎加入!)
- 更新伺服器: [MaaDownloadServer](https://github.com/MaaAssistantArknights/MaaDownloadServer)
- 官網 <https://www.maa.plus>: [maa-website](https://github.com/MaaAssistantArknights/maa-website)
- 作業分享站 <https://www.prts.plus>: [前端](https://github.com/MaaAssistantArknights/maa-copilot-frontend) , [後端](https://github.com/MaaAssistantArknights/MaaCopilotServer)
## 致謝
### 開源庫
- 圖像辨識庫:[opencv](https://github.com/opencv/opencv.git)
- ~~字元辨識庫:[chineseocr_lite](https://github.com/DayBreak-u/chineseocr_lite.git)~~
- 字元辨識庫:[PaddleOCR](https://github.com/PaddlePaddle/PaddleOCR)
- ~~關卡掉落辨識:[企鵝物流辨識](https://github.com/penguin-statistics/recognizer)~~
- 地圖格子辨識:[Arknights-Tile-Pos](https://github.com/yuanyan3060/Arknights-Tile-Pos)
- C++ JSON庫[meojson](https://github.com/MistEO/meojson.git)
- C++ 算子分析器:[calculator](https://github.com/kimwalisch/calculator)
- ~~C++ base64編解碼[cpp-base64](https://github.com/ReneNyffenegger/cpp-base64)~~
- C++ 解壓壓縮庫:[zlib](https://github.com/madler/zlib)
- C++ Gzip封裝[gzip-hpp](https://github.com/mapbox/gzip-hpp)
- WPF MVVW框架[Stylet](https://github.com/canton7/Stylet)
- WPF部件庫[HandyControl](https://github.com/HandyOrg/HandyControl)
- C# JSON庫: [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json)
- 下載器:[aria2](https://github.com/aria2/aria2)
### 資料源
- ~~公開招募資料:[明日方舟工具箱](https://www.bigfun.cn/tools/aktools/hr)~~
- 幹員及基建資料:[PRTS明日方舟中文WIKI](http://prts.wiki/)
- 關卡資料:[企鵝物流資料統計](https://penguin-stats.cn/)
- 素材資料:[明日方舟bot常用素材](https://github.com/yuanyan3060/Arknights-Bot-Resource)
### 貢獻/參與者
感謝所有參與到開發/測試中的朋友們,是大家的幫助讓 MAA 越來越好! (*´▽`)
[![Contributors](https://contributors-img.web.app/image?repo=MaaAssistantArknights/MaaAssistantArknights)](https://github.com/MaaAssistantArknights/MaaAssistantArknights/graphs/contributors)
## 開發相關
### Windows
直接使用 Visual Studio 2019 ~~或更高版本~~ 打開 `MeoAssistantArknights.sln` 即可,所有環境都是配置好的
### Linux | macOS
請參考 [Linux 編譯教程](docs/Linux编译教程.md)
### API
- [C 介面](include/AsstCaller.h)[整合示例](tools/TestCaller/main.cpp)
- [Python 介面](src/Python/asst.py)[整合示例](src/Python/sample.py)
- [Golang 介面](src/Golang/maa/)[整合示例](src/Golang/cli.go)(已停止維護 orz
- [Dart 介面](src/dart/)
- [Java 介面](src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MeoAssistant.java)[整合示例](src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java)
- [Rust 介面](src/Rust/src/maa_sys/)[HTTP 介面](src/Rust)
- [HTTP 介面](src/Java/Maaj/Readme.md)
- [整合文件](docs/集成文档.md)
- [回呼訊息協定](docs/回调消息协议.md)
- [任務流程協定](docs/任务流程协议.md)
- [自動抄作業協定](docs/战斗流程协议.md)
### 想參與開發,但不太會用 Github?
[Github Pull Request 流程簡述](docs/PR流程简述.md)
## 聲明
- 本軟體 logo 並非使用 AGPL 3.0 條款開源,畫師 [耗毛](https://weibo.com/u/3251357314) 及軟體全體開發者保留所有權利。不得以 AGPL 3.0 條款已授權為由在未經授權的情況下使用本軟體 logo, 不得在未經授權的情況下將本軟體 logo 用於任何商業用途。
- 本軟體開源、免費,僅供學習交流使用。若您遇到商家使用本軟體進行代練並收費,可能是設備與時間等費用,產生的問題及後果與本軟件無關。
## 廣告
[用戶交流群Telegram 群)](https://t.me/+Mgc2Zngr-hs3ZjU1)
自動戰鬥 JSON 作業分享: <https://www.prts.plus> , QQ 一群(已滿),[QQ 二群](https://jq.qq.com/?_wv=1027&k=R3oleoKc)[QQ 三群](https://jq.qq.com/?_wv=1027&k=mKdOnhWV)
[Bilibili 直播間](https://live.bilibili.com/2808861):每晚直播敲代碼,近期很長一段時間應該都是在寫本軟體~
[舟無關技術交流 & 吹水群QQ 群)](https://jq.qq.com/?_wv=1027&k=ypbzXcA2):內捲地獄!
[開發者群QQ 群)](https://jq.qq.com/?_wv=1027&k=JM9oCk3C)
如果覺得軟體對你有幫助,幫忙點個 Star 吧!~(網頁最上方右上角的小星星),這就是對我們最大的支持了!

View File

@@ -75,7 +75,7 @@ Todo
Connection failed.
- `Connected`
Connected. Note that the `uuid` field is empty now (and will be retrieved in the next step)
- `UuidGetted`
- `UuidGot`
UUID has been retrieved.
- `UnsupportedResolution`
The resolution is not supported.
@@ -94,7 +94,7 @@ Todo
{
"taskchain": string, // Last task chain
"uuid": string // UUID
"runned_tasks": [ // ID of the last task run
"finished_tasks": [ // ID of the last task run
int,
...
]

View File

@@ -49,7 +49,7 @@ Try restarting your computer.
## Wrong recognition/program freezes after starting
Tip 1: The `Current Stage` of auto battle that costs Sanity requires you to go to the screen with the `Start` button. Please confirm they are not related.
Tip 1: The auto battle requires you to go to the screen with the `Start` button. Please confirm they are not related.
Tip 2: Follow the steps below until the problem is solved.
1. Confirm that your emulator is supported in the [List of the Supported Emulators](EMULATOR_SUPPORTS.md).

View File

@@ -51,7 +51,7 @@ Appends a task.
// Corresponding task parameters
{
"enable": bool, // Whether to enable this task, optional, true by default
"stage": string, // Stage name, optional, by default "当前关卡". Editing in run-time is not supported.
"stage": string, // Stage name, optional, by default crrent / last stage. Editing in run-time is not supported.
"medicine": int, // Maximum number Sanity Potion used, optional, by default 0
"stone": int, // Maximum number of Originite Prime used, optional, by default 0
"times": int, // Maximum times, optional, by default infinite
@@ -159,10 +159,16 @@ Appends a task.
```jsonc
{
"enable": bool, // Whether to enable this task, optional, by default true
"mode": int // Mode, optional, by default 0
// 0 - Plays as much as you can
// 1 - Exits after first level
// 2 - Plays until trading
"mode": int, // Mode, optional, by default 0
// 0 - For candle, plays as much as you can with stable strategy
// 1 - For Originium Ingots, exits after first level
// 2 - For both, Plays until invests
// 3 - For pass, plays as much as you can with aggressive strategy
"starts_count": int, // Number of starts, optional, by default INT_MAX
"investments_count": int,
// Number of investments, optional, by default INT_MAX
"stop_when_investment_full": bool
// Stop the task when investment is full, optional, by default false
}
```

10
docs/glossary/class.md Normal file
View File

@@ -0,0 +1,10 @@
中文|English|日本語|한국어
---|---|---|---
先锋|Vanguard|先鋒|뱅가드
近卫|Guard|前衛|가드
重装|Defender|重装|디펜더
狙击|Sniper|狙撃|스나이퍼
术士|Caster|術師|캐스터
辅助|Supporter|補助|서포터
医疗|Medic|医療|메딕
特种|Specialist|特殊|스페셜리스트

17
docs/glossary/general.md Normal file
View File

@@ -0,0 +1,17 @@
中文|English|日本語|한국어
---|---|---|---
明日方舟|Arknights|アークナイツ|명일방주
源石|Originium|源石|오리지늄
战斗|Combat|作戦|작전
编队|Squads|編成|편성
干员|Operator|人事|오퍼레이터
采购中心|Store|購買部|구매센터
招募|Recruitment|SCOUT|모집
公开招募|Recruit|公開求人|공개모집
干员寻访|Headhunt|人材発掘|헤드헌팅
任务|Mission|任務|임무
基建|Base|基地|기반시설
仓库|Depot|倉庫|창고
好友|Friends|戦友|친구
情报|Info|図鑑|정보
理智|Sanity|理性|이성

140
docs/glossary/items.md Normal file
View File

@@ -0,0 +1,140 @@
中文|English|日本語|한국어
---|---|---|---
基础作战记录|Drill Battle Record|入門作戦記録|기초 작전 기록
初级作战记录|Frontline Battle Record|初級作戦記録|초급 작전 기록
中级作战记录|Tactical Battle Record|中級作戦記録|중급 작전 기록
高级作战记录|Strategic Battle Record|上級作戦記録|고급 작전 기록
中文|English|日本語|한국어
---|---|---|---
源岩|Orirock|源岩鉱|원암
异铁碎片|Oriron Shard|異鉄の欠片|이철 조각
双酮|Diketon|アケトン試剤|다이케톤
代糖|Sugar Substitute|ブドウ糖|감미료
酯原料|Ester|エステル原料|에스테르
破损装置|Damaged Device|破損装置|파손장치
固源岩|Orirock Cube|初級源岩|고원암
异铁|Oriron|初級異鉄|이철
酮凝集|Polyketon|初級アケトン|케톤 앰플
糖|Sugar|初級糖原|설탕
聚酸酯|Polyester|初級エステル|폴리에스테르
装置|Device|初級装置|장치
固源岩组|Orirock Cluster|中級源岩|고원암 더미
异铁组|Oriron Cluster|中級異鉄|이철 결정
酮凝集组|Aketon|中級アケトン|케톤 세트
糖组|Sugar Pack|中級糖原|설탕 봉지
聚酸酯组|Polyester Pack|中級エステル|폴리에스테르 세트
全新装置|Integrated Device|中級装置|개조장치
扭转醇|Loxic Kohl|合成コール|레조에틸렌
轻锰矿|Manganese Ore|マンガン|망간
研磨石|Grindstone|砥石|연마석
RMA70-12|RMA70-12|RMA70-12|RMA70-12
凝胶|Coagulating Gel|人工ゲル|젤
炽合金|Incandescent Alloy|熾合金|열합금
晶体元件|Crystalline Component|素子結晶|크리스탈 소자
化合切削液|Compound Cutting Fluid|切削液|중합 절삭유
半自然溶剂|Semi-Synthetic Solvent|半自然溶剤|반합성 용제
提纯源岩|Orirock Concentration|上級源岩|정제원암
异铁块|Oriron Block|上級異鉄|이철 덩어리
酮阵列|Keton Colloid|上級アケトン|케톤 진열장
糖聚块|Sugar Lump|上級糖原|설탕 박스
聚酸酯块|Polyester Lump|上級エステル|폴리에스테르 박스
改量装置|Optimized Device|上級装置|개량장치
白马醇|White Horse Kohl|上級合成コール|에틸렌바이마
三水锰矿|Manganese Trihydrate|上級マンガン|깁사이트
五水研磨石|Grindstone Pentahydrate|上級砥石|오수연마석
RMA70-24|RMA70-24|RMA70-24|RMA70-24
聚合凝胶|Polymerized Gel|融合ゲル|중합젤
炽合金块|Incandescent Alloy Block|上級熾合金|열합금 덩어리
晶体电路|Crystalline Circuit|結晶回路|크리스탈 회로
切削原液|Cutting Fluid Solution|上級切削液|절삭유 원액
精炼溶剂|Refined Solvent|精錬溶剤|
聚合剂|Polymerization Preparation|融合剤|
双极纳米片|Bipolar Nanoflake|ナノフレーク|바이폴라 나노칩
D32钢|D32 Steel|D32鋼|D32강
晶体电子单元|Crystalline Electronic Unit|結晶制御装置|크리스탈 전자 유닛
中文|English|日本語|한국어
---|---|---|---
基础加固建材|Light Building Material|初級補強材|기초 건축 자제
进阶加固建材|Concrete Building Material|中級補強材|강화 건축 자제
高级加固建材|Reinforced Building Material|上級補強材|고급 건축 자제
碳|Carbon Stick|初級炭素材|탄소 막대
碳素|Carbon Brick|中級炭素材|탄소 막대 묶음
碳素组|Carbon Pack|上級炭素材|탄소 막대 세트
龙骨|Keel|竜骨|용골
中文|English|日本語|한국어
---|---|---|---
技巧概要·卷1|Skill Summary - 1|アーツ学I|스킬개론 제1권
技巧概要·卷2|Skill Summary - 2|アーツ学II|스킬개론 제2권
技巧概要·卷3|Skill Summary - 3|アーツ学III|스킬개론 제3권
中文|English|日本語|한국어
---|---|---|---
芯片|Chip|初級SoC|칩
芯片组|Chip Pack|中級SoC|칩셋
双芯片|Dualchip|上級SoC|듀얼칩
芯片助剂|Chip Catalyst|SoC強化剤|칩 첨가제
中文|English|日本語|한국어
---|---|---|---
信物复制品|Replicated Token|★1○○の印|
信物原件|Original Token|★2○○の印|OOO 증표 원본
信物藏品|Antique Token|★3○○の印|OOO 앤틱 증표
传承信物|Rare Token|★4○○の印|OOO 레어 증표
遗产信物|Epic Token|★5○○の印|OOO 에픽 증표
皇家信物|Royal Token|★6○○の印|OOO 로열 증표
中文|English|日本語|한국어
---|---|---|---
信用|Credit|FP|크레딧
家具零件|Furniture Part|家具パーツ|가구 부품
龙门币|LMD|龍門幣|용문폐
采购凭证|Shop Voucher|購買資格証|구매증명서
资质凭证|Commendation Certificate|一般資格証|자격증명서
高级凭证|Distinction Certificate|上級資格証|고급증명서
情报凭证|Intelligence Certificate|情報資格証|정보증명서
赤金|Pure Gold|純金|순금
合成玉|Orundum|合成玉|합성옥
至纯源石|Originite Prime|純正源石|오리지늄
源石碎片|Originium Shard|源石の欠片|오리지늄 조각
寻访参数模型|Headhunting Parametric Model|特別引換証|헤드헌팅 파라미터 모델
寻访数据契约|Headhunting Data Contract|限定契約証|
事相碎片|Information Fragment|事象の欠片|기록 조각
事相结晶|Event Crystal|事象の結晶|
中文|English|日本語|한국어
---|---|---|---
应急理智小样|Emergency Sanity Sampler|試供理性回復剤|응급 이성 샘플
应急理智合剂|Emergency Sanity Potion|初級理性回復剤|응급 이성 회복제
应急理智顶液|Top Emergency Sanity Potion|上級理性回復剤|긴급 이성 회복제
双人汉堡餐|Burger Set For Two|ハンバーガーセット|햄버거 커플 세트
咸蛋黄味巧克力|Salted Egg Yolk Flavor Chocolate|塩卵味チョコレート|솔티드 에그 초콜릿
中文|English|日本語|한국어
---|---|---|---
招聘许可|Recruitment Permit|求人票|모집 허가증
加急许可|Expedited Plan|緊急招集票|즉시 완료 허가증
寻访凭证|Headhunting Permit|スカウト券|헤드헌팅 허가증
十连寻访凭证|Ten-roll Headhunting Permit|10回スカウト券|헤드헌팅 10회 허가증
公开招募★3兑换券·I|★3 Recruitment Exchange Voucher I|公開求人★3指名券I|공개 모집 ★3 교환권·I
公开招募★4兑换券·I|★4 Recruitment Exchange Voucher I|公開求人★4指名券I|공개 모집 ★4 교환권·I
预约干员随机4选1|Preregister to get 1 of 4 Operators randomly||
干员兑换券|Operator Voucher|オペレーター指名券|오퍼레이터 교환권
资深干员特训邀请函|Senior Operator Training Invitation Letter|★5特訓招待状|특별 채용 훈련 초대장
资深干员调用凭证|Senior Operator Transfer Permit|★5招聘指名券|특별 채용 조달 허가증
高级干员调用凭证|Top Operator Transfer Permit|★6招聘指名券|고급 오퍼레이터 조달 허가증
庆典干员凭证|Thank-You Celebration Headhunting Permit|感謝祭記念★6招聘指名券|
火神因陀罗招募券|Vulcan and Indra Recruitment Voucher|公開求人★5特別指名券|벌컨/인드라 모집권
时装自选凭证|Outfit Voucher|コーデ引換券|컬렉션 자유 선택권
中文|English|日本語|한국어
---|---|---|---
罗德岛物资补给|Rhodes Island Supplies|補給物資・ロドス|로도스 아일랜드 보급 물자
ID信息更新卡|ID Info Update Card|ID情報更新カード|ID 정보 갱신 카드
模组数据块|Module Data Block|モジュールデータ|모듈 데이터 칩
理智|Sanity|理性|이성
声望|EXP|名声|경험치
演习券|Drill Plan|演習券|
无人机|Drone|ドローン|드론

269
docs/glossary/operators.md Normal file
View File

@@ -0,0 +1,269 @@
中文|English|日本語|한국어
---|---|---|---
Lancet-2|Lancet-2|Lancet-2|Lancet-2
Castle-3|Castle-3|Castle-3|Castle-3
THRM-EX|THRM-EX|THRM-EX|THRM-EX
正义骑士号|'Justice Knight'|ジャスティスナイト|저스티스 나이트
中文|English|日本語|한국어
---|---|---|---
12F|12F|12F|12F
黑角|Noir Corne|ノイルホーン|느와르 코르네
杜林|Durin|ドゥリン|두린
夜刀|Yato|ヤトウ|야토
巡林者|Rangers|レンジャー|레인저
中文|English|日本語|한국어
---|---|---|---
芙蓉|Hibiscus|ハイビスカス|히비스커스
炎熔|Lava|ラヴァ|라바
米格鲁|Beagle|ビーグル|비글
芬|Fang|フェン|팽
克洛丝|Kroos|クルース|크루스
翎羽|Plume|プリュム|플룸
玫兰莎|Melantha|メランサ|멜란사
卡缇|Cardigan|カーディ|카디건
史都华德|Steward|スチュワード|스튜어드
安德切尔|Adnachiel|アドナキエル|아드나키엘
安赛尔|Ansel|アンセル|안셀
香草|Vanilla|バニラ|바닐라
梓兰|Orchid|オーキッド|오키드
泡普卡|Popukar|ポプカル|포푸카
空爆|Catapult|カタパルト|캐터펄트
月见夜|Midnight|ミッドナイト|미드나이트
斑点|Spot|スポット|스팟
预备干员-近战|Reserve Operator - Melee|予備隊員-近距離|예비 인원 - 근거리
预备干员-术师|Reserve Operator - Caster|予備隊員-術師|예비 인원 - 캐스터
预备干员-后勤|Reserve Operator - Logistics|予備隊員-支援|예비 인원 - 지원
预备干员-狙击|Reserve Operator - Sniper|予備隊員-狙撃|예비 인원 - 스나이퍼
中文|English|日本語|한국어
---|---|---|---
远山|Gitano|ギターノ|기타노
深海色|Deepcolor|ディピカ|딥컬러
末药|Myrrh|ミルラ|미르
白雪|Shirayuki|シラユキ|시라유키
流星|Meteor|メテオ|메테오
艾丝黛尔|Estelle|エステル|에스텔
杜宾|Dobermann|ドーベルマン|도베르만
梅|May|メイ|메이
猎蜂|Beehunter|ビーハンター|비헌터
夜烟|Haze|ヘイズ|헤이즈
清道夫|Scavenger|スカベンジャー|스캐빈저
蛇屠箱|Cuora|クオーラ|쿠오라
桃金娘|Myrtle|テンニンカ|머틀
断罪者|Conviction|コンビクション|컨빅션
调香师|Perfumer|パフューマー|퍼퓨머
地灵|Earthspirit|アーススピリット|어스스피릿
慕斯|Mousse|ムース|무스
嘉维尔|Gavial|ガヴィル|가비알
红云|Vermeil|ヴァーミル|버메일
霜叶|Frostleaf|フロストリーフ|프로스트리프
古米|Gummy|グム|굼
讯使|Courier|クーリエ|쿠리어
角峰|Matterhorn|マッターホルン|마터호른
杰西卡|Jessica|ジェシカ|제시카
暗索|Rope|ロープ|로프
砾|Gravel|グラベル|그라벨
格雷伊|Greyy|グレイ|그레이
波登可|Podenco|ポデンコ|포덴코
坚雷|Dur-nar|ジュナー|듀나
芳汀|Arene|アレーン|아렌
孑|Jaye|ジェイ|제이
阿消|Shaw|ショウ|쇼
缠丸|Matoimaru|マトイマル|마토이마루
红豆|Vigna|ヴィグナ|비그나
苏苏洛|Sussurro|ススーロ|수수로
刻刀|Cutter|カッター|커터
安比尔|Ambriel|アンブリエル|엠브리엘
卡达|Click|カシャ|클릭
宴|Utage|ウタゲ|우타게
杰克|Jackie|ジャッキー|재키
伊桑|Ethan|イーサン|에단
酸糖|Aciddrop|アシッドドロップ|애시드드롭
泡泡|Bubble|バブル|버블
清流|Purestream|セイリュウ|퓨어스트림
松果|Pinecone|パインコーン|파인콘
豆苗|Beanstalk|ビーンストーク|빈스토크
深靛|Indigo|インディゴ|인디고
罗比菈塔|Roberta|ロベルタ|로베르타
布丁|Pudding|プリン|푸딩
褐果|||
中文|English|日本語|한국어
---|---|---|---
阿米娅|Amiya|アーミヤ|아미야
空|Sora|ソラ|소라
德克萨斯|Texas|テキサス|텍사스
芙兰卡|Franka|フランカ|프란카
雷蛇|Liskarm|リスカム|리스캄
赫默|Silence|サイレンス|사일런스
凛冬|Zima|ズィマー|지마
白面鸮|Ptilopsis|フィリオプシス|프틸롭시스
蓝毒|Blue Poison|アズリウス|블루포이즌
炎客|Flamebringer|エンカク|플레임브링어
星源|||
拉普兰德|Lappland|ラップランド|라플란드
幽灵鲨|Specter|スペクター|스펙터
红|Projekt Red|レッド|레드
普罗旺斯|Provence|プロヴァンス|프로방스
临光|Nearl|ニアール|니어
因陀罗|Indra|インドラ|인드라
守林人|Firewatch|ファイヤーウォッチ|파이어워치
火神|Vulcan|ヴァルカン|벌컨
夜魔|Nightmare|ナイトメア|나이트메어
天火|Skyfire|スカイフレア|스카이파이어
华法琳|Warfarin|ワルファリン|와파린
崖心|Cliffheart|クリフハート|클리프하트
初雪|Pramanix|プラマニクス|프라마닉스
真理|Istina|イースチナ|이스티나
可颂|Croissant|クロワッサン|크루아상
白金|Platinum|プラチナ|플래티넘
卡夫卡|Kafka|カフカ|카프카
狮蝎|Manticore|マンティコア|맨티코어
安哲拉|Andreana|アンドレアナ|안드레아나
陨星|Meteorite|メテオリーテ|메테오라이트
格拉尼|Grani|グラニ|그라니
吽|Hung|ウン|훔
暴行|Savage|サベージ|새비지
食铁兽|FEater|エフイーター|에프이터
梅尔|Mayer|メイヤー|메이어
槐琥|Waai Fu|ワイフー|와이후
柏喙|Bibeak|バイビーク|바이비크
巫恋|Shamare|シャマレ|샤마르
苇草|Reed|リード|리드
鞭刃|Whislash|ウィスラッシュ|위슬래시
星极|Astesia|アステシア|아스테시아
微风|Breeze|ブリーズ|브리즈
送葬人|Executor|イグゼキュター|이그제큐터
断崖|Ayerscarpe|エアースカーペ|에이어스카르페
暴雨|Heavyrain|ヘビーレイン|헤비레인
惊蛰|Leizi|レイズ|레이즈
诗怀雅|Swire|スワイヤー|스와이어
拜松|Bison|バイソン|바이슨
格劳克斯|Glaucus|グラウコス|글라우쿠스
铸铁|Sideroca|シデロカ|시데로카
稀音|Scene|シーン|씬
爱丽丝|Iris|アイリス|아이리스
月禾|Tsukinogi|ツキノギ|츠키노기
蜜蜡|Beeswax|ビーズワクス|비즈왁스
亚叶|Folinic|フォリニック|폴리닉
奥斯塔|Aosta|アオスタ|아오스타
锡兰|Ceylon|セイロン|실론
贾维|Chiave|キアーベ|키아베
布洛卡|Broca|ブローカ|브로카
熔泉|Toddifons|トギフォンス|토디폰스
四月|April|エイプリル|에이프릴
灰喉|GreyThroat|グレースロート|그레이스롯
贝娜|Bena|ベナ|베나
莱恩哈特|Leonhardt|レオンハルト|레온하르트
石棉|Asbestos|アスベストス|아스베스토스
慑砂|Sesa|シェーシャ|세사
雪雉|Snowsant|スノーズント|스노우상트
薄绿|Mint|ミント|민트
极境|Elysium|エリジウム|엘리시움
图耶|Tuye|トゥイエ|투예
苦艾|Absinthe|アブサント|압생트
特米米|Tomimi|トミミ|토미미
燧石|Flint|フリント|플린트
羽毛笔|La Pluma|ラ・プルマ|라 플루마
极光|Aurora|オーロラ|오로라
灰毫|Ashlock|アッシュロック|애쉬락
掠风|||
絮雨|Whisperain|ウィスパーレイン|위스퍼레인
蜜莓|Honeyberry|ハニーベリー|허니베리
罗宾|Robin|ロビン|로빈
乌有|Mr. Nothing|ウユウ|우요우
闪击|Blitz|Blitz|Blitz
霜华|Frost|Frost|Frost
战车|Tachanka|Tachanka|Tachanka
桑葚|Mulberry|マルベリー|멀베리
赤冬|Akafuyu|アカフユ|아카후유
夜半|||
绮良|Kirara|キララ|키라라
龙舌兰|Tequila|テキーラ|테킬라
蚀清|Corroserum|コロセラム|코로세럼
夏栎|||
野鬃|Wild Mane|ワイルドメイン|와일드메인
Sharp|Sharp|Sharp|Sharp
Pith|Pith|Pith|Pith
Touch|Touch|Touch|Touch
Stormeye|Stormeye|Stormeye|Stormeye
暮落|Shalem|シャレム|샬렘
炎狱炎熔|Lava the Purgatory|炎獄ラヴァ|라바 더 퍼거토리
寒芒克洛丝|||
濯尘芙蓉|||
承曦格雷伊|||
耶拉|Kjera|イェラ|쉐라
风丸|||
九色鹿|Nine-Colored Deer|九色鹿|나인컬러드 디어
暮落|Shalem|シャレム|샬렘
见行者|||
洛洛|||
埃拉托|||
海蒂|||
车尔尼|||
中文|English|日本語|한국어
---|---|---|---
凯尔希|Kal'tsit|ケルシー|켈시
陈|Ch'en|チェン|첸
煌|Blaze|ブレイズ|블레이즈
能天使|Exusiai|エクシア|엑시아
推进之王|Siege|シージ|시즈
W|W|W|W
伊芙利特|Ifrit|イフリータ|이프리트
星熊|Hoshiguma|ホシグマ|호시구마
闪灵|Shining|シャイニング|샤이닝
银灰|SilverAsh|シルバーアッシュ|실버애쉬
夜莺|Nightingale|ナイチンゲール|나이팅게일
艾雅法拉|Eyjafjalla|エイヤフィヤトラ|에이야퍄들라
赫拉格|Hellagur|ヘラグ|헬라그
早露|Rosa|ロサ|로사
塞雷娅|Saria|サリア|사리아
灵知|Gnosis|ノーシス|노시스
莫斯提马|Mostima|モスティマ|모스티마
风笛|Bagpipe|バグパイプ|백파이프
阿|Aak|ア|아
麦哲伦|Magallan|マゼラン|마젤란
傀影|Phantom|ファントム|팬텀
斯卡蒂|Skadi|スカジ|스카디
山|Mountain|マウンテン|마운틴
安洁莉娜|Angelina|アンジェリーナ|안젤리나
棘刺|Thorns|ソーンズ|쏜즈
菲亚梅塔|||
泥岩|Mudrock|マドロック|머드락
老鲤|||
空弦|Archetto|アルケット|아르케토
黑|Schwarz|シュヴァルツ|슈바르츠
史尔特尔|Surtr|スルト|수르트
铃兰|Suzuran|スズラン|스즈란
嵯峨|Saga|サガ|사가
澄闪|||
迷迭香|Rosmontis|ロスモンティス|로즈몬티스
温蒂|Weedy|ウィーディ|위디
森蚺|Eunectes|ユーネクテス|유넥티스
焰尾|Flametail|フレイムテイル|플레임테일
瑕光|Blemishine|ブレミシャイン|블레미샤인
卡涅利安|Carnelian|カーネリアン|카넬리안
远牙|Fartooth|ファートゥース|파투스
水月|Mizuki|ミヅキ|미즈키
灰烬|Ash|Ash|Ash
异客|Passenger|パッセンジャー|패신저
歌蕾蒂娅|Gladiia|グレイディーア|글래디아
琴柳|Saileach|サイラッハ|사일라흐
帕拉斯|Pallas|パラス|팔라스
浊心斯卡蒂|Skadi the Corrupting Heart|濁心スカジ|스카디 더 커럽팅 하트
假日威龙陈|Ch'en the Holungday|遊龍チェン|첸 더 홀룽데이
耀骑士临光|Nearl the Radiant Knight|耀騎士ニアール|니어 더 래디언트 나이트
归溟幽灵鲨|||
刻俄柏|Ceobe|ケオベ|케오베
年|Nian|ニェン|니엔
夕|Dusk|シー|시
令|||
艾丽妮|||
号角|||
流明|||
黑键|||
多萝西|||

View File

@@ -0,0 +1,42 @@
# -*- coding: utf-8 -*-
import re
import requests
OPERATOR_URL = 'https://api.prts.plus/arknights/operator?server='
SERVERS: list[str] = ['cn', 'en', 'ja', 'ko']
OUTPUT_FILE = 'operators.md'
operators: dict[int, dict[int, dict[str, str]]] = {} # star, id, server, name
for server in SERVERS:
r = requests.get(OPERATOR_URL + server)
server_data = r.json()
if server_data['status_code'] != 200:
continue
operator_data: list[dict[str, str]] = server_data['data']
for operator in operator_data:
m = re.match(r'^char_(\d+).*$', operator['id']) # char_999_something
if not m:
continue
id = int(m.group(1))
star: int = operator['star']
operators[star] = operators.get(star, {})
operators[star][id] = operators[star].get(id, {})
operators[star][id][server] = operator['name']
# Output
with open(OUTPUT_FILE, 'w', encoding='utf-8') as fp:
for star in [1, 2, 3, 4, 5, 6]:
print('中文|English|日本語|한국어', file=fp)
print('---|---|---|---', file=fp)
id_list = list(operators[star].keys())
id_list.sort()
for id in id_list:
operator: dict[str, str] = operators[star][id]
print('|'.join([operator.get(server, '')
for server in SERVERS]), file=fp)
print(file=fp)

View File

@@ -75,7 +75,7 @@ Todo
连接失败
- `Connected`
已连接,注意此时的 `uuid` 字段值为空(下一步才是获取)
- `UuidGetted`
- `UuidGot`
已获取到设备唯一码
- `UnsupportedResolution`
分辨率不被支持
@@ -94,7 +94,7 @@ Todo
{
"taskchain": string, // 最后的任务链
"uuid": string, // 设备唯一码
"runned_tasks": [ // 已经运行过的任务 id
"finished_tasks": [ // 已经运行过的任务 id
int,
...
]

View File

@@ -49,7 +49,7 @@ _注意蓝叠安装完后需要在模拟器设置中打开 `Android 调试桥
## 识别错误/任务开始后一直不动、没有反应
提示 1. 自动战斗功能 和 刷理智的 `当前关卡`,都是需要手动点到关卡页有 `开始行动` 按钮的地方再开始任务的。请确认不是这个问题~
提示 1. 自动战斗功能是需要手动点到关卡页有 `开始行动` 按钮的地方再开始任务的。请确认不是这个问题~
提示 2. 依次进行,若问题解决,则无需往下
1. 请根据 [模拟器支持情况](模拟器支持.md) 确定您的模拟器是受支持的

View File

@@ -51,7 +51,7 @@ TaskId ASSTAPI AsstAppendTask(AsstHandle handle, const char* type, const char* p
// 对应的任务参数
{
"enable": bool, // 是否启用本任务,可选,默认为 true
"stage": string, // 关卡名,可选,默认“当前关卡。不支持运行中设置
"stage": string, // 关卡名,可选,默认为空,识别当前/上次的关卡。不支持运行中设置
"medicine": int, // 最大使用理智药数量,可选,默认 0
"stone": int, // 最大吃石头数量,可选,默认 0
"times": int, // 指定次数,可选,默认无穷大
@@ -159,10 +159,16 @@ TaskId ASSTAPI AsstAppendTask(AsstHandle handle, const char* type, const char* p
```jsonc
{
"enable": bool, // 是否启用本任务,可选,默认为 true
"mode": int // 模式,可选项。默认 0
// 0 - 尽可能一直往后打
// 1 - 第一层投资完源石锭就退出
// 2 - 投资过后再退出,没有投资就继续往后打
"mode": int, // 模式,可选项。默认 0
// 0 - 刷蜡烛,尽可能稳定的打更多层数
// 1 - 刷源石锭,第一层投资完就退出
// 2 - 【即将弃用】两者兼顾,投资过后再退出,没有投资就继续往后打
// 3 - 【开发中】尝试通关,尽可能打的远
"starts_count": int, // 开始探索 次数,可选,默认 INT_MAX。达到后自动停止任务
"investments_count": int,
// 投资源石锭 次数,可选,默认 INT_MAX。达到后自动停止任务
"stop_when_investment_full": bool
// 投资满了自动停止任务,可选,默认 false
}
```

View File

@@ -28,8 +28,11 @@ extern "C" {
bool ASSTAPI AsstStart(AsstHandle handle);
bool ASSTAPI AsstStop(AsstHandle handle);
unsigned long long ASSTAPI AsstGetImage(AsstHandle handle, void* buff, unsigned long long buff_size);
bool ASSTAPI AsstCtrlerClick(AsstHandle handle, int x, int y, bool block);
unsigned long long ASSTAPI AsstGetImage(AsstHandle handle, void* buff, unsigned long long buff_size);
unsigned long long ASSTAPI AsstGetUUID(AsstHandle handle, char* buff, unsigned long long buff_size);
unsigned long long ASSTAPI AsstGetTasksList(AsstHandle handle, TaskId* buff, unsigned long long buff_size);
unsigned long long ASSTAPI AsstGetNullSize();
ASSTAPI_PORT const char* ASST_CALL AsstGetVersion();
void ASSTAPI AsstLog(const char* level, const char* message);

View File

@@ -47,7 +47,7 @@
}
},
{
"name_template": "MaaDependency-NoAvx-{VERSION}",
"name_template": "MaaDependencyNoAvx-{VERSION}",
"type": "MaaDependencyNoAvx",
"configuration": {
"include": [

5876
resource/battle_data.json Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -8,12 +8,12 @@
0
],
"controlDelayRange_Doc": "点击随机延时:每次点击操作会进行随机延时,降低封号风险(好像也没听说过谁被封号的)。格式为 [ 最小延时, 最大延时 ]单位为毫秒。例如想设置3~5秒延时即修改为[ 3000, 5000 ]默认0~0",
"adbExtraSwipeDist": 50,
"adbExtraSwipeDist": 100,
"adbExtraSwipeDist_Doc": "额外的滑动距离adb有bug同样的参数偶尔会划得非常远。额外做一个短程滑动把之前的停下来",
"adbExtraSwipeDuration": 1000,
"adbExtraSwipeDuration_Doc": "额外的滑动持续时间adb有bug同样的参数偶尔会划得非常远。额外做一个短程滑动把之前的停下来。若小于0则关闭额外滑动功能",
"penguinReport": {
"Doc": "企鹅数据汇报: https://penguin-stats.cn/",
"Doc": "企鹅物流汇报: https://penguin-stats.cn/",
"cmdFormat": "curl -H \"Content-Type: application/json\" -s -i -d \"[body]\" \"https://penguin-stats.cn/PenguinStats/api/v2/report\" [extra]",
"cmdFormat_Doc": "命令格式,想打印详细信息可以尝试添加 -v -i"
},

View File

@@ -9,10 +9,11 @@
- 刷理智(仅支持选择`当前关卡`
- 使用理智药恢复理智
- 使用源石恢复理智
- 指定次数
- 公招计算
- 刷理智指定
- 访问好友
- 领取日常奖励
- 公招计算
- 无限刷肉鸽(测试功能)
## Global (EN)
@@ -24,6 +25,7 @@ Now supports:
- Restore with potion
- Restore with Originite
- Set the max number of auto battles
- Recruitment calculate
- Friends visit
- Award collect
- Recruitment calculate
- Auto Roguelike (beta)

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 103 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 75 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 114 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

View File

@@ -9,35 +9,41 @@
- 刷理智(仅支持选择`当前关卡`
- 使用理智药恢复理智
- 使用源石恢复理智
- 指定次数
- 刷理智指定次数
- 自动公招
- 访问好友
- 领取日常奖励
- 公招计算
- 无限刷肉鸽(测试功能)
## Japanese
## JP Client
Please go to `Settings` - `Startup Settings` - `Client Version` and select `YoStarJP`
Now supports:
Supported features:
- Auto battle (only supports selecting `current stage`)
- Restore with potion
- Restore with Originite
- Auto-use sanity potion
- Auto-use Originite Prime
- Set the max number of auto battles
- Auto recruiting
- Visiting friend's infrastructure
- Collecting daily quest awards
- Recruitment calculate
- Friends visit
- Award collect
- Auto Roguelike (beta)
## 日本
## 日本サーバー
「設定」-「スタートアップ設定」-「クライアントバージョン」に移動し、「YoStarJP」を選択してください
現在サポートされています
現在サポートされている機能
- オートバトラー(「現在のステージ」の選択のみをサポート
- ポーションで復元
- Originiteで復元
- 自動戦闘の最大数を設定します
- 採用計算
-達が訪問
- アワードコレクト
- 自動ローグライク(ベータ版)
- 自動戦闘(「現在のステージ」の選択だけ
- 理性回復アイテムを使う
- 純正源石を使う
- 自動戦闘の最大数を指定する
- 自動公開求人
- 友訪問
- デイリーリクエストのアワードを収集する
- 公開求人の計算
- 自動統合戦略(ベータ版)

View File

@@ -82,7 +82,9 @@
"algorithm": "OcrDetect",
"text": [
"上限",
"達しました"
"達しました",
"Fpは入手できません",
"再訪問の場合"
],
"action": "DoNothing",
"roi": [
@@ -1450,6 +1452,289 @@
"3"
]
]
},
"GoLastBattle": {
"algorithm": "OcrDetect",
"text": [
"前回の参加作戦"
],
"roi": [
916,
479,
249,
127
],
"action": "ClickSelf",
"next": [
"UsePrts",
"UsePrts-StageSN",
"StartButton1"
]
},
"StageThemeChapter3ToChapter2To1-7": {
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": [
"幻滅"
],
"roi": [
200,
120,
80,
32
],
"cache": false,
"next": [
"StageThemeChapter2ToChapter1To1-7"
]
},
"StageThemeChapter2ToChapter1To1-7": {
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": [
"覚醒"
],
"roi": [
200,
120,
80,
32
],
"cache": false,
"next": [
"StageThemeEpisode3ToEpisode1To1-7",
"StageThemeEpisode2ToEpisode1To1-7",
"StageThemeEpisode1To1-7"
]
},
"StagePR-A-1": {
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": [
"Pr-A-1",
"PR-A-1"
],
"roi": [
27,
260,
742,
400
]
},
"StagePR-A-2": {
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": [
"Pr-A-2",
"PR-A-2"
],
"roi": [
472,
0,
793,
502
]
},
"StagePR-B-1": {
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": [
"Pr-B-1",
"PR-B-1"
],
"roi": [
27,
260,
742,
400
]
},
"StagePR-B-2": {
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": [
"Pr-B-2",
"PR-B-2"
],
"roi": [
472,
0,
793,
502
]
},
"StagePR-C-1": {
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": [
"Pr-C-1",
"PR-C-1"
],
"roi": [
27,
260,
742,
400
]
},
"StagePR-C-2": {
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": [
"Pr-C-2",
"PR-C-2"
],
"roi": [
472,
0,
793,
502
]
},
"StagePR-D-1": {
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": [
"Pr-D-1",
"PR-D-1"
],
"roi": [
27,
260,
742,
400
]
},
"StagePR-D-2": {
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": [
"Pr-D-2",
"PR-D-2"
],
"roi": [
472,
0,
793,
502
]
},
"StageCE5": {
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": [
"CE-5"
],
"roi": [
850,
140,
250,
220
]
},
"StageLS5": {
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": [
"LS-5",
"L$-5"
],
"roi": [
850,
140,
250,
220
]
},
"StageCA5": {
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": [
"CA-5"
],
"roi": [
850,
140,
250,
220
]
},
"StageAP5": {
"algorithm": "OcrDetect",
"action": "ClickSelf",
"text": [
"AP-5"
],
"roi": [
850,
140,
250,
220
]
},
"CE-6": {
"algorithm": "JustReturn",
"action": "DoNothing",
"sub": [
"StageResource",
"SwipeToTheLeft",
"StageCE",
"StageCE5"
]
},
"LS-6": {
"algorithm": "JustReturn",
"action": "DoNothing",
"sub": [
"StageResource",
"SwipeToTheLeft",
"StageLS",
"StageLS5"
]
},
"StartRecruit": {
"algorithm": "OcrDetect",
"action": "ClickSelf",
"rearDelay": 500,
"text": [
"求人開始"
],
"roi": [
0,
300,
1280,
420
]
},
"RecruitFlag": {
"algorithm": "OcrDetect",
"text": [
"公開求人"
],
"roi": [
50,
100,
230,
100
],
"action": "Stop"
},
"RecruitNow": {
"algorithm": "OcrDetect",
"action": "ClickSelf",
"rearDelay": 500,
"cache": false,
"text": [
"緊急招集"
],
"roi": [
0,
300,
1280,
420
],
"next": [
"RecruitNowConfirm"
]
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View File

@@ -9,4 +9,6 @@
- 刷理智(仅支持选择`当前关卡`
- 使用理智药恢复理智
- 使用源石恢复理智
- 指定次数
- 刷理智指定次数
- 自动公招
- 公招识别

View File

@@ -58,5 +58,293 @@
"next": [
"ClickCorner"
]
},
"RecruitFlag": {
"algorithm": "OcrDetect",
"text": [
"公開招募"
],
"roi": [
50,
100,
230,
100
],
"action": "Stop"
},
"TodaysSuppliesToRecruit": {
"algorithm": "OcrDetect",
"text": [
"今日配給"
],
"action": "ClickRect",
"specificRect": [
1000,
1,
270,
340
],
"roi": [
500,
50,
300,
150
],
"next": [
"ReturnToRecruitCloseAnno",
"Recruit"
]
},
"RecruitBeginLoading": {
"algorithm": "OcrDetect",
"action": "DoNothing",
"text": [
"正在提交",
"反饋至神經"
],
"roi": [
700,
600,
300,
120
],
"next": [
"RecruitBeginLoading",
"Recruit",
"RecruitBegin"
]
},
"RecruitFinishLoading": {
"algorithm": "OcrDetect",
"action": "DoNothing",
"text": [
"正在提交",
"反饋至神經"
],
"roi": [
700,
600,
300,
120
],
"next": [
"RecruitFinishLoading",
"RecruitFinish",
"RecruitSkip",
"RecruitSkipWithoutButton"
]
},
"StartRecruit": {
"algorithm": "OcrDetect",
"action": "ClickSelf",
"rearDelay": 500,
"text": [
"開始招.*",
"開始招募"
],
"roi": [
0,
300,
1280,
420
]
},
"RecruitNow": {
"algorithm": "OcrDetect",
"action": "ClickSelf",
"rearDelay": 500,
"cache": false,
"text": [
"立即招.*"
],
"roi": [
0,
300,
1280,
420
],
"next": [
"RecruitNowConfirm"
]
},
"RecruitLoading": {
"algorithm": "OcrDetect",
"action": "DoNothing",
"text": [
"正在提交",
"反饋至神經"
],
"roi": [
700,
600,
300,
120
],
"next": [
"RecruitLoading",
"SleepThenStop"
]
},
"RecruitConfirmLoading": {
"algorithm": "OcrDetect",
"action": "DoNothing",
"text": [
"正在提交",
"反饋至神經"
],
"roi": [
700,
600,
300,
120
],
"next": [
"RecruitConfirmLoading",
"RecruitFlag"
]
},
"RecruitTags": {
"algorithm": "OcrDetect",
"text": [],
"roi": [
375,
360,
480,
120
],
"ocrReplace": [
[
"初期",
"新手"
],
[
"乾員",
"干员"
],
[
"幹員",
"干员"
],
[
"資深",
"资深"
],
[
"高級資深",
"高级资深"
],
[
"近戰位",
"近战位"
],
[
"遠程位",
"远程位"
],
[
"近衛",
"近卫"
],
[
"醫療",
"医疗"
],
[
"先鋒",
"先锋"
],
[
"術師",
"术师"
],
[
"衛師",
"术师"
],
[
"狙撃",
"狙击"
],
[
"狙擊",
"狙击"
],
[
"重裝",
"重装"
],
[
"輔助",
"辅助"
],
[
"特種",
"特种"
],
[
"治療",
"治疗"
],
[
"支援",
"支援"
],
[
"輸出",
"输出"
],
[
"群攻",
"群攻"
],
[
"減速",
"减速"
],
[
"生存",
"生存"
],
[
"防護",
"防护"
],
[
"削弱",
"削弱"
],
[
"位移",
"位移"
],
[
"控場",
"控场"
],
[
"爆發",
"爆发"
],
[
"召喚",
"召唤"
],
[
"快速復活",
"快速复活"
],
[
"回復",
"回复"
],
[
"費用回.+",
"费用回复"
],
[
"支援機械",
"支援机械"
]
]
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

View File

@@ -1,19 +1,14 @@
[
{
"stage_name": "驯兽小屋",
"replacement_home": [
[
8,
3
]
]
},
{
"stage_name": "巡逻队",
"replacement_home": [
[
8,
3
],
[
8,
4
]
]
},
@@ -21,8 +16,8 @@
"stage_name": "压轴登场",
"replacement_home": [
[
2,
2
3,
4
]
]
},
@@ -82,15 +77,6 @@
]
]
},
{
"stage_name": "恐怖传说",
"replacement_home": [
[
0,
4
]
]
},
{
"stage_name": "寒渊惜别",
"replacement_home": [
@@ -221,5 +207,14 @@
4
]
]
},
{
"stage_name": "悦耳杀机",
"replacement_home": [
[
6,
6
]
]
}
]

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,489 @@
[
{
"name": "扩散之手",
"chars": [
"异客"
]
},
{
"name": "撕扯之手",
"chars": [
"帕拉斯"
]
},
{
"name": "金酒之杯",
"no_longer_buy": true,
"ignore_no_longer_buy": true
},
{
"name": "骑士戒律·新编",
"no_longer_buy": true,
"ignore_no_longer_buy": true
},
{
"name": "投币玩具",
"no_longer_buy": true,
"ignore_no_longer_buy": true
},
{
"name": "人事部密信"
},
{
"name": "残弩-典训",
"roles": [
"SNIPER"
],
"promotion": 1
},
{
"name": "绿叶菜罐头"
},
{
"name": "073号安全试剂"
},
{
"name": "Miss.Christine摸摸券",
"promotion": 2
},
{
"name": "残弩-神速",
"roles": [
"SNIPER"
]
},
{
"name": "折戟-浴血",
"roles": [
"WARRIOR"
]
},
{
"name": "四叶草化石"
},
{
"name": "玻璃小鸟"
},
{
"name": "赤金的远征"
},
{
"name": "锈蚀的铁锤"
},
{
"name": "《第二经济改革法》"
},
{
"name": "长生者之证"
},
{
"name": "被撬开的道具箱"
},
{
"name": "石像鬼塑像"
},
{
"name": "尖笑鬼牌",
"promotion": 1
},
{
"name": "血魔的寝床"
},
{
"name": "《杜林地上环游记》"
},
{
"name": "特殊抑制器"
},
{
"name": "“时光之末”"
},
{
"name": "折戟-典训",
"roles": [
"WARRIOR"
],
"promotion": 1
},
{
"name": "高卢银行支票"
},
{
"name": "折戟-破釜沉舟",
"roles": [
"WARRIOR"
]
},
{
"name": "折戟-一夫当关",
"roles": [
"WARRIOR"
]
},
{
"name": "全局作战文件"
},
{
"name": "折戟-锋刃",
"roles": [
"WARRIOR"
]
},
{
"name": "皇家利口酒"
},
{
"name": "断杖-典训",
"roles": [
"CASTER"
],
"promotion": 1
},
{
"name": "古旧乐谱残章"
},
{
"name": "苦行者泡芙"
},
{
"name": "乌萨斯列巴"
},
{
"name": "高卢小圆饼"
},
{
"name": "微缩舞台模型"
},
{
"name": "蓝色丝巾"
},
{
"name": "钝爪-典训",
"roles": [
"PIONEER"
],
"promotion": 1
},
{
"name": "残弩-百步穿杨",
"roles": [
"SNIPER"
]
},
{
"name": "万能钥匙"
},
{
"name": "“法术杀手”"
},
{
"name": "猩红剧团票根"
},
{
"name": "老蒲扇"
},
{
"name": "空白名片"
},
{
"name": "难闻的止血剂"
},
{
"name": "迷迭香之拥"
},
{
"name": "源石鸢尾花"
},
{
"name": "断杖-织法者",
"roles": [
"CASTER"
]
},
{
"name": "“当红歌手”"
},
{
"name": "银餐叉"
},
{
"name": "Scout的狙击镜"
},
{
"name": "维多利亚“废铁”勋章"
},
{
"name": "折戟-突破",
"roles": [
"WARRIOR"
]
},
{
"name": "莱塔尼亚荣誉勋章"
},
{
"name": "女妖之吻"
},
{
"name": "突击协议-利刃",
"roles": [
"WARRIOR",
"PIONEER"
]
},
{
"name": "爱丽舍钱袋"
},
{
"name": "至宝指环",
"ignore_no_longer_buy": true
},
{
"name": "制式防暴用具"
},
{
"name": "幸运硬币",
"ignore_no_longer_buy": true
},
{
"name": "维多利亚蛋糕"
},
{
"name": "“黑夜呢喃”"
},
{
"name": "红色蝴蝶结"
},
{
"name": "残弩-战场依存",
"roles": [
"SNIPER"
]
},
{
"name": "断杖-咏唱",
"roles": [
"CASTER"
]
},
{
"name": "支柱-典训",
"roles": [
"SUPPORT"
],
"promotion": 1
},
{
"name": "香草沙士汽水"
},
{
"name": "悬丝傀儡"
},
{
"name": "镶金骨骰"
},
{
"name": "钝爪-爆发",
"roles": [
"PIONEER"
]
},
{
"name": "苍白花冠"
},
{
"name": "“绽放”"
},
{
"name": "作者的喉舌"
},
{
"name": "设计师量尺"
},
{
"name": "古高卢银币"
},
{
"name": "医者-妙手",
"roles": [
"MEDIC"
]
},
{
"name": "急救药箱"
},
{
"name": "钝爪-百战",
"roles": [
"PIONEER"
]
},
{
"name": "皇帝的收藏"
},
{
"name": "断杖-凝神",
"roles": [
"CASTER"
]
},
{
"name": "铁棍面包"
},
{
"name": "迷梦香精"
},
{
"name": "赶车夫的长鞭"
},
{
"name": "人偶之家"
},
{
"name": "锈蚀刀片"
},
{
"name": "贵族刺剑"
},
{
"name": "《旧高卢地名源流考》"
},
{
"name": "路线说明图"
},
{
"name": "摩根队长佳酿"
},
{
"name": "试制巧克力"
},
{
"name": "黄铜指南针"
},
{
"name": "“噤声”"
},
{
"name": "“童趣玩偶”"
},
{
"name": "显圣吊坠"
},
{
"name": "破坏协议-消除",
"roles": [
"CASTER",
"SPECIAL"
]
},
{
"name": "远程协议-遥击",
"roles": [
"SNIPER",
"MEDIC"
]
},
{
"name": "地区行动方案"
},
{
"name": "舞者手链"
},
{
"name": "安洁莉娜的创想"
},
{
"name": "异铁小圆盾"
},
{
"name": "破损的面具"
},
{
"name": "羽兽肝酱"
},
{
"name": "活玫瑰"
},
{
"name": "“聚焦”"
},
{
"name": "钝爪-熟稔",
"roles": [
"PIONEER"
]
},
{
"name": "独奏八音盒"
},
{
"name": "球球果汁"
},
{
"name": "古怪的长笛"
},
{
"name": "女皇之愿"
},
{
"name": "荒地龙舌兰"
},
{
"name": "演出用香水"
},
{
"name": "医者-理智固剂",
"roles": [
"MEDIC"
]
},
{
"name": "生命之水"
},
{
"name": "奇渊面具"
},
{
"name": "昏暗的提灯"
},
{
"name": "皇族金胸针"
},
{
"name": "皇帝的恩宠"
},
{
"name": "开裂的束缚带"
},
{
"name": "解约协议"
},
{
"name": "残破合影"
},
{
"name": "精神治疗录像带"
},
{
"name": "军团护心镜"
},
{
"name": "“迷醉荷谟伊”"
},
{
"name": "食腐者手杖"
},
{
"name": "凯旋号角"
},
{
"name": "假面舞会面具",
"ignore_no_longer_buy": true
},
{
"name": "高闪相机"
},
{
"name": "“逝者垂泪”"
}
]

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Some files were not shown because too many files have changed in this diff Show More