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
6,025 Commits 61 Branches 1,838 Tags
d4613368266ef6c4e5dfce29e87569feefdfe4ea
Commit Graph

6025 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MistEO
d461336826 docs: changelog 2023-02-16 01:01:23 +08:00
MistEO
3212286c4b fix: 修复自动换班排序错误导致的干员冲突问题 
fix #3721
 2023-02-16 00:59:34 +08:00
MistEO
d53653dbbd Merge pull request #3701 from MaaAssistantArknights/dev 
Release v4.11.0-alpha.1
v4.11.0-alpha.1 		2023-02-15 22:23:17 +08:00
MistEO
a03f7ea412 docs: changelogs 2023-02-15 22:09:17 +08:00
MistEO
08aa4a8f80 Merge pull request #3718 from MaaAssistantArknights/docs/migration 
docs: 删除docs中的文档，readme中的网址换为官网地址
 2023-02-15 21:58:10 +08:00
MistEO
c8eeed8530 Merge pull request #3491 from fearlessxjdx/xjdx 
feat: 复核干员选择是否符合期望
 2023-02-15 21:43:09 +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
MistEO
6d1a18a1af chore: 更新企鹅关卡json 2023-02-15 21:25:30 +08:00
uye
16d048fbee docs: 删除docs中的文档，readme中的网址换为官网地址 2023-02-15 21:17:56 +08:00
uye
e3aa53d19b docs: 删除docs中的文档，readme中的网址换为官网地址 2023-02-15 20:52:01 +08:00
MistEO
99c5a2c5c8 Merge pull request #3688 from ChildeRolando/patch-2 
Update 3.1-集成文档.md
 2023-02-15 18:26:07 +08:00
uye
c5cdc79545 Merge pull request #3684 from bigqiao/dev 
支持设置无限使用48小时内理智药
 2023-02-15 16:37:15 +08:00
uye
0e5b468466 Merge pull request #3704 from WLLEGit/ReclamationAlgorithm 
fix: 生息演算 关卡导航
 2023-02-15 16:26:56 +08:00
Yifan Liu
1fa722ae17 chore: update overseas clients tools 
add a new tool to help locate untranslated texts in json
minor updates to the old ones
rename files so that they are more intuitive
 2023-02-14 23:15:07 -06:00
MistEO
e725e35700 Merge pull request #3709 from cenfusheng/dev 
FIX:重新修复缄默德克萨斯的文字识别问题
 2023-02-15 13:12:34 +08:00
cenfusheng
85697dc50f FIX:重新修复缄默德克萨斯的文字识别问题 
修复缄默德克萨斯识别为威默德克萨斯、感默德克萨斯、默德克萨斯等情况
 2023-02-15 12:59:11 +08:00
lhhxxxxx
21c02b5ba0 Merge pull request #3702 from MaaAssistantArknights/CustomStyle/TextBlock 
chore: TextBlock使用自定义控件
 2023-02-15 02:54:59 +08:00
LambdaLe
4c675ad225 fix: 生息演算 关卡导航 2023-02-14 22:08:46 +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
Horror Proton
88831d180f chore: remove unnecessary upgrade in Linux action 2023-02-14 19:53:24 +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
MistEO
b9d1102643 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-02-14 16:17:34 +08:00
MistEO
72859ea0ee Merge branch 'master' into dev 2023-02-14 16:17:16 +08:00
MistEO
221e966dd3 Merge branch 'stable' into dev 2023-02-14 16:16:58 +08:00
MistEO
af44c3a873 Merge pull request #3700 from MaaAssistantArknights/release/4.10.9 
Release v4.10.9
v4.10.10 		2023-02-14 16:15:25 +08:00
MistEO
69854f556c docs: changelogs 2023-02-14 16:14:28 +08:00
MistEO
cb23ff17da chore: 更新游戏数据 2023/2/14 2023-02-14 16:13:11 +08:00
MistEO
df56e8bdb5 docs: changelogs v4.10.9-rc.1 2023-02-14 14:45:52 +08:00
MistEO
71a21d7b56 Merge tag 'v4.10.7' into stable v4.10.9 2023-02-14 14:38:33 +08:00
MistEO
b64e6d2cbd docs: update changelog 2023-02-14 14:34:53 +08:00
uye
0bfdcad0fd docs: 更新文档 23/02/12 2023-02-14 14:32:22 +08:00
uye
3ab93277a0 docs: 更新文档 23/02/12 2023-02-14 14:32:09 +08:00
Yifan Liu
f7f6b05944 feat: update JP templates 2023-02-14 14:30:52 +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
打麻将有点累
d936fd9bbb 修复因赠送线索弹窗遮挡new图标导致的因线索已满赠送后没有领取自己线索的问题 2023-02-14 14:26:06 +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
702f525365 fix: 修复保全第三层中途掉落卡住的问题 2023-02-14 14:25:07 +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
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