fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 10:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,282 Commits 61 Branches 1,839 Tags
f2788a34638777a3a748985cf8ab1ea052d6f910
Commit Graph

4282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DavidWang19
f2788a3463 feat: 合并本次掉落和掉落统计 2022-10-20 17:38:26 +01:00
MistEO
4c948b0485 fix: 初步修复日服掉落无法上传问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2363
 2022-10-20 22:10:53 +08:00
MistEO
7ebec10793 fix: 同步修复美服掉落识别的问题 2022-10-20 22:10:33 +08:00
MistEO
b9ec1e6477 fix: 修复基建搓玉补货后不换人的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2366
 2022-10-20 21:51:46 +08:00
MistEO
9ff1d67c87 Merge pull request #2365 from wallsman/dev 
doc: JP Add update line
 2022-10-20 20:18:52 +08:00
uye
931324e8a0 feat: 当材料选择框为"NotSelected"时不过滤材料列表 2022-10-20 19:26:21 +08:00
uye
123bfe363b style: 肉鸽加* 
fix #2347
 2022-10-20 19:11:23 +08:00
zzyyyl
e24be62b83 fix: 同步外服 StartButton1 的设置 2022-10-20 16:41:07 +08:00
zzyyyl
843303a367 fix: JP Client 结算界面识别问题 again 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2363
 2022-10-20 16:35:01 +08:00
zzyyyl
6a86b43047 fix: JP Client 结算界面识别问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2363
 2022-10-20 16:20:16 +08:00
Wallsman
5c5cccc75a Doc : Add update line 
Base EN
 2022-10-20 08:45:46 +09:00
MistEO
f3a24449ec Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-10-18 11:18:05 +08:00
MistEO
3708c09749 chore: update translations 2022-10-18 11:17:41 +08:00
MistEO
d7594001c6 Merge pull request #2332 from LittleFall/fix/stop-not-fail 
fix: 修复手动终止任务时有概率出现的“任务出错”
 2022-10-18 00:24:53 +08:00
Horror Proton
887dde6bb0 fix: fix an if branch in asst.py 2022-10-17 20:56:34 +08:00
MistEO
fb9667941e fix: 修复肉鸽战斗中干员名识别错误时，一直点干员的问题 2022-10-16 22:34:35 +08:00
Zhi Qi
68bbb22fe6 fix compile error 2022-10-16 08:24:50 +08:00
Zhi Qi
8bb4f64ae2 fix: 修复手动终止任务时有概率出现的“任务出错” 2022-10-16 08:06:28 +08:00
MistEO
c42b0640d2 Merge branch 'build/package_name' into dev 2022-10-16 06:20:33 +08:00
MistEO
7d8bccf581 build: rename CI package 2022-10-16 05:56:04 +08:00
DavidWang19
6ab371a7da Revert "fix: 修复了肉鸽战斗时一个导致程序崩溃的问题" 
This reverts commit 5871f80af7.
 2022-10-15 22:22:39 +01:00
zzyyyl
003c5db0cd feat: 适配台服肉鸽 2022-10-15 22:38:17 +08:00
Horror Proton
ef7e62570e feat: use blue channel image in RoguelikeRecruitImageAnalyzer::match_level 2022-10-15 22:34:37 +08:00
MistEO
0bcfbad87a Merge pull request #2272 from MaaAssistantArknights/refactor/roguelike 
refactor: 重构肉鸽任务并修改回调
 2022-10-15 22:28:00 +08:00
MistEO
304b7e7dd0 Merge pull request #2328 from MaaAssistantArknights/build/package_name 
build: Modify CI product name and remove unneeded files from the product package
 2022-10-15 22:27:45 +08:00
MistEO
1097950a9e Merge pull request #2322 from KiyuM1n/dev 
feat: 適配台服肉鴿
 2022-10-15 22:27:09 +08:00
MistEO
b21d0da75a build: Modify CI product name and remove unneeded files from the product package 2022-10-15 22:24:37 +08:00
MistEO
9d4514f44a Merge pull request #2306 from hguandl/feat/macos-app 
feat: 构建 macOS App
 2022-10-15 21:15:58 +08:00
Hao Guan
695da56bce Release trigger; debug symbols 2022-10-15 23:06:40 +10:00
KiyuM1n
3bb5ae5084 補齊部分圖檔 
剩餘
Roguelike1GamePass
Roguelike1GamePassSkip1
 2022-10-15 17:42:29 +08:00
zzyyyl
bb0d06dbcb feat: 新版肉鸽外服支持 2022-10-15 16:32:50 +08:00
zzyyyl
0b27527165 docs: 集成文档 2022-10-15 16:32:50 +08:00
zzyyyl
0005eb8ca0 docs: 修改回调文档 2022-10-15 16:32:50 +08:00
zzyyyl
6e039269e1 perf: 修改部分任务名 2022-10-15 16:32:50 +08:00
zzyyyl
ec21bc401a fix: 修复回调 2022-10-15 16:32:50 +08:00
zzyyyl
5fd5c7d274 style: 字典序排列肉鸽相关 task 2022-10-15 16:32:50 +08:00
zzyyyl
c72c9983a6 fix: 修复写错的任务 2022-10-15 16:32:49 +08:00
zzyyyl
adbfd815ad refactor: 重构肉鸽文件结构 2022-10-15 16:32:49 +08:00
MistEO
7480808ba7 chore: 删除肉鸽切换主题时的重启提示 2022-10-15 16:32:49 +08:00
MistEO
9691bf975c perf: 统一定义肉鸽主题状态字段 2022-10-15 16:32:49 +08:00
zzyyyl
4cd019a724 feat: 加点日志 
Co-authored-by: MistEO <mistereo@hotmail.com>
 2022-10-15 16:32:49 +08:00
zzyyyl
af4bc4a538 perf: std::move string 
Co-authored-by: MistEO <mistereo@hotmail.com>
 2022-10-15 16:32:49 +08:00
zzyyyl
e9ddaba387 refactor: 重构肉鸽资源加载逻辑和任务流程 2022-10-15 16:32:49 +08:00
zzyyyl
30332b37e0 fix: 修复笔误 2022-10-15 16:32:49 +08:00
MistEO
630cb852f7 perf: 优化任务参数设置 2022-10-15 16:32:49 +08:00
zzyyyl
ef8c07e026 fix: 修复任务特化时 next 等不带前缀的问题 2022-10-15 16:32:48 +08:00
zzyyyl
f764904cc3 fix: 修复任务流程 2022-10-15 16:32:48 +08:00
zzyyyl
738b6f928c feat: 增加一些模板任务生成逻辑 
除了 template，其余参数若留空则生成时继承模板任务的参数

Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
 2022-10-15 16:32:40 +08:00
KiyuM1n
f91818f558 加入肉鴿的文字替換 
不完整 只改了一小部分
 2022-10-15 03:17:04 +08:00
KiyuM1n
125c9b40b5 台服肉鴿圖檔 
Roguelike1StageDreadfulFoeEnter
Roguelike1GamePassSkip1
Roguelike1GamePass
因為還沒遇上 所以是國服的圖檔
 2022-10-15 03:15:13 +08:00