fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 18:01:26 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,293 Commits 61 Branches 1,838 Tags
77736960a09b8a73b067f437c736f8e3dff8e8cc
Commit Graph

319 Commits

Author SHA1 Message Date
status102
77736960a0 fix: var type 2025-08-28 18:01:46 +08:00
Status102
eeaffe368f feat: 支持一键悖论模拟 (#13893) 
* feat: 支持一键悖论模拟 (#13885)

* feat: 支持一键悖论模拟

* chore: OperParadoxBegin EN

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

* feat: 支持一键悖论模拟

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

* feat: 支持一键悖论模拟

* fix: 更新悖论模拟按钮位置

* feat: 悖论模拟UI资源添加

* fix: 删除xml中被误添加的文件

* feat: 根据关卡类型显示选项

* i18n: 标签翻译

* feat: 修改小提示

* i18n: EN

* chore: zh-tw

* i18n: KR

* i18n: KR 2

Long text breaks the UI :(

* i18n: SSS -> SSS

* feat: 多行 TabControl

* chore: 调整布局

* i18n: JP

* perf: 优化返回流程

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

* chore: 删掉 core 的联网功能

---------

Co-authored-by: 翔宇 战 <1361227324@qq.com>
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: _Burnside <33724737+Burnside999@users.noreply.github.com>
Co-authored-by: momomochi987 <as99us301@gmail.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>

* fix: 新战斗导航下的悖论模拟

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: 翔宇 战 <1361227324@qq.com>
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: _Burnside <33724737+Burnside999@users.noreply.github.com>
Co-authored-by: momomochi987 <as99us301@gmail.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
 2025-08-28 17:32:32 +08:00
status102
7ea22b6b03 fix: 自动战斗-战斗列表使用错误的作业战斗 2025-08-26 23:25:34 +08:00
Status102
f2d70245c1 rft: 重构自动战斗战斗列表 (#13852) 
* rft(core): 重构多作业自动战斗

* rft(wpf): wpf支持新任务参数

* perf: 移除不必要move

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

* fix: 任务计数

* fix: 战斗完成提示

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-08-24 22:51:08 +08:00
status102
dc9bd70726 feat(core): 自动战斗关卡结束后增加识别使用黑色返回按钮的检测 2025-08-23 12:27:32 +08:00
status102
0c4211062a rft: 自动战斗不再使用need_navigate字段作为导航启用开关, 而是直接使用navigate_name字段 2025-08-22 16:17:48 +08:00
Status102
51fd7bacea refactor: 自动战斗干员编队状态; 修复编队中干员属性未达标时反复报错; 缺少干员输出时, 干员组内干员打平输出 (#13795) 
* chore: 状态定义

* rft: 重构干员编队的状态

* feat: 编入上次干员

* rft: wpf输出

* fix: ubuntu
 2025-08-20 19:59:08 +08:00
uye
d3a5217f3b feat: 不忽略肉鸽的报错 2025-08-04 00:18:57 +08:00
Lemon-miaow
a8d0210944 feat: 新增是否进行线索交流选项 (#13368) 
* feat: 新增是否进行线索交流选项

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

* docs: 文档添加参数

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-08-02 20:32:33 +08:00
uye
2ec7728e2f chore: 删除 999 2025-07-31 23:26:19 +08:00
uye
1565e3ef4f fix: 奇妙的模拟器卡启动 2025-07-27 22:11:55 +08:00
Weiyou Wang
67fb6e0ab2 fix: 尝试修复 investment_with_more_score 2025-07-27 01:01:39 +08:00
travellerse
33d1ee9326 perf: 添加自动编队选项 忽略干员属性要求 (#13250) 
* perf: 添加自动编队选项 支持模组不满足时选择默认模组

* refactor: 修改“模组不满足时选择默认模组”为“跳过未满足的干员属性要求”

* rft: 忽略干员属性要求

* i18n: KR

* i18n: EN

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2025-07-21 20:16:07 +08:00
status102
e3c0925d09 fix: 移除MaaCore的StartUp任务的client_type空值支持 (#13318) 
* fix: 移除MaaCore的StartUp任务的client_type空值支持

* i18n: KR

---------

Co-authored-by: HX3N <scarlet7518@gmail.com>
 2025-07-21 11:03:35 +08:00
status102
ce0c8bf658 fix: 刷理智代理倍率移除1000适配 2025-07-18 10:22:19 +08:00
晓丶梦丶仁
4fa1cb4c97 feat: RA store (#12833) 
* feat: RA store

* feat: 生息演算商店接入刷点数

* fix: 停止方式
 2025-05-31 18:13:14 +08:00
uye
288dc86bc5 chore: 自动战斗循环 BattleStartPre retry 3次 2025-05-21 00:24:09 +08:00
status102
a385755c33 fix: 部分情况下刷理智连战使用AUTO模式时, 吃理智药溢出理智 2025-05-18 19:56:03 +08:00
status102
b5d825845b fix: 再铲一屎 2025-05-13 00:03:02 +08:00
status102
0666c4af1c feat(breaking change): 指定次数联动连战, 修复连战导致指定次数失效 (#12592) 
* feat: 指定次数联动连战

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

* perf: 适配指定次数

* fix: 移除不再使用的插件

* perf: 优化回调, 解耦

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

* chore: 剩余理智使用 auto 连战

* fix: 最后一轮

* perf: 移除多余的理智识别

* chore(tools): ignore template

* perf: reduceTimes

* fix: 无药可用时, 升级恢复理智后不选择最高

* perf: 移除不再使用的task

---------

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>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2025-05-07 23:43:02 +08:00
status102
5ad80b0ecb chore: sort [skip changelog] 2025-05-07 19:10:28 +08:00
status102
254051c048 chore: 加点常用的进来 2025-05-07 18:19:09 +08:00
status102
422d985bef perf: 移除过旧的任务参数 
涉及:
自动战斗: is_raid, is_adverse, add_user_additional
肉鸽任务: investment_enter_second_floor, investment_with_more_score
 2025-05-06 18:21:55 +08:00
status102
1d248ae051 fix: 连战次数修复, 减少hard code 2025-05-06 18:11:31 +08:00
Yoake
621273a363 Reapply "feat:实现自适应调整连战次数 (#12555)" 
This reverts commit d10516c3c2.

移除不相关的文件修改

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2025-05-06 16:57:04 +08:00
status102
d10516c3c2 Revert "feat:实现自适应调整连战次数 (#12555)" 
This reverts commit 5c9ae13811.

Revert "chore: 新增 AUTO 选项"

This reverts commit 416ce337a2.

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

This reverts commit 0eff8fd57e.

Revert "chore: 连战新增 -1 表示禁用切换"

This reverts commit 58760e9421.
 2025-05-06 16:55:26 +08:00
uye
58760e9421 chore: 连战新增 -1 表示禁用切换 2025-05-06 14:27:06 +08:00
uye
416ce337a2 chore: 新增 AUTO 选项 2025-05-05 17:03:35 +08:00
Yoake
5c9ae13811 feat:实现自适应调整连战次数 (#12555) 
* feat:实现自适应调整连战次数

* fix: redundant operation

* fix: 掉落物回报、理智回报失效

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

* fix: typo

* feat: 添加无理智药时的识别

* chore: 删除无用 include

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

* chore: 异常时返回 -1

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-05-05 15:07:38 +08:00
Lemon-miaow
3a7c05fe77 feat: 适配基建队列轮换与干员休整 (#11252) 
* feat: 创建使用游戏内基建配置换班功能 (WPF)

* feat: 基于上游更新适配游戏内基建配置换班功能 (WPF)

* feat: 适配队列轮换与干员休整（Core）

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

* feat: 优化基建选项UI

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

* perf: enum

* feat: 新增mode值合并infrast_rotation

* docs: 新增一键轮换字段

* rft: 同步 tasks.json 未拆分部分的修改

* perf: 合并界面

* rft: test

* fix: enum binding

搞不懂calcBinding了

* docs: update mode descriptions

* perf: 移除CustomInfrastEnabled

* perf: 简化参数设置

* chore: 添加提示

---------

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>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2025-04-29 19:12:27 +08:00
Plumess
0896fcc0df feat: 优化技能识别模型 (#11984) 
* chore: 更新技能识别测试例 test_skill_ready()

1. 由于更新了技能识别为三分类模型，新增”可取消“类别，增加相关类别的测试；
2. 扩充了输出信息，便于Debug;

* feat: 调整技能识别推理函数，支持新的三分类模型

1. 新的三分类模型基于MobileNetv4训练并导出onnx，详情参考MaaAI仓库中的技能识别训练代码；
2. 新增”可取消“分类，标签为c，但暂不启用区分，与”未就绪“同样归于not ready;
3. 新增了部分前处理操作，以匹配模型的输入；

* perf: 使用 MobileNetv4 Small 重新训练了技能识别模型，改为三分类

新增”可取消“状态，即技能可能处于”可取消“，”未就绪“，”已就绪“三种状态；
新的三分类模型基于MobileNetv4 Conv Small 训练并导出，详情参考MaaAI仓库中的技能识别训练代码；

* feat: 调整技能识别自动截图，支持三分类

新增在debug模式下对”可取消“新类别的截图保存功能；

* chore: 存储截图时打印分数

* chore: 使用 ranges

* perf: 使用新训练集，基于官方mobilenetv4_conv_small的权重进行微调

16000张左右的训练集，在3000张测试集中准确率99.7%

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2025-04-29 14:30:24 +08:00
Constrat
ce07e061e9 style: precommit clang? 2025-04-20 11:26:52 +02:00
Aliothmoon
76e41e30e2 feat: 调整按钮阴影 (#12398) 
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-04-19 00:14:23 +08:00
Constrat
f33fcc4ce5 style: clang mass formatting 2025-04-17 09:32:58 +02:00
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