fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 02:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,952 Commits 60 Branches 1,840 Tags
04495927e165a07f596dc6b695d4e8aca5f8dca5
Commit Graph

14952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
github-actions[bot]
04495927e1 chore: Auto Update Game Resources - 2025-05-15 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15037365361

[skip changelog]
 2025-05-15 05:30:34 +00:00
uye
9d7292e72b chore: 调整 prts 颜色 2025-05-15 00:24:05 +08:00
uye
c3f790b1d7 chore: 添加几个专精 ocrReplace 2025-05-14 23:39:13 +08:00
uye
db68b29a96 Release v5.16.5 (#12688) 2025-05-14 23:22:28 +08:00
github-actions[bot]
ec3ab5beb7 docs: Auto Update Changelogs of v5.16.5 (#12698) 
* docs: Auto Generate Changelog of Release v5.16.5

* docs: changelog

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
 2025-05-14 23:21:53 +08:00
uye
45d40bf7bd fix: 凹开局干员直升精二选项显示时机错误 2025-05-14 22:25:27 +08:00
status102
801a664f1b perf: 肉鸽不期而遇退出检测加个重试 2025-05-14 20:37:46 +08:00
萨拉托加
508031e29a Revert "feat: 在肉鸽招募中增加m3作为群奶 (#12353)" 
This reverts commit bd195069d8.
 2025-05-14 16:54:48 +08:00
status102
ea8fdc354c docs: 任务流color_scales注释优化 2025-05-14 16:18:02 +08:00
status102
f3d08b06b7 perf: 指定类型 2025-05-14 16:15:09 +08:00
status102
05b01d2683 fix: 连战次数乘号匹配失败 2025-05-14 15:55:33 +08:00
uye
5b7a6a979d feat: 调整连战输出 2025-05-14 15:06:18 +08:00
Hao Guan
604e495caa feat(mac): 新增基建配置 2025-05-14 13:57:25 +08:00
晓丶梦丶仁
62ec118d9b perf: store loading 2025-05-14 11:29:21 +08:00
晓丶梦丶仁
7544471d31 fix: yellow ticket items 2025-05-14 10:25:51 +08:00
uye
f027b02742 chore: 简化代码 2025-05-14 10:18:02 +08:00
Loong
546b3ad410 ci: don't check github link (#12667) 
* ci: don't check github link

* ci: remove cache

* chore: readd cache

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2025-05-13 16:39:44 +02:00
status102
52579ddb3f fix: ocrTask text 2025-05-13 21:43:07 +08:00
status102
29acc13b3f chore: 提示补全 2025-05-13 19:56:45 +08:00
status102
c6dfd9aefd chore: NumberReplace 2025-05-13 19:56:44 +08:00
status102
263b16ac8b feat: 特征匹配 (#10966) 
* feat: 特征匹配

* chore: 测试内容

* refactor: 根据最新版本重新迁移, 移除多模板

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

* chore: 测试移除

* fix: platform

* chore: docs

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-05-13 18:24:16 +08:00
晓丶梦丶仁
06c01fafe1 Revert "fix: github change string to int (#12574)" 
This reverts commit a75c5d6769.
 2025-05-13 13:23:05 +08:00
晓丶梦丶仁
8aeea5bfa2 fix: Store@UnderfundedOCR 2025-05-13 11:37:09 +08:00
晓丶梦丶仁
9817a62e75 i18n: 绿票、黄票、活动商店 (#12674) 
* i18n: en

* i18n: temp

* i18n: jp

* chore: YostarJP buy items

* fix: template task

* fix: en

* i18n: kr

* i18n: tw

---------

Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
 2025-05-13 11:35:54 +08:00
晓丶梦丶仁
4ebb50d8f4 fix: store underfunded ocr full match 2025-05-13 00:46:51 +08:00
status102
b5d825845b fix: 再铲一屎 2025-05-13 00:03:02 +08:00
github-actions[bot]
de0347d61d chore: Auto Update Game Resources - 2025-05-12 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14973978510

[skip changelog]
 2025-05-12 13:49:04 +00:00
晓丶梦丶仁
12d5463eeb feat: 绿票、黄票、活动商店 (#12586) 
* feat: 绿票、黄票商店

* i18n: EN fix

* feat: 活动商店

* perf: baseTask

* perf: 非代币关联性模板

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

* perf: baseTask

* chore: sub

* chore: 修改截图

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

* fix: 第一页买完之后无法进行活动商店购买

* fix: 买完皮肤、干员之后的 swipe

* chore: 修改描述

* perf: 购买商品确认next优化

* perf: 模板图复用

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

* perf: 合并部分task

* fix: 代币不足

* fix: 代币不足 ocr

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2025-05-12 21:45:19 +08:00
uye
bf9312f071 fix: cache 移动逻辑 2025-05-12 19:42:53 +08:00
status102
bf17a6dc67 fix: 这回应该铲完了 
[skip changelog]
 2025-05-12 19:09:00 +08:00
status102
f44c91ab51 fix: ubuntu unused 2025-05-12 18:59:23 +08:00
status102
1b7111a308 fix: 铲屎包了个try 
[skip changelog]
 2025-05-12 18:49:24 +08:00
status102
c872400eed fix: 铲屎 2025-05-12 18:44:47 +08:00
uye
276dc5aa66 fix: 修复了屎遇上手动覆盖文件的大聪明爆炸的问题 2025-05-12 18:40:51 +08:00
status102
a943d0ef5f chore: mark 2025-05-12 17:37:09 +08:00
uye
ef8cfba28e chore: 调整 UI 与 Core 版本不一致的解决方案提示 2025-05-12 17:17:15 +08:00
uye
be55827a83 chore: 点击任意职业回正列表 2025-05-12 15:49:14 +08:00
uye
41697c3032 refactor: 基建先进行技能识别并返回列表首位，再清空选择 
fix #12659
 2025-05-12 13:36:01 +08:00
status102
59197f6230 fix: 修复MaaCore asst.log文件句柄泄露 (#12639) 
* fix: 尝试修复日志文件句柄泄露

* fix: platform

* fix: platform

* fix: platform

* fix: platform

* fix: cr-lf

* chore: useless
 2025-05-11 19:34:01 +08:00
uye
625fd44db3 Release v5.16.4 (#12655) 2025-05-11 18:11:37 +08:00
uye
7ebbf65931 docs: Update CHANGELOG.md 2025-05-11 18:10:47 +08:00
status102
6aee8498e9 fix: 修复外服基建干员选择列表无法重置 (#12652) 
fix #12649
 2025-05-11 18:06:32 +08:00
status102
204d05288b style: format 
[skip changelog]
 2025-05-11 13:21:18 +08:00
MistEO
e01a3e806a ci: add mirrorchyan link to changelog 2025-05-11 01:53:53 +08:00
uye
cb6590027a Release v5.16.3 (#12619) 2025-05-11 00:46:57 +08:00
github-actions[bot]
e6353c90e5 docs: Auto Update Changelogs of v5.16.3 (#12640) 
* docs: Auto Generate Changelog of Release v5.16.3

* docs: changelog

* docs: changelog

* docs: changelog

* docs: Update CHANGELOG.md

* docs: remove unnecessary bot

* docs: changelog

* docs: changelog

* docs: cahgenlog

* docs: Update CHANGELOG.md

* docs: 翻译

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2025-05-11 00:44:27 +08:00
Rbqwow
8ea379a370 docs: 用户协议 (#11666) 
* docs: 初版用户协议

* docs: 贴合AGPL-3.0修改协议(1/2)

* docs: 贴合AGPL-3.0修改协议(2/3)

* docs: 贴合AGPL-3.0修改协议(3/3)

* docs: 用户协议添加tldr

* docs: review (2/3)

Co-authored-by: AnnAngela <naganjue@vip.qq.com>

* docs: 学姐：把森空岛拆出来

* docs: tldr增加免责说明

* docs: 改个词

* docs: 赦免Mirror酱

* docs: 来点加粗

* docs: 强调一下官方账号

* docs: 成年

* docs: 企鹅物流不一定匿名

* docs: 玛

fa1268d150

* docs: 添加超链接引用

* docs: review

玛

* docs: Update terms-of-service.md

* docs: review

玛玛

* docs: 玛说要有镜，于是丽便有了光

* docs: 写多了 但我的 git rebase -i 坏掉了 只能再推个commit

* docs: 修改文档

* docs: 客户端反作弊

* docs: no deepseek anymore

---------

Co-authored-by: AnnAngela <naganjue@vip.qq.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: No-Deepseek <do-not-use-deepseek-to-suck-my-ass@rbqwow.icu>
 2025-05-10 23:33:43 +08:00
uye
6352160d7d chore: 统一引号 2025-05-10 23:17:51 +08:00
status102
a92addcf5e Revert "fix: 指定连战次数允许降低" 
This reverts commit 9c9cad4882.
 2025-05-10 23:13:16 +08:00
status102
9c9cad4882 fix: 指定连战次数允许降低 2025-05-10 23:11:02 +08:00