Commit Graph

1010 Commits

Author SHA1 Message Date
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
status102
1696147a53 Revert "fix: 要求每次进入基建宿舍后都重新选择一遍筛选条件 (#10968)"
This reverts commit f74e556cc6.
2024-11-01 23:03:19 +08:00
status102
c8622c3589 perf: 肉鸽不切换难度时禁用插件 2024-11-01 01:47:39 +08:00
status102
8460b9b0c1 Revert 50ea5deaee 2024-11-01 00:59:53 +08:00
晓丶梦丶仁
c07e989d64 perf: 肉鸽选难度允许不选难度 (#10979)
* perf: 肉鸽选难度允许不选难度

* fix: 在插件中对 gui 传入的 -1 值做特殊处理
2024-10-31 21:41:36 +08:00
Weiyou Wang
4c385f0915 fix: 修复对 expected_collapsal_paradigms 参数支持 (#10978)
* fix: 修复对 expected_collapsal_paradigms 参数支持

* refactor: 简化一下

* feat: ui 添加坍缩列表

---------

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>
2024-10-31 21:35:49 +08:00
Weiyou Wang
f74e556cc6 fix: 要求每次进入基建宿舍后都重新选择一遍筛选条件 (#10968)
* fix: 要求每次进入基建宿舍后都重新选择一遍筛选条件

* chore: Auto update by pre-commit hooks
* fix: 修复死循环,替换为只执行一遍

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

* refactor: 加个 log,未来用于检测

---------

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-10-30 11:22:44 +08: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
Weiyou Wang
2be9e12936 fix: 快速编队向左滑动后等待可能的画面回弹 2024-10-28 11:25:38 +08:00
status102
e57cded7af style: format
[skip changelog]
2024-10-28 09:24:38 +08:00
status102
f632936e39 fix: MaaCore RoguelikeTask 补充未选择刷开局模式下启用凹精二的禁用判定 2024-10-27 19:24:08 +08:00
不留
6c8d828189 chore: 部分中文与英文中追加间隔;修正理智识别的理智上限注释 (#10945)
* fix: 优化 UI 界面部分中文文本显示效果

* fix: 理智识别的理智上限校验修改

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

* 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>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-10-27 19:11:59 +08:00
status102
a9a8da15ae feat: AbstractTask新增附加已有插件、插件查找
Revert a9cdc678f1
2024-10-27 09:13:12 +08:00
Weiyou Wang
3305e608ba feat: 点刺成锭分队,刷钱 (#10901)
* feat: fastInvestment

* feat: wpf 适配

* refactor: 点刺成锭分队快速编队

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

* feat: 投资模式下点刺成锭分队直接放弃招募

* refactor: 投资模式下点刺成锭分队不再考虑思维负荷

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

* fix: 修复放弃招募机会时卡顿的问题,模版和 roi 错了

* refactor: 进一步优化

* fix: 取消投资模式下快速定位点刺成锭分队的功能,照顾非全解锁玩家

* fix: 尝试修复跳过 StrategyChange 的问题

* fix: set_squad 提前

* feat: 根据需要启用/禁用 <思维负荷干员编队功能>

* refactor: 加点注释

* fix: 减少需要匹配的模版

* 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>
2024-10-27 09:04:25 +08:00
status102
b1a661bf71 fix: 理智识别的理智上限校验修改 2024-10-26 23:18:26 +08:00
pre-commit-ci[bot]
ce02c80498 chore: Auto update by pre-commit hooks [skip changelog] 2024-10-22 08:40:28 +00:00
Weiyou Wang
f1ae8b920f fix: 部分情况下信用购物因过度动画购买错误 (#10893) 2024-10-22 15:40:00 +11:00
Weiyou Wang
7df397a49c fix: semicolon missing (#10892) 2024-10-22 11:42:31 +08:00
uye
cfcb6e8e19 fix: 部分情况下信用购物因过度动画购买错误 2024-10-22 11:04:50 +08:00
晓丶梦丶仁
98801b7d42 fix: 修复肉鸽阵容完备度中单个干员重复出现于多个干员组的问题 (#10806)
* fix: 修复肉鸽阵容完备度中单个干员重复出现于多个干员组的问题

* style: clang
2024-10-21 02:18:34 +08:00
uye
c4cdbd729b fix: 官服切换账号识别问题
#10878
2024-10-21 01:00:31 +08:00
Weiyou Wang
587b4537c1 fix: 公开招募检测 Tag 失败时尝试识别 <继续招募> 按钮 (#10846)
* fix: 公开招募检测 Tag 失败时尝试识别 <继续招募> 按钮

* fix: 部分界面仍会卡在放弃招募界面

* chore: 成功返回的公招允许重试

* chore: EN, JP and txwy RecruitConfirm

* chore: KR RecruitConfirm

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: HX3N <128385247+HX3N@users.noreply.github.com>
2024-10-21 00:39:39 +08:00
uye
9211b67c92 feat: b服支持多分辨率多 dpi 登录 (#10817)
* feat: b服支持多分辨率多 dpi 登录

* chore: 调整 b 服 AccountCurrentOCRBili 识别范围

* chore: 删除 UI 多余显示

* chore: 删除多余图片
2024-10-17 13:52:30 +08:00
uye
e1d77936ad fix: 部署/开技能后添加等待过度动画延迟,避免屏幕倾斜遇到的识别错误 2024-10-13 18:24:43 +08:00
status102
05baeb444f perf: 自动战斗自定义添加干员编队时按职业选择 2024-10-10 19:15:04 +08:00
uye
dcd2ebc0ff chore: 优化编队模板图片,识别不到对应职业图标时在 全部 中寻找 2024-10-02 14:29:13 +08:00
uye
f6bd8c9fc0 fix: 肉鸽重新编队应在首页执行 (#10465)
#9510
正常来说 cur_page 变量都是正确的,可以作为判断依据,既不用每次都划几下也不用识别左侧是否还有干员。
2024-09-30 20:40:43 +08:00
晓丶梦丶仁
95dc30cee8 fix: 将肉鸽招募的等级限制改为精一55级 2024-09-10 01:10:16 +08:00
zzyyyl
dfca198657 refactor: 重构 ProcessTask (#10001) 2024-09-09 11:23:44 +08:00
uye
c2f1230991 perf: 拆分技能识别与使用 (#10536)
* perf: 拆分技能识别与使用

* chore: 调整 use_all_ready_skill 技能使用过快判断
2024-09-08 16:27:10 +08:00
uye
90c18993ed chore: 调整使用技能间隔日志输出等级,调整间隔时间 2024-09-07 14:21:18 +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
YueLengM
dd10ff28c1 fix: 修改回到干员首页的条件 2024-09-05 23:38:40 +08:00