fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 02:10:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,355 Commits 61 Branches 1,838 Tags
48196d65f2cd90c4299ce8dcdb70784cd2365c18
Commit Graph

285 Commits

Author SHA1 Message Date
status102
48196d65f2 perf: 基建信息板收取信用增加开关 (#12050) 
* perf: 基建信息板收取开关

* feat(core): 基建任务会客室领取留言板信用

* i18n: wpf

* 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-03-12 09:04:28 +08:00
status102
aa09a17a23 perf: 肉鸽任务参数禁止运行期修改 2025-02-25 20:01:26 +08:00
status102
9b3e098bf7 Revert "perf: 自动战斗BattleStartPre任务合并理智药检测" 
This reverts commit 5da64cf4da.
 2025-02-14 19:15:02 +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
status102
5da64cf4da perf: 自动战斗BattleStartPre任务合并理智药检测 2025-02-11 14:33:43 +08:00
status102
a93bd61f07 rft: 移除RoguelikeLastRewardSelectTaskPlugin，合并烧水奖励选择 2025-02-07 13:25:48 +08:00
github-actions[bot]
044a80d982 docs: Auto Update Changelogs of v5.13.0-beta.3 (#11719) 
* docs: Auto Generate Changelog of Release v5.13.0-beta.3

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

* docs: changelog

* docs: changelog

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@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-02-03 00:15:46 +08:00
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
896032a477 fix: 移除二次检查 
[skip changelog]
 2025-02-02 15:44:55 +08:00
status102
199fd8beb5 fix: 自动战斗开始战斗时使用理智药检测失效 
fix MaaAssistantArknights/MaaAssistantArknights#11701
 2025-02-02 10:09:40 +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
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
status102
79835c70de perf: 简化萨卡兹肉鸽种子入口 2025-01-16 11:26:13 +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
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
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
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
uye
f4cb72aef9 feat: 支持肉鸽选难度 (#10918) 
* feat: 支持肉鸽选难度

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

* refactor: 补充相关机制

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

* feat: 瞎写一个wpf，切系统测试去

* feat: select roguelike difficulty using wpf gui

* fix: 简单修补凹开局密文板功能，等待未来重构

* chore: global adaptation

* refactor: 舍弃 next_difficulty 参数

* refactor: 增加对 RoguelikeMode::Collectible 模式下衍生参数有效性的判定

* rft: 移除run_for_collectible

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

* style: format

* chore: 调整肉鸽等级列表初始化

* perf: 减少不必要判断

* fix: 傀影肉鸽修复潜在的干员招募逻辑错误，并添加难度参数校验

* Revert "fix: 傀影肉鸽修复潜在的干员招募逻辑错误，并添加难度参数校验"

This reverts commit 08b715a8eb.

* perf: 难度参数校验

* Revert "rft: 移除run_for_collectible"

This reverts commit cf170750c5.

# Conflicts:
#	src/MaaCore/Task/Interface/RoguelikeTask.cpp
#	src/MaaCore/Task/Roguelike/RoguelikeConfig.cpp
#	src/MaaCore/Task/Roguelike/Sami/RoguelikeFoldartalStartTaskPlugin.cpp

* fix: 水烧开是 !get_run_for_collectible()，之前我写错了

* doc: 补充 zh-cn 文档

* doc: 补充其他语言的文档（机翻）

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Weiyou Wang <44151844+Alan-Charred@users.noreply.github.com>
Co-authored-by: Weiyou Wang <Weiyou.Wang@anu.edu.au>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-10-29 09:08:22 +08:00
pre-commit-ci[bot]
ce02c80498 chore: Auto update by pre-commit hooks [skip changelog] 2024-10-22 08:40:28 +00:00
status102
05baeb444f perf: 自动战斗自定义添加干员编队时按职业选择 2024-10-10 19:15:04 +08:00
status102
adffb4c992 style: format 
[skip changelog]
 2024-09-07 14:02:29 +08:00
status102
59dd7894d8 style: format 
[skip changelog]
 2024-09-07 14:02:29 +08:00
uye
e186181d69 fix: 识别不到基建入口时会在其他界面滑动导致误触 2024-09-03 03:09:37 +08:00
Weiyou Wang
070d1d1399 feat: ReclamationCraftTaskPlugin 2024-08-31 23:38:48 +10:00
Weiyou Wang
c530ce9ee6 feat: AbstractReclamationTaskPlugin 2024-08-31 21:58:50 +10:00
Weiyou Wang
2f2a4c0652 feat: 生息演算新参数: num_craft_batches 2024-08-31 21:58:50 +10:00
zzyyyl
ec42d503e0 feat!: 更新保全 strategies 逻辑 (#10314) 
* feat: 保全策略更新

* docs: 修改保全文档对 strategies 的描述

* style: format

[skip changelog]

* feat: 无可用工具人且无 core 时允许检查同一格的后续策略

* style: format

[skip changelog]

* feat: 不再检查干员是否暴毙

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

* fix: 修复m_all_cores可能插入空core名字导致保全战斗主要部署逻辑结束后仍然识别待部署区

* fix: var reset

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-08-29 19:53:52 +08:00
Weiyou Wang
72f06f469a refactor: 重构生息演算 (#10356) 
* refactor: 调整 tasks.json 中部分 doc field 格式

* feat: ReclamationConfig

* refactor: ReclamationTask

* refactor: template <Tales@Reclamation@ProsperityNoSave>

* refactor: tasks.json <Tales@Reclamation@ProsperityNoSave>

* refactor: template <Tales@Reclamation@ProsperityInSave>

* refactor: tasks.json <Tales@Reclamation@ProsperityInSave>

* refactor: 生息点数达到上限后停止任务

* refactor: global adaption

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

* chore: YostarKR CancelEnterBuildMode

* fix: typo in MaaCore.vcxproj

* refactor: Wpf Gui Support (still under progress)

* refactor: practice of template tasks

* refactor: strategy -> mode; mode -> difficulty

* refactor: WpfGui strategy -> mode; mode -> difficulty

* refactor: Tales@Reclamation -> Tales@RA

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

* refactor: simplify task names

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

* feat: 如果当前编队规模大于等于7人则清空当前编队

* refactor: 简化部分任务流

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

* feat: 跳过可能的对话事件

* fix: 修复部分任务流

* fix: add ocrReplace for JP "Tales@RA@ClickShrubberyGalore"

* fix: 加个 delay 防卡顿

* fix: enlarge roi

* feat: 加入日文适配

* fix: 部分任务 guard 通过后操作不一定马上起效，delay 未知，加入特殊处理

* refactor: 任务链描述

* fix: fix wrong task name

* fix: Yostar Confirmation window

* i18n: tweak YostarKR

* fix: enlarge roi for robustness

---------

Co-authored-by: 晓丶梦丶仁 <1020623818@qq.com>
Co-authored-by: HX3N <128385247+HX3N@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2024-08-28 09:25:54 +10:00
zzyyyl
a4f01fe112 fix: 修复数色闭运算导致的 StageRefresh FP 2024-08-17 01:22:26 +08:00
zzyyyl
48178e9eee fix: 修复部分设备萨卡兹肉鸽商店 StageTraderEnter 得分过低 
fix #10160
 2024-08-12 12:56:16 +08:00
Rbqwow
67c10f1982 refactor: StopGame (#9658) 
* perf: StopGame

* style: rename Intent to packageName

* chore: 不准不选择区服

* fix: 移除其他配置中的抽象 stop 匹配

* style: 统一驼峰

* style: 按照执行顺序重新排序

* feat: 添加回调和文档

* fix: 修复参数传入

* docs: 更新文档

* fix: merge

* chore: 把WSA的配置也改了

* chore: update submodule

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: Loong <wangl.cc@outlook.com>
 2024-08-11 01:50:30 +08:00
Loong
f7c591239d fix: validate filename before using it to avoid crash (#10138) 
When custom mode is enabled and filename is not set, the program will crash.
This patch adds a check to validate the filename before using it to avoid the crash.
 2024-08-09 23:50:17 +08:00
Weiyou Wang
74da94d446 feat: 加入肉鸽节点地图识别功能，并应用于萨卡兹肉鸽蓝图快速过图 (#9812) 
* feat: 添加 RoguelikeMode::FastPass，负责用蓝图分队快速过图

* chore: update templates for RoguelikeMap and RoguelikeRouting

* feat: RoguelikeMap

* feat: RoguelikeMapConfig

* feat: BrightPointAnalyzer

* feat: RoguelikeRouting

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

* fix: 修复会卡在商店门口的bug

* fix: adapt new plugin-registration signature

* chore: try fix submodule

* perf: 复用task

* 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>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-08-09 22:54:19 +10:00
status102
94ad2e4718 perf: 合并肉鸽插件中止控制 2024-08-07 12:06:43 +08:00
status102
46c7d487aa perf: Wpf肉鸽非刷等级模式时，隐藏第五层BOSS前停下设置 2024-07-29 14:16:25 +08:00
status102
12133550ca perf: 简化RoguelikeTask set_param (#9905) 
* perf: 简化RoguelikeTask set_param

* fix: return value
 2024-07-29 13:09:25 +08:00
zzyyyl
0a4d115da6 debug: 更新 DebugTask 方便模板匹配测试 2024-07-27 23:59:15 +08:00
zzyyyl
870306568e debug: 调整 DebugTask 测试模板匹配时的输出信息 2024-07-27 14:35:12 +08:00
zzyyyl
405d616f0e debug: 更新 DebugTask 方便模板匹配测试 2024-07-27 03:32:11 +08:00
Sherkey
0516b91406 feat: 肉鸽五层 BOSS 前暂停功能 (#9801) 
* feat: 肉鸽五层 BOSS 前暂停功能

Co-authored-by: Lancarus <34369130+Lancarus@users.noreply.github.com>
Co-authored-by: DavidWang19 <dwang0340@gmail.com>
 2024-07-25 11:50:45 +01:00
status102
aa547f6db9 perf: 简化RoguelikeTask set_params 
[skip changelog]
 2024-07-25 09:59:20 +08:00