fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 10:32:19 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,395 Commits 61 Branches 1,840 Tags
d2f95ea7d7c90c00a7946d75f9a3689697abd0d0
Commit Graph

2067 Commits

Author SHA1 Message Date
uye
d2f95ea7d7 fix: 钼铅识别错误 
fix #12169
 2025-03-16 21:26:24 +08:00
status102
06a65dca78 Revert "fix: roguelike already left encounter check and return from map screen (#12088)" 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/12088#issuecomment-2724040534
 2025-03-14 16:59:46 +08:00
github-actions[bot]
79c82b9a69 chore: Auto Update Game Resources - 2025-03-14 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13852722614

[skip changelog]
 2025-03-14 08:31:28 +00:00
BxFS
1c0a7cefc6 fix: roguelike already left encounter check and return from map screen (#12088) 
* fix: back out of map screen in roguelike

* feat: check if already left encounter for RoguelikeStageEncounterTaskPlugin
 2025-03-14 16:20:22 +08:00
status102
13770b1521 fix: 自动战斗费用识别在部分分辨率下概率出错 
720p存在故障
 2025-03-10 19:05:23 +08:00
github-actions[bot]
4bb3a7ad57 chore: Auto Update Game Resources - 2025-03-10 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13758799171

[skip changelog]
 2025-03-10 07:06:20 +00:00
BxFS
9887a8e98c 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
Sherkey Asher
f813e0c456 feat: SideStory「挽歌燃烧殆尽」导航 (#12094) 
* feat: SideStory「挽歌燃烧殆尽」导航

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

* feat: 神秘ocr
 2025-03-09 01:05:18 +08:00
BxFS
f4541042e3 feat: 萨卡兹肉鸽深入调查实装 (#12098) 
* feat: Sarkaz Deep Investigation

* refactor: remove duplicate sarkaz confirm pngs
 2025-03-07 11:22:07 +01:00
Roland125
687413b031 fix: 修复截图速度过快导致不能切换贸易站订单的问题 (#12090) 
ChangeToMoneyOrder任务在9ms的截图速度下，点击动作在游戏中无法生效，故添加一个任务前延时。
顺便为ChangeToSyntheicJadeFlagOrder任务也添加一个前延时。
Co-authored-by:@Alan-Charred
 2025-03-06 10:15:33 +08:00
BxFS
39fe954980 fix: burden/toil tasks threshold 0.9 -> 0.8 (#12087) 
---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2025-03-05 18:42:09 +01:00
BxFS
15020c12fb fix: stuck on StageEnterBattleAgain while in team selection screen (#12059) 2025-03-01 11:53:38 +01:00
github-actions[bot]
54a145d2a2 chore: Auto Update Game Resources - 2025-02-26 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13542431504

[skip changelog]
 2025-02-26 11:06:27 +00:00
status102
6f2fe1e02b perf: 基建会客室信息板无新访客时，不再进入领取页 2025-02-26 18:48:52 +08:00
github-actions[bot]
34714436a2 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
cb4ba252c0 fix: 萨米第二次调查装备获取+萨米暂时撤退适配 (#12030) 
fix: choose any device and MissionFailedFlag3 for sami DE/DI
 2025-02-25 22:32:34 +08:00
status102
2c560c8398 fix: 肉鸽深入调查没有指挥分队可选时，随机选择分队跳过干员招募 
fix #12016
 2025-02-25 21:40:27 +08:00
status102
bad45b428c 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
3a402e6aed fix: fast forward text in encounter (#12021) 2025-02-24 08:32:20 +01:00
晓丶梦丶仁
514224078a fix: 肉鸽放弃战斗奖励后仍能识别到掉落 (#12000) 2025-02-21 20:13:22 +08:00
github-actions[bot]
9695d86224 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
0028af16ca fix: Monthly Squad for Global (#11993) 
---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2025-02-21 11:57:15 +01:00
晓丶梦丶仁
10ce238ebc fix: IS4 绝境？抉择？ocr (#11969) 2025-02-19 10:49:18 +08:00
status102
3ee7b2ca89 perf: 萨卡兹肉鸽负荷干员编入入口ROI拆分 (#11966) 
* Reapply "chore: Auto Update Game Resources - 2025-02-18"

This reverts commit cfaad2dfbc.

* perf: 国服ROI缩小

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

Revert "revert c3d98ec8822fc41892c07f6b6caef5fd435fbc43"

This reverts commit 450d193932.

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

This reverts commit 083b82b9ad.
 2025-02-18 11:05:55 +08:00
status102
450d193932 revert c3d98ec882 
PR #11921 相关，非预期的CN服资源修改
 2025-02-18 10:29:02 +08:00
Constrat
c4fb641873 feat: YoStarEN Sarkaz roguelike (#11921) 
---------
Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
 2025-02-17 10:54:19 +01:00
HX3N
47588aae4c 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
54b2968c74 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
9b3e098bf7 Revert "perf: 自动战斗BattleStartPre任务合并理智药检测" 
This reverts commit 5da64cf4da.
 2025-02-14 19:15:02 +08:00
BxFS
4d5afa5757 fix: 月度小队模式不再试图提前离开肉鸽 (#11872) 
fix: monthly squad mode no longer try to leave early
 2025-02-13 13:07:29 +08:00
萨拉托加
e4080e478f chore: 简化干员名正则 (#11876) 
国服也简化一下？照着改的
 2025-02-13 12:16:08 +08:00
status102
34fa74e8f3 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
28b532a0c6 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]
ebc9ec3f78 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
f89fe2a317 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
5da64cf4da perf: 自动战斗BattleStartPre任务合并理智药检测 2025-02-11 14:33:43 +08:00
status102
1d4f1ebb0b Revert "fix: 肉鸽未提供指挥分队时用OCR随便选一个 (#11843)" 
This reverts commit 936a64a54d.
 2025-02-10 19:50:00 +08:00
status102
f3372f8500 fix: 移除账号切换中不必要的任务 (#11820) 
c4cdbd729b
 2025-02-10 15:32:39 +08:00
BxFS
936a64a54d fix: 肉鸽未提供指挥分队时用OCR随便选一个 (#11843) 
* fix: SquadBackup for situations missing SquadDefault

* refactor: redundant SquadBackup
 2025-02-10 14:35:50 +08:00
BxFS
ca61de8c36 fix: CheckLevelMax OCR (#11764) 2025-02-06 22:51:37 +08:00
status102
db3bf32840 fix: 肉鸽开始探索反复重试后结束 
fix #11755
 2025-02-05 17:20:38 +08:00
Tsukiyowu
5dc343e057 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
晓丶梦丶仁
47cf92c084 fix: 狭路相逢事件识别失败 (#11752) 
* fix: 狭路相逢事件识别失败

* fix: 中文符号
 2025-02-05 15:39:11 +08:00
Tsukiyowu
a3aa2c36e1 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
6c4a1b6ac7 fix: 自动战斗勾选使用理智药时自动编队卡住 2025-02-03 16:51:11 +08:00
status102
199fd8beb5 fix: 自动战斗开始战斗时使用理智药检测失效 
fix MaaAssistantArknights/MaaAssistantArknights#11701
 2025-02-02 10:09:40 +08:00
晓丶梦丶仁
c18d31506e perf: 将Sarkaz开局添加负荷干员的进入任务改为范围点击 (#11100) 
perf: 将开局添加负荷干员的进入任务改为范围点击
 2025-01-31 10:23:38 +08:00
status102
22b7f6ee3a rft: 调整肉鸽选择烧水奖励任务链，重新将Roguelike@LastRewardConfirm并入主任务链 2025-01-29 17:06:04 +08:00
github-actions[bot]
5616410a1e 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