fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-15 17:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,464 Commits 61 Branches 1,836 Tags
bda10bde87af29cc372a55cf707698ef90fd4e8d
Commit Graph

5464 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MistEO
bda10bde87 docs: 更新QQ群加群链接 2023-01-11 17:06:27 +08:00
MistEO
00f6725d7b Merge pull request #3254 from MaaAssistantArknights/dev 
Release v4.9.1 hotfix
v4.9.1 		2023-01-01 19:31:45 +08:00
MistEO
989615468e perf: 自动战斗优化了一些有的没的 2023-01-01 19:30:57 +08:00
MistEO
59b2738e42 Merge pull request #3253 from MaaAssistantArknights/dev 
Release v4.9.1
 2023-01-01 19:22:23 +08:00
MistEO
b584c16c2d docs: update changelog 2023-01-01 19:22:02 +08:00
MistEO
fb79b03e03 fix: 修复自动战斗cd干员匹配错误问题 2023-01-01 19:20:13 +08:00
MistEO
dc9d60858c fix: 修复高分辨率下关卡导航滑动过头的问题 2023-01-01 19:01:49 +08:00
MistEO
ac3de7950e fix: 修复自动战斗不部署召唤物的问题 2023-01-01 18:53:33 +08:00
MistEO
7cba9c6f5f Merge pull request #3251 from MaaAssistantArknights/dev 
Release v4.9.0 hotfix
v4.9.0 		2023-01-01 17:30:31 +08:00
MistEO
28f98c7cbd fix: 修复抄作业不开技能的问题 2023-01-01 17:29:12 +08:00
MistEO
d4b2f0432e Merge pull request #3249 from MaaAssistantArknights/dev 
Release v4.9.0
 2023-01-01 17:16:22 +08:00
MistEO
3c67c1a8ff chore: 更新企鹅物流关卡数据 2023/1/1 2023-01-01 17:16:03 +08:00
MistEO
7274a9f048 docs: update changelog 2023-01-01 17:13:03 +08:00
MistEO
e32251ef58 Merge pull request #3242 from WLLEGit/dev 
feat: WpfGUI 添加肉鸽助战选项
 2023-01-01 16:43:13 +08:00
uye
731172469f feat: 添加 SideStory「将进酒」复刻活动关卡导航 2023-01-01 16:20:23 +08:00
MistEO
542596a6d6 chore: 更新资源: 2023/1/1 2023-01-01 15:43:20 +08:00
wangli
c8bd88c3a2 WpfGUI 添加肉鸽助战选项 2022-12-31 18:36:35 +08:00
MistEO
3fe9059b7a Merge pull request #3237 from Pitiedwzr/dev 
修正EN服tasks.json格式错误
 2022-12-31 13:38:02 +08:00
Pitiedwzr
04c49d9051 Update tasks.json 
修正格式错误
 2022-12-31 10:59:18 +13:00
MistEO
3a5c101e99 Merge pull request #3230 from Pitiedwzr/dev 
适配EN服自动公招&添加尘影余音活动数据&修复领取奖励，线索收集，肉鸽不投资的问题
 2022-12-31 04:10:05 +08:00
MistEO
8905f0a10e Merge branch 'dev' into dev 2022-12-31 04:09:55 +08:00
MistEO
8ab3f64a32 Merge pull request #3226 from vonnoq/dev 
繁中服更新 SideStory「吾导先路」
 2022-12-30 23:39:50 +08:00
MistEO
0ca7f2742e Merge pull request #3231 from RiichiTsumo/master 
国际服更新干员和肉鸽内容拓展2
 2022-12-30 23:38:42 +08:00
RiichiTsumo
e553f41b7a Update tasks.json 2022-12-30 18:14:42 +08:00
Pitiedwzr
61ab17d319 修复非1280x720分辨率下肉鸽不投资的问题 
目前想到的最佳解
 2022-12-30 21:39:59 +13:00
Pitiedwzr
7261c56f08 修复非1280x720分辨率下肉鸽不投资的问题 
目前能想到的最佳解
 2022-12-30 21:39:25 +13:00
RiichiTsumo
2b37efd47c 更新干员和肉鸽内容拓展2 
（急急急）
 2022-12-30 12:39:45 +08:00
Pitiedwzr
5b34dce777 修复EN服肉鸽不投资的问题 2022-12-30 16:25:59 +13:00
Pitiedwzr
10d0acc8c5 修复EN服基建线索收集卡住的问题 2022-12-30 15:51:46 +13:00
Pitiedwzr
296ab3513d 适配EN服自动公招 2022-12-30 15:49:57 +13:00
Pitiedwzr
06432cc44d 适配EN服自动公招等剩余功能，修复领取奖励失败的问题 2022-12-30 15:47:54 +13:00
Pitiedwzr
7eee003c31 更新EN服活动“尘影余音”掉落物 2022-12-30 15:44:33 +13:00
Pitiedwzr
2adadc05a1 更新EN服活动“尘影余音”开放时间 2022-12-30 15:43:31 +13:00
vonnoq
7348020210 繁中服更新 SideStory「吾导先路」 2022-12-30 02:08:32 +08:00
uye
50f27516d3 feat: 新增定时器分钟选择 2022-12-30 00:01:54 +08:00
uye
f325d8f7ce feat: 修改活动剩余0天时的tips 2022-12-29 22:44:34 +08:00
guigui
45814b5cee bugfix.修复一个无法加载maaCore的bug 2022-12-29 21:54:11 +08:00
MistEO
64147478d3 Merge pull request #3221 from MaaAssistantArknights/dev 
Release v4.9.0-rc.1
v4.9.0-rc.1 		2022-12-29 17:16:06 +08:00
MistEO
f4507dc3db docs: update changelog 2022-12-29 17:15:52 +08:00
MistEO
7acad9787c chore: 提高高资tag的识别容错 2022-12-29 17:13:16 +08:00
uye
c66a6a572c feat: 增加活动剩余开放天数显示 
fix #3219
 2022-12-29 16:28:27 +08:00
MistEO
0cb5d4e093 fix: 修复自动战斗上干员延迟不生效的问题 2022-12-29 16:02:35 +08:00
MistEO
e9821d2d62 fix: 修复自动战斗编队排序错误 2022-12-29 16:02:28 +08:00
uye
0c5c2c2ec7 fix: 修复「照我以火」活动开放时间错误 2022-12-29 15:05:44 +08:00
Horror Proton
daf9cc8977 fix: update recruit tag ocr replace list 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3211
 2022-12-28 23:59:39 +08:00
Horror Proton
b8dae058ea fix: update template for YoStarJP 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3214

TODO: same issue may also occur in txwy
 2022-12-28 22:52:40 +08:00
uye
a842ec38e0 feat: 更新日语借助战功能描述 2022-12-27 23:07:14 +08:00
MistEO
d16d22ad7d Merge pull request #3206 from MaaAssistantArknights/dev 
Release v4.9.0-alpha.2 hotfix
v4.9.0-alpha.2 		2022-12-27 22:45:49 +08:00
MistEO
ba057cbeb4 docs: update changelog 2022-12-27 22:45:37 +08:00
uye
34ff155f6d feat: 增加一些启动模拟器时的日志 2022-12-27 22:43:14 +08:00