fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 10:32:19 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,253 Commits 61 Branches 1,840 Tags
2a598bda6592c76fd92e9e52db2e45605ff4d7f1
Commit Graph

6218 Commits

Author SHA1 Message Date
uye
2a598bda65 chore: 对 gui.json 排序 2024-10-30 12:47:37 +08:00
Weiyou Wang
b28ffcc13e 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
2dcd54a2d8 fix: 肉鸽难度默认值错误 2024-10-30 10:51:04 +08:00
uye
acf4c9ccc7 fix: 1234567890ABCDEF 给爷爬 2024-10-30 10:48:35 +08:00
uye
5014fb8e70 chore: 修改版本不一致描述，提前 return 位置 2024-10-29 18:03:40 +08:00
uye
3d2307fced chore: 资源更新失败时弹出吐司通知 2024-10-29 17:19:37 +08:00
uye
8f483ae1ed feat: 添加直接显示吐司内容函数，固定Show执行线程 2024-10-29 17:10:54 +08:00
uye
b1ad1b2b55 chore: 设置代理时提高github优先度 2024-10-29 17:08:38 +08:00
uye
c533e7379a chore: 移除多余变量 2024-10-29 16:53:48 +08:00
uye
1f69ccb654 fix: 修复手动关闭或闪退后，无法截图到新窗口 2024-10-29 16:24:40 +08:00
uye
627fa36b69 feat: 添加主任务进度条 2024-10-29 16:06:38 +08:00
uye
82e2c2ad6d chore: remove test 2024-10-29 15:22:11 +08:00
uye
f678f65c8e perf: 调整关卡选择更新逻辑 (#10913) 2024-10-29 14:47:52 +08: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
uye
28f5e009a2 feat: 支持状态栏显示进度条 2024-10-29 02:57:07 +08:00
Weiyou Wang
9be4b9c157 fix: 快速编队向左滑动后等待可能的画面回弹 2024-10-28 11:25:38 +08:00
status102
e0b963aef8 style: format 
[skip changelog]
 2024-10-28 09:24:38 +08:00
Weiyou Wang
2445453de0 fix: MuMu bridge connection (#10937) 
* fix: MuMu bridge connection

* fix: global adaptation

* chore: 调整布局，优化变量位置

* fix: 网络桥接模式设置不再与自动检测链接相关

* chore: 自动检测时禁用增强模式开关

* chore: 添加开启桥接的提示

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2024-10-27 23:07:16 +08:00
status102
eaeaab7b18 fix: MaaCore RoguelikeTask 补充未选择刷开局模式下启用凹精二的禁用判定 2024-10-27 19:24:08 +08:00
不留
d464d87d07 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
uye
e7872bb76e fix: typo 2024-10-27 18:18:36 +08:00
uye
e83888d548 chore: 调整切换语言显示 2024-10-27 18:07:59 +08:00
uye
cc3afa83bd chore: 优化互斥锁描述 2024-10-27 10:22:03 +08:00
status102
6e965ef2da feat: AbstractTask新增附加已有插件、插件查找 
Revert c89b63b78e
 2024-10-27 09:13:12 +08: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
status102
7d6212026b fix: 理智识别的理智上限校验修改 2024-10-26 23:18:26 +08:00
uye
cdb7e781bf chore: 优化描述 2024-10-26 19:34:25 +08:00
uye
22c26483dc chore: 修改 QQ 群文案 2024-10-26 19:24:34 +08:00
Zhanyuan Guo
723c27bab2 chore: MAA 多开限制提示优化 (#10922) 
chore: MAA 多开限制语句更新
 2024-10-26 11:05:36 +08:00
uye
9a41644725 perf: 优化设置指引 2024-10-25 17:46:57 +08:00
Loong
62dd266c63 chore: bump maa-cli to 0.5.1 (#10899) 2024-10-24 18:19:06 +08:00
pre-commit-ci[bot]
d3796ea4b3 chore: Auto update by pre-commit hooks [skip changelog] 2024-10-22 08:40:28 +00:00
Weiyou Wang
ea1c74ab01 fix: 部分情况下信用购物因过度动画购买错误 (#10893) 2024-10-22 15:40:00 +11:00
Weiyou Wang
7e251a154b fix: semicolon missing (#10892) 2024-10-22 11:42:31 +08:00
uye
8bc6dc9bb9 fix: 部分情况下信用购物因过度动画购买错误 2024-10-22 11:04:50 +08:00
uye
798869cbdb chore: 添加日志 2024-10-21 17:03:19 +08:00
uye
fcbf8838c7 chore: 调整雷电自动检测支持端口 2024-10-21 15:23:30 +08:00
Rbqwow
ae49d0c3fe docs: 更正错误说明 (#10881) 
docs: 7555 改成 16384

[skip changelog]
 2024-10-21 02:25:30 +08:00
晓丶梦丶仁
e24b5e18be fix: 修复肉鸽阵容完备度中单个干员重复出现于多个干员组的问题 (#10806) 
* fix: 修复肉鸽阵容完备度中单个干员重复出现于多个干员组的问题

* style: clang
 2024-10-21 02:18:34 +08:00
uye
5e5b18edea feat: 软件更新中添加手动更新资源版本 (#10877) 2024-10-21 01:02:03 +08:00
uye
beabba92e3 fix: 官服切换账号识别问题 
#10878
 2024-10-21 01:00:31 +08:00
Rbqwow
c85c66a126 docs: 更新文档（自动检测 雷电端口 截图增强） (#10753) 
* docs: 添加`自动检测`文档

* docs: 再改改新手上路

* docs: 主要是添加雷电连接地址

* docs: 雷电给文档了

* docs: 为什么要填写 7555！

* docs: 那就让我把 MuMu 6 亲手结束掉

* fix: typo

* docs: update link

* docs: update .net8 link

* docs: 删掉一些过时的版本说明

* docs: 我明明是来洗白这个安装器的

* chore: make markdownlint happy

* docs: 我或许一辈子都用不上 MuMu 的网络桥接了

* docs: 差劲的审美
 2024-10-21 00:51:18 +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
Zhanyuan Guo
fc01083c47 feat(#3767):restricted multi-instance under same MAA (#10869) 
* feat(#3767):restricted multi-instance under same MAA.exe

使用了 @THSLP13 的方案。

* Revert "feat(#3767):restricted multi-instance under same MAA.exe"

This reverts commit 53f50c646d.

* feat(#3767):restricted multi-instance for the same MAA
取消注释并使用变量记录互斥锁存在情况，拆分了提示信息的i18n。
 2024-10-21 00:36:24 +08:00
lcebot
139d87cdb1 fix: typo in[docs] 更新MuMu截图增强模式中端口的文本描述 (#10866) 
fix: typo on line 383
 2024-10-20 12:55:39 +08:00
Anonymous
7ffcbbff1b i18n: Translated using Weblate (English (United States)) 
Currently translated at 99.4% (780 of 784 strings)

Translation: MAA Assistant Arknights/WPF GUI
Translate-URL: https://weblate.maa-org.net/projects/maa/wpf-gui/en_US/
 2024-10-19 21:33:08 +02:00
AoXuan
d20cc1031e docs: 更新MuMu截图增强模式中端口的文本描述 (#10851) 
* docs: 更新MuMu截图增强模式中端口的文本描述

fix #10848

* docs: 更新MuMu截图增强模式中端口的文本描述

* docs: 更新MuMu截图增强模式中端口的文本描述

添加空格
 2024-10-18 20:12:47 +08:00
Rbqwow
4ffde96d99 docs: MuMu 截图增强适配后台保活&雷电截图增强文档 (#10783) 
* docs: 文档也适配 MuMu 后台保活了！

* docs: 玛丽没改！

* i18n: translate

* docs: update ld support version

* docs: 明确版本

* docs: update docs

* fix: typo

* i18n: kr tweak connection.md

* chore: 多行对齐问题

---------

Co-authored-by: HX3N <128385247+HX3N@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2024-10-18 00:48:58 +08:00
AoXuan
7fd7dea530 feat: 新增server酱3的推送逻辑 (#10805) 
* feat: 新增server酱3的推送逻辑

新增server酱3的推送逻辑（通过 sendkey 判断）

* feat: 兼容server酱3最新的接口格式

兼容server酱3最新的接口格式

* chore: annotation
 2024-10-17 15:05:45 +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