fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 09:50:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,497 Commits 61 Branches 1,837 Tags
7378ea5f37bf02f9d064c06f062bc61ba2d7f591
Commit Graph

616 Commits

Author SHA1 Message Date
github-actions[bot]
d888cc9638 chore: Auto Templates Optimization 
Triggered by 59239a812c

[skip changelog]
 2024-12-11 10:38:22 +00:00
Weiyou Wang
59239a812c feat: 为选择线索添加判定 (#11323) 
* 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-12-11 21:38:01 +11:00
github-actions[bot]
ecf96dfb46 chore: Auto Templates Optimization 
Triggered by d0b50115c9

[skip changelog]
 2024-12-10 11:30:05 +00:00
晓丶梦丶仁
d0b50115c9 fix: 网络卡顿导致领邮件失败 (#11333) 2024-12-10 19:29:11 +08:00
github-actions[bot]
e1c26665ed chore: Auto Update Game Resources - 2024-12-05 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12172132319

[skip changelog]
 2024-12-05 02:37:51 +00:00
github-actions[bot]
899d105fd4 chore: Auto Templates Optimization 
Triggered by dfbbecac03

[skip changelog]
 2024-11-15 14:29:17 +00:00
uye
dfbbecac03 fix: 无法进入通用图标的活动 2024-11-15 22:28:11 +08:00
github-actions[bot]
b591a7425b chore: Auto Update Game Resources - 2024-11-15 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11853309361

[skip changelog]
 2024-11-15 09:06:01 +00:00
github-actions[bot]
6a6553d265 chore: Auto Templates Optimization 
Triggered by f0174a6541

[skip changelog]
 2024-11-05 13:38:20 +00: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
status102
bbfeecb288 Revert "chore: Auto Templates Optimization" 
This reverts commit 364162713b.
 2024-11-05 17:55:39 +08:00
github-actions[bot]
364162713b chore: Auto Templates Optimization 
Triggered by e595aa021f

[skip changelog]
 2024-11-05 06:09:54 +00: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
uye
6dae992697 perf: 优化访问好友模板匹配 2024-11-04 16:49:21 +08:00
uye
06e08d6f4f fix: UI 更新后无法开趴 2024-11-04 01:21:29 +08:00
github-actions[bot]
0baca39a02 chore: Auto Templates Optimization 
Triggered by c209c2bb77

[skip changelog]
 2024-11-02 02:23:08 +00:00
Sherkey Asher
c209c2bb77 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
github-actions[bot]
515bb86a3f chore: Auto Update Game Resources - 2024-11-01 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11632723590

[skip changelog]
 2024-11-01 16:29:32 +00:00
github-actions[bot]
1a7a4f58d4 chore: Auto Update Game Resources - 2024-11-01 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11623242775

[skip changelog]
 2024-11-01 02:37:20 +00:00
github-actions[bot]
65e9265d1c chore: Auto Templates Optimization 
Triggered by 3305e608ba

[skip changelog]
 2024-10-27 01:05:20 +00: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
github-actions[bot]
3932280dc0 chore: Auto Update Game Resources - 2024-10-26 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11532771894

[skip changelog]
 2024-10-26 15:06:33 +00:00
uye
9211b67c92 feat: b服支持多分辨率多 dpi 登录 (#10817) 
* feat: b服支持多分辨率多 dpi 登录

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

* chore: 删除 UI 多余显示

* chore: 删除多余图片
 2024-10-17 13:52:30 +08:00
github-actions[bot]
5c1168c57c chore: Auto Update Game Resources - 2024-10-16 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11362411676/job/update-game-resources

[skip changelog]
 2024-10-16 09:06:11 +00:00
github-actions[bot]
a1468057b0 chore: Auto Update Game Resources - 2024-10-09 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11247083202

[skip changelog]
 2024-10-09 02:27:12 +00:00
github-actions[bot]
1a8d322da8 chore: Auto Templates Optimization 
[skip changelog]
 2024-10-02 06:29:42 +00:00
uye
dcd2ebc0ff chore: 优化编队模板图片，识别不到对应职业图标时在 全部 中寻找 2024-10-02 14:29:13 +08:00
github-actions[bot]
90369c5876 chore: Auto Templates Optimization 
[skip changelog]
 2024-09-29 09:01:38 +00:00
uye
a12957cc00 fix: 自动编队偶现无法匹配职业图标 2024-09-29 17:01:11 +08:00
github-actions[bot]
a5aedb65bd chore: Auto Templates Optimization 
[skip changelog]
 2024-09-28 16:42:38 +00:00
Weiyou Wang
237423dc8d feat: 为战斗界面识别模块添加部署费用左侧图标的识别 (#10702) 
* 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-09-29 00:42:19 +08:00
github-actions[bot]
ef894443a1 chore: Auto Templates Optimization 
[skip changelog]
 2024-09-27 10:11:53 +00:00
pre-commit-ci[bot]
137c6f840b chore: Auto update by pre-commit hooks [skip changelog] 2024-09-27 12:11:31 +02:00
github-actions[bot]
fbfc5f8a43 chore: Auto Update Game Resources - 2024-09-27 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11067735736

[skip changelog]
 2024-09-27 09:03:55 +00:00
uye
e25a99867f chore: ss-open 使用 StageSideStory.png 2024-09-20 19:09:58 +08:00
uye
6d8aab10a3 perf: 公招识别得分较低 
fix #10513
 2024-09-09 20:40:18 +08:00
github-actions[bot]
859730cd00 chore: Auto Update Game Resources - 2024-09-09 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/10770032581

[skip changelog]
 2024-09-09 09:08:15 +00:00
github-actions[bot]
18873057a9 chore: Auto Templates Optimization 
[skip changelog]
 2024-09-08 09:56:45 +00:00
Weiyou Wang
a2b322c575 fix: 修复生息演算任务中的若干问题 (#10464) 
* fix: 修复生息演算无存档刷点模式下队伍中有 1-6 名干员时卡住的 bug

* fix: 添加 <等待直到识别到左下角驻扎地图标> 的任务以增加容错率

* fix: 之前做的 <确认地图视图已重置到原始位置> 的机制没起效

* fix: 防止因加载时间太长而卡住

* fix: 缩小 tool 识别 roi

* fix: 调整下滑动距离和参数

* fix: 在点击 <开始行动> 前确认已点击区域节点

* feat: 从主界面导航到生息演算

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

* fix: 补上CloseAnnos#next

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

* fix: 增加 <众人会聚之地> 节点点击判定

* doc: 对文档中生息演算任务名和 theme 参数的描述进行纠正

* fix: 加个 preDelay 防止卡住

* fix: 导航没加 theme 无法从 todo list 进入

* chore: 为导航相关 task 国际服 placeholder

* chore: global adaptation for EN

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

* chore: global adaptation for JP

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

* chore: fill in missing tasks requiring global adaptation

* fix: 为每个 "Tales@RA@StartToday" 派生 task 添加回滚

* chore: global adaptation for KR

* chore: update template for JP

* 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-09-08 19:56:13 +10:00
uye
ebfd1bfce4 fix: 界面更新后悖论模拟无法开始战斗 (#10439) 
* fix: 界面更新后悖论模拟无法开始战斗

* chore(docs): change clarification

* chore: 使用 HSV 匹配

* docs: task update info

* fix: 外服 method 错误

---------

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>
 2024-09-04 17:58:21 +08:00
github-actions[bot]
cc14b3e76e chore: Auto Templates Optimization 
[skip changelog]
 2024-09-02 15:16:34 +00:00
Sherkey
4ac8fe036b feat: 适配「滋味」界面主题 (#10427) 
* feat: 适配「滋味」界面主题

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

* chore(tools): new theme temp ignore

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2024-09-02 16:16:07 +01:00
github-actions[bot]
387a53e03f chore: Auto Update Game Resources - 2024-09-02 
[skip changelog]
 2024-09-02 03:28:16 +00:00
uye
9c603b2011 fix: sarkaz 仓库识别错误 2024-09-01 23:52:18 +08:00
github-actions[bot]
b94999ec2d chore: Auto Templates Optimization 
[skip changelog]
 2024-09-01 15:39:21 +00:00
Sherkey
b6bfda0237 feat: 适配「词祭」界面主题 (#10331) 
* feat: 适配萨卡兹界面主题

* chore: 更新 GetImageFromROI 工具组

* perf: Mall 从 OCR 切换为模板匹配

* fix: smoke testing missing algorithm

* fix: template name consistency

* feat: EN templates

* fix: remove Mall task from global
!!! NEED TEMPLATES !!!
smoke testing

* chore: YostarJP mall template

* chore: YostarKR mall template

* chore: txwy mall template
---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: ManicSteiner <manicsteiner@outlook.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
 2024-09-01 23:38:49 +08:00
uye
f1fded1472 fix: 萨卡兹肉鸽多选招募券模板错误 
fix #10401
 2024-08-31 00:19:10 +08:00
github-actions[bot]
4c83353705 chore: Auto Templates Optimization 
[skip changelog]
 2024-08-27 23:26:18 +00:00
Weiyou Wang
72f06f469a refactor: 重构生息演算 (#10356) 
* refactor: 调整 tasks.json 中部分 doc field 格式

* feat: ReclamationConfig

* refactor: ReclamationTask

* refactor: template <Tales@Reclamation@ProsperityNoSave>

* refactor: tasks.json <Tales@Reclamation@ProsperityNoSave>

* refactor: template <Tales@Reclamation@ProsperityInSave>

* refactor: tasks.json <Tales@Reclamation@ProsperityInSave>

* refactor: 生息点数达到上限后停止任务

* refactor: global adaption

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

* chore: YostarKR CancelEnterBuildMode

* fix: typo in MaaCore.vcxproj

* refactor: Wpf Gui Support (still under progress)

* refactor: practice of template tasks

* refactor: strategy -> mode; mode -> difficulty

* refactor: WpfGui strategy -> mode; mode -> difficulty

* refactor: Tales@Reclamation -> Tales@RA

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

* refactor: simplify task names

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

* feat: 如果当前编队规模大于等于7人则清空当前编队

* refactor: 简化部分任务流

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

* feat: 跳过可能的对话事件

* fix: 修复部分任务流

* fix: add ocrReplace for JP "Tales@RA@ClickShrubberyGalore"

* fix: 加个 delay 防卡顿

* fix: enlarge roi

* feat: 加入日文适配

* fix: 部分任务 guard 通过后操作不一定马上起效，delay 未知，加入特殊处理

* refactor: 任务链描述

* fix: fix wrong task name

* fix: Yostar Confirmation window

* i18n: tweak YostarKR

* fix: enlarge roi for robustness

---------

Co-authored-by: 晓丶梦丶仁 <1020623818@qq.com>
Co-authored-by: HX3N <128385247+HX3N@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2024-08-28 09:25:54 +10:00