Commit Graph

44 Commits

Author SHA1 Message Date
status102
57888f783e perf: 黄票绿票商店使用特征匹配 (#12718)
* perf: 黄票绿票商店使用特征匹配

* fix: task
2025-05-16 23:52:45 +08:00
uye
989ba7ee52 chore: 矢量突破开始行动 2025-05-16 01:45:09 +08:00
uye
6104d0602b refactor: 重构干员识别
fix #12703
2025-05-15 14:17:53 +08:00
uye
7e7beabb35 chore: 添加几个专精 ocrReplace 2025-05-14 23:39:13 +08:00
晓丶梦丶仁
cd723f2210 perf: store loading 2025-05-14 11:29:21 +08:00
晓丶梦丶仁
93ab1cc811 fix: yellow ticket items 2025-05-14 10:25:51 +08:00
status102
7e3e43e81a fix: ocrTask text 2025-05-13 21:43:07 +08:00
status102
5aa1d74b96 chore: NumberReplace 2025-05-13 19:56:44 +08:00
晓丶梦丶仁
81504417c7 fix: Store@UnderfundedOCR 2025-05-13 11:37:09 +08:00
晓丶梦丶仁
771c3e53b7 i18n: 绿票、黄票、活动商店 (#12674)
* i18n: en

* i18n: temp

* i18n: jp

* chore: YostarJP buy items

* fix: template task

* fix: en

* i18n: kr

* i18n: tw

---------

Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
2025-05-13 11:35:54 +08:00
晓丶梦丶仁
5cc7861d5c fix: store underfunded ocr full match 2025-05-13 00:46:51 +08:00
github-actions[bot]
8da46bf991 chore: Auto Update Game Resources - 2025-05-12
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14973978510

[skip changelog]
2025-05-12 13:49:04 +00:00
晓丶梦丶仁
26f421418e feat: 绿票、黄票、活动商店 (#12586)
* feat: 绿票、黄票商店

* i18n: EN fix

* feat: 活动商店

* perf: baseTask

* perf: 非代币关联性模板

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

* perf: baseTask

* chore: sub

* chore: 修改截图

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

* fix: 第一页买完之后无法进行活动商店购买

* fix: 买完皮肤、干员之后的 swipe

* chore: 修改描述

* perf: 购买商品确认next优化

* perf: 模板图复用

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

* perf: 合并部分task

* fix: 代币不足

* fix: 代币不足 ocr

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-05-12 21:45:19 +08:00
status102
25903aba2d fix: 修复外服基建干员选择列表无法重置 (#12652)
fix #12649
2025-05-11 18:06:32 +08:00
晓丶梦丶仁
ed2c55e81c fix: 切换账号失败 2025-05-09 15:43:22 +08:00
status102
4a836290b9 perf: 关卡理智识别流程通用化 2025-05-09 10:45:41 +08:00
uye
5cda61f8a6 style: typo
[skip changelog]
2025-05-08 17:29:06 +08:00
uye
b37afbaec1 fix: 无法进入活动 2025-05-08 17:28:39 +08:00
status102
966ded3836 fix: 关闭连战列表点击 2025-05-08 10:07:01 +08:00
status102
f184093732 fix: 关闭连战列表 2025-05-08 09:52:25 +08:00
uye
ef844da918 fix: 刷理智结束后卡在“理智药选择”界面
fix #12601
2025-05-08 09:40:20 +08:00
status102
29b25079b8 feat(breaking change): 指定次数联动连战, 修复连战导致指定次数失效 (#12592)
* feat: 指定次数联动连战

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

* perf: 适配指定次数

* fix: 移除不再使用的插件

* perf: 优化回调, 解耦

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

* chore: 剩余理智使用 auto 连战

* fix: 最后一轮

* perf: 移除多余的理智识别

* chore(tools): ignore template

* perf: reduceTimes

* fix: 无药可用时, 升级恢复理智后不选择最高

* perf: 移除不再使用的task

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2025-05-07 23:43:02 +08:00
Yoake
979f6699cc Reapply "feat:实现自适应调整连战次数 (#12555)"
This reverts commit 7359653317.

移除不相关的文件修改

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-05-06 16:57:04 +08:00
status102
7359653317 Revert "feat:实现自适应调整连战次数 (#12555)"
This reverts commit 254db83bf6.

Revert "chore: 新增 AUTO 选项"

This reverts commit 722302bc28.

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

This reverts commit 22f88ef718.

Revert "chore: 连战新增 -1 表示禁用切换"

This reverts commit 4debf210bd.
2025-05-06 16:55:26 +08:00
Yoake
254db83bf6 feat:实现自适应调整连战次数 (#12555)
* feat:实现自适应调整连战次数

* fix: redundant operation

* fix: 掉落物回报、理智回报失效

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

* fix: typo

* feat: 添加无理智药时的识别

* chore: 删除无用 include

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

* chore: 异常时返回 -1

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-05-05 15:07:38 +08:00
uye
e2c19995c2 fix: 基建选人前收起职业栏 (#12556)
* fix: 基建选人前收起职业栏

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

* 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-05-04 14:14:54 +08:00
uye
218e9ec31a fix: 无法切换连战次数 2025-05-03 13:48:31 +08:00
github-actions[bot]
ba26b64b22 chore: Auto Update Game Resources - 2025-05-03
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14808017611

[skip changelog]
2025-05-03 05:45:04 +00:00
uye
33b54e81b0 fix 不能正确选择干员CONFESS-47
fix #12543
2025-05-03 13:41:45 +08:00
uye
7ef4343f16 chore: 优化赠送单抽逻辑 2025-05-02 09:41:38 +08:00
uye
715c2c13b5 fix: 神秘的鹰小姐修改了他的干员职业图标亮度 2025-05-01 19:19:15 +08:00
uye
d65cde7574 fix: 适配新基建 (#12500)
* fix: 适配新基建

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

* 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-05-01 18:08:34 +08:00
SherkeyXD
fa42a0880e fix: 修正送抽任务 2025-05-01 16:35:10 +08:00
SherkeyXD
2a32052ab0 feat: 特殊月卡扩大识别范围 2025-05-01 16:30:22 +08:00
SherkeyXD
1dba23a93e feat: 幸运墙适配六周年 2025-05-01 16:24:14 +08:00
SherkeyXD
9592b1fd40 feat: SideStory「众生行记」导航 2025-05-01 16:22:23 +08:00
BxFS
503d653330 fix: CheckLevelMax too fast without delay (#12498) 2025-05-01 08:35:44 +02:00
Lemon-miaow
ef99f63311 feat: 适配基建队列轮换与干员休整 (#11252)
* feat: 创建使用游戏内基建配置换班功能 (WPF)

* feat: 基于上游更新适配游戏内基建配置换班功能 (WPF)

* feat: 适配队列轮换与干员休整(Core)

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

* feat: 优化基建选项UI

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

* perf: enum

* feat: 新增mode值合并infrast_rotation

* docs: 新增一键轮换字段

* rft: 同步 tasks.json 未拆分部分的修改

* perf: 合并界面

* rft: test

* fix: enum binding

搞不懂calcBinding了

* docs: update mode descriptions

* perf: 移除CustomInfrastEnabled

* perf: 简化参数设置

* chore: 添加提示

---------

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>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-04-29 19:12:27 +08:00
github-actions[bot]
2dc6745fdb chore: Auto Update Game Resources - 2025-04-28
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14705082471

[skip changelog]
2025-04-28 09:59:59 +00:00
晓丶梦丶仁
5820fb202d feat: 争锋频道:青草城 (#12470)
* feat: 争锋频道:青草城

* fix: end

* fix: 鸭宝不在

* perf: 公开 wpfgui 的自定义任务

* Revert "perf: 公开 wpfgui 的自定义任务"

This reverts commit 536864caa2.

* feat: 加一个丑爆了的界面

* chore: 修改描述

* chore: 修改描述

* chore: 统一按钮大小

* chore: 添加停止功能

* chore: 添加停止按钮

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-04-28 17:34:06 +08:00
SherkeyXD
e76e95c0a4 rft: rename base stage 2025-04-27 00:11:50 +08:00
SherkeyXD
e4aa506cb4 fix: BB task fix 2025-04-26 23:57:41 +08:00
SherkeyXD
3b0093c13c feat: 六周年月卡 2025-04-26 21:53:34 +08:00
Constrat
dce6e317c8 rft: tasks (#12448)
* rft: tasks

* chore: remove older tasks.json

* rft: move some stages

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

* rft: rename

---------

Co-authored-by: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-04-25 18:31:37 +08:00