Commit Graph

1043 Commits

Author SHA1 Message Date
status102
073d3ab42c Revert "style: follow clang formatting"
This reverts commit 51a8419297.
2025-02-02 23:59:54 +08:00
status102
5628ad3693 Revert "style: clang formatting"
This reverts commit 1656a80b54.
2025-02-02 23:59:46 +08:00
status102
4417c7c713 chore: include 2025-02-02 23:54:46 +08:00
Constrat
1656a80b54 style: clang formatting
[skip changelog]
2025-02-02 14:24:12 +01:00
Constrat
51a8419297 style: follow clang formatting
[skip changelog]
2025-02-02 13:53:32 +01:00
status102
8328c7a57b fix: 肉鸽开局干员使用助战失效
fix MaaAssistantArknights/MaaAssistantArknights#11709
2025-02-02 18:02:07 +08:00
status102
896032a477 fix: 移除二次检查
[skip changelog]
2025-02-02 15:44:55 +08:00
status102
e41f160037 fix: 肉鸽烧水使用分队失效 2025-02-02 15:25:03 +08:00
status102
199fd8beb5 fix: 自动战斗开始战斗时使用理智药检测失效
fix MaaAssistantArknights/MaaAssistantArknights#11701
2025-02-02 10:09:40 +08:00
Constrat
544d6db9f6 style: fix pre-commit.ci
[skip changelog]
2025-02-01 13:28:34 +01:00
status102
9ba758aa7c perf: 简化肉鸽任务使用助战参数内部存储流程 2025-02-01 20:01:32 +08:00
晓丶梦丶仁
fa85cca0e2 fix: 肉鸽临时招募预备干员时, 不额外提升权重 (#11442)
fix: 尝试修复临时招募预备干员的权重过高
2025-01-30 22:22:19 +08:00
status102
22b7f6ee3a rft: 调整肉鸽选择烧水奖励任务链,重新将Roguelike@LastRewardConfirm并入主任务链 2025-01-29 17:06:04 +08:00
status102
8765f35af0 rft: 迁移RoguelikeStartSelect 2025-01-29 16:25:54 +08:00
status102
a40badc39c fix: 肉鸽烧水未获得目标奖励逻辑补漏
关联 69e7518596
2025-01-26 16:08:02 +08:00
status102
69e7518596 fix: 临时处理肉鸽烧水flag异常 2025-01-25 16:40:13 +08:00
DavidWang19
d2982bd9b4 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
status102
eda61cc3bd fix: 修复基建排班错误和加工站卡住 (#11590)
- close #11499, close #7081
2025-01-22 11:00:00 +08:00
BxFS
a3df45acd4 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
e9504b7f68 style: fix clang format 2025-01-21 20:34:20 +01:00
status102
9d9ae9b20a style: include
[skip changelog]
2025-01-21 22:53:09 +08:00
status102
842f1edfe3 fix: 萨卡兹肉鸽种子存钱分队选择失败 2025-01-21 22:46:10 +08:00
HauKuen
f90a1c910d fix: 修复加工站重复执行问题
返回 false 会导致重复执行 on_run_fails 四次,#11415
2025-01-21 16:48:40 +08:00
status102
fd554f63df fix: 萨卡兹肉鸽使用种子刷钱参数存储分类错误 2025-01-19 22:42:17 +08:00
status102
79835c70de perf: 简化萨卡兹肉鸽种子入口 2025-01-16 11:26:13 +08:00
pre-commit-ci[bot]
dd0e671775 chore: Auto update by pre-commit hooks [skip changelog] 2025-01-15 15:38:17 +00:00
status102
349a2d3afc perf: 肉鸽投资移除手中没钱时的额外检测重试 2025-01-15 23:18:30 +08:00
Weiyou Wang
830c874eba feat: 萨卡兹肉鸽刷开局 2 构想 (#11277)
* feat: 萨卡兹肉鸽刷开局 2 构想

* feat: wpf 支持

* feat: 补上语言文件

* fix: 不太对劲,改改逻辑
2025-01-14 18:38:59 +08:00
晓丶梦丶仁
3d5e05414f 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
uye
93ab86afbb chore: Release 模式下,如文件夹中包含 DEBUG.txt 也会输出 DBG 日志 (#11496)
* chore: Release 模式,如文件夹中包含 DEBUG.txt 也会输出 DBG 日志

* chore: lambda 被否了

* chore: 不读 DEBUG
2025-01-12 17:46:38 +08:00
BxFS
eaee3bff44 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
uye
ab07c81b1b fix: 肉鸽烧热水没烧出来会从预设难度开始,而不是返回n0 2025-01-09 23:30:17 +08:00
status102
ace5129b3e fix: 博朗台计算等待时间失败数据处理 2025-01-06 20:02:15 +08:00
Roland125
b47b969c1e fix:修正nothing to select情况下的判断逻辑 2025-01-05 11:22:19 +08:00
Roland125
3077ed1eb7 feat:不自动招募1/5/6星干员时,不计入最大确认招募次数 (#11380)
* feat:不自动招募1/5/6星干员时,不计入最大确认招募次数
test:添加相应的测试函数(仅Relwithdebinfo生效)
fix:添加calc_task_result_type结构体的构造函数。修改其用法,使得代码更直观。

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

* fix:修复跳过特定招募计数功能中的逻辑错误#11380

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

* Revert "fix:修复跳过特定招募计数功能中的逻辑错误#11380"

This reverts commit 4870e127aa.

* fix:修复跳过特定招募计数功能中的逻辑错误#11380

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

* fix: do not return early for calc only task

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
2025-01-04 19:41:40 +08:00
uye
dfefeae353 chore: 上报添加 User-Agent 2025-01-04 14:03:03 +08:00
Constrat
dc5002d9f2 fix: RA2 crafting list
fix e1177db348
2024-12-24 15:39:55 +01:00
Constrat
e07bdaf3d3 feat: RA2 multi-crafting 2024-12-23 18:07:35 +01:00
Constrat
522a186f54 style: fix clang style 2024-11-26 13:55:08 +01:00
status102
62b78f03f2 fix: remove test code
[skip changelog]
2024-11-26 20:33:00 +08:00
status102
c45e9703d2 perf: 优化葛朗台,碎石在理智不会溢出时不再等待
close #11048
2024-11-26 09:51:41 +08:00
Weiyou Wang
8498d47872 fix: 修复肉鸽选难度的若干 Bug (#11131)
* fix: 选择最高难度的时候会 SubTaskError,修一下

* refactor: 加点 Log 方便 debug

* fix: MAA 无法识别 N0,会从虚空中读到奇怪的字符
2024-11-12 12:29:29 +01:00
Weiyou Wang
30602d3db8 fix: 只凹直升的时候不再需要去 N0 打到 3 层 (#11124)
* fix: 只凹直升的时候不再需要去 N0 打到 3 层

* refactor: 更多的参数有效性检查
2024-11-10 22:27:36 +08:00
晓丶梦丶仁
f834f5802c fix: 肉鸽不期而遇闪退 (#11087)
fix: 不期而遇闪退
2024-11-09 09:10:22 +08:00
status102
4ce6576920 fix: 调整自动战斗参数默认值 2024-11-08 17:12:51 +08:00
Weiyou Wang
f0174a6541 feat: 自动编队允许指定助战单位 (#11075)
* feat: 自动编队自动借助战

Revert d78fc68

fix: 招募助战后继续(缺少点击快速招募)

i18n: 翻译

style: clang-format

fix: basetask template

fix: werror

perf: 注释、format

i18n: en

perf: 完成功能实现,复用task,进行gui输出

perf: 更改默认状态

feat: BattleFormationTask

Revert 05baeb4 (Back to 739aa03)

* fix: 缺干员回到主界面的时候应该点确认而不是返回

* feat: 助战干员职业选择栏模版

* refactor: UseSupportUnitTaskPlugin

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

* perf: 默认值适配国服

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

* feat: try_find_and_apply_support_unit

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

* fix: 大概可以用了

* fix: 补充 struct 的构造函数

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

* fix: 添加默认构造函数

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

* fix: 改改类型

* fix: callback[what] 纠正

* perf: roi及初始化优化

* perf: 简化中英文查找

* perf: rename func

* perf: click roi

* fix: 在点击助战干员的行动后添加 LoadingText

* fix: 打点 Log

* fix: remove unused function

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
2024-11-06 00:37:43 +11:00
status102
1daa200c40 Revert "feat: 自动编队允许指定助战单位 (#10820)"
This reverts commit e595aa021f.
2024-11-05 17:57:24 +08:00
晓丶梦丶仁
e595aa021f feat: 自动编队允许指定助战单位 (#10820)
* feat: 自动编队自动借助战

Revert d78fc68

fix: 招募助战后继续(缺少点击快速招募)

i18n: 翻译

style: clang-format

fix: basetask template

fix: werror

perf: 注释、format

i18n: en

perf: 完成功能实现,复用task,进行gui输出

perf: 更改默认状态

feat: BattleFormationTask

Revert 05baeb4 (Back to  739aa03)

* fix: 缺干员回到主界面的时候应该点确认而不是返回

* feat: 助战干员职业选择栏模版

* refactor: UseSupportUnitTaskPlugin

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

* perf: 默认值适配国服

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

* feat: try_find_and_apply_support_unit

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

* fix: 大概可以用了

* fix: 补充 struct 的构造函数

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

* fix: 添加默认构造函数

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

* fix: 改改类型

* fix: callback[what] 纠正

* perf: roi及初始化优化

* perf: 简化中英文查找

* perf: rename func

* perf: click roi

* fix: 在点击助战干员的行动后添加 LoadingText

* fix: 打点 Log

* fix: remove unused function

---------

Co-authored-by: Weiyou Wang <44151844+Alan-Charred@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-11-05 17:09:25 +11:00
status102
8d1336d3e9 rft: BattleFormation 移除未使用函数
[skip changelog]
2024-11-04 18:31:32 +08:00
status102
a9640f4345 fix: 基建换班宿舍任务期间重进宿舍后,重置过滤状态记录 2024-11-01 23:03:19 +08:00