Commit Graph

1949 Commits

Author SHA1 Message Date
晓丶梦丶仁
3757626b2a fix: 萨卡兹肉鸽降低 Sarkaz@Roguelike@CloseCollectionContinue 阈值 (#11090) 2024-11-08 09:04:41 +08:00
Weiyou Wang
e13f1e357a chore: 更新 macos.cmake 中的库版本 (#11101)
* chore: 更新 macos.cmake 中的库版本

* 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>
2024-11-07 20:09:35 +08:00
uye
3b91c61816 fix: 导航进商店 2024-11-07 09:57:28 +08:00
github-actions[bot]
216d78f6e8 chore: Auto Update Game Resources - 2024-11-05
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11685401615

[skip changelog]
2024-11-05 13:42:30 +00:00
Weiyou Wang
72119ac361 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 385541a (Back to c2849d2)

* 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
Constrat
3de378b7f7 docs: tasks doc clarification
[skip changelog]
2024-11-05 13:35:28 +01:00
status102
a17ac2ea69 Revert "feat: 自动编队允许指定助战单位 (#10820)"
This reverts commit 3c97864f0a.
2024-11-05 17:57:24 +08:00
status102
38e3ff5c50 Revert "chore: Auto Update Game Resources - 2024-11-05"
This reverts commit ddd926e073.
2024-11-05 17:57:11 +08:00
Weiyou Wang
1456e11803 fix: 为 PVChapterToPV 添加 1 秒的 postDelay (#11074)
应该够了吧?
应该吧?
2024-11-05 14:37:59 +08:00
github-actions[bot]
ddd926e073 chore: Auto Update Game Resources - 2024-11-05
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11678777106

[skip changelog]
2024-11-05 06:29:35 +00:00
晓丶梦丶仁
3c97864f0a 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 385541a (Back to  c2849d2)

* 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
Weiyou Wang
e83d188d10 fix: enlarge rectMove offset for PV-10 (#11073) 2024-11-05 17:08:19 +11:00
uye
5a028c506d fix: pv-10 2024-11-04 23:13:27 +08:00
uye
616c12951b perf: 优化访问好友模板匹配 2024-11-04 16:49:21 +08:00
Weiyou Wang
2996de0a18 fix: 为 PV-10 添加偏移 (#11045) 2024-11-03 21:41:19 +08:00
status102
d0c03174d9 fix: 明日方舟资源更新文本提示roi 2024-11-03 11:15:26 +08:00
Weiyou Wang
9f10c31f33 fix: 为生息演算无存档刷点模式,点击区域节点任务加上 1 秒的 postDelay (#11035) 2024-11-03 10:54:41 +08:00
uye
ff124dd085 chore: 使用 baseTask
[skip changelog]
2024-11-03 01:50:15 +08:00
github-actions[bot]
8e41170298 chore: Auto Update Game Resources - 2024-11-02
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11643913685

[skip changelog]
2024-11-02 15:42:23 +00:00
uye
da937c6d5a chore: 修改幸运墙逻辑 2024-11-02 23:35:51 +08:00
uye
5c59ce6662 chore: 修改延迟时间
[skip changelog]
2024-11-02 16:49:16 +08:00
uye
82ede27999 fix: 肉鸽偏后的分队选错 2024-11-02 16:48:20 +08:00
Sherkey Asher
bcd8b02270 feat: 支持最新的幸运墙任务 (#11008)
* feat: 支持最新的幸运墙任务

* 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>
2024-11-02 10:22:48 +08:00
uye
f6d0426ee7 fix: 无法按信赖排序基建 2024-11-02 01:21:50 +08:00
Windsland
98630837bb fix: 修改基建 InfrastOperListTab 部分的 roi (#10999) (#11001)
* fix: 修改基建 InfrastOperListTab 部分的 roi (#10999)

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

* fix: update roi for unification.

* 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>
2024-11-01 17:41:17 +01:00
uye
a69d5d92f3 fix: 导航错误 2024-11-02 00:41:03 +08:00
uye
9086c0df30 feat: SideStory「揭幕者们」 2024-11-01 23:42:07 +08:00
晓丶梦丶仁
aee8ba3aea fix: 为生息演算无存档刷点数模式最后的删除存档任务添加重试机制 (#10965)
fix: 为 Tales@RA@PNS-ProsperityBelowLimit-SwipeSave 任务添加重试机制
2024-10-29 14:44:59 +08:00
uye
2b7a457cbd perf: 优化全主线关卡导航 2024-10-29 13:37:31 +08:00
github-actions[bot]
f02208c7c6 chore: Auto Update Game Resources - 2024-10-29
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11565843426

[skip changelog]
2024-10-29 01:55:24 +00:00
uye
482f013697 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
github-actions[bot]
fce556ff46 chore: Auto Update Game Resources - 2024-10-27
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11536680996

[skip changelog]
2024-10-27 01:57:35 +00:00
Weiyou Wang
b430f36bb4 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
uye
2f6a6dfafc fix: 购物卡在确认界面 2024-10-26 18:55:18 +08:00
uye
5dc3512bb8 perf: 关卡导航 2024-10-26 18:42:11 +08:00
uye
d2d80a2858 fix: 关卡导航失败
fix #10906
2024-10-24 18:33:28 +08:00
uye
0ae9f9ed5c fix: 无法导航至关卡9-19刷理智
fix #10904
2024-10-24 15:12:44 +08:00
Weiyou Wang
ea1c74ab01 fix: 部分情况下信用购物因过度动画购买错误 (#10893) 2024-10-22 15:40:00 +11:00
uye
8bc6dc9bb9 fix: 部分情况下信用购物因过度动画购买错误 2024-10-22 11:04:50 +08:00
uye
beabba92e3 fix: 官服切换账号识别问题
#10878
2024-10-21 01:00:31 +08:00
Weiyou Wang
7ab291a843 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
晓丶梦丶仁
246df99a78 fix: 降低 肉鸽投资确认 模板匹配阈值 (#10864) 2024-10-21 00:37:06 +08:00
uye
0d6ad34b92 fix: 自动编队无法选中特种标签页 2024-10-19 22:06:35 +08:00
uye
69da388948 fix: b 服切换账号无法选择下拉列表中的中文名 2024-10-18 21:01:30 +08:00
萨拉托加
3f8a9ff8bc fix: 修复维多利亚正则错误 (#10850) 2024-10-18 16:57:08 +08:00
AnnAngela
64ae91b048 fix: GO 识别错误 (#10844)
See #10843
2024-10-18 11:09:42 +08:00
晓丶梦丶仁
f10d011893 fix: CharsNameOcrReplace 维娜·维多利亚 (#10818)
* fix: CharsNameOcrReplace 维娜·维多利亚

* fix: 修改

* Update tasks.json
2024-10-17 23:52:17 +08:00
uye
dee8df8f78 feat: b服支持多分辨率多 dpi 登录 (#10817)
* feat: b服支持多分辨率多 dpi 登录

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

* chore: 删除 UI 多余显示

* chore: 删除多余图片
2024-10-17 13:52:30 +08:00
晓丶梦丶仁
8d80c4d1da perf: RA加快开局教程对话 (#10824)
perf: 加快开局教程对话
2024-10-16 19:53:17 +08:00
github-actions[bot]
bdf0a6fd27 chore: Auto Update Game Resources - 2024-10-11
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11293249751

[skip changelog]
2024-10-11 13:29:07 +00:00