Commit Graph

2053 Commits

Author SHA1 Message Date
github-actions[bot]
9ccdd9884a chore: Auto Update Game Resources - 2025-02-25
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13523913630

[skip changelog]
2025-02-25 14:44:59 +00:00
BxFS
7a9c5a9f2d fix: 萨米第二次调查装备获取+萨米暂时撤退适配 (#12030)
fix: choose any device and MissionFailedFlag3 for sami DE/DI
2025-02-25 22:32:34 +08:00
status102
16c47f466b fix: 肉鸽深入调查没有指挥分队可选时,随机选择分队跳过干员招募
fix #12016
2025-02-25 21:40:27 +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
Constrat
e1860299f7 fix: fast forward text in encounter (#12021) 2025-02-24 08:32:20 +01:00
晓丶梦丶仁
07f46ab421 fix: 肉鸽放弃战斗奖励后仍能识别到掉落 (#12000) 2025-02-21 20:13:22 +08:00
github-actions[bot]
43992af553 chore: Auto Update Game Resources - 2025-02-21
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13455490910

[skip changelog]
2025-02-21 11:06:04 +00: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
晓丶梦丶仁
107c9d330c fix: IS4 绝境?抉择?ocr (#11969) 2025-02-19 10:49:18 +08:00
status102
26d270a51a perf: 萨卡兹肉鸽负荷干员编入入口ROI拆分 (#11966)
* Reapply "chore: Auto Update Game Resources - 2025-02-18"

This reverts commit f55ea6b1f8.

* perf: 国服ROI缩小

* fix: 补充JP、KR的roi
2025-02-18 21:24:26 +08:00
晓丶梦丶仁
f55ea6b1f8 Revert "chore: Auto Update Game Resources - 2025-02-18"
This reverts commit 8e63f60a6e.

Revert "revert c3d98ec8822fc41892c07f6b6caef5fd435fbc43"

This reverts commit 6d229c72fe.

Revert "fix: EN服萨卡兹肉鸽负荷干员icon ROI"

This reverts commit 77cc830feb.
2025-02-18 11:05:55 +08:00
status102
6d229c72fe revert c3d98ec882
PR #11921 相关,非预期的CN服资源修改
2025-02-18 10:29:02 +08:00
Constrat
f78deb7b93 feat: YoStarEN Sarkaz roguelike (#11921)
---------
Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
2025-02-17 10:54:19 +01:00
HX3N
92d53de182 feat: YostarKR Sarkaz roguelike (#11920)
* chore: add text and ocrReplace

* chore: Stage and Encounter

* chore: roguelike squad

* chore: img 1

* chore: remove space

* chore: img 2

* chore: tweak SelectTheme text

* chore: img 3

* chore: remove space

* chore: remove SpecialValRecognition

* chore: change template size

* chore: StageBoskyPassageEnter

* fix: incorrect template replacement

* i18n: 去伪存真

* i18n: tweak resource translation

* i18n: Roguelike seed and monthly

* i18n: tweak wrong translation

* fix: replace ChooseBurdenOperatorAtStart with a higher score image

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

* fix: StageRefresh roi

* fix: StageRefresh image

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

* fix: StageRefreshConfirm.png templ size

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

* fix: stagerefresh threshold

* fix: ChooseBurdenOperatorAtStart templThreshold

* fix: 纯烬艾雅法拉 ocrReplace

* i18n: 专业人士分队

I keep making mistakes because I'm drunk :P

* fix: remove $ from 相遇 ocrReplace

and replace , > .

* i18n: tweak Endpoint translation

---------

Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-02-16 22:05:12 +09:00
BxFS
70a1b34c3a fix: 支持肉鸽特定模式下跳过选队直接选人 (#11915)
fix: provision for certain roguelike mode without RolesDefault and go straight into RecruitMain, like sami.DE.8
2025-02-14 23:55:23 +08:00
status102
ec3bd9b48b Revert "perf: 自动战斗BattleStartPre任务合并理智药检测"
This reverts commit d54c408769.
2025-02-14 19:15:02 +08:00
BxFS
361256bdf0 fix: 月度小队模式不再试图提前离开肉鸽 (#11872)
fix: monthly squad mode no longer try to leave early
2025-02-13 13:07:29 +08:00
萨拉托加
33811962fe chore: 简化干员名正则 (#11876)
国服也简化一下?照着改的
2025-02-13 12:16:08 +08:00
status102
34124cc037 feat!: 自动战斗不再允许使用带TR的导航关卡名禁用自动编队,改为自动检测 (#11868)
* fix: 自动战斗不再允许使用带TR的导航关卡名禁用自动编队,改为自动检测

* 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-13 09:49:44 +08:00
BxFS
538f734cc8 fix: Roguelike InitialDrop: SquadDefault -> Squad-EnterPoint (#11870)
fix: Roguelike InitialDrop: Roguelike SquadDefault -> Roguelike Squad-EnterPoint
2025-02-12 17:44:48 +08:00
github-actions[bot]
b321264add chore: Auto Update Game Resources - 2025-02-12
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13280763199

[skip changelog]
2025-02-12 08:08:09 +00:00
status102
383a3ee34f fix: 肉鸽开局无法选择指挥分队时放弃探索 (#11847)
* fix: 肉鸽开局无法选择指挥分队时放弃探索

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

* fix: 无法选择指挥分队时,随机选一个

* chore: YoStarEN `Squad-EnterPoint`

* chore: 增大EN服roi

* chore: txwy

* chore: jp

* chore: kr

---------

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-12 15:58:02 +08:00
status102
d54c408769 perf: 自动战斗BattleStartPre任务合并理智药检测 2025-02-11 14:33:43 +08:00
status102
6013c42cd4 Revert "fix: 肉鸽未提供指挥分队时用OCR随便选一个 (#11843)"
This reverts commit fe2dfe1d65.
2025-02-10 19:50:00 +08:00
status102
888a39837d fix: 移除账号切换中不必要的任务 (#11820)
beabba92e3
2025-02-10 15:32:39 +08:00
BxFS
fe2dfe1d65 fix: 肉鸽未提供指挥分队时用OCR随便选一个 (#11843)
* fix: SquadBackup for situations missing SquadDefault

* refactor: redundant SquadBackup
2025-02-10 14:35:50 +08:00
BxFS
3dfee0ac65 fix: CheckLevelMax OCR (#11764) 2025-02-06 22:51:37 +08:00
status102
c08f38eb2e fix: 肉鸽开始探索反复重试后结束
fix #11755
2025-02-05 17:20:38 +08:00
Tsukiyowu
663d017a1f fix: 修复国际服无法通过文字OCR识别关闭雷电模拟器弹窗的问题 (#11756)
* fix: 修复国际服无法通过文字OCR识别关闭雷电模拟器弹窗的问题

* fix: 修复国际服无法通过文字OCR识别关闭雷电模拟器弹窗的问题

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

* fix: 修复国际服无法通过文字OCR识别关闭雷电模拟器弹窗的问题

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-02-05 15:39:59 +08:00
晓丶梦丶仁
2dc0f84dcc fix: 狭路相逢事件识别失败 (#11752)
* fix: 狭路相逢事件识别失败

* fix: 中文符号
2025-02-05 15:39:11 +08:00
Tsukiyowu
0d9f495e05 perf: 开始任务自动关闭雷电模拟器 Google 套件窗口 (#11748)
* perf: 开始任务自动关闭雷电模拟器 Google 套件窗口

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

* perf: 开始任务自动关闭雷电模拟器 Google 套件窗口

* perf: 开始任务自动关闭雷电模拟器 Google 套件窗口

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-02-04 22:36:56 +08:00
status102
6e5708bb98 fix: 自动战斗勾选使用理智药时自动编队卡住 2025-02-03 16:51:11 +08:00
status102
f5c2b951c6 fix: 自动战斗开始战斗时使用理智药检测失效
fix MaaAssistantArknights/MaaAssistantArknights#11701
2025-02-02 10:09:40 +08:00
晓丶梦丶仁
d7deb04c74 perf: 将Sarkaz开局添加负荷干员的进入任务改为范围点击 (#11100)
perf: 将开局添加负荷干员的进入任务改为范围点击
2025-01-31 10:23:38 +08:00
status102
d00e26d0fd rft: 调整肉鸽选择烧水奖励任务链,重新将Roguelike@LastRewardConfirm并入主任务链 2025-01-29 17:06:04 +08:00
github-actions[bot]
b4be266d15 chore: Auto Update Game Resources - 2025-01-28
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13004384595

[skip changelog]
2025-01-28 05:44:29 +00:00
uye
9ba7ead6c8 feat: 适配新 ui 未进驻选项 2025-01-28 13:38:39 +08:00
晓丶梦丶仁
1054cfe93c fix: 肉鸽作战编队截图过快导致截图与实际不符 (#11527) 2025-01-26 20:16:24 +08:00
status102
a329d55857 fix: 幸运墙领取奖励界面识别过早
fix MaaAssistantArknights/MaaAssistantArknights#11667
2025-01-26 10:15:26 +08:00
uye
e79efce17d chore: 调整基建办公室阈值 2025-01-25 02:04:06 +08:00
uye
a40dde9432 chore: 调整 InfrastBottomLeftTab 的 specificRect 2025-01-25 02:04:05 +08:00
uye
7095790129 chore: 调整基建发电站阈值 2025-01-24 13:56:20 +08:00
uye
0dbe5ac09c chore: 调整基建宿舍阈值 2025-01-24 13:46:59 +08:00
uye
38c8dd81e1 fix: 基建修复3 (#11629)
* fix: 反复进出训练室

* fix: 宿舍识别错误

* chore: 更新基建模板

* 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-01-24 00:32:58 +08:00
uye
df96a45b4f fix: 基建确认按钮 2025-01-23 23:06:36 +08:00
uye
68357b95bf fix: 基建修复2 (#11618)
* fix: 偶现无法进入训练室

* chore: 更新截图

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

* fix: 有时候点不到设施的确认按钮,沟槽的侧边栏遮挡点击的范围怎么还能变大的

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-01-23 21:48:38 +08:00
uye
13364bff65 chore: 导航塞 SideStoryStage 下面 2025-01-23 03:24:48 +08:00
Sherkey Asher
51a336ae83 fix: 修复基建 (#11598)
* fix: 修复线索被选中标志

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

* fix: 默认主题和黑暗主题的基建图标

* fix: 修复萨米主题基建图标

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

* fix: 修复基建会客室图标识别

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

* fix: 修复主题 大荒城 的基建图标

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

* fix: 基建点击右上角进入的缩小状态模板错误

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

* fix: mini roi

* 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>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-01-23 03:05:34 +08:00
Sherkey Asher
dc545a3ba5 feat: SideStory「相见欢」导航 (#11597) 2025-01-22 16:58:55 +08:00
github-actions[bot]
fc0fa1f078 chore: Auto Update Game Resources - 2025-01-22
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12901577375

[skip changelog]
2025-01-22 05:06:19 +00:00