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
14,355 Commits 61 Branches 1,838 Tags
48196d65f2cd90c4299ce8dcdb70784cd2365c18
Commit Graph

1595 Commits

Author SHA1 Message Date
status102
48196d65f2 perf: 基建信息板收取信用增加开关 (#12050) 
* perf: 基建信息板收取开关

* feat(core): 基建任务会客室领取留言板信用

* i18n: wpf

* fix: 补回遗漏传参，简化调用

* chore: Auto update by pre-commit hooks [skip changelog]

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-03-12 09:04:28 +08:00
BxFS
9887a8e98c fix: 尝试修复肉鸽不期而遇退出后仍在尝试点击事件 
chore: update tools ignore

feat: check if already left encounter for RoguelikeStageEncounterTaskPlugin

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Signed-off-by: status102 <102887808+status102@users.noreply.github.com>
 2025-03-10 15:03:36 +08:00
status102
ea24a062e8 perf: 肉鸽投资ocr封装 2025-03-09 20:14:27 +08:00
BxFS
f4541042e3 feat: 萨卡兹肉鸽深入调查实装 (#12098) 
* feat: Sarkaz Deep Investigation

* refactor: remove duplicate sarkaz confirm pngs
 2025-03-07 11:22:07 +01:00
BxFS
2d65956725 fix: sarkaz MS count 1->8 (#12085) 2025-03-06 13:09:18 +01:00
status102
f917f0b505 fix: log rotate (#12025) 
* fix: log rotate

* chore: Auto update by pre-commit hooks [skip changelog]

* fix: ubuntu

* chore: Auto update by pre-commit hooks [skip changelog]

* fix: counter

* fix: ubuntu

* fix: static lock

* perf: type

* perf: catch file error

* fix: 修复size计算错误

* revert: 还原阈值为64mb

* chore: Auto update by pre-commit hooks [skip changelog]

* perf: 移除不必要的锁传递

* rft: 使用streambuf计数

* perf: rename & 移除未使用函数

* fix: platform diff

* perf: init

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-03-03 15:02:06 +08:00
Roland125
b2d2b007b0 fix: 修复公招的几个问题 (#12056) 
* fix: 修复不自动招募4星干员时，执行空招募的问题

* chore: Auto update by pre-commit hooks [skip changelog]

* fix: 修改is_calc_only_task()的判断条件，避免正常招募流程的一种情形（所有星级都不执行招募）被错判为仅公招计算。从公招计算启动招募时，加入-1作为标识。
fix: 在正常招募流程中，自动招募1星时，将1星也加入comfirm_level

* chore: Auto update by pre-commit hooks [skip changelog]

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-02-27 21:27:55 +08:00
Roland125
b252ecd863 fix: 修复不自动招募4星干员时，会执行空招募的问题 (#12054) 
* fix: 修复不自动招募4星干员时，执行空招募的问题

* chore: Auto update by pre-commit hooks [skip changelog]

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-02-27 19:54:12 +08:00
BxFS
cb4ba252c0 fix: 萨米第二次调查装备获取+萨米暂时撤退适配 (#12030) 
fix: choose any device and MissionFailedFlag3 for sami DE/DI
 2025-02-25 22:32:34 +08:00
BxFS
3dd00e6207 fix: 月度小队/深入调查未启用自动切换会以当前游戏模式开始探索 (#12032) 
fix: MS/DE now switch to correct tabs even without autoiterate ticked
 2025-02-25 22:23:19 +08:00
status102
aa09a17a23 perf: 肉鸽任务参数禁止运行期修改 2025-02-25 20:01:26 +08:00
status102
bad45b428c feat: 基建收取会客室周限300信用 (#12014) 
* feat: 基建收取会客室周限300信用

* chore: Auto update by pre-commit hooks [skip changelog]

* chore(tools): add templates to ignore list

* fix: stack overflow

* fix: pipeline

* chore: Auto update by pre-commit hooks [skip changelog]

* fix: 动画延迟+roi

* fix: 动画加加retry

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2025-02-24 21:21:47 +08:00
BxFS
0028af16ca fix: Monthly Squad for Global (#11993) 
---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2025-02-21 11:57:15 +01:00
uye
2f0a92a8b0 fix: 会客室进入失败 (#11950) 
* chore: 基建滑动后等待动画结束

* fix: office 进入失败后重试

* chore: Auto update by pre-commit hooks [skip changelog]

* fix: lower case sleep

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
 2025-02-21 16:14:30 +08:00
BxFS
de9375ccd7 fix: add an missing @ for MonthlySquadCommsBackTwice (#11991) 2025-02-21 10:12:40 +08:00
晓丶梦丶仁
edb59786e5 fix: 狭路相逢遇到构想卡死 (#11970) 
* fix: 狭路相逢遇到构想卡死

* perf: 更改头文件位置

* fix: empty image

* Revert "fix: empty image"

This reverts commit ae11bbf138.

* fix: asst::VisionHelper::correct_rect image is empty

* perf: 识别到构想后输出 trace log

* perf: Matcher, ProcessTask
 2025-02-19 21:20:17 +08:00
status102
301c641cf8 perf: 避免不必要拷贝 
[skip changelog]
 2025-02-19 13:07:10 +08:00
status102
ca06a0bc54 fix: 移除肉鸽结算插件中的Matcher复用 2025-02-19 13:06:19 +08:00
status102
8b4e768cb4 fix: 修复BattleHelper中的意外报错 2025-02-19 13:06:19 +08:00
晓丶梦丶仁
66dd7c49e7 perf: 肉鸽为识别错误的事件也添加 callback (#11946) 
* perf: 为识别错误的事件也添加 callback

* perf: log.error、修改what内容

* i18n: KR translation

* i18n: JP translation

---------

Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: ManicSteiner <manicsteiner@outlook.com>
 2025-02-17 21:20:38 +08:00
status102
a3c68c74e9 chore: TaskData增加OcrTask的ocrReplace合法性检查 (#11878) 
* chore: TaskData增加OcrTask的ocrReplace合法性检查

* docs: 加点注释
 2025-02-17 09:25:44 +08:00
status102
76bb116e5d rft: 使用RecruitData代替ocrReplace的外服适配 (#11879) 
* rft: use RecruitData instead of ocrReplace

* chore: tasks.json

* docs: 注释

* i18n: txwy tweak

* perf: 加载资源时缓存客户端对应语言的招募tag集

---------

Co-authored-by: momomochi987 <as99us301@gmail.com>
 2025-02-17 09:14:27 +08:00
status102
a11535d574 fix: Log Rotate 临时性检查措施 (#11835) 
* fix: Log Rotate 增加任务开始时主动检查

* feat: Log Rotate 增加肉鸽每轮探索开始时主动检查

* perf: 移除TaskChain单任务结束后检查
 2025-02-14 21:35:14 +08:00
Roland125
b52ef75c99 fix: 3星招募逻辑修复 (#11913) 
* fix: 3星招募逻辑修复
 2025-02-14 20:04:31 +08:00
status102
9b3e098bf7 Revert "perf: 自动战斗BattleStartPre任务合并理智药检测" 
This reverts commit 5da64cf4da.
 2025-02-14 19:15:02 +08:00
status102
868e8e24f1 fix: 肉鸽职业组 
fix #11901
 2025-02-14 18:37:06 +08:00
uye
8e94570489 Revert "fix: 修复招募功能中的逻辑漏洞，并添加相应的测试函数 (#11898)" 
This reverts commit 6009646f62.
 2025-02-14 18:33:27 +08:00
status102
300a5006e0 revert: 4481710605 (#11900) 
移除种子刷钱相关业务逻辑入口
 2025-02-14 13:35:31 +08:00
status102
e5bb724420 fix: 自动战斗使用技能keep_waiting情况下在离开战斗、中止任务时无法中断 2025-02-14 12:33:26 +08:00
status102
6fec81a3c1 Revert "fix: use_skill 在按下停止按钮后不退出 (#11761)" 
This reverts commit 94900d59aa.
 2025-02-14 12:33:26 +08:00
Roland125
6009646f62 fix: 修复招募功能中的逻辑漏洞，并添加相应的测试函数 (#11898) 
* fix: 修复招募功能中的逻辑漏洞，并添加相应的测试函数

* chore: Auto update by pre-commit hooks [skip changelog]

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-02-14 10:47:54 +08:00
status102
7ef60642c7 revert: 4481710605 2025-02-14 09:49:41 +08:00
BxFS
4d5afa5757 fix: 月度小队模式不再试图提前离开肉鸽 (#11872) 
fix: monthly squad mode no longer try to leave early
 2025-02-13 13:07:29 +08:00
status102
20c66eec45 docs: 自动招募添加少量注释 
[skip changelog]
 2025-02-13 12:15:49 +08:00
status102
34fa74e8f3 feat!: 自动战斗不再允许使用带TR的导航关卡名禁用自动编队，改为自动检测 (#11868) 
* fix: 自动战斗不再允许使用带TR的导航关卡名禁用自动编队，改为自动检测

* chore: Auto update by pre-commit hooks [skip changelog]

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-02-13 09:49:44 +08:00
status102
f89fe2a317 fix: 肉鸽开局无法选择指挥分队时放弃探索 (#11847) 
* fix: 肉鸽开局无法选择指挥分队时放弃探索

* chore: Auto update by pre-commit hooks [skip changelog]

* fix: 无法选择指挥分队时，随机选一个

* chore: YoStarEN `Squad-EnterPoint`

* chore: 增大EN服roi

* chore: txwy

* chore: jp

* chore: kr

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2025-02-12 15:58:02 +08:00
status102
52f8074d37 fix: 自动编队干员选择错误 2025-02-11 21:41:37 +08:00
status102
be8628157d fix: 自动编队错误 
[skip changelog]

fix #11859
 2025-02-11 21:29:13 +08:00
status102
1264e55be5 perf: MaaCore PackageTask中未进入的subtask将不再输出log (#11783) 
perf: 未进入的subtask将不再输出log
 2025-02-11 18:27:13 +08:00
status102
5da64cf4da perf: 自动战斗BattleStartPre任务合并理智药检测 2025-02-11 14:33:43 +08:00
status102
738db64082 perf: 肉鸽投资在同一局内投资系统错误后不再进入投资插件 (#11826) 2025-02-11 11:01:02 +08:00
status102
b15ade0f73 chore: 上调MaaCore Log Rotate阈值为64MB (#11834) 2025-02-10 17:38:13 +08:00
status102
ba336fa510 perf: 自动战斗自动编队在选择职业前编入非干员组干员 (#11830) 2025-02-10 15:44:13 +08:00
status102
99a85ec22a rft: 肉鸽局内参数重构遗留 (#11829) 
trader_no_longer_buy & team_full_without_rookie
 2025-02-10 15:35:26 +08:00
status102
f3372f8500 fix: 移除账号切换中不必要的任务 (#11820) 
c4cdbd729b
 2025-02-10 15:32:39 +08:00
status102
40b0288d0c docs: 肉鸽参数注释 
team_full_without_rookie
 2025-02-10 14:46:18 +08:00
status102
dc69337d22 fix: 肉鸽开局烧水奖励领取失败 2025-02-08 20:09:52 +08:00
status102
59f1ec7be4 Revert "rft: 任务执行期间Log Rotate增加检查，并上调阈值至64MiB (#11670)" 
This reverts commit aa97deef9b.

Revert "fix: rotate_check 位置错误"

This reverts commit d9856d96ff.

Revert "chore: 单独为肉鸽添加日志检查"

This reverts commit 5f70c92f97.

Revert "chore: 移除过于消耗性能的检查"

This reverts commit 8198017f9c.

fix #11801
 2025-02-08 19:20:44 +08:00
uye
d9856d96ff fix: rotate_check 位置错误 2025-02-08 15:22:00 +08:00
MistEO
5f70c92f97 chore: 单独为肉鸽添加日志检查 2025-02-08 14:48:20 +08:00