fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 02:10:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,954 Commits 61 Branches 1,838 Tags
29146e8baa7de3f5c6cbefaeee2b98bc19d5a98e
Commit Graph

3165 Commits

Author SHA1 Message Date
zzyyyl
29146e8baa fix: 修复奇怪的合并冲突 
fix 0e5eae1060
 2023-02-14 20:10:22 +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
uye
91375188f2 feat: 未开放关卡支持英文显示 2023-02-13 16:54:32 +08:00
uye
b7f46003ef chore: 更新关卡字典键为显示值 2023-02-13 16:18:26 +08:00
uye
351310e976 feat: 启动时清理关卡列表中过期的关卡 2023-02-13 15:58:07 +08:00
LambdaLe
5b4a8a5484 feat: 生息演算 MAACore添加刷粗制赤金参数 
生息演算集成文档

修复mainModel变量名更改导致的编译错误
 2023-02-12 20:36:49 +08:00
LambdaLe
c6da3d9e14 refactor: 重构生息演算，增强拓展性 
生息演算 修复若干bug
 2023-02-12 20:20:57 +08:00
wangli
8793b2ffab 生息演算 添加黑市npc对话支持 2023-02-12 20:20:12 +08:00
wangli
52f9664e97 improvement: BattleSkillReadyImageAnalyzer改为多目标检测并提供get_result api 2023-02-12 20:20:12 +08:00
_ChingC
2f158ed173 fix: 更改TrayIcon的生命周期 2023-02-11 19:44:56 +08:00
uye
e162de6745 feat: 公招识别功能添加3星时间设置 
fix #3647
 2023-02-11 19:20:51 +08:00
uye
ef666421e9 fix: 修复Asst初始化错误 2023-02-11 18:15:54 +08:00
uye
b8d739a932 style: 格式化代码 2023-02-11 17:56:39 +08:00
uye
9699d196de refactor: 优化剩余理智 2023-02-11 17:54:06 +08:00
uye
6ff5a4c9db refactor: 简化TextBlock写法 2023-02-11 16:42:36 +08:00
MistEO
78e1a28edc 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
b9905de685 Merge pull request #3660 from HerrCai0907/fix/segv 
fix: all_melee_retreat 在使用迭代器遍历的同时删除元素导致segmentation fault
 2023-02-11 04:53:51 +08:00
Congcong Cai
9d61061032 use Point instead PointRef 2023-02-11 04:33:55 +08:00
uye
070db7db01 Merge branch 'dev' into refactor/inject 2023-02-11 01:14:43 +08:00
Congcong Cai
1b77da1906 fix: all_melee_retreat 在使用迭代器遍历的同时删除元素导致SEGV 2023-02-11 00:26:04 +08:00
uye
8565b52f44 chore: 优化sleep检查退出的间隔时间 2023-02-10 23:28:22 +08:00
uye
ed2ed2fbf0 fix: 修复剩余理智显示错误 2023-02-10 21:57:55 +08:00
Congcong Cai
3e7901a6dc fix: Analyzer should constructor with image and then set task info 2023-02-10 01:18:36 +08:00
MistEO
34e79aa983 fix: 修复检查更新不应用代理设置的问题 2023-02-09 22:33:41 +08:00
uye
b1597aa283 feat: 修改连接配置时更新WindowTitle 2023-02-09 21:40:52 +08:00
uye
b562643ae8 chore: 改个变量名 2023-02-09 21:26:18 +08:00
MistEO
fce2ce8593 feat: 保全core上满了就不再上工具人了 2023-02-09 20:58:25 +08:00
uye
9adb09e3b8 feat: 支持保存近五次连接的端口号 
fix #3614
 2023-02-09 20:52:37 +08:00
ChingCdesu
3cccc21c5a refactor: 重构注入方式 
- 将AsstProxy和工具类注入更改为构造器注入
- 在业务代码中不再使用`_container.Get<T>`方法
- 从`Screen`类继承的Model，在第一次显示Model时进行注入，这样做是避免已经存在的循环依赖导致构造堆栈溢出
- `VersionUpdateViewModel`是特殊的，因为它有可能不显示，所以它仍然采用构造器注入的方式
- `StageManager`为非单例类，`_container.Get<StageManager>()`会返回一个新的实例
 2023-02-09 18:22:10 +08:00
Congcong Cai
3f58e1a5ba fix: check_and_use_skill logic bug 2023-02-08 08:05:27 +08:00
MistEO
c1f20c5e55 Merge pull request #3623 from HerrCai0907/fix/command_shell_use_lot_of_resource 
fix: `call_command_posix` in socket mode should return after child process finished
 2023-02-07 23:02:02 +08:00
uye
08c594cf83 feat: 开启备选关卡的情况下剿灭结束后尝试剩余开放的备选关卡 
fix #3626
 2023-02-07 17:34:30 +08:00
Yifan Liu
39fe9b7dcc feat: 更新了各个时区的YJ时间以及调整了YJ时间的计算方法 2023-02-07 02:32:49 -06:00
Yifan Liu
c28ecc2b56 fix: StageManager.cs 服务器为不选择的时候也视为官服 2023-02-07 01:57:15 -06:00
uye
fdbc6a7ea6 feat: 切换服务器类型时更新关卡列表和关卡提示 2023-02-07 01:51:54 -06:00
uye
376de2c22b chore: 重命名客户端对应时间变量名 2023-02-07 00:18:09 -06:00
uye
0d2e374799 feat: 界面更新时间根据所选客户端类型决定（外服时区还要改） 2023-02-07 00:17:16 -06:00
Congcong Cai
7138184c90 move sys socket in unix only macro 2023-02-07 07:53:25 +08:00
Congcong Cai
1fce2e046e shutdown socket before close 2023-02-07 00:32:14 +08:00