Commit Graph

4678 Commits

Author SHA1 Message Date
晓丶梦丶仁
d7deb04c74 perf: 将Sarkaz开局添加负荷干员的进入任务改为范围点击 (#11100)
perf: 将开局添加负荷干员的进入任务改为范围点击
2025-01-31 10:23:38 +08:00
萨拉托加
c6c1832bc6 chore: JP 艾雅法拉 ocrReplace (#11685)
* chore: JP 艾雅法拉 ocrReplace

不能直接正则,还是直接替换吧

* chore: 试试双斜杠转义行不行

* fix: Update resource/global/YoStarJP/resource/tasks.json

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>

---------

Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2025-01-29 19:54:00 +08:00
status102
d00e26d0fd rft: 调整肉鸽选择烧水奖励任务链,重新将Roguelike@LastRewardConfirm并入主任务链 2025-01-29 17:06:04 +08:00
DavidWang19
a5ba2d94e0 fix: 添加不期而遇新事件空无前兆 (#11573) 2025-01-28 17:30:57 +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
github-actions[bot]
d6a7e7fe5a chore: Auto Templates Optimization
Triggered by 9ba7ead6c8

[skip changelog]
2025-01-28 05:39:13 +00:00
uye
9ba7ead6c8 feat: 适配新 ui 未进驻选项 2025-01-28 13:38:39 +08:00
晓丶梦丶仁
dc8951dd89 perf: 萨卡兹肉鸽不期而遇统一使用默认策略 (#11512) 2025-01-26 20:20:36 +08:00
晓丶梦丶仁
1054cfe93c fix: 肉鸽作战编队截图过快导致截图与实际不符 (#11527) 2025-01-26 20:16:24 +08:00
晓丶梦丶仁
40fa5f8161 Revert "perf: 肉鸽优先拿美愿 (#11558)" (#11565)
This reverts commit 8f5ee4819e, reversing
changes made to 0b0486a4ee.
2025-01-26 20:12:29 +08:00
status102
a329d55857 fix: 幸运墙领取奖励界面识别过早
fix MaaAssistantArknights/MaaAssistantArknights#11667
2025-01-26 10:15:26 +08:00
HY
8688baa623 chore: 繁中服「懷黍離」導航入口更動 (#11662) 2025-01-25 15:48:43 +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
github-actions[bot]
a7e5f6ff5f chore: Auto Update Game Resources - 2025-01-24
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12945163495

[skip changelog]
2025-01-24 07:26:10 +00:00
HY
14f414f6ca fix: 繁中服-生息演算中,完成生存週期畫面、大地圖畫面卡住 (#11649) 2025-01-24 15:07:38 +08:00
XuQingTW
7d8ab5e77a feat: 繁中服更新活動導航"懷黍離" (#11592)
chore: 繁中服更新活動導航"懷黍離"
2025-01-24 15:07:03 +08:00
HY
3eee1c769a chore: 補上繁中服的加工站、訓練室相關內容 (#11648)
* 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 14:51:17 +08:00
uye
7095790129 chore: 调整基建发电站阈值 2025-01-24 13:56:20 +08:00
HY
b831a11746 fix: 繁中服 生息演算讀檔畫面卡住 (#11646)
fix: 生息演算讀檔畫面卡住
2025-01-24 13:48:54 +08:00
uye
0dbe5ac09c chore: 调整基建宿舍阈值 2025-01-24 13:46:59 +08:00
uye
0ec0cdbff1 fix: 基建修复4 (#11642)
* 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-01-24 10:32:31 +08:00
Constrat
e71e817577 fix: 38c8dd8 68357b9 modified base tasks in Official. Global needs custom ROI to work 2025-01-24 01:16:25 +01:00
github-actions[bot]
cbf7a61260 chore: Auto Templates Optimization
Triggered by 9b55aad993

[skip changelog]
2025-01-23 21:31:58 +00:00
Constrat
9b55aad993 fix: 380bf68 modified Base Infrast Siege for all clients. Reverting for global and co. 2025-01-23 22:31:11 +01: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
HY
1ca9ca4112 feat: 繁中服 生息演算【沙洲遺聞】 (#11620)
* 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>
2025-01-23 12:55:12 +01:00
AoXuan
380bf68cfc fix: “围攻”主题 基建无法打开 (#11615)
* 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-01-23 16:19:16 +08:00
github-actions[bot]
1e46f9234a chore: Auto Update Game Resources - 2025-01-22
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12915554449

[skip changelog]
2025-01-22 19:24:55 +00: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
HY
902828dc49 feat: 繁中服 抽幸運牆的功能 (#11602)
feat: 繁中服 抽取龍門幸運牆
2025-01-22 14:36:40 +00:00
github-actions[bot]
7b0fbf9b23 chore: Auto Update Game Resources - 2025-01-22
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12910341481

[skip changelog]
2025-01-22 14:28:44 +00:00
github-actions[bot]
dcd7e0a7cf chore: Auto Update Game Resources - 2025-01-22
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12905798158

[skip changelog]
2025-01-22 10:05:38 +00: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]
ed42afa473 chore: Auto Update Game Resources - 2025-01-22
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12900967839

[skip changelog]
2025-01-22 04:07:19 +00:00
status102
7058163f70 fix: 修复基建排班错误和加工站卡住 (#11590)
- close #11499, close #7081
2025-01-22 11:00:00 +08:00
github-actions[bot]
4ee96b8f10 chore: Auto Templates Optimization
Triggered by 0350521a58

[skip changelog]
2025-01-22 02:30:50 +00:00
github-actions[bot]
0350521a58 chore: Auto Update Game Resources - 2025-01-22
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12899930282

[skip changelog]
2025-01-22 02:30:17 +00: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
Constrat
2359a6e113 perf: give priority to higher value choices in I.S. encounter.json (#11580)
chore: give priority to higher value choices in I.S. encounter.json
2025-01-21 21:31:17 +01:00
萨拉托加
9c2b777b05 fix: tw 黍 百炼嘉维尔 OcrReplace (#11591)
* fix: 黍 OcrReplace

* fix: tw 黍 百炼嘉维尔 OcrReplace

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

* fix: 多复制了一个
2025-01-21 21:15:43 +08:00
HauKuen
9e0f58ca46 fix: 修复巫恋组错误应用到源石订单贸易站 2025-01-21 16:34:00 +08:00
Constrat
7d67cefd73 chore: remove duplicates in txwy tasks
[skip changelog]
2025-01-20 11:48:37 +01:00
AoXuan
dc70f2bf2e feat: 萨卡兹肉鸽卫士不语功战斗策略调整 (#11582)
* 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>
2025-01-20 18:40:22 +08:00