fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 10:32:19 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,300 Commits 61 Branches 1,840 Tags
409fc199e028dfd5c599abfbc0754409941a3384
Commit Graph

4300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MistEO
409fc199e0 Merge pull request #2332 from LittleFall/fix/stop-not-fail 
fix: 修复手动终止任务时有概率出现的“任务出错”
 2022-10-18 00:24:53 +08:00
Horror Proton
f7fefcde9c fix: fix an if branch in asst.py 2022-10-17 20:56:34 +08:00
MistEO
1d3acf411b fix: 修复肉鸽战斗中干员名识别错误时，一直点干员的问题 2022-10-16 22:34:35 +08:00
Zhi Qi
77820b134c fix compile error 2022-10-16 08:24:50 +08:00
Zhi Qi
b450e6f265 fix: 修复手动终止任务时有概率出现的“任务出错” 2022-10-16 08:06:28 +08:00
MistEO
cc50427ae3 Merge branch 'build/package_name' into dev 2022-10-16 06:20:33 +08:00
MistEO
7d49ea1eab build: rename CI package v0.0.1-test 2022-10-16 05:56:04 +08:00
DavidWang19
cd31802fc7 Revert "fix: 修复了肉鸽战斗时一个导致程序崩溃的问题" 
This reverts commit a687037a36.
 2022-10-15 22:22:39 +01:00
zzyyyl
d6d45efc39 feat: 适配台服肉鸽 2022-10-15 22:38:17 +08:00
Horror Proton
a421c5c3cb feat: use blue channel image in RoguelikeRecruitImageAnalyzer::match_level 2022-10-15 22:34:37 +08:00
MistEO
9d877b46d9 Merge pull request #2272 from MaaAssistantArknights/refactor/roguelike 
refactor: 重构肉鸽任务并修改回调
 2022-10-15 22:28:00 +08:00
MistEO
30b1e84b37 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
31cb5e8a4a Merge pull request #2322 from KiyuM1n/dev 
feat: 適配台服肉鴿
 2022-10-15 22:27:09 +08:00
MistEO
c353fc7c7c build: Modify CI product name and remove unneeded files from the product package 2022-10-15 22:24:37 +08:00
MistEO
769082db9c Merge pull request #2306 from hguandl/feat/macos-app 
feat: 构建 macOS App
 2022-10-15 21:15:58 +08:00
Hao Guan
6ec11bf0a8 Release trigger; debug symbols 2022-10-15 23:06:40 +10:00
KiyuM1n
30abf0242c 補齊部分圖檔 
剩餘
Roguelike1GamePass
Roguelike1GamePassSkip1
 2022-10-15 17:42:29 +08:00
zzyyyl
333a97a829 feat: 新版肉鸽外服支持 2022-10-15 16:32:50 +08:00
zzyyyl
c8bf252ff6 docs: 集成文档 2022-10-15 16:32:50 +08:00
zzyyyl
b5cda20163 docs: 修改回调文档 2022-10-15 16:32:50 +08:00
zzyyyl
435854934f perf: 修改部分任务名 2022-10-15 16:32:50 +08:00
zzyyyl
05087fb663 fix: 修复回调 2022-10-15 16:32:50 +08:00
zzyyyl
afb7895433 style: 字典序排列肉鸽相关 task 2022-10-15 16:32:50 +08:00
zzyyyl
93af574386 fix: 修复写错的任务 2022-10-15 16:32:49 +08:00
zzyyyl
01f9ec08ab refactor: 重构肉鸽文件结构 2022-10-15 16:32:49 +08:00
MistEO
0269d33af2 chore: 删除肉鸽切换主题时的重启提示 2022-10-15 16:32:49 +08:00
MistEO
e6de08c26d perf: 统一定义肉鸽主题状态字段 2022-10-15 16:32:49 +08:00
zzyyyl
677aa3f90c feat: 加点日志 
Co-authored-by: MistEO <mistereo@hotmail.com>
 2022-10-15 16:32:49 +08:00
zzyyyl
809453e40a perf: std::move string 
Co-authored-by: MistEO <mistereo@hotmail.com>
 2022-10-15 16:32:49 +08:00
zzyyyl
0a8db14315 refactor: 重构肉鸽资源加载逻辑和任务流程 2022-10-15 16:32:49 +08:00
zzyyyl
b2cf7163fb fix: 修复笔误 2022-10-15 16:32:49 +08:00
MistEO
b8811e587a perf: 优化任务参数设置 2022-10-15 16:32:49 +08:00
zzyyyl
9fb1b94f34 fix: 修复任务特化时 next 等不带前缀的问题 2022-10-15 16:32:48 +08:00
zzyyyl
e7ca26ec9a fix: 修复任务流程 2022-10-15 16:32:48 +08:00
zzyyyl
71f113a8a1 feat: 增加一些模板任务生成逻辑 
除了 template，其余参数若留空则生成时继承模板任务的参数

Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
 2022-10-15 16:32:40 +08:00
KiyuM1n
ff0949ac02 加入肉鴿的文字替換 
不完整 只改了一小部分
 2022-10-15 03:17:04 +08:00
KiyuM1n
73e47e81c2 台服肉鴿圖檔 
Roguelike1StageDreadfulFoeEnter
Roguelike1GamePassSkip1
Roguelike1GamePass
因為還沒遇上 所以是國服的圖檔
 2022-10-15 03:15:13 +08:00
Hao Guan
1361de769c feat: App for macOS v4.6.4-fork-2 2022-10-15 04:45:28 +10:00
DavidWang19
a687037a36 fix: 修复了肉鸽战斗时一个导致程序崩溃的问题 2022-10-14 19:27:44 +01:00
MistEO
d935d69bc2 fix: 修复肉鸽没部署也可能识别到cooling干员的问题 2022-10-15 02:22:40 +08:00
MistEO
2cfccc28bf fix: 修复战斗中部分干员cooling识别错误的问题 
能天使 oper_cooling_analyze | 870
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2313
 2022-10-15 02:11:45 +08:00
MistEO
c21b14847b perf: 优化肉鸽一个没啥用的逻辑 2022-10-15 01:49:52 +08:00
MistEO
7c37b51e40 Merge pull request #2297 from DavidWang19/fix/removeNL 
fix: 移除长夜临光关卡选择
 2022-10-15 00:55:52 +08:00
MistEO
12d05841be Merge pull request #2307 from JiHongYuan/patch-2 
docs: Update 3.2-回调消息协议.md
 2022-10-15 00:50:36 +08:00
zzyyyl
d40952f519 fix: 修复嵯峨 ocr 识别错误的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2317
 2022-10-14 15:20:33 +08:00
uye
245692f531 fix: 修复11章开启后自定义导航无法进入第9/10章 2022-10-14 01:37:14 +08:00
Horror Proton
7a40588606 fix: 公开招募 tag 识别失败后跳过 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2299
 2022-10-13 22:22:25 +08:00
JiHongYuan
b1d1d5beaf Update 3.2-回调消息协议.md 
完善消息类型信息
 2022-10-13 21:58:33 +08:00
zzyyyl
96545be6c1 Merge pull request #2285 from MaaAssistantArknights/fix/task_name 
fix: 修复 reduce_other_times 不能正常工作的问题
 2022-10-13 15:49:23 +08:00
zzyyyl
b995fdc81a fix: 处理 verify 问题 2022-10-13 14:30:32 +08:00