fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 17:57:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,027 Commits 61 Branches 1,837 Tags
38ceba64db08cb643cf65482904fe87aaa03d8a0
Commit Graph

3207 Commits

Author SHA1 Message Date
uye
71d5b9b3fa feat: 支持吾导先路活动导航 2023-02-21 17:03:31 +08:00
Wallsman
7ee96cfc6e Merge pull request #3774 from wallsman/dev 
doc : Config JP text translate
 2023-02-21 04:28:35 +09:00
uye
65201b6625 fix: 修复获取指定语言文字时不支持转义的问题 2023-02-20 18:15:49 +08:00
Wallsman
caad190900 Update ja-jp.xaml 
miss fix.
 2023-02-20 06:07:58 +09:00
Wallsman
21631e180e Update ja-jp.xaml 
Typo Miss
 2023-02-20 02:56:42 +09:00
uye
3009f2b127 Merge pull request #3760 from MaaAssistantArknights/feat/realtime_binding_combat_parameters 
feat: 实时更新战斗设置
 2023-02-20 00:37:57 +08:00
uye
135cb7221f chore: 不在判断剩余理智是否开放 
否则在不开放的时候显示可能为当前/上次，而第二天变成了之前的关卡，可能会带来一些问题
 2023-02-20 00:36:04 +08:00
Wallsman
919d8e93e5 Update ja-jp.xaml 2023-02-19 23:54:38 +09:00
Wallsman
163c78abd3 doc : Config JP text translate 
いくらか抜けていた部分や翻訳抜けを修正。
Some omissions and missing translations were corrected.
 2023-02-19 23:49:11 +09:00
Hao Guan
d6f5792220 fix: Mac GUI 修复编队错误 2023-02-19 12:51:20 +10:00
uye
9a980200a8 fix: 修复部分情况下隐藏到托盘功能不生效的问题 2023-02-18 20:18:03 +08:00
uye
90347ebb3f chore: 通过TryParse判断数量而不是字符串 2023-02-18 17:22:28 +08:00
uye
7d4cf37d21 fix: 修复关卡选择输入空字符串变为0的问题 2023-02-18 17:05:04 +08:00
uye
964c155cce feat: 实时绑定战斗设置 2023-02-18 16:42:26 +08:00
xjdx
e769b27c98 fix: 修复"复核干员选择"的一些bug 2023-02-18 04:26:44 +08:00
uye
9cad7890cf chore: 添加剩余理智的悬浮提示 
fix #3376
 2023-02-17 18:47:03 +08:00
MistEO
b0fd12903c fix: 调整一下日志等级 2023-02-17 17:37:20 +08:00
MistEO
12d51d48a9 fix: 为战斗干员头像识别，召唤物使用单独的阈值 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3735
 2023-02-17 17:37:10 +08:00
uye
c9182e2379 Merge pull request #3743 from sakuraxp/dev 
chore: 修改信用商店购物黑名单
 2023-02-17 16:49:13 +08:00
uye
2ba9602b10 style: 格式化代码 2023-02-17 01:55:46 +08:00
_ChingC
dd5890ffa7 fix: TrayIcon不显示的问题 2023-02-17 01:39:58 +08:00
MistEO
a4ae8cd4d7 perf: 优化牛牛喝酒 2023-02-16 21:53:57 +08:00
sakuraxp
946d6fbeab chore: 修改信用商店购物黑名单 2023-02-16 21:06:29 +08:00
uye
d3aee23c1a fix: 从 UI 线程更新最近连接地址列表 2023-02-16 20:22:42 +08:00
uye
09a5c518e3 chore: 修改中文版本表述 2023-02-16 19:20:35 +08:00
uye
eab7d1a53d fix: 修复链接错误 
fix #3726
 2023-02-16 16:06:48 +08:00
uye
796edbd51d Merge pull request #3725 from lanhao34/master 
fix: 修复adb自动检测逻辑
 2023-02-16 13:31:55 +08:00
MistEO
bc7aafa548 fix: 修复自定义基建不使用无人机的问题 2023-02-16 12:37:15 +08:00
lanhao34
e7117bf0b1 fix adb auto detect logic 2023-02-15 19:10:59 -05:00
MistEO
d702bf848e fix: 修复自动换班排序错误导致的干员冲突问题 
fix #3721
 2023-02-16 00:59:34 +08:00
MistEO
927591e1d7 Merge branch 'dev' into xjdx 2023-02-15 21:42:55 +08:00
MistEO
686e84a98a fix: 修复文档链接 2023-02-15 21:29:49 +08:00
uye
ebf3bb6f34 Merge pull request #3684 from bigqiao/dev 
支持设置无限使用48小时内理智药
 2023-02-15 16:37:15 +08:00
lhhxxxxx
84215c23bc Merge pull request #3702 from MaaAssistantArknights/CustomStyle/TextBlock 
chore: TextBlock使用自定义控件
 2023-02-15 02:54:59 +08:00
lhhxxxxx
90c3331264 fix. build warning 2023-02-14 21:01:02 +08:00
zzyyyl
b87b20fff3 fix: 修复 copilot 神秘代码无法使用的问题 2023-02-14 20:10:30 +08:00
zzyyyl
29146e8baa fix: 修复奇怪的合并冲突 
fix 0e5eae1060
 2023-02-14 20:10:22 +08:00
uye
2de572c2a8 chore: TextBlock使用自定义控件 2023-02-14 17:58:40 +08:00
MistEO
0e5eae1060 Merge branch 'stable' into dev 2023-02-14 16:21:07 +08:00
Congcong Cai
b3f690da1e use Point instead PointRef 2023-02-14 14:30:38 +08:00
Congcong Cai
41b99fc03a fix: all_melee_retreat 在使用迭代器遍历的同时删除元素导致SEGV 2023-02-14 14:27:46 +08:00
uye
dcccca08e6 chore: 优化sleep检查退出的间隔时间 2023-02-14 14:26:53 +08:00
uye
d81a63a8d1 fix: 修复剩余理智显示错误 2023-02-14 14:26:39 +08:00
Congcong Cai
03a758d798 fix: Analyzer should constructor with image and then set task info 2023-02-14 14:25:42 +08:00
MistEO
e445f8915e fix: 修复检查更新不应用代理设置的问题 2023-02-14 14:25:27 +08:00
MistEO
5a48c48bf1 feat: 保全core上满了就不再上工具人了 2023-02-14 14:24:57 +08:00
_ChingC
9c5d90754a fix: 修复函数可见性问题[skip ci] 2023-02-14 13:19:59 +08:00
_ChingC
94d7da88f9 fix: #3687，并检查出2处可能存在的注入漏洞 
- src/MaaWpfGui/Main/TaskQueueViewModel.cs:291
- src/MaaWpfGui/Main/TaskQueueViewModel.cs:371
 2023-02-14 01:57:56 +08:00
LambdaLe
d35b0fff93 Merge pull request #3680 from WLLEGit/ReclamationAlgorithm 
refactor&feat: 重构生息演算，Core添加刷赤金参数
 2023-02-13 22:45:10 +08:00
uye
71b3e98429 fix: 自动检测模拟器自带adb出错时崩溃 2023-02-13 18:01:44 +08:00