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
13,203 Commits 61 Branches 1,838 Tags
a9640f4345004f519577dcae3dab3b5a20548e83
Commit Graph

994 Commits

Author SHA1 Message Date
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
YueLengM
8f3c02ea5b fix: 已在首页时不再触发翻至首页 2024-09-04 23:40:49 +08:00
YueLengM
65b42bba8a fix: 肉鸽重新编队应先回到首页 2024-09-04 23:27:09 +08:00
uye
2c60bc0003 fix: 生息演算无法循环 2024-09-04 17:51:04 +08:00
uye
af01e13fb4 chore: 截图延迟过大时可能会关闭可关闭技能 2024-09-03 17:19:34 +08:00
uye
e186181d69 fix: 识别不到基建入口时会在其他界面滑动导致误触 2024-09-03 03:09:37 +08:00
Weiyou Wang
3ea87003b9 fix: need_exit 2024-09-02 12:51:28 +10:00
status102
67f9d999e8 fix: sln 2024-09-02 10:12:48 +08:00
Weiyou Wang
939b0b8a70 refactor: 统一 namespace 用法 2024-09-01 20:23:11 +10:00
Weiyou Wang
acf030aefd feat: 加入hold模式 2024-09-01 20:11:47 +10: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
Weiyou Wang
bbf8c94e62 refactor: 顺带补上缺失的 Roguelike\Sami filter 并修正注释 2024-08-31 19:30:53 +10:00
Weiyou Wang
636dc8072f refactor: 把 Fire@Reclamation 的插件移入 Deprecated 文件夹 2024-08-31 19:30:52 +10:00
Weiyou Wang
a71997f6ef refactor: Within The Sand -> Within the Sand 2024-08-31 19:14:13 +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