Commit Graph

2020 Commits

Author SHA1 Message Date
晓丶梦丶仁
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
DavidWang19
023ed5563f feat: 优化肉鸽刷开局模式的流程和逻辑 (#11559)
* feat: 新增刷开局模式下是否购物的选项

* chore: 修改傀影开局模板图文件名

* chore: 添加注释

* fix: 修复刷开局模式下不能进入商店的问题

* feat: 添加各肉鸽主题可刷开局 通用:热水壶 盾(血) 源石锭 希望  随机;水月:钥匙 骰子;萨卡兹:构想

* refactor: CheckComboBox 改为 key 在前

* feat: 界面添加开局奖励选择

* fix: ubuntu build

* feat: proxy 添加对应参数

* rft: 拆分烧水奖励领取

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

* fix: 刷完后直接退出,精二时继续检查

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

* perf: 优化肉鸽刷开局模式RoguelikeShoppingTaskPlugin verify

* perf: 简化肉鸽烧水期望传参

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

* fix: Wpf传值错误

* perf: 衔接旧流程

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

* feat: 支持选择不同的烧水分队和目标分队

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

* fix: 移除遗漏调用

* fix: 变量名一致化

* chore: 烧水期望奖励翻译预留

* fix: 移除无用的set_task_base

* i18n: 添加开局奖励翻译

* i18n: JP translate

* i18n: KR translate

* i18n: zh-tw translate

* i18n: EN tweak

* chore: 移除不再使用的task

* docs: 加点文档

* docs: 烧水使用分队

* perf: UI

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

---------

Co-authored-by: uye <99072975+ABA2396@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: ManicSteiner <manicsteiner@outlook.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: momomochi987 <as99us301@gmail.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2025-01-22 12:57:25 +08:00
github-actions[bot]
c91ac4d9dd chore: Auto Update Game Resources - 2025-01-22
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12899566943

[skip changelog]
2025-01-22 01:54:52 +00:00
BxFS
65b87a5699 feat: 肉鸽月度小队/深入调查基础策略+自动切换 (#11566)
* feat: 肉鸽月度小队奖励/访谈记录策略 #7058

* i18n: Translation for 809d0db

* fix: place Roguelike@DialogSkip under various Roguelike@Stages, and Roguelike@DialogSkip / Roguelike@DialogSkipConfirm reordering

* feat: tickboxes for AutoIterate on wpf

* style: typo

* feat: Iterate Monthly Squad

* fix: proper insertion point for monthly squad plugin, and task for collecting rewards

* feat: Iterate Deep Exploration

* feat: autoiterate for mizuki, sami and sarkaz

* fix: proper InitialDrop.png for three roguelikes and proper compeletion behaviour for iterate plugins

* fix: use different MonthlySquadRewardMiss.png for each roguelike

* feat: Iterate Monthly Squad Comms Option

* refactor: RoguelikeIterateDeepExplorationPlugin and RoguelikeIterateMonthlySquadPlugin, provision for per theme deep exploration adaptation, and basic adaptation to get it running

* fix: keep Sarkaz@Roguelike@DeepExplorationEnd from intruding other tasks with empty.png, and attempted fix of Phantom@Roguelike@CommsMiss

* fix: predelay 500ms for StartExplore

* fix: reduce retry_times for tasks that expect fail

* refactor: move DifficultySelectionTaskPlugin skip condition from verify to load_params

* style: remove RoguelikeDeepExplorationSpecialParameters::load_params and remove linebreakers for long ProcessTasks

* fix: post rebase fixes

* fix: ChooseMonthlySquad -> MonthlySquad, Template -> OcrDetect for resilience against changed backgrounds, and mac/arm64 compiler compliance

* fix: drop load_params from RoguelikeDeepExplorationSpecialParameters

* fix: added delay for MonthlySquadCommsBackTwice/Once, and some style fixes

* revert: cfc1951a already merged

* refactor: duplicate template removal and replacement with ocr

* refactor: more duplicate template removal

* fix: phantom monthly squad dialog timout, again

* fix: ocr -> template without words, and duct tape for Phantom@Roguelike@StrategyChange so it does not lock up in case stage name wasn't captured

* chore: remove words from noop

* fix: Roguelike@DeepExplorationDark.png -> Phantom@Roguelike@DeepExploration.png

* fix: MonthlySquadCompleted/DeepExplorationCompleted task to callback, and basic machine translation for it

* fix: masking for Roguelike@DeepExploration.png and Roguelike@MonthlySquad.png, removing Roguelike@NormalOperation.png as unused

* chore: slight tweak to maskrange templates

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

* refactor: variable names and DeepExplorationNotUnlocked.png masking

* fix: drop the nonexistent Sarkaz@Roguelike@DeepExplorationEnd.png and use default instead

* fix: delay moved from startExplore

* refactor: readability and duplicate removal

* refactor: filename, readability, and task chain adjustment

* perf: RoguelikeMode校验

* fix: retry 1->3, style fix and typo fix

* fix: move set_retry_times to RoguelikeTask

* docs: RoguelikeIterateMonthlySquadPlugin and RoguelikeIterateDeepExplorationPlugin

* fix: make MonthlySquadCommsBackTwice stuck proof

* chore: pick DeepExplorationSpecialParameters out of branch

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

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
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-01-22 09:04:48 +08:00
萨拉托加
9c2b777b05 fix: tw 黍 百炼嘉维尔 OcrReplace (#11591)
* fix: 黍 OcrReplace

* fix: tw 黍 百炼嘉维尔 OcrReplace

翻阅log发现百炼嘉维尔也错了

* fix: 多复制了一个
2025-01-21 21:15:43 +08:00
status102
47535d2cdd perf: 肉鸽战斗完成判定MissionCompletedFlag移除重复模板 2025-01-17 19:46:52 +08:00
Constrat
21a90dca17 fix: add delay to Roguelike@QuickFormation 2025-01-16 16:59:06 +01:00
github-actions[bot]
774bbf2c03 chore: Auto Update Game Resources - 2025-01-16
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12801521024

[skip changelog]
2025-01-16 03:28:46 +00:00
status102
3a43d26aef perf: 简化萨卡兹肉鸽种子入口 2025-01-16 11:26:13 +08:00
github-actions[bot]
d0a84e0d0f chore: Auto Update Game Resources - 2025-01-15
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12794721573

[skip changelog]
2025-01-15 18:30:29 +00:00
不留
59f3667aa2 fix: 修复肉鸽种子模式引起的异常卡死 (#11552)
* fix: 优化种子存钱流程,避免卡死

* fix: Update tasks.json

* chore: 完善 task 注释

* fix: 加回不该乱删的字符(心虚

* perf: 命名、doc

* perf: Update tasks.json

---------

Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
2025-01-16 02:10:13 +08:00
BxFS
794f1717a1 fix: Return-White.png 识别 (#11469)
* fix: remove edge from Return-White.png, possible fix for #11461

* fix: templThreshold for Return-White.png 0.8 -> 0.7

* doc: Return-White.png
2025-01-15 23:33:55 +08:00
status102
102bc8cb31 perf: 肉鸽投资移除手中没钱时的额外检测重试 2025-01-15 23:18:30 +08:00
status102
eaecef60d1 fix: 修复肉鸽开始探索重试时额外占用开始次数 2025-01-15 20:16:12 +08:00
Weiyou Wang
3fa01d304c feat: 萨卡兹肉鸽刷开局 2 构想 (#11277)
* feat: 萨卡兹肉鸽刷开局 2 构想

* feat: wpf 支持

* feat: 补上语言文件

* fix: 不太对劲,改改逻辑
2025-01-14 18:38:59 +08:00
Weiyou Wang
432684550d fix: 生息演算为点击右上角天数任务添加重试机制 (#11540) 2025-01-13 18:39:51 +01:00
github-actions[bot]
6b8b32ae5e chore: Auto Update Game Resources - 2025-01-12
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12733331220

[skip changelog]
2025-01-12 12:08:54 +00:00
晓丶梦丶仁
ae2aaa1e6d feat: 点刺、后勤种子存钱 & ProcessTask 添加 Input 方法 (#11521)
* feat: 为 ProcessTask 添加文本输入功能

* feat: 点刺、后勤种子存钱

* docs: 为 Input 方法添加文档

* perf: 添加循环刷钱cd检查

* perf: werror

* perf: 改变 Input 的 int 值

* perf: 减少 AsstProxy 传参,改用 c:Binding

* chore: 界面显示和获取分离

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-01-12 20:03:09 +08:00
BxFS
2ec5b06e44 feat: 肉鸽满级自动停止选项 (#11466)
---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: momomochi987 <as99us301@gmail.com>
Co-authored-by: ManicSteiner <manicsteiner@outlook.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2025-01-10 15:27:39 +01:00
晓丶梦丶仁
0bce9b0ba8 feat: 为肉鸽开始探索添加 cd 识别 (#11443) 2025-01-10 20:21:07 +08:00
uye
f8fa4cdb5a fix: 肉鸽烧热水没烧出来会从预设难度开始,而不是返回n0 2025-01-09 23:30:17 +08:00
晓丶梦丶仁
30d3aec48a fix: tasks.json png后缀 (#11511)
[skip changelog]
2025-01-09 22:39:58 +08:00
晓丶梦丶仁
669e289d27 feat: 萨卡兹内容拓展II点刺进入商店获得构想 (#11509) 2025-01-09 13:10:18 +01:00
uye
1e35d0ef02 fix: 更新 “视相“ 主题后未关闭退出基建弹窗时无法回到主界面
fix #11463
2024-12-31 15:46:08 +08:00
Sherkey Asher
e1fab541e5 feat: 适配界面主题「大荒」与「视相」 (#11449) 2024-12-29 18:06:13 +08:00
Weiyou Wang
19fc7d3472 fix: crop ClueSelected template to make sure it works under long clue names (#11409)
---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-12-22 00:22:55 +01:00
晓丶梦丶仁
be67372350 fix: RA删除存档时重复识别 (#11406) 2024-12-22 03:20:32 +11:00
uye
b1cabfca1a feat: RS-5 导航 2024-12-19 20:35:14 +08:00
Constrat
d3ab6c4060 fix: precommit prettier
[skip changelog]
[skip ci]
2024-12-18 13:46:37 +01:00
uye
229bdb6514 fix: 修复肉鸽选难度偶现识别错误 2024-12-18 20:32:20 +08:00
Weiyou Wang
411bba66f8 fix: 生息演算无存档刷点模式,允许在确认离开当前区块后没有 Loading Text 的情况下等待 (#11381) 2024-12-18 19:59:21 +08:00
uye
e4c03d2775 feat: 重新适配 DepotEnter 多界面主题 2024-12-17 13:26:20 +08:00
uye
42dfa2233c Revert "feat: DepotEnter适配界面主题 (#7145)"
This reverts commit 113f3235b3.
2024-12-17 13:21:36 +08:00
Weiyou Wang
07023b15a4 feat: 为选择线索添加判定 (#11323)
* feat: 为选择线索添加判定

* 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-12-11 21:38:01 +11:00