fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 10:00:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,784 Commits 61 Branches 1,838 Tags
b7c3711b9db9d8b771017f4de02bfe0a8c0ca295
Commit Graph

98 Commits

Author SHA1 Message Date
travellerse
965a762e8a feat: 适配界园肉鸽通宝交换 (#13835) 
* feat: 初步实现界园肉鸽通宝交换

* feat: 实现通宝交换后弹窗点击

* fix: 使用ocr作为通宝交换完成的标志

* fix: 给通宝弹窗确认的 pre_task 加上 postDelay

* fix: 小错误修改

* fix: 添加ocrReplace

* feat: 给通宝赋予临时权重，之后再改

* refactor: 重构通宝任务插件，拆分复杂的_run

* fix: 修正通宝选择点击错误

* refactor: 把滑动函数改回直观

* feat: 新增已投出时的通宝丢弃权重

* fix: 更新通宝名称匹配规则

* chore: 增加注释和日志输出

* chore: 添加调试截图保存

* fix: 清理未使用的参数

* fix: 微调通宝权重

* fix: 修正保存截图过多

* fix: 修复Rect不匹配造成的错误

* fix: 调整debug截图

* fix: 修正选择通宝时位置错误

* fix: 修复刷不交换通宝时无法退出

* fix: 修改`已投出`识别得分的绘制位置

* fix: 启用不期而遇`饕餮廊`获取通宝

* fix: 调整通宝识别区域宽度

* fix: 添加`厉-安硕` -> `厉-安硕鼷`的替换

* fix: 为通宝名称未匹配产生的debug截图添加方框

* fix: 修正debug截图方框位置

* fix: 清理无用的ocrReplace

* fix: 删除通过任务给插件传递特殊参数

* fix: 增加"衡-霹雳"和"花-圣诏封神"的ocr替换

* docs: 添加界园肉鸽通宝交换文档

* fix: 默认刷开局模式交换通宝

* fix: 删除未使用的通宝列表行数变量

* fix: 通宝交换完成识别增加延迟

* fix: 增加"衡-军屯垦"的ocr替换

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

* fix: 修正调试图像保存路径

* perf: 优化通宝创建逻辑

* refactor: 更新通宝任务模式名称

* refactor: 更新通宝稀有度键值

* chore: 更新通宝优先级

* fix: 通宝列表匹配时可能会将y轴间隔覆盖为0

* perf: 将交换通宝的信息发送到wpf

* perf: 将通宝调试截图改为jpeg

* fix:  添加"衡-旱热"的ocr替换

* refactor: 传递任务执行结果

* feat: 初步动态识别通宝列表

* perf: 将期望为空的识别逻辑改为期望匹配到

* chore: 为通宝类型模板添加mask

* refactor: 重构通宝识别逻辑

* refactor: 提取保存调试图像

* refactor: 使用std::format优化日志输出

* refactor: 收尾

* chore: 微调滑动距离

* fix: 忘了加maskRange了

* chore: 保留score小数点后六位

* fix: 修复神秘的点击停止后卡死问题

* docs: 更新文档

* docs: 添加通宝识别流程示意图

* fix: 更新通宝稀有度定义

* chore: 添加通宝交换模式的图片示意注释

* chore: 加点注释

* perf: 预分配通宝和检测结果的空间

* chore: 优化运行时状态变量注释

* fix: 仅在确实已被投出时绘制已投出的调试方框

* fix: 修正坐标变量名称以符合语义

* perf: 滑动误差较大时额外滑动一次进行回正

* fix: 仅在缓慢滑动时校准位置

* refactor: 优化通宝列表滑动

* fix: 尝试修复偶发通宝最后一列无法识别

* fix: 移除了 999

* fix: 进一步修复滑动

* chore: 更新未知通宝调试图像保存路径

* fix: 更改调试截图保存位置和matcher使用图片初始化

* fix: 添加"厉-一字落"的ocr替换

* fix: 适配MaaUtils的更改

* chore: 调整任务顺序

* chore: 添加通宝重投和开关钱盒任务配置

* chore: 文件头/注释调整

* rft: meojson反序列化

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

* perf: 替换部分新log输出

* i18n: KR

---------

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: HX3N <scarlet7518@gmail.com>
 2025-11-19 15:22:33 +08:00
Weiyou Wang
d2587626e0 refactor: 拆出界园岁兽残识地图导航 (#14432) 
* refactor: 舍弃 AbstractRoguelikeMap，拆到 RoguelikeMapConfig 与 RoguelikeBoskyPassageMap

* refactor: 拆出界园岁兽残识地图导航
 2025-10-18 20:15:36 +11:00
uye
d3a5217f3b feat: 不忽略肉鸽的报错 2025-08-04 00:18:57 +08:00
uye
2ec7728e2f chore: 删除 999 2025-07-31 23:26:19 +08:00
Weiyou Wang
67fb6e0ab2 fix: 尝试修复 investment_with_more_score 2025-07-27 01:01:39 +08:00
status102
aa09a17a23 perf: 肉鸽任务参数禁止运行期修改 2025-02-25 20:01:26 +08:00
status102
a93bd61f07 rft: 移除RoguelikeLastRewardSelectTaskPlugin，合并烧水奖励选择 2025-02-07 13:25:48 +08:00
status102
4417c7c713 chore: include 2025-02-02 23:54:46 +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
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
status102
adffb4c992 style: format 
[skip changelog]
 2024-09-07 14:02:29 +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
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
status102
276199475c perf: 简化RoguelikeTask set_params 2024-07-25 09:25:45 +08:00
status102
f6376626a5 perf: 修改 set_params 以避免语义不一致 2024-07-23 22:30:51 +08:00
status102
e0e3d20970 fix: 肉鸽插件set_params补充 (#9893) 2024-07-23 12:35:54 +00:00
status102
53cf85be94 perf: 迁移肉鸽投资参数设置 2024-07-23 19:38:21 +08:00
zzyyyl
32748b1dd0 feat: 将 config 逻辑从 RoguelikeTask::set_params 移至 RoguelikeConfig::set_params 2024-07-23 17:49:22 +08:00
zzyyyl
a2f67d5663 feat: 将部分逻辑从 RoguelikeTask 移至对应插件的 set_params 2024-07-23 17:49:22 +08:00
zzyyyl
e76acfcdf2 feat: 使用 set_params + set_enable 管理插件而不是延迟注册插件 2024-07-23 17:49:13 +08:00
status102
6835fbc0fb fix: 移除find_plugin 
[skip changelog]
 2024-07-23 17:41:59 +08:00
status102
d9632cd97b perf: 非萨米肉鸽时禁用仅萨米用插件 (#9888) 
* perf: 非萨米肉鸽时禁用仅萨米用插件

* style: format

* Revert e470835dd5
 2024-07-23 07:18:27 +00:00
status102
cc3c360179 Revert "feat: 肉鸽插件添加设置参数功能，设置失败的插件会被自动disable (#9862)" 
This reverts commit bd59e12f1c.
 2024-07-23 08:06:38 +08:00
Weiyou Wang
bd59e12f1c feat: 肉鸽插件添加设置参数功能，设置失败的插件会被自动disable (#9862) 
* feat: 肉鸽插件添加设置参数功能，设置失败的插件会被自动移除

* feat: 肉鸽插件设置参数示例——坍缩范式插件

* refactor: 保留 virtual 关键字
 2024-07-23 03:09:29 +10:00
status102
81b536d520 perf: 拆分肉鸽数据 (#9841) 2024-07-22 09:45:39 +00:00
status102
37cff0bb8d perf: 迁移部分参数设置 2024-07-21 16:51:53 +08:00
status102
d7f61bbc4a perf: 简化期望获得塌缩设置 2024-07-21 16:49:09 +08:00
status102
ab58ea6798 fix: 修复肉鸽插件重复注册 2024-07-21 15:46:18 +08:00
zzyyyl
f4ad8a0331 Revert "fix: 修复多次设置参数时肉鸽插件重复注册 (#9786)" 
This reverts commit 7e8712422e, reversing
changes made to 0792db0b37.
 2024-07-20 16:25:02 +08:00
status102
1c8893190d fix: 修复多次设置参数时肉鸽插件重复注册 2024-07-20 12:39:22 +08:00
status102
e7109dce80 perf: 移除肉鸽投资部分变量，简化肉鸽Config 2024-07-20 12:20:41 +08:00
Weiyou Wang
aed0872dc1 refactor: 萨米肉鸽配置文件/插件单独文件夹 (#9651) 
* refactor: sami roguelike plugins
 2024-07-16 00:32:58 +01:00
Weiyou Wang
b45d424e0c fix: 修复萨米肉鸽因插件注册顺序导致的无法运行问题 (#9633) 
* fix: m_roguelike_register_plugins

* refactor: !(A == B) --> (A != B)
 2024-07-12 17:57:09 +08:00
Weiyou Wang
c2319beb22 fix: 修复坍缩范式插件导致的Gui和傀影/水月肉鸽初始化Bug (#9573) 
* fix: call Clp_Pd plugin function directly from Encounter & FoldartalUse plugins

* refactor: 去除 tasks.json 中的冗余

* fix: 修正坍缩范式插件对banner文字位置的判断

* refactor: get_rare_clp_pds直接使用find结果返回

* refactor: delete code for debug

* refactor: 减少hard coding

* refactor: 减少hard coding

* refactor: use canonical debug mode

* refactor: add explanation for m_need_check_panel in comment

* fix: 日版翻译更正 thanks to @Manicsteiner

* refactor: refine the condition for using clp_pd_plugin in *.cpp files

* refactor: refine condition check for enabling clp_pd_task plugin

* refactor: change back to ASST_DEBUG
 2024-07-12 01:12:02 +08:00
Weiyou Wang
1d1e6e0c4a refactor: 肉鸽根据主题选择加载的插件 2024-07-11 14:04:16 +08:00
Weiyou Wang
540103cef1 feat: 初步实现肉鸽模式5：刷隐藏坍缩 2024-06-07 12:00:35 +10:00
Weiyou Wang
a801634196 feat: Roguelike任务下加入use_foldartal参数选项以控制是否使用密文版，默认为true 2024-06-04 02:44:14 +10:00
status102
42f7c80694 perf: 肉鸽投资模式进入第二层拓展为投资模式启用购物、招募 2024-03-15 11:40:14 +08:00
Lancarus
187b031db5 perf: 肉鸽失败重试次数上限改为999 2024-03-09 12:29:16 +08:00
Lancarus
3687cb16e6 feat: 萨米肉鸽增加凹远见密文板 2024-03-09 12:17:13 +08:00
Lancarus
fa713feea6 feat: 刷开局模式增加萨米肉鸽生活队凹密文板 (#8408) 
* feat: 增加萨米肉鸽凹密文板UI，优化肉鸽部分UI的显示

* feat: 凹开局板子相关逻辑

* perf: 优化相关逻辑

* perf: 传参使用array代替string

* style: format

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-02-28 13:01:15 +08:00
status102
1479a4ff8c perf: 移除肉鸽投资相关的无用代码 2024-02-25 18:28:38 +08:00