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,039 Commits 61 Branches 1,839 Tags
d6b751b707fc5e11244f583f4efc800a9df4642f
Commit Graph

3190 Commits

Author SHA1 Message Date
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
Congcong Cai
3d8fce1062 use Point instead PointRef 2023-02-14 14:30:38 +08:00
Congcong Cai
89dc209c75 fix: all_melee_retreat 在使用迭代器遍历的同时删除元素导致SEGV 2023-02-14 14:27:46 +08:00
uye
dc40f9ea0a chore: 优化sleep检查退出的间隔时间 2023-02-14 14:26:53 +08:00
uye
af91d73036 fix: 修复剩余理智显示错误 2023-02-14 14:26:39 +08:00
Congcong Cai
b9ca5ca68c fix: Analyzer should constructor with image and then set task info 2023-02-14 14:25:42 +08:00
MistEO
d352733916 fix: 修复检查更新不应用代理设置的问题 2023-02-14 14:25:27 +08:00
MistEO
31dce5d791 feat: 保全core上满了就不再上工具人了 2023-02-14 14:24:57 +08:00
_ChingC
b76f00a0cb fix: 修复函数可见性问题[skip ci] 2023-02-14 13:19:59 +08:00
_ChingC
ed8702cc22 fix: #3687，并检查出2处可能存在的注入漏洞 
- src/MaaWpfGui/Main/TaskQueueViewModel.cs:291
- src/MaaWpfGui/Main/TaskQueueViewModel.cs:371
 2023-02-14 01:57:56 +08:00
LambdaLe
6a345365fb Merge pull request #3680 from WLLEGit/ReclamationAlgorithm 
refactor&feat: 重构生息演算，Core添加刷赤金参数
 2023-02-13 22:45:10 +08:00
uye
2ea5b34584 fix: 自动检测模拟器自带adb出错时崩溃 2023-02-13 18:01:44 +08:00
uye
61529cc8fd feat: 未开放关卡支持英文显示 2023-02-13 16:54:32 +08:00
uye
e07c90b03b chore: 更新关卡字典键为显示值 2023-02-13 16:18:26 +08:00
uye
ac6fcfb271 feat: 启动时清理关卡列表中过期的关卡 2023-02-13 15:58:07 +08:00
LambdaLe
37dcb6fb12 feat: 生息演算 MAACore添加刷粗制赤金参数 
生息演算集成文档

修复mainModel变量名更改导致的编译错误
 2023-02-12 20:36:49 +08:00
LambdaLe
bd07609888 refactor: 重构生息演算，增强拓展性 
生息演算 修复若干bug
 2023-02-12 20:20:57 +08:00
wangli
7e1daae9d5 生息演算 添加黑市npc对话支持 2023-02-12 20:20:12 +08:00
wangli
24d866e355 improvement: BattleSkillReadyImageAnalyzer改为多目标检测并提供get_result api 2023-02-12 20:20:12 +08:00
bigqiao
7bbc1162a1 合并改动 2023-02-12 09:14:50 +08:00
_ChingC
e4161b570c fix: 更改TrayIcon的生命周期 2023-02-11 19:44:56 +08:00
uye
ccf8c35b27 feat: 公招识别功能添加3星时间设置 
fix #3647
 2023-02-11 19:20:51 +08:00
uye
110b1c7ee4 fix: 修复Asst初始化错误 2023-02-11 18:15:54 +08:00
uye
915fded490 style: 格式化代码 2023-02-11 17:56:39 +08:00
uye
496bfb147b refactor: 优化剩余理智 2023-02-11 17:54:06 +08:00
uye
24dec0e4cf refactor: 简化TextBlock写法 2023-02-11 16:42:36 +08:00
bigqiao
3dc39a4eeb GUI支持设置无限吃48小时内过期的理智药 2023-02-11 15:13:04 +08:00
bigqiao
ffd2123f05 MaaCore支持使用48小时内理智药 2023-02-11 14:28:45 +08:00
MistEO
5770d9fc0f Merge pull request #3652 from HerrCai0907/fix/Analyzer-set-roi-without-image 
fix: `Analyzer` should constructor with image and then set task info
 2023-02-11 04:55:24 +08:00
MistEO
f62abb9f62 Merge pull request #3660 from HerrCai0907/fix/segv 
fix: all_melee_retreat 在使用迭代器遍历的同时删除元素导致segmentation fault
 2023-02-11 04:53:51 +08:00