fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 02:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,467 Commits 60 Branches 1,840 Tags
ddfde43abdea8a5a36148011c8ca599a9e232bc7
Commit Graph

12467 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
梁星逢
ddfde43abd perf: 添加萨卡兹肉鸽作业"炉工志愿队","血脉之辩","见闻峰会" (#10228) 
* feat: 添加萨卡兹肉鸽作业"炉工志愿队","血脉之辩","见闻峰会"

* chore: Auto update by pre-commit hooks [skip changelog]

* revert: default.json

* Update default.json

* change default.json

* perf: 修改部分replace home和blacklist

* perf: 修改见闻峰会blacklist

---------

Co-authored-by: 晓丶梦丶仁 <1020623818@qq.com>
 2024-08-13 17:49:51 +08:00
github-actions[bot]
cd496a5170 chore: Auto Update Game Resources - 2024-08-13 
[skip changelog]
 2024-08-13 08:42:53 +00:00
github-actions[bot]
493d0de83d chore: Auto Templates Optimization 
[skip changelog]
 2024-08-13 08:38:54 +00:00
晓丶梦丶仁
146315f17a refactor: 将生息演算：沙洲遗闻由任务树重构为任务环，以便使用出口、后续重构 (#10223) (#10229) (#10230) 
* refactor!: 将生息演算：沙洲遗闻由任务树重构为任务环，以便使用出口、后续重构 (#10229)

* style: 删除RA2Ex以免混淆视线且方便revert

* refactor: 重构begin模块

* refactor: 重构丰饶灌木林模块

* refactor: 重构聚羽之地模块

* refactor: 完成剩余部分（缺少图片名重构）

* style: 把RA2Ex放回来（同时缺图片和外服适配）

* refactor: 完成英日韩三服任务名转移

* refactor: 替换图片名

* refactor: 新图片名写入任务template

* fix: 补上忘改了的任务名

* fix: 为旧任务更名并允许Ex复用

* fix: 任务名错乱

* fix: 修复模板匹配的空图片名

* fix: 补足落下的任务名

* fix: 韩服任务名打错

* fix: 补齐日服OCR替换

* fix: 补齐韩服OCR替换
 2024-08-13 16:38:35 +08:00
status102
7c8b9701a4 fix: 日服理智药正在使用数量识别错误 
fix #10172
 2024-08-13 16:07:15 +08:00
Weiyou Wang
7472ef7674 chore: update TaskSorter (#10224) 
添加对萨卡兹肉鸽任务 Sarkaz@Roguelike 和生息演算两个主题 Fire@Reclamation, Tales@Reclamation 的排序
 2024-08-12 22:43:21 +10:00
github-actions[bot]
5c7a47c4c1 chore: Auto Update Game Resources - 2024-08-12 
[skip changelog]
 2024-08-12 11:23:48 +00:00
Weiyou Wang
1bf373ac4b refactor: polish code for collapsal paradigm plugin (#10198) 
* refactor: 复用 LoadingText

* refactor: 删除国际服 tasks.json 中冗余内容

* refactor: 改用 task 实现点击与滑动操作，并为精简后的相关 config task 添加注释
 2024-08-12 21:03:45 +10:00
github-actions[bot]
013fc85b70 chore: Auto Update Game Resources - 2024-08-12 
[skip changelog]
 2024-08-12 11:01:55 +00:00
github-actions[bot]
9023e5e871 chore: Auto Templates Optimization 
[skip changelog]
 2024-08-12 10:51:07 +00:00
Weiyou Wang
87fc119612 refactor: 整理生息演算<沙中之火>的任务流 (#10215) 
* refactor: 为沙中之火的模版文件名加上SandFire前缀

* refactor: 整理生息演算任务顺序，将 Reclamation 放在 Reclamation2 之前

* refactor: 整理沙中之火任务流

* refactor: append SandFire prefix

* fix: 补上隐试生成的任务

* refactor: 为国际服沙中之火的模版文件名加上SandFire前缀

* refactor: 适配国际服

* refactor: SandFire -> Fire

* chore: Auto update by pre-commit hooks [skip changelog]

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2024-08-12 20:48:40 +10:00
晓丶梦丶仁
8555711824 fix: 战斗结束掉落过程弹窗 (#10218) 2024-08-12 17:24:55 +08:00
github-actions[bot]
c609640308 chore: Auto Update Game Resources - 2024-08-12 
[skip changelog]
 2024-08-12 06:43:29 +00:00
HX3N
bac79daa83 chore: YostarKR Reclamation2ExClickProduct add ocrReplace 2024-08-12 15:40:45 +09:00
zzyyyl
48178e9eee fix: 修复部分设备萨卡兹肉鸽商店 StageTraderEnter 得分过低 
fix #10160
 2024-08-12 12:56:16 +08:00
zzyyyl
4a30f0009c feat: 数色前先通过闭运算填充小空洞，避免数色的得分过低 2024-08-12 12:54:56 +08:00
Constrat
520d159f9f fix: delay between Mall and CreditStoreOcr for refresh lag 2024-08-11 23:41:31 +02:00
Constrat
03faeb1b09 chore: added regex for EX stages (#10211) 
* chore: added regex for EX stages

* chore: Auto update by pre-commit hooks [skip changelog]

* perf: remove unneccesart regex

* perf: non-greedy quantifier
 2024-08-11 21:34:00 +02:00
uye
6184ed9cc3 chore: 减少debug下截图数量最大值 2024-08-11 23:51:38 +08:00
晓丶梦丶仁
c10a5fd252 i18n: 生息演算停止任务返回主页面OCR 2024-08-11 22:20:29 +08:00
github-actions[bot]
7c396cba92 chore: Auto Update Game Resources - 2024-08-11 
[skip changelog]
 2024-08-11 13:41:33 +00:00
ManicSteiner
c4853baf92 chore: YostarJP Reclamation2QuitToMainPage 2024-08-11 21:38:12 +08:00
uye
cf4da7c6e1 fix: json格式错误 
[skip changelog]
 2024-08-11 20:40:00 +08:00
uye
0486c9f722 i18n: 生息演算停止任务 2024-08-11 20:26:03 +08:00
github-actions[bot]
942e4e94ad chore: Auto Update Game Resources - 2024-08-11 
[skip changelog]
 2024-08-11 11:41:54 +00:00
github-actions[bot]
38e88fd400 chore: Auto Templates Optimization 
[skip changelog]
 2024-08-11 11:29:51 +00:00
晓丶梦丶仁
1bf777c75e feat: 生息演算刷满后停止任务 (#10197) 
* feat: 生息演算刷满后停止任务

* chore: Auto update by pre-commit hooks [skip changelog]

* fix: 修改出口

* fix: 我也不知道我写的什么玩意 revert掉

* chore: Auto update by pre-commit hooks [skip changelog]

* fix: 用Stop结束任务

* chore: Auto update by pre-commit hooks [skip changelog]

* perf: 删掉多余图片

* feat: 完成后不删除存档并返回主页面

* chore: Auto update by pre-commit hooks [skip changelog]
 2024-08-11 19:29:33 +08:00
uye
352652c950 chore: 扩大组装台寻找范围 2024-08-11 19:27:43 +08:00
status102
b3b9198db8 chore: ui perf 
[skip changelog]
 2024-08-11 16:56:42 +08:00
晓丶梦丶仁
cb429ba703 fix: 在舍弃思绪过程中识别可关闭弹窗 (#10184) 2024-08-11 13:15:05 +08:00
uye
7e89c3e546 fix: 缺失 return 
[skip changelog]
我脑子一定是烧坏了
 2024-08-11 10:57:17 +08:00
uye
da16429672 fix: 错误的判断条件 
fix #10185
 2024-08-11 10:42:50 +08:00
github-actions[bot]
054f59e374 chore: Auto Update Game Resources - 2024-08-11 
[skip changelog]
 2024-08-11 01:34:44 +00:00
status102
969459ef3d chore: task name 
[skip changelog]
 2024-08-11 09:17:23 +08:00
HX3N
0413247c5f docs: KR fix typo integration.md 
[skip changelog]
 2024-08-11 06:12:04 +09:00
Rbqwow
67c10f1982 refactor: StopGame (#9658) 
* perf: StopGame

* style: rename Intent to packageName

* chore: 不准不选择区服

* fix: 移除其他配置中的抽象 stop 匹配

* style: 统一驼峰

* style: 按照执行顺序重新排序

* feat: 添加回调和文档

* fix: 修复参数传入

* docs: 更新文档

* fix: merge

* chore: 把WSA的配置也改了

* chore: update submodule

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: Loong <wangl.cc@outlook.com>
 2024-08-11 01:50:30 +08:00
HX3N
7e8029448d fix: YostarKR Reclamation2CopiousCoppice add ocrReplace 2024-08-11 02:47:32 +09:00
uye
ebd021d900 feat: 完成后勾选界面添加清空按钮 
fix #10190
 2024-08-11 00:07:44 +08:00
萨拉托加
853466a95a fix: 台服目前坍縮值改为當前坍縮值 (#10186) 2024-08-10 20:46:42 +08:00
Constrat
3e7ae037b3 i18n: MAA webplate manual changes 
ref: #10178
 2024-08-10 11:54:30 +02:00
uye
04267a8420 chore: Replace Poptip with ToolTip and Add InitialShowDelay for PostActionSetting.Once 2024-08-10 15:55:36 +08:00
github-actions[bot]
b195c11d7b chore: Auto Update Game Resources - 2024-08-10 
[skip changelog]
 2024-08-10 07:41:31 +00:00
uye
a732001c20 fix: 不必要的重置连接 
fix #10183
 2024-08-10 15:29:27 +08:00
ManicSteiner
723be15506 fix: YostarJP Reclamation2Ex text 2024-08-10 15:21:38 +08:00
status102
a4596cd0de perf: 优化完成后动作仅一次提示文本的显示和描述 (#10182) 
* docs: 仅一次

* docs: 仅一次

* docs: 仅一次

* perf: 优化提示显示

* chore: 优化文本
 2024-08-10 15:02:56 +08:00
晓丶梦丶仁
3bbbdabfdb fix: 肉鸽探索失败后执行ClickToStartPointAfterFailed点进讲述者 (#10177) 2024-08-10 10:44:01 +08:00
Loong
f04c02997b chore: bump maa-cli to 0.4.10 (#10179) 2024-08-09 21:14:16 +01:00
uye
69b3b84f69 chore: 修改自动检测连接后重置连接状态 2024-08-10 01:27:04 +08:00
Constrat
69ec87a95d fix(i18n): wrong key in translation en-us 2024-08-09 18:59:36 +02:00
uye
21e71870b5 chore: 修改生息演算不同模式的介绍 (#10169) 
* chore: 修改生息演算不同模式的介绍

* i18n: KR tweak

use official? word

* i18n: english tweaks

* chore: 修改开始界面翻译

* chore: KR 修改开始界面翻译

also aligned the format with that of the other server

chore: fix typo

---------

Co-authored-by: HX3N <128385247+HX3N@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2024-08-10 00:09:25 +08:00