fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 10:57:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,096 Commits 60 Branches 1,841 Tags
ece4b10a11bc0e2b4a8160931bbc407d51c2f35f
Commit Graph

13096 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rbqwow
ece4b10a11 docs: 更正错误说明 (#10881) 
docs: 7555 改成 16384

[skip changelog]
 2024-10-21 02:25:30 +08:00
github-actions[bot]
18ca6d9b1f docs: Auto Update Changelogs of v5.8.0-beta.2 (#10880) 
* docs: Auto Generate Changelog of Release v5.8.0-beta.2

* docs: 给 #10807 添加pr指引

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
 2024-10-21 02:18:48 +08:00
晓丶梦丶仁
98801b7d42 fix: 修复肉鸽阵容完备度中单个干员重复出现于多个干员组的问题 (#10806) 
* fix: 修复肉鸽阵容完备度中单个干员重复出现于多个干员组的问题

* style: clang
 2024-10-21 02:18:34 +08:00
uye
1aedac74eb feat: 软件更新中添加手动更新资源版本 (#10877) 2024-10-21 01:02:03 +08:00
uye
c4cdbd729b fix: 官服切换账号识别问题 
#10878
 2024-10-21 01:00:31 +08:00
Rbqwow
f0bf99fd23 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
github-actions[bot]
d461ba3a06 chore: Auto Update Game Resources - 2024-10-20 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11427982563

[skip changelog]
 2024-10-20 16:44:14 +00:00
晓丶梦丶仁
1439b2663f docs: 更新肉鸽文档 (#10807) 2024-10-21 00:41:11 +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
晓丶梦丶仁
99836e6a53 fix: 降低 肉鸽投资确认 模板匹配阈值 (#10864) 2024-10-21 00:37:06 +08:00
Zhanyuan Guo
fdcefc3a69 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
5b957641fd fix: typo in[docs] 更新MuMu截图增强模式中端口的文本描述 (#10866) 
fix: typo on line 383
 2024-10-20 12:55:39 +08:00
Anonymous
31a2e292cc 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
uye
723b4db6aa fix: 自动编队无法选中特种标签页 2024-10-19 22:06:35 +08:00
uye
9ed39092ee fix: b 服切换账号无法选择下拉列表中的中文名 2024-10-18 21:01:30 +08:00
AoXuan
c1f74ec57e docs: 更新MuMu截图增强模式中端口的文本描述 (#10851) 
* docs: 更新MuMu截图增强模式中端口的文本描述

fix #10848

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

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

添加空格
 2024-10-18 20:12:47 +08:00
github-actions[bot]
1151d7fda6 chore: Auto Update Game Resources - 2024-10-18 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11402490530

[skip changelog]
 2024-10-18 11:03:19 +00:00
萨拉托加
196b1f878c fix: 修复维多利亚正则错误 (#10850) 2024-10-18 16:57:08 +08:00
Constrat
328383b262 fix: update BB navigation for EX YostarEN 2024-10-18 08:57:49 +02:00
AnnAngela
f836882d10 fix: GO 识别错误 (#10844) 
See #10843
 2024-10-18 11:09:42 +08:00
uye
1cef48c9c8 docs: 支持mumu后台保活，通过包名获取display_id 2024-10-18 09:29:11 +08:00
uye
9fe753d49c Release v5.8.0-beta.1 (#10839) 
咋没发出去）
 2024-10-18 09:25:28 +08:00
github-actions[bot]
fa52beffb9 chore: Auto Update Game Resources - 2024-10-17 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11391345466

[skip changelog]
 2024-10-17 19:03:21 +00:00
uye
2052221f16 Release v5.8.0-beta.1 (#10832) 2024-10-18 00:52:38 +08:00
uye
38c239f9fe docs: Update CHANGELOG.md 
[skip ci][skip changelog]
 2024-10-18 00:52:10 +08:00
github-actions[bot]
5ad39e57ae docs: Auto Update Changelogs of v5.8.0-beta.1 (#10834) 
docs: Auto Generate Changelog of Release v5.8.0-beta.1

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 2024-10-18 00:49:45 +08:00
Rbqwow
10bd192200 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
晓丶梦丶仁
a950b5ec83 fix: CharsNameOcrReplace 维娜·维多利亚 (#10818) 
* fix: CharsNameOcrReplace 维娜·维多利亚

* fix: 修改

* Update tasks.json
 2024-10-17 23:52:17 +08:00
AoXuan
58abc74ae7 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
9211b67c92 feat: b服支持多分辨率多 dpi 登录 (#10817) 
* feat: b服支持多分辨率多 dpi 登录

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

* chore: 删除 UI 多余显示

* chore: 删除多余图片
 2024-10-17 13:52:30 +08:00
MistEO
3528d317b6 ci: update DirectML to 1.15.2 for Windows (#10827) 2024-10-17 12:54:57 +08:00
晓丶梦丶仁
af30216072 perf: IS Phantom Update 雕匠与石像.json (#10829) 
perf: Update 雕匠与石像.json
 2024-10-17 12:53:39 +08:00
晓丶梦丶仁
f08c804444 perf: 更新肉鸽 ew 优先级 (#10830) 
* perf: 更新肉鸽 ew 优先级
 2024-10-17 12:52:49 +08:00
晓丶梦丶仁
0698e0e521 perf: 将萨米、萨卡兹肉鸽阵容完备度的 益达、玛恩纳、水陈 组调为2 (#10831) 2024-10-17 12:52:31 +08:00
晓丶梦丶仁
e4556c6941 perf: RA加快开局教程对话 (#10824) 
perf: 加快开局教程对话
 2024-10-16 19:53:17 +08:00
github-actions[bot]
2be8a50aa5 chore: Auto Update Game Resources - 2024-10-16 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11362807178

[skip changelog]
 2024-10-16 09:27:23 +00:00
ManicSteiner
d088aa14e8 chore: revert 4a41cd9 [skip changelog] 2024-10-16 11:23:45 +02:00
Constrat
8341dc240b Revert "ci: use runs/job instead of just runs for ResourceUpdater" 
This reverts commit 07a222f203.
 2024-10-16 11:22:02 +02: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
dependabot[bot]
c45ff17005 ci: bump lycheeverse/lychee-action from 1 to 2 in /.github/workflows in the github-actions group (#10810) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Loong <40141251+wangl-cc@users.noreply.github.com>
 2024-10-15 18:22:27 +02:00
uye
4a41cd92d1 fix: 日服偶现无法开始行动 
fix #10771
 2024-10-15 16:55:58 +08:00
github-actions[bot]
943bad8831 chore: Auto Update Game Resources - 2024-10-15 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11342224983/job/update-game-resources

[skip changelog]
 2024-10-15 08:29:22 +00:00
status102
5481a41a5c chore: Mumu regex 2024-10-15 15:12:06 +08:00
晓丶梦丶仁
67a8585efd chore: 更新 bug-issue 模板 (#10811) 
* chore: Update cn-bug-report.yaml

* chore: Update en-bug-report.yaml (#10812)
 2024-10-15 01:11:20 +08:00
Rbqwow
4ee9a1536c fix: 修复错误的定时 7分钟最大值 (#10804) 2024-10-14 08:47:08 +08:00
github-actions[bot]
5016d8b4ba chore: Auto Templates Optimization 
Triggered by 31a6880683

[skip changelog]
 2024-10-13 21:55:58 +00:00
HX3N
31a6880683 fix: YostarKR replaced StageFerociousPresageEnter.png to improve recognition score 2024-10-13 23:55:37 +02:00
晓丶梦丶仁
4f7b195530 perf: 降低萨米、萨卡兹肉鸽 维娜·维多利亚 招募优先级 (#10792) 
* perf: 降低萨米肉鸽 维娜·维多利亚 招募优先级

* perf: 降低萨卡兹肉鸽 维娜·维多利亚 招募优先级 (#10793)

* perf: 萨米、萨卡兹肉鸽降低维娜部署优先度
 2024-10-14 01:28:39 +11:00
晓丶梦丶仁
7eeb43491f perf: 傀影肉鸽招募适配乌尔比安 (#10798) 
* perf: 傀影肉鸽招募适配乌尔比安

* fix: 快训练
 2024-10-13 22:17:18 +08:00
uye
da6b8e81fe style: 格式化 
[skip changelog]
 2024-10-13 18:24:43 +08:00