fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 18:47:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,020 Commits 60 Branches 1,840 Tags
1a8d7e5a3fef1d2daba87e1e37ef31bbaf4c3659
Commit Graph

108 Commits

Author SHA1 Message Date
MistEO
640eed10e2 refactor: use MaaUtils instead of Utils (#14579) 
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-11-02 23:19:38 +08:00
Weiyou Wang
795efbcd23 refactor: 将 Copilot ActionType::ResetTimer 更改为更适合的 ResetStopwatch (#14507) 
* refactor: 为 ActionType::ResetTimer 加入中文变种

* refactor: Timer -> Stopwatch
 2025-10-22 22:20:50 +11:00
Weiyou Wang
2c619493f6 feat: 跳过使用未准备好的技能 && 全局计时器 (#13913) 
* feat: skip_if_not_ready

* feat: elapsed_time

* feat: WpfGui log 输出计时器信息

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

* feat: 不默认启用全局计时器

* refactor: 支持 ResetTimer 拼写变种

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-10-20 01:35:37 +11:00
MistEO
6c13efe7e0 feat: use coreml OCR for apple (#14108) 2025-09-16 18:20:10 +08:00
MistEO
5c0445d3ab refactor: 依赖大更新 (#13908) 
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>
 2025-09-08 21:17:47 +08:00
uye
5d1f054e5b chore: core 删除 cpr 2025-08-28 17:35:23 +08:00
Status102
eeaffe368f feat: 支持一键悖论模拟 (#13893) 
* feat: 支持一键悖论模拟 (#13885)

* feat: 支持一键悖论模拟

* chore: OperParadoxBegin EN

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

* feat: 支持一键悖论模拟

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

* feat: 支持一键悖论模拟

* fix: 更新悖论模拟按钮位置

* feat: 悖论模拟UI资源添加

* fix: 删除xml中被误添加的文件

* feat: 根据关卡类型显示选项

* i18n: 标签翻译

* feat: 修改小提示

* i18n: EN

* chore: zh-tw

* i18n: KR

* i18n: KR 2

Long text breaks the UI :(

* i18n: SSS -> SSS

* feat: 多行 TabControl

* chore: 调整布局

* i18n: JP

* perf: 优化返回流程

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

* chore: 删掉 core 的联网功能

---------

Co-authored-by: 翔宇 战 <1361227324@qq.com>
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: _Burnside <33724737+Burnside999@users.noreply.github.com>
Co-authored-by: momomochi987 <as99us301@gmail.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>

* fix: 新战斗导航下的悖论模拟

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: 翔宇 战 <1361227324@qq.com>
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: _Burnside <33724737+Burnside999@users.noreply.github.com>
Co-authored-by: momomochi987 <as99us301@gmail.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
 2025-08-28 17:32:32 +08:00
travellerse
d39167007b feat: 支持编队添加干员时选择模组 (#12811) 
* feat: 支持编队添加干员时选择模组

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

* feat: 更新模组编号和本地化字符串以支持新模组

* fix: 统一使用激活时的模组字符图像,将识别阈值下降至0.8以识别未激活时的模组字符

* perf: 省略不必要的参数

* perf: 修改模组默认值为`-1: 不修改`

* fix: 修复不使用模组时的点击区域, 使用模板图替换

* fix: roi

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

* perf: 优化部分文本

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

* fix: 选择模组失败时反选干员

* fix: 选择模组失败时继续检查同组其他干员

* perf: 过个Rgb

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

* chore: 不过灰度

* fix: 添加模板图片以匹配y模组字母的两种形式

---------

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: uye <99072975+ABA2396@users.noreply.github.com>
 2025-07-11 23:56:37 +08:00
status102
964c64576d perf: 自动战斗编队固定优先编入所有干员, 且按照作业顺序 2025-06-06 13:24:55 +08:00
status102
597b8fd818 revert 8fb4b9951f 2025-06-06 13:13:45 +08:00
status102
8fb4b9951f fix: 漏了.jpg 
[skip changelog]
 2025-06-06 13:02:20 +08:00
Constrat
995af0fcda ci: bump oxi, clang, prettier, markdownlint (#12388) 
* ci: bump oxi, clang, prettier, markdownlint

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

* chore: 移除不再使用clang-format的JSON文件

* chore: clang-format disable

* chore: clang版本更新

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

* chore: ver注释

* docs: Modify the clang-format version restriction in the documentation to match the current changes

@zzyyyl

---------

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-04-20 09:42:41 +08:00
status102
b9f663180f perf(core): 自动战斗开始前仅移除相似的召唤物头像缓存 2025-03-14 15:05:40 +08:00
status102
76bb116e5d rft: 使用RecruitData代替ocrReplace的外服适配 (#11879) 
* rft: use RecruitData instead of ocrReplace

* chore: tasks.json

* docs: 注释

* i18n: txwy tweak

* perf: 加载资源时缓存客户端对应语言的招募tag集

---------

Co-authored-by: momomochi987 <as99us301@gmail.com>
 2025-02-17 09:14:27 +08:00
pre-commit-ci[bot]
ce02c80498 chore: Auto update by pre-commit hooks [skip changelog] 2024-10-22 08:40:28 +00: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
status102
730b1733d0 Revert "feat: 保全作战保留core不过牌且放置core后回到待部署则重放工具人和core" (#10300) 
* Revert "feat: 保全作战保留core不过牌且放置core后回到待部署则重放工具人和core"

This reverts commit 970d2cfddc.

* Revert "feat: 保全作战相同location以json写的策略顺序执行"

This reverts commit 29db7fabd9.
 2024-08-20 08:00:50 +08:00
晓丶梦丶仁
29db7fabd9 feat: 保全作战相同location以json写的策略顺序执行 2024-08-20 00:47:59 +08:00
zzyyyl
e9093b07a0 perf(debug): 简单处理 DEBUG 的时候 OCR 很卡的问题 2024-07-26 19:20:45 +08:00
uye
3861c2194b fix: 修改材料名称注释 2024-07-17 10:23:35 +08:00
status102
1be6265bbb fix: 自动战斗开始时移除召唤物类头像缓存，以避免跨局错误识别相似技能的召唤物 (#9649) 
* fix: 自动战斗开始时移除召唤物类头像缓存，以避免跨局错误识别相似技能的召唤物

* chore: description
 2024-07-13 22:53:04 +08:00
dantmnf
5a89cafe8e fix: leak fastdeploy objects to avoid crash 2024-07-10 14:44:39 +08:00
Horror Proton
d14c2dfd49 fix: fix typings in Recruit task 
fix: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/9517
 2024-07-09 00:31:49 +08:00
uye
1e42b2e8f1 chore: 简化Release日志输出 2024-06-26 18:50:23 +08:00
Horror Proton
c53426b102 refactor: move functions to TileCalc2 and TileDef 2024-06-16 10:47:59 +08:00
Horror Proton
34bf1cfd9d feat: calculate position of skill & retreat button 2024-03-31 10:16:20 +08:00
status102
098c0a1fa4 perf: asst.log中的输出使用相对路径取代绝对路径 (#8385) 
* perf: AbstractConfig::Load改为输出相对路径

* perf: 输出相对路径
 2024-02-24 22:31:19 +08:00
lpowo
ae0be8a9a9 feat: 增加公招多选策略 (#7463) 
* fix #7452   

按照 #7452 的想法，在 #6900  的基础上增加了只选尽可能多选且只选高星tag的功能选项，并将选项策略合并
默认策略：只选一个高星tag组合
#6900 策略：选满三个tag为止

新增策略：尽可能多选高星tag，且额外的tag组合要么完整选入，要么舍弃；且若当前出现更高星tag组合，则不会考虑较低星，只会尽可能选高星tag组合（例如出现五星tag时，将尽力多选五星tag，不会考虑四星tag）
(result_vec的排序规则暂时未更改)
在GUI中增加了选择公招策略的功能，如图：

<details>


![image](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/113409320/4b0d4f7d-5156-4144-b411-b96b604e49c7)

![image](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/113409320/18167d72-741a-4bcd-95c8-6f916dec008d)

</details>

最后用模拟器在自己账号上进行了一些自动公招测试。

---------

Co-authored-by: David <56174894+Constrat@users.noreply.github.com>
Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
 2023-12-13 16:22:59 +08:00
status102
6584c1234f perf: SSS Stage Name revision to LT-n (#7527) 
- link to #7523 
- close #7522 

这样就不用修改过往的作业了，未测试外服roi
 2023-12-11 09:45:49 +01:00
zzyyyl
af9ff4c0bb style: format [skip changelog] 
python tools\ClangFormatter\clang-formatter.py --input=src\MaaCore --ignore="[\"src/MaaCore/x64\"]"
python tools\ClangFormatter\clang-formatter.py --input=resource\ --ignore="[\"resource/Arknights-Tile-Pos\", \"resource/infrast.json\"]"
 2023-10-19 14:35:06 +08:00
MistEO
7e8975caf2 feat: support GPU OCR (#6872) 2023-10-13 22:16:52 +08:00
zzyyyl
093ef47b38 fix: 修复因 ocr_replace 与 m_eq_classes 冲突导致的 ocr 识别失效的问题 2023-10-11 18:10:41 +08:00
MistEO
4f1bf344c4 feat: support GPU OCR 2023-10-11 17:44:18 +08:00
David
8c72af9a04 feat: operbox operator names localization (#6726) 
fix #6664
 2023-10-08 11:17:59 +02:00
status102
caa353cc53 fix: 修复无法对后续加载的图片资源进行存在检测的错误，跳过宿舍技能检查 2023-10-05 09:20:58 +08:00
zzyyyl
69fad6f127 style: code format 2023-09-30 23:44:34 +08:00
zzyyyl
c44eb73b59 feat: 增加未通过企鹅检查的掉落截图，增加 UnknownStage 时的难度回调 2023-09-11 12:05:05 +08:00
MistEO
ac148c1339 fix: 尝试修复LoadResource卡死的问题 2023-09-02 01:18:38 +08:00
MiaoYan JY
abe648344b fix: 修复肉鸽中干员 山 2 技能反复释放的问题 2023-08-21 23:40:40 +08:00
MistEO
a510ab6f75 fix: all operators are marked as new for overseas clients (Toolbox-Recruitment) (#6009) 2023-08-20 21:48:51 +08:00
Annoying Flower
5a7659c1b3 feat: 添加对 "skill_times" 字段的支持，再也不会狂点重岳辣 (#6007) 2023-08-20 21:38:40 +08:00
Fryze
334c8602b7 fix: all operators are marked as new for overseas clients (Toolbox-Recruitment) 2023-08-20 20:34:46 +09:00
MistEO
5230b6bad7 fix: 修复切换日服后再切回后OCR配置不清空的问题 
fix #4955
 2023-05-28 15:44:22 +08:00
MistEO
e12d4bccb9 chore: ResourceLoader 添加一些日志 2023-05-02 14:22:49 +08:00
MistEO
b0844c85a5 fix: 修复资源读取错误，改一点日志 2023-04-29 01:19:33 +08:00
MistEO
2246d799f8 perf: 更快的加载！ 2023-04-29 00:13:40 +08:00
MistEO
d87d92f9cc perf: 优化干员头像加载 2023-04-28 23:02:02 +08:00
MistEO
c63008bb7e perf: 更多的惰性加载！ 2023-04-28 18:45:22 +08:00
MistEO
69fdd29f35 chore: 改一些日志 2023-04-28 15:14:34 +08:00
MistEO
b3e2c5fe65 feat: OCR 惰性加载 2023-04-28 00:41:32 +08:00