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

5960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MistEO
3b43be484c Merge pull request #3709 from cenfusheng/dev 
FIX:重新修复缄默德克萨斯的文字识别问题
 2023-02-15 13:12:34 +08:00
cenfusheng
4cb919aba7 FIX:重新修复缄默德克萨斯的文字识别问题 
修复缄默德克萨斯识别为威默德克萨斯、感默德克萨斯、默德克萨斯等情况
 2023-02-15 12:59:11 +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
Horror Proton
96f5a90859 chore: remove unnecessary upgrade in Linux action 2023-02-14 19:53:24 +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
MistEO
75549cd5d9 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-02-14 16:17:34 +08:00
MistEO
5095c477bd Merge branch 'master' into dev 2023-02-14 16:17:16 +08:00
MistEO
7dde63a875 Merge branch 'stable' into dev 2023-02-14 16:16:58 +08:00
MistEO
933487219b Merge pull request #3700 from MaaAssistantArknights/release/4.10.9 
Release v4.10.9
 2023-02-14 16:15:25 +08:00
MistEO
14f2117866 docs: changelogs 2023-02-14 16:14:28 +08:00
MistEO
dcde2e5125 chore: 更新游戏数据 2023/2/14 2023-02-14 16:13:11 +08:00
MistEO
844b92f321 docs: changelogs 2023-02-14 14:45:52 +08:00
MistEO
b12bd92f70 Merge tag 'v4.10.7' into stable 2023-02-14 14:38:33 +08:00
MistEO
a60271d223 docs: update changelog 2023-02-14 14:34:53 +08:00
uye
5c14fc864f docs: 更新文档 23/02/12 2023-02-14 14:32:22 +08:00
uye
5025afae29 docs: 更新文档 23/02/12 2023-02-14 14:32:09 +08:00
Yifan Liu
443ffa509b feat: update JP templates 2023-02-14 14:30:52 +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
打麻将有点累
540b155318 修复因赠送线索弹窗遮挡new图标导致的因线索已满赠送后没有领取自己线索的问题 2023-02-14 14:26:06 +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
f5160145a6 fix: 修复保全第三层中途掉落卡住的问题 2023-02-14 14:25:07 +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
87af2071a4 Merge branch 'master' into dev 2023-02-14 13:07:02 +08:00
MistEO
4c23748c9f Merge pull request #3695 from MaaAssistantArknights/release/4.10.8 
Release v4.10.8-rc.1
 2023-02-14 11:23:59 +08:00
MistEO
ab3148f4e0 docs: changelogs 2023-02-14 11:23:34 +08:00
_ChingC
0d4be35a7c fix: #3687，并检查出2处可能存在的注入漏洞 
- src/MaaWpfGui/Main/TaskQueueViewModel.cs:291
- src/MaaWpfGui/Main/TaskQueueViewModel.cs:371
 2023-02-14 11:21:29 +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
MistEO
8832a7e600 Merge pull request #3685 from MaaAssistantArknights/dev 
Release v4.10.8-beta.1
 2023-02-13 22:18:12 +08:00
MistEO
18f2cb0504 docs: update changelog 2023-02-13 22:16:58 +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
uye
0e474bfdbf docs: 更新文档 23/02/12 2023-02-12 20:42:15 +08:00
LambdaLe
5b4a8a5484 feat: 生息演算 MAACore添加刷粗制赤金参数 
生息演算集成文档

修复mainModel变量名更改导致的编译错误
 2023-02-12 20:36:49 +08:00
uye
1de8fc5acb docs: 更新文档 23/02/12 2023-02-12 20:34:23 +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