fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 01:59:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,971 Commits 61 Branches 1,838 Tags
b76f00a0cbdbffb406986c83cfd16ca51132595f
Commit Graph

5971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
_ChingC
b76f00a0cb fix: 修复函数可见性问题[skip ci] 2023-02-14 13:19:59 +08:00
_ChingC
4d586524f8 Merge branch 'master' into dev 2023-02-14 13:07:02 +08:00
MistEO
9000c9cc84 Merge pull request #3695 from MaaAssistantArknights/release/4.10.8 
Release v4.10.8-rc.1
v4.10.8-rc.1 		2023-02-14 11:23:59 +08:00
MistEO
9f42089c0e docs: changelogs 2023-02-14 11:23:34 +08:00
_ChingC
7877c0340d fix: #3687，并检查出2处可能存在的注入漏洞 
- src/MaaWpfGui/Main/TaskQueueViewModel.cs:291
- src/MaaWpfGui/Main/TaskQueueViewModel.cs:371
 2023-02-14 11:21:29 +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
MistEO
6a4cb19e8e Merge pull request #3685 from MaaAssistantArknights/dev 
Release v4.10.8-beta.1
v4.10.8-beta.1 		2023-02-13 22:18:12 +08:00
MistEO
b729575e9e docs: update changelog 2023-02-13 22:16:58 +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
uye
1dc44d9c37 docs: 更新文档 23/02/12 2023-02-12 20:42:15 +08:00
LambdaLe
37dcb6fb12 feat: 生息演算 MAACore添加刷粗制赤金参数 
生息演算集成文档

修复mainModel变量名更改导致的编译错误
 2023-02-12 20:36:49 +08:00
uye
272c8e3bbd docs: 更新文档 23/02/12 2023-02-12 20:34:23 +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
_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
Yifan Liu
c664d99f14 feat: update JP templates 2023-02-10 18:49:39 -06: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
Congcong Cai
7eaa18b812 use Point instead PointRef 2023-02-11 04:33:55 +08:00
uye
2ff7786c20 Merge pull request #3661 from MaaAssistantArknights/refactor/inject 
refactor: 重构注入方式
 2023-02-11 01:17:39 +08:00
uye
85cc864212 Merge branch 'dev' into refactor/inject 2023-02-11 01:14:43 +08:00
Congcong Cai
913bf4892c fix: all_melee_retreat 在使用迭代器遍历的同时删除元素导致SEGV 2023-02-11 00:26:04 +08:00
uye
c3703f6851 chore: 优化sleep检查退出的间隔时间 2023-02-10 23:28:22 +08:00
MistEO
b2122d305c Merge pull request #3653 from Sed66666/dev 
修复因赠送线索弹窗遮挡new图标导致的因线索已满赠送后没有领取自己线索的问题
 2023-02-10 22:52:18 +08:00
uye
628575dcc9 fix: 修复剩余理智显示错误 2023-02-10 21:57:55 +08:00
打麻将有点累
be9b055b6a 修复因赠送线索弹窗遮挡new图标导致的因线索已满赠送后没有领取自己线索的问题 2023-02-10 11:17:01 +08:00
Congcong Cai
90f40ac3cf fix: Analyzer should constructor with image and then set task info 2023-02-10 01:18:36 +08:00
MistEO
21bb9825c9 fix: 修复检查更新不应用代理设置的问题 2023-02-09 22:33:41 +08:00
uye
610443fb60 feat: 修改连接配置时更新WindowTitle 2023-02-09 21:40:52 +08:00
uye
b4118c97e3 chore: 改个变量名 2023-02-09 21:26:18 +08:00
MistEO
a9b2ad883f fix: 修复保全第三层中途掉落卡住的问题 2023-02-09 20:58:25 +08:00
MistEO
1f84a79a3f feat: 保全core上满了就不再上工具人了 2023-02-09 20:58:25 +08:00
uye
fddbe5e3ae feat: 支持保存近五次连接的端口号 
fix #3614
 2023-02-09 20:52:37 +08:00
ChingCdesu
2133e2560a refactor: 重构注入方式 
- 将AsstProxy和工具类注入更改为构造器注入
- 在业务代码中不再使用`_container.Get<T>`方法
- 从`Screen`类继承的Model，在第一次显示Model时进行注入，这样做是避免已经存在的循环依赖导致构造堆栈溢出
- `VersionUpdateViewModel`是特殊的，因为它有可能不显示，所以它仍然采用构造器注入的方式
- `StageManager`为非单例类，`_container.Get<StageManager>()`会返回一个新的实例
 2023-02-09 18:22:10 +08:00
MistEO
8ab3a26cb6 Merge pull request #3640 from MaaAssistantArknights/dev 
Release v4.10.7
v4.10.7 		2023-02-08 16:12:43 +08:00
MistEO
5af75c0456 docs: changelogs 2023-02-08 16:12:08 +08:00
GalvinGao
290e9311a4 build: fix release-mirrors 2023-02-08 02:35:54 -05:00
MistEO
b91fe519f7 Merge pull request #3638 from HerrCai0907/fix/has_error 
fix: `check_and_use_skill` logic bug
 2023-02-08 15:23:21 +08:00
GalvinGao
b81b5587b3 build: fix release-mirrors 2023-02-08 02:21:38 -05:00
GalvinGao
c9b109e39c build: fix release-mirrors 2023-02-08 02:19:04 -05:00