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
3,829 Commits 61 Branches 1,838 Tags
0d26eefe69d327ef7ad2cd435f1a8475fa2501ef
Commit Graph

3829 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MistEO
0d26eefe69 Merge pull request #1948 from MaaAssistantArknights/dev 
Release v4.6.0-alpha.2
 2022-09-28 01:15:17 +08:00
MistEO
5b39202ff4 fix: 修复水月肉鸽第三层boss卡住的问题 
但是这样第五层boss就会卡了，明天再改.jpg
 2022-09-28 01:14:29 +08:00
MistEO
9033d72bfb Merge pull request #1947 from MaaAssistantArknights/dev 
Release v4.6.0-alpha.1
 2022-09-28 00:50:34 +08:00
MistEO
e321b9f403 fix: 修复一些水月肉鸽卡住的问题 2022-09-28 00:41:50 +08:00
MistEO
ebc69dc7fd fix: 修复水月肉鸽紧急作战关卡识别错误 2022-09-28 00:25:46 +08:00
MistEO
014f62862b docs: update changelog 2022-09-28 00:25:46 +08:00
MistEO
972a437b3c fix: 修复水月肉鸽的一些卡住的问题 2022-09-28 00:25:46 +08:00
MistEO
ce2fd7fdc8 Merge pull request #1930 from MaaAssistantArknights/feat/more_overseas_support 
feat: support more features for overseas clients
 2022-09-28 00:05:27 +08:00
MistEO
41f4551ead Merge pull request #1927 from Hydrogina/dev 
feat: 在信用值溢出时无视黑名单进行购物
 2022-09-28 00:04:53 +08:00
MistEO
7cd78bde56 Merge pull request #1946 from MaaAssistantArknights/fix/process_still_active 
fix: 修复 hProcess 返回值 259（STILL_ACTIVE）导致重连的问题
 2022-09-27 23:57:46 +08:00
MistEO
c32a3dcf2f feat: 初步完成水月肉鸽 2022-09-27 23:52:30 +08:00
MistEO
fc8cc7c6b7 perf: 优化肉鸽干员招募时的识别逻辑 2022-09-27 23:52:30 +08:00
uye
1041d30980 feat: 修复出新活动后导航可能出错的问题 2022-09-27 21:01:17 +08:00
uye
2630fe6810 fix: 修复更新后活动导航失效 2022-09-27 20:58:01 +08:00
zzyyyl
bdbca3db7f fix: 加个 closesocket 2022-09-27 19:26:34 +08:00
zzyyyl
14ed0ca367 feat: 加点日志，timeout 时强制中止 hProcess 2022-09-27 19:10:25 +08:00
zzyyyl
1cc7e66189 fix: 继续修复退出时两次 kill-server 的问题 2022-09-27 19:07:12 +08:00
Hydrogina
5403244e83 refactor: 优化信用商店购买逻辑 2022-09-27 18:12:30 +08:00
zzyyyl
3e64209fe4 feat: 加点日志输出 2022-09-27 17:47:33 +08:00
MistEO
121c8dd665 fix: typo 2022-09-27 17:05:19 +08:00
MistEO
aa0c2d93b9 chore: update resources 2022-09-27 17:01:08 +08:00
MistEO
6d50412278 Merge pull request #1924 from wallsman/dev 
doc:ja-jp.xaml add line.
 2022-09-27 16:39:52 +08:00
MistEO
98c7841282 docs: update ja-jp.xml 2022-09-27 16:39:39 +08:00
MistEO
d5f5efa2c5 Merge pull request #1928 from MaaAssistantArknights/chore/recruitment_resource 
feat: Localize recruitment results and make resources auto updated
 2022-09-27 16:38:28 +08:00
MistEO
ce3ad18b9d perf: Optimize some minor issues of recruitment 2022-09-27 16:37:51 +08:00
MistEO
0e5e359e27 perf: 自定义基建干员名为空时候则忽略该项 2022-09-26 19:04:43 +08:00
MistEO
a2ee11d90f feat: 新增自定义基建无人机和 Fia 的 enable 字段，优化部分解析逻辑 2022-09-26 19:01:32 +08:00
Hydrogina
8184e0eafd style, docs: 优化参数名，补充集成文档 2022-09-26 17:59:30 +08:00
Hydrogina
a746516f37 style, docs: 优化参数名，补充集成文档 2022-09-26 17:48:52 +08:00
Hydrogina
60f0664ef7 style, docs: 优化参数名，补充集成文档 2022-09-26 13:12:04 +08:00
Hydrogina
9e53088640 feat: 添加选项 信用溢出时无视黑名单 2022-09-25 19:04:23 +08:00
zzyyyl
bd31e73020 Merge pull request #1929 from MaaAssistantArknights/docs/issue-bot 
docs: 更新 IssueBot 文档
 2022-09-25 14:56:06 +08:00
Hydrogina
15b069329c perf: 优化数字识别 2022-09-25 12:52:18 +08:00
zzyyyl
a6bce31568 chore(issue-checker): fix typo 2022-09-25 00:03:47 +08:00
MistEO
a461ce11d4 feat: support credit shopping for JP and EN clients 2022-09-24 23:53:39 +08:00
zzyyyl
2a95b70e5c docs: 更新 IssueBot 文档 2022-09-24 23:14:02 +08:00
zzyyyl
829416a965 chore(issue-checker): 紧急修复 issue-checker 2022-09-24 23:05:19 +08:00
MistEO
dec0caf487 feat: Localize recruitment results and make resources auto updated 2022-09-24 22:42:39 +08:00
Hydrogina
d4da3177c2 feat: 在信用值溢出时无视黑名单进行购物 2022-09-24 22:19:41 +08:00
zzyyyl
257c2be041 chore(issue-checker): 把 issue-checker 的配置写得让正常人能看得懂 
chore(issue-checker): 更新 issue-checker 到 v1.7

chore(issue-checker): 修复 IssueBot 把基建作业相关的内容打上 copilot 标签的问题
 2022-09-24 21:59:53 +08:00
Wallsman
1cfbbce8b8 doc:ja-jp.xaml add line. 
"RemainingSanityStage" add Base EN.
 2022-09-24 20:50:05 +09:00
Tastror
665542dce6 Merge pull request #1918 from wallsman/dev 
doc:Create 3.6-インフラスケジュール設定.md
 2022-09-24 16:24:01 +08:00
Wallsman
ec4f2302ef Update 3.6-インフラスケジュール設定.md 2022-09-24 16:50:07 +09:00
MistEO
040267ce97 Merge branch 'master' into dev 2022-09-24 13:26:21 +08:00
MistEO
73a055590c docs: Make base doc more accurate 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/1918
 2022-09-24 12:32:40 +08:00
MistEO
6235d3741c chore: 更新界面翻译 2022-09-24 06:57:01 +08:00
MistEO
f8dddeb026 chore: 将内置243作业改为巫恋组永动 2022-09-24 02:05:16 +08:00
Wallsman
54ad1e3865 Create 3.6-インフラスケジュール設定.md 
CN base in Japanese, Maybe the translation is a little suspect.

https://github.com/wallsman/MaaAssistantArknights/blob/dev/docs/3.6-%E5%9F%BA%E5%BB%BA%E6%8E%92%E7%8F%AD%E5%8D%8F%E8%AE%AE.md
 2022-09-23 22:51:46 +09:00
MistEO
2783dce0d9 Merge pull request #1916 from MaaAssistantArknights/feat/rt_params 
feat: 主界面参数实时生效，删除“修改”按钮
 2022-09-23 19:53:37 +08:00
MistEO
2a7ac40fe1 docs: update docs about custom base, fix built-in configuration 2022-09-23 18:04:55 +08:00