fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 10:00:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,574 Commits 61 Branches 1,838 Tags
eca534bb99c7e40fc01fceea09d206d619e37fdb
Commit Graph

12574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Constrat
eca534bb99 chore: git blame added styling commits (#10283) 
chore: added styling commits
 2024-08-19 09:12:43 +01:00
SherkeyXD
12c88207b4 chore: smoking-test中肉鸽参数更新 2024-08-19 14:02:11 +08:00
SherkeyXD
dce897a69e chore: smoking-test添加领取奖励的测试 2024-08-19 14:02:11 +08:00
SherkeyXD
fd62b5818a chore: 移除tasks中的默认值 2024-08-19 14:02:11 +08:00
uye
b59d3e58a7 Release v5.6.0-beta.1 (#10271) 2024-08-19 12:52:33 +08:00
github-actions[bot]
5cf5c0c853 docs: Auto Update Changelogs of v5.6.0-beta.1 (#10278) 
* docs: Auto Generate Changelog of Release v5.6.0-beta.1

* docs: Update CHANGELOG.md

* docs: changelog

* docs: changelog

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-08-19 12:51:25 +08:00
萨拉托加
4cf318bd44 chore: 添加交战荒野保全作业 (#10286) 
* feat:添加一份保全作业

* Rename MAACopilot_保全派驻-交战荒野-维什戴尔-澄闪-浊蒂-纯烬艾雅法拉兼容应急.json to SSS_保全派驻-交战荒野-维什戴尔-澄闪-浊蒂-纯烬艾雅法拉兼容应急.json

* Rename SSS_保全派驻-交战荒野-维什戴尔-澄闪-浊蒂-纯烬艾雅法拉兼容应急.json to SSS_交战荒野-维什戴尔-澄闪-浊蒂-纯烬艾雅法拉兼容应急.json

* 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-08-19 11:34:40 +10:00
status102
0b5704c02f Revert "chore: 保全作战相同location以json写的策略顺序执行、全局保留core干员不作为过牌干员" (#10285) 
Revert "chore: 保全作战相同location以json写的策略顺序执行、全局保留core干员不作为过牌干员 (#10284)"

This reverts commit 22817d4717.

不该是chore吧，要发版了等发版完再进
 2024-08-19 07:49:25 +08:00
晓丶梦丶仁
22817d4717 chore: 保全作战相同location以json写的策略顺序执行、全局保留core干员不作为过牌干员 (#10284) 
* feat: SSSstrategy之间同一位置需按json内写的顺序放置

* fix: 添加哈希函数

* fix: 修改错误参数

* refactor: 改用shared_ptr

* feat: 保全作业将不允许用核心干员作为工具人

* fix: 实现全局保core

* fix: 增加顺序tag减少bug

---------

Co-authored-by: Weiyou Wang <blspgzs@gmail.com>
 2024-08-19 07:36:22 +08:00
Loong
f23d41d526 fix: 去除干员 OCR 识别结果中的前导下划线 (#10280) 
* fix: 去除干员 OCR 识别结果中的前导下划线

* fix: make sure at least one character following the underscore

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2024-08-18 22:52:37 +02:00
Constrat
ac299ea2a1 refactor: remove unneccesary Grid.Column fields 2024-08-18 22:51:37 +02:00
晓丶梦丶仁
ee48bd940a refactor: 生息演算2用户界面提醒 (#10281) 
docs: update zh-cn.xaml
 2024-08-19 04:38:11 +08:00
Constrat
17e4c04b03 i18n: english tweak 
[skip ci]
 2024-08-18 22:35:44 +02:00
Constrat
d0d4f6ae1d Revert "fix: multithread double free in Logger" 
This reverts commit 710fa1971c.
 2024-08-18 22:29:18 +02:00
Constrat
875f109666 chore(wpfgui): removed unnecessary fields + adb path centering 2024-08-18 22:17:58 +02:00
Constrat
dbd0d7a99b i18n: english tweak 
[skip changelog] [skip ci]
 2024-08-18 22:10:03 +02:00
Constrat
af9f02a28c style: tightened margins for GUI settings 2024-08-18 22:06:22 +02:00
Horror Proton
710fa1971c fix: multithread double free in Logger 2024-08-19 00:18:14 +08:00
uye
782e280aaa feat: 允许选择WPFGUI中的干员名称显示语言 (#10079) 
允许选择“干员名称显示语言”为“跟随MAA”或“跟随游戏客户端”。
这个应该不会需要更多选项吧（）
先糊一坨，睡了（）

已知问题：
 - 所有相关内容都需要重启客户端才能生效

TODO：
 - 将“切换语言后重启MAA”引入此处选项修改后任务
 - Other languages
 - 更多显示干员名称的区域，如 #10067 提到的招募小工具界面
 - 拆分重置 #9457 

待讨论：
 - 更多的专有名词


![图片](https://github.com/user-attachments/assets/cf384f22-0549-40cd-a698-07b6d4316818)
 2024-08-18 23:11:29 +08:00
ManicSteiner
876ab23577 chore: revert ui perf (commit b3b9198) 2024-08-18 23:09:13 +08:00
Hao Guan
fdea4e68fc chore: update maadeps to 2024-08-17 (#10268) 
* chore: update maadeps

* chore: FIXME: temporarily hold maadeps version for windows package

---------

Co-authored-by: dantmnf <dantmnf@users.noreply.github.com>
 2024-08-18 23:01:26 +08:00
uye
e6edbefe6a chore: 减少保全截图间隔 2024-08-18 22:31:36 +08:00
Manicsteiner
0becaf9170 Merge branch 'dev' into feat_opername 2024-08-18 22:26:30 +08:00
status102
787409be23 fix: 截图速度过快时可能卡在公招放弃界面 2024-08-18 20:33:51 +08:00
status102
320be4e83d Revert "fix: 截图速度过快时可能卡在公招放弃界面" 
This reverts commit 3c9f0930a0.
 2024-08-18 20:33:50 +08:00
uye
63453023b4 fix: 获得导能元件时可能错误判断是否在战斗中 2024-08-18 20:33:27 +08:00
DL_君逸寒
724037ca63 perf: 优化 玉门市集 保全派驻作业 (#10276) 
* perf: 优化 玉门市集 保全派驻作业

perf: 优化 玉门市集 保全派驻作业

* 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-08-18 20:01:40 +08:00
uye
3a42f4a0f8 chore: 移动旧保全文件至old文件夹 2024-08-18 19:45:40 +08:00
uye
3c9f0930a0 fix: 截图速度过快时可能卡在公招放弃界面 2024-08-18 17:59:21 +08:00
Loong
bbc125552b chore: bump maa-cli to 0.4.11 (#10274) 2024-08-18 10:44:04 +01:00
晓丶梦丶仁
b0644ed1f6 perf: 删除萨卡兹肉鸽作战策略空数组 (#10275) 
[skip changelog]
 2024-08-18 17:43:51 +08:00
DL_君逸寒
f98caaef1f perf: 优化 交战荒野、玉门市集 保全派驻作业 (#10273) 
* perf: 优化 交战荒野 保全派驻作业

perf: 优化 交战荒野 保全派驻作业

* perf: 优化 玉门市集 保全派驻作业

perf: 优化 玉门市集 保全派驻作业

* 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-08-18 17:09:46 +08:00
uye
d1c0cc2704 docs: 修改 README 2024-08-18 16:36:46 +08:00
uye
aba31fc398 chore: 修改 版本更新 界面 2024-08-18 15:55:25 +08:00
uye
e7bb510010 docs: 更新 README 2024-08-18 15:38:32 +08:00
Linisdjxm
433e9ea7d7 feat: 增加SOCKS5支持 (#10061) 2024-08-18 15:08:47 +08:00
uye
8f2852aaeb refactor(config) : reorganize settings loading (#10133) 
重新组织配置读取的函数。虽然还是没找到 #2535 的根因。

ConfigHelper 使用.bak前应该先检查一下.bak是否可以被有效解析，可能会出现两者同时解析失败的情况 

AsstConnect 勾选自动检测的逻辑处理感觉有些乱，也一并重写了一下。
 2024-08-18 15:03:08 +08:00
Hao Guan
4d78d5be71 feat: Mac GUI自动编队添加信赖干员 2024-08-18 15:02:03 +08:00
uye
de30a7c53d fix: 生息演算可能无法退出组装台 2024-08-18 14:53:29 +08:00
晓丶梦丶仁
b595539e9b fix: 国服CharsNameOcrReplace (#10269) 
* fix: 国服CharsNameOcrReplace

* fix: 国服OCR替换改进

* fix: 同上

* fix: 麻了
 2024-08-18 01:44:47 +08:00
Loong
e510ab2848 chore: add flag -fexperimental-library for clang < 16 (#10265) 
* Revert "ci: 在 macOS 上使用 clang 18"

This reverts commit d16eb092bd.

* feat: add -fexperimental-library for clang < 16
 2024-08-18 00:04:53 +08:00
zzyyyl
f939cd2742 fix: 修复 "-MO-" 会被替换为 "-M0-" 导致的关卡识别错误 (#10263) 2024-08-17 23:53:41 +08:00
AnnAngela
efdbe1cd91 ci: 修复比较链接 2024-08-17 22:10:01 +08:00
uye
a1aa7c182f test: ci "(]"\"" 2024-08-17 20:24:41 +08:00
AnnAngela
89a5932dc5 ci: 用 nodejs 读取 changelog (#10267) 2024-08-17 20:15:16 +08:00
uye
a5ed3ce39c chore: 移除不必要的引用 "()" 2024-08-17 19:32:25 +08:00
AnnAngela
572b907667 ci: 修复 changelog 错误的问题 (#10266) 
ci: 这样行不行
 2024-08-17 19:29:33 +08:00
uye
ff2cbc7585 ci: Update release-nightly-ota.yml 2024-08-17 18:39:58 +08:00
uye
86f9d2e6de Revert "test: ci(123)" 
This reverts commit 105054138b6ee7da48650d878506a4bbcdc9582b.
 2024-08-17 18:02:01 +08:00
uye
06ba8bfe19 test: ci 2024-08-17 18:02:01 +08:00