Commit Graph

1622 Commits

Author SHA1 Message Date
SherkeyXD
0743e1773b style: 优化部分文件排版 2025-04-20 21:27:47 +08:00
Constrat
446ec8b8f6 style: precommit clang? 2025-04-20 11:26:52 +02:00
status102
d42a8ba42e chore: MaaCore日志文件占用缓解, 取消大小限制 2025-04-20 16:46:15 +08:00
Constrat
66d49a7e81 ci: bump oxi, clang, prettier, markdownlint (#12388)
* ci: bump oxi, clang, prettier, markdownlint

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

* chore: 移除不再使用clang-format的JSON文件

* chore: clang-format disable

* chore: clang版本更新

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

* chore: ver注释

* docs: Modify the clang-format version restriction in the documentation to match the current changes

@zzyyyl

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2025-04-20 09:42:41 +08:00
uye
4d76fabd77 feat: LoadResourceAndCheckRet 额外读取对应文件名_custom.json (#12382)
* feat: LoadResourceAndCheckRet 额外读取对应文件名_custom.json

* chore: 添加日志,问题反馈打包带上custom文件
2025-04-19 12:16:05 +08:00
Aliothmoon
457023106c feat: 调整按钮阴影 (#12398)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-04-19 00:14:23 +08:00
Constrat
9ed30c5658 style: clang mass formatting 2025-04-17 09:32:58 +02:00
uye
cc7891c11d chore: 调整 include 顺序
[skip changelog]
2025-04-17 15:26:51 +08:00
uye
21f9864140 fix: 二次点击部署栏取消选中时,点击 y 坐标较小的 rect 2025-04-17 15:25:56 +08:00
status102
de2c50ec7e Revert "perf: 自动战斗待部署识别减少一次预识别"
This reverts commit 0839de2c94.
2025-04-17 12:40:47 +08:00
status102
debcf92010 chore: 自动战斗待部署区识别未知干员已知问题标记
待部署区相同干员 (如 超重绝缘水泥) 会在关闭第一个时候, 可能错误展开第二个, 导致识别第二个时提前关闭第二个, 无法识别名字
2025-04-17 11:03:18 +08:00
status102
0839de2c94 perf: 自动战斗待部署识别减少一次预识别 2025-04-17 10:58:44 +08:00
status102
c9374383c1 rft: rename 2025-04-17 10:54:18 +08:00
status102
1c321bb313 rft: rename 2025-04-17 10:16:48 +08:00
status102
4d975a1633 fix: 自动战斗 保全水泥替换 2025-04-17 10:14:05 +08:00
Weiyou Wang
c3dc7d3711 fix: 先取消暂停再取消选择 (#12369)
* fix: 先取消暂停再取消选择

* fix: 换个思路

* fix: 重新识别头像位置

* fix: 删除多余的判断

* fix: 保险起见加回来点东西

* fix: 第二遍点击后更新 name_image
2025-04-16 20:51:55 +08:00
status102
4e3b10ded7 perf: 基建干员选择滑动优化 2025-04-16 17:18:44 +08:00
uye
13fa90a214 perf: 加快无基建技能干员选择速度,加快选择列表回正速度 (#12363)
* perf: 加快无基建技能干员选择速度,加快选择列表回正速度

* 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>
2025-04-16 15:34:07 +08:00
status102
6196676eb3 fix: 移除battleHelper中的BestMatcher复用 (#12136)
* fix: 移除battleHelper中的BestMatcher复用

* fix: type

* fix: require
2025-04-14 08:29:35 +08:00
Weiyou Wang
934f752820 fix: update deployment (#11959)
* fix: update deployment

* fix: 把 check_in_battle 加回来

* fix: misc

* fix: 逻辑取反了

* fix: typo

* refactor: 去掉不需要的 init 参数与重复的 check_in_battle 检查

* refactor: 注释

* fix: misc

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-04-09 17:46:01 +08:00
status102
0045bbcd8b fix: 修复刷理智错误识别突袭关3星结算 2025-04-09 16:27:41 +08:00
Weiyou Wang
0dbd5ee80b fix: mac下选择难度 999 导致卡死 (#12235)
* fix: mac下选择难度 999 导致卡死

* refactor: 用常量
2025-04-04 13:22:21 +08:00
Weiyou Wang
219d3a9151 fix: 修复宿舍填充干员时不经过检测盲点首位干员的问题 (#12234) 2025-04-04 11:01:12 +08:00
BxFS
42e36f11da fix: CheckLevelMax ocr target "-" -> digits (#12223) 2025-03-31 13:31:34 +08:00
dantmnf
3c2105eae1 fix: handle leak
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/12199#issuecomment-2746840742
2025-03-24 22:42:54 +08:00
Constrat
47dc686e89 chore: add delay pre UnlockClues 2025-03-21 12:55:03 +01:00
status102
758f79d1ad perf(core): 自动战斗开始前仅移除相似的召唤物头像缓存 2025-03-14 15:05:40 +08:00
status102
8a85df4a36 perf: 基建信息板收取信用增加开关 (#12050)
* perf: 基建信息板收取开关

* feat(core): 基建任务会客室领取留言板信用

* i18n: wpf

* fix: 补回遗漏传参,简化调用

* 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>
2025-03-12 09:04:28 +08:00
BxFS
56e578f99c fix: 尝试修复肉鸽不期而遇退出后仍在尝试点击事件
chore: update tools ignore

feat: check if already left encounter for RoguelikeStageEncounterTaskPlugin

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Signed-off-by: status102 <102887808+status102@users.noreply.github.com>
2025-03-10 15:03:36 +08:00
status102
2e17de4983 perf: 肉鸽投资ocr封装 2025-03-09 20:14:27 +08:00
BxFS
67b680e83a feat: 萨卡兹肉鸽深入调查实装 (#12098)
* feat: Sarkaz Deep Investigation

* refactor: remove duplicate sarkaz confirm pngs
2025-03-07 11:22:07 +01:00
BxFS
2f5c625abd fix: sarkaz MS count 1->8 (#12085) 2025-03-06 13:09:18 +01:00
status102
e6e6b3d486 fix: log rotate (#12025)
* fix: log rotate

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

* fix: ubuntu

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

* fix: counter

* fix: ubuntu

* fix: static lock

* perf: type

* perf: catch file error

* fix: 修复size计算错误

* revert: 还原阈值为64mb

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

* perf: 移除不必要的锁传递

* rft: 使用streambuf计数

* perf: rename & 移除未使用函数

* fix: platform diff

* perf: init

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-03-03 15:02:06 +08:00
Roland125
49d9af722e fix: 修复公招的几个问题 (#12056)
* fix: 修复不自动招募4星干员时,执行空招募的问题

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

* fix: 修改is_calc_only_task()的判断条件,避免正常招募流程的一种情形(所有星级都不执行招募)被错判为仅公招计算。从公招计算启动招募时,加入-1作为标识。
fix: 在正常招募流程中,自动招募1星时,将1星也加入comfirm_level

* 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>
2025-02-27 21:27:55 +08:00
Roland125
ecb098e65c fix: 修复不自动招募4星干员时,会执行空招募的问题 (#12054)
* fix: 修复不自动招募4星干员时,执行空招募的问题

* 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>
2025-02-27 19:54:12 +08:00
BxFS
7a9c5a9f2d fix: 萨米第二次调查装备获取+萨米暂时撤退适配 (#12030)
fix: choose any device and MissionFailedFlag3 for sami DE/DI
2025-02-25 22:32:34 +08:00
BxFS
76e59348b2 fix: 月度小队/深入调查未启用自动切换会以当前游戏模式开始探索 (#12032)
fix: MS/DE now switch to correct tabs even without autoiterate ticked
2025-02-25 22:23:19 +08:00
status102
2d3947ecd1 perf: 肉鸽任务参数禁止运行期修改 2025-02-25 20:01:26 +08:00
status102
75c71a90d5 feat: 基建收取会客室周限300信用 (#12014)
* feat: 基建收取会客室周限300信用

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

* chore(tools): add templates to ignore list

* fix: stack overflow

* fix: pipeline

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

* fix: 动画延迟+roi

* fix: 动画加加retry

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2025-02-24 21:21:47 +08:00
BxFS
73907eb807 fix: Monthly Squad for Global (#11993)
---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2025-02-21 11:57:15 +01:00
uye
e42a839828 fix: 会客室进入失败 (#11950)
* chore: 基建滑动后等待动画结束

* fix: office 进入失败后重试

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

* fix: lower case sleep

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
2025-02-21 16:14:30 +08:00
BxFS
afe2165af6 fix: add an missing @ for MonthlySquadCommsBackTwice (#11991) 2025-02-21 10:12:40 +08:00
晓丶梦丶仁
876df6e005 fix: 狭路相逢遇到构想卡死 (#11970)
* fix: 狭路相逢遇到构想卡死

* perf: 更改头文件位置

* fix: empty image

* Revert "fix: empty image"

This reverts commit ae11bbf138.

* fix: asst::VisionHelper::correct_rect image is empty

* perf: 识别到构想后输出 trace log

* perf: Matcher, ProcessTask
2025-02-19 21:20:17 +08:00
status102
ebb4b603a4 perf: 避免不必要拷贝
[skip changelog]
2025-02-19 13:07:10 +08:00
status102
3ae29ec453 fix: 移除肉鸽结算插件中的Matcher复用 2025-02-19 13:06:19 +08:00
status102
f3233b12db fix: 修复BattleHelper中的意外报错 2025-02-19 13:06:19 +08:00
晓丶梦丶仁
dd71224d63 perf: 肉鸽为识别错误的事件也添加 callback (#11946)
* perf: 为识别错误的事件也添加 callback

* perf: log.error、修改what内容

* i18n: KR translation

* i18n: JP translation

---------

Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: ManicSteiner <manicsteiner@outlook.com>
2025-02-17 21:20:38 +08:00
status102
004d6b4a9b chore: TaskData增加OcrTask的ocrReplace合法性检查 (#11878)
* chore: TaskData增加OcrTask的ocrReplace合法性检查

* docs: 加点注释
2025-02-17 09:25:44 +08:00
status102
a4fbee3207 rft: 使用RecruitData代替ocrReplace的外服适配 (#11879)
* rft: use RecruitData instead of ocrReplace

* chore: tasks.json

* docs: 注释

* i18n: txwy tweak

* perf: 加载资源时缓存客户端对应语言的招募tag集

---------

Co-authored-by: momomochi987 <as99us301@gmail.com>
2025-02-17 09:14:27 +08:00
status102
16022bcc2d fix: Log Rotate 临时性检查措施 (#11835)
* fix: Log Rotate 增加任务开始时主动检查

* feat: Log Rotate 增加肉鸽每轮探索开始时主动检查

* perf: 移除TaskChain单任务结束后检查
2025-02-14 21:35:14 +08:00