fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 10:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,083 Commits 61 Branches 1,839 Tags
3f0636ac61daa2dbd7d8c8118d8ae2091e8f0bfa
Commit Graph

3219 Commits

Author SHA1 Message Date
zzyyyl
3f0636ac61 style: format 
请各位开发者统一代码风格！
```
python tools\ClangFormatter\clang-formatter.py --clang-format=YOUR\PATH\TO\clang-format.exe --input=src\MaaCore
python tools\ClangFormatter\clang-formatter.py --clang-format=YOUR\PATH\TO\clang-format.exe --input=src\resource
```
参考 https://maa.plus/docs/2.2-%E5%BC%80%E5%8F%91%E7%9B%B8%E5%85%B3.html#%E5%9C%A8-visual-studio-%E4%B8%AD%E5%90%AF%E7%94%A8-clang-format
 2023-02-23 10:00:51 +08:00
MistEO
ebc4117d22 Merge pull request #3800 from MaaAssistantArknights/feat/updateStage 
feat: 添加4点检查web是否更新关卡
 2023-02-23 00:41:41 +08:00
MistEO
31facbf47f Merge pull request #3762 from horror-proton/perf/tile_pack_parse 
perf: read tile data concurrently
 2023-02-23 00:39:49 +08:00
uye
a0c5a5e06d feat: 添加4点检查web是否更新关卡 2023-02-22 23:01:14 +08:00
Horror Proton
19a3b57623 perf: read tile data concurrently 2023-02-22 10:54:04 +00:00
zzyyyl
9cb07172b9 feat: 增加一些空白符 2023-02-22 13:10:18 +08:00
zzyyyl
cdd32b4dee feat: 对 # 运算的逻辑稍作调整 
允许 A#(next+sub), 表示 (A#next + A#sub)
 2023-02-22 12:01:14 +08:00
zzyyyl
472a8b2b5f feat: 对 @ 运算的逻辑稍作调整 
调整前: (...)@#none=#none, #none@(...)=#none
调整后: (...)@#none=(...), #none@(...)=(...)
 2023-02-22 11:57:04 +08:00
zzyyyl
e6dbaa955c perf: 结构优化 2023-02-22 11:01:53 +08:00
zzyyyl
2478aef083 feat: 增加一个虚任务 #none 
例：
```
"A": { "next": [ "#none+B" ] }
```
这个任务在增加前缀（如 `"D@A"`）时 next 不变。
 2023-02-22 11:01:53 +08:00
zzyyyl
d681bafeee feat: 简易的任务表达式运算 2023-02-22 11:01:53 +08:00
uye
8bd3884949 feat: 支持吾导先路活动导航 2023-02-21 17:03:31 +08:00
Wallsman
553f698033 Merge pull request #3774 from wallsman/dev 
doc : Config JP text translate
 2023-02-21 04:28:35 +09:00
uye
07ffac91ab fix: 修复获取指定语言文字时不支持转义的问题 2023-02-20 18:15:49 +08:00
Wallsman
49a6192e4d Update ja-jp.xaml 
miss fix.
 2023-02-20 06:07:58 +09:00
Wallsman
5f8a6ef0b2 Update ja-jp.xaml 
Typo Miss
 2023-02-20 02:56:42 +09:00
uye
6b654f2bd0 Merge pull request #3760 from MaaAssistantArknights/feat/realtime_binding_combat_parameters 
feat: 实时更新战斗设置
 2023-02-20 00:37:57 +08:00
uye
49d59bae5f chore: 不在判断剩余理智是否开放 
否则在不开放的时候显示可能为当前/上次，而第二天变成了之前的关卡，可能会带来一些问题
 2023-02-20 00:36:04 +08:00
Wallsman
515c84c0c7 Update ja-jp.xaml 2023-02-19 23:54:38 +09:00
Wallsman
e8d6a7d80c doc : Config JP text translate 
いくらか抜けていた部分や翻訳抜けを修正。
Some omissions and missing translations were corrected.
 2023-02-19 23:49:11 +09:00
Hao Guan
eb04db36eb fix: Mac GUI 修复编队错误 2023-02-19 12:51:20 +10:00
uye
526d7f45b8 fix: 修复部分情况下隐藏到托盘功能不生效的问题 2023-02-18 20:18:03 +08:00
uye
95b7e2c5ff chore: 通过TryParse判断数量而不是字符串 2023-02-18 17:22:28 +08:00
uye
35018503d4 fix: 修复关卡选择输入空字符串变为0的问题 2023-02-18 17:05:04 +08:00
uye
46c00c7648 feat: 实时绑定战斗设置 2023-02-18 16:42:26 +08:00
xjdx
7198bc8311 fix: 修复"复核干员选择"的一些bug 2023-02-18 04:26:44 +08:00
uye
402c9e455d chore: 添加剩余理智的悬浮提示 
fix #3376
 2023-02-17 18:47:03 +08:00
MistEO
c42c8e40d9 fix: 调整一下日志等级 2023-02-17 17:37:20 +08:00
MistEO
030b479b7a fix: 为战斗干员头像识别，召唤物使用单独的阈值 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3735
 2023-02-17 17:37:10 +08:00
uye
d6b751b707 Merge pull request #3743 from sakuraxp/dev 
chore: 修改信用商店购物黑名单
 2023-02-17 16:49:13 +08:00
uye
f87b91aa56 style: 格式化代码 2023-02-17 01:55:46 +08:00
_ChingC
57b18dc4c5 fix: TrayIcon不显示的问题 2023-02-17 01:39:58 +08:00
MistEO
8bcafda31d perf: 优化牛牛喝酒 2023-02-16 21:53:57 +08:00
sakuraxp
52718fbd78 chore: 修改信用商店购物黑名单 2023-02-16 21:06:29 +08:00
uye
1346699400 fix: 从 UI 线程更新最近连接地址列表 2023-02-16 20:22:42 +08:00
uye
bed285cb25 chore: 修改中文版本表述 2023-02-16 19:20:35 +08:00
uye
63d4e4fdc7 fix: 修复链接错误 
fix #3726
 2023-02-16 16:06:48 +08:00
uye
f8c5fae9ea Merge pull request #3725 from lanhao34/master 
fix: 修复adb自动检测逻辑
 2023-02-16 13:31:55 +08:00
MistEO
ab7aa2d597 fix: 修复自定义基建不使用无人机的问题 2023-02-16 12:37:15 +08:00
lanhao34
efac9af7a6 fix adb auto detect logic 2023-02-15 19:10:59 -05:00
MistEO
3212286c4b fix: 修复自动换班排序错误导致的干员冲突问题 
fix #3721
 2023-02-16 00:59:34 +08:00
MistEO
c17137c86c Merge branch 'dev' into xjdx 2023-02-15 21:42:55 +08:00
MistEO
9ece0e64b9 fix: 修复文档链接 2023-02-15 21:29:49 +08:00
uye
c5cdc79545 Merge pull request #3684 from bigqiao/dev 
支持设置无限使用48小时内理智药
 2023-02-15 16:37:15 +08:00
lhhxxxxx
21c02b5ba0 Merge pull request #3702 from MaaAssistantArknights/CustomStyle/TextBlock 
chore: TextBlock使用自定义控件
 2023-02-15 02:54:59 +08:00
lhhxxxxx
bba3bd9951 fix. build warning 2023-02-14 21:01:02 +08:00
zzyyyl
ed6c3d4ee2 fix: 修复 copilot 神秘代码无法使用的问题 2023-02-14 20:10:30 +08:00
zzyyyl
ac62981447 fix: 修复奇怪的合并冲突 
fix 8ed735619d
 2023-02-14 20:10:22 +08:00
uye
65b7f6533c chore: TextBlock使用自定义控件 2023-02-14 17:58:40 +08:00
MistEO
8ed735619d Merge branch 'stable' into dev 2023-02-14 16:21:07 +08:00