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
16,561 Commits 61 Branches 1,839 Tags
e6e63a1d7ffc552b9a452b4646c2bbaade7cbee2
Commit Graph

16561 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MistEO
e6e63a1d7f Release v5.25.0-beta.3 (#14115) 2025-09-15 16:50:34 +08:00
MistEO
10574ca36b docs: changelog version 2025-09-15 16:50:13 +08:00
MistEO
7665579ee7 docs: changelog 2025-09-15 16:49:32 +08:00
MistEO
2db165a158 ci: fix minitouch scale 2025-09-15 16:43:58 +08:00
MistEO
94dc216ac8 ci: add create issue 2025-09-15 15:28:04 +08:00
MistEO
c1c74c9fee ci: use download-artifact v4 2025-09-15 15:28:04 +08:00
MistEO
1b88d4122d Release v5.25.0-beta.2 (#14111) 2025-09-15 15:00:10 +08:00
github-actions[bot]
c158dd60fd docs: Auto Update Changelogs of v5.25.0-beta.2 (#14112) 
* docs: Auto Generate Changelog of Release v5.25.0-beta.2

* docs: changelog

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
 2025-09-15 14:58:02 +08:00
MistEO
e3b219d0d0 ci: fix win zip 2025-09-15 14:02:35 +08:00
MistEO
3cfcb4ecd6 ci: add zip for win ci and create issue if failed release 2025-09-15 13:37:59 +08:00
status102
36edacd2f0 perf: 加个try先 2025-09-15 13:19:19 +08:00
Constrat
820c93cad7 ci(fix): try to color only [err] log as red 2025-09-15 01:36:04 +02:00
MistEO
0e75992426 ci: split cmake file (#14109) 2025-09-15 04:18:40 +08:00
mistereo@hotmail.com
d23f82d913 chore: remove SyncRes 2025-09-15 03:07:17 +08:00
MistEO
295fe15604 ci: set hash version 2025-09-15 02:31:32 +08:00
Status102
e2b209e723 feat: 自动战斗多作业支持保存干员组内编入的干员 (#14095) 
* chore: 加个存储先

* feat: 与旧编队比较

* feat: 快速编队

* fix: 计数

* fix: 缓存了旧的组名

* perf: 快速退出

* fix: 跳过编队后修改编队状态

* fix: 完事

* fix: err

* fix: 顺手一起修了
 2025-09-15 01:27:51 +08:00
MistEO
bec0325236 refactor: use std::format instead of sprintf (#14107) 
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-09-15 01:07:05 +08:00
Constrat
613e21e70f ci:. standardize cache key for nuget cache 2025-09-14 18:55:13 +02:00
Constrat
07e2a64675 ci: standardize hash for windows maadeps 2025-09-14 18:52:20 +02:00
Constrat
dbd2d31877 fix: smoke-testing script 2025-09-14 18:48:47 +02:00
uye
000e64ffd2 Release v5.25.0-beta.1 (#14100) 2025-09-15 00:41:06 +08:00
MistEO
a498727fc5 ci: refactor res_updater cmake (#14106) 
* ci: refactor res_updater cmake

* ci: remove ResourceUpdater from main cmake

* ci: typos

* build: remove boost

* ci: fix deps and cmake config

* ci: add zsh script

* chore: fix res_updater

* chore: use -Wno-error for res_updater

* fix: perms for version.zsh

* fix: gitignore

* fix: script

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2025-09-14 18:33:40 +02:00
github-actions[bot]
ccedc58e6d docs: Auto Update Changelogs of v5.25.0-beta.1 (#14101) 
* docs: Auto Generate Changelog of Release v5.25.0-beta.1

* docs: Update CHANGELOG with recent changes and fixes

* docs: Update button click behavior in battle list settings

* docs: Update CHANGELOG with recent changes and fixes

* docs: changelog

* docs: Update CHANGELOG with recent changes and fixes

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: Status102 <102887808+status102@users.noreply.github.com>
 2025-09-15 00:32:40 +08:00
uye
17881ef33d chore: 自定义基建配置时间仍在有效期内时不检查其他时间段 2025-09-15 00:26:33 +08:00
Constrat
a9fbe7b0b7 fix: typo 2025-09-14 17:56:32 +02:00
Constrat
6623132e2d Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2025-09-14 17:55:19 +02:00
Constrat
de3229f549 fix: type number for nightly ota 2025-09-14 17:55:12 +02:00
MistEO
3221af0bb2 build: do not auto gen version for local build 2025-09-14 23:28:08 +08:00
status102
d1df9b2578 feat: CustomTask增加任务存在检测 2025-09-14 21:45:43 +08:00
Constrat
27b847ba71 ci: add caching for macos maadeps 2025-09-14 14:32:51 +02:00
MistEO
40c3cccfb2 ci: try macos for smoke_test (#14104) 
* ci: try macos for smoke_test

* ci: Remove concurrency from smoke-testing workflow

* ci: use ninjga build for macos testing

* ci: add trigger

* ci: fix macos parallel

* ci: update bash

* fix: zsh script

* fix: perms

* fix: zsh script regular array

* ci: add resource link for cache hit

* test: enable dev for testing

* test: revert test

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2025-09-14 14:22:15 +02:00
nekosu
f2b4a622e6 feat: custom clang (#14102) 
* feat: custom clang

* fix: version typo

* fix: version typo
 2025-09-14 12:35:40 +02:00
萨拉托加
1f7d864324 chore: 界园萨卡兹肉鸽招募休谟斯优先级 2025-09-14 17:54:08 +08:00
Status102
fbbc0d9f59 ci: 为smoke-testing使用cache时增加resource链接 (#14096) 
Co-authored-by: MistEO <mistereo@hotmail.com>
 2025-09-14 17:30:30 +08:00
github-actions[bot]
822c8a61be chore: Auto Update Game Resources - 2025-09-14 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17708701640

[skip changelog]
 2025-09-14 08:30:48 +00:00
pre-commit-ci[bot]
f49ceb4c85 chore: Auto update by pre-commit hooks [skip changelog] 2025-09-14 08:25:54 +00:00
uye
7101cb9544 chore: 更新基建技能效率 2025-09-14 16:20:15 +08:00
Litwak913
f3b2631c15 fix: 修复 cmake copy_and_add_rpath_library 的失败逻辑 (#14097) 2025-09-14 06:39:06 +08:00
Constrat
4e4dd8792b chore: remove -DINSTALL_RESOURCES 2025-09-13 18:01:40 +02:00
uye
cf362a4106 fix: 刷开局奖励只选票券时行为异常 
fix #14079
 2025-09-13 21:12:09 +08:00
Constrat
d762960691 fix: smoke testing upload logs 2025-09-13 15:05:52 +02:00
Constrat
d2faaf6bb9 fix: move smoke testing working dir 2025-09-13 14:55:15 +02:00
uye
bb0202841f feat: core 崩溃后下次启动时 ui 输出提示 (#14022) 
* feat: core 崩溃后下次启动时 ui 输出提示

* style: space

* chore: ubuntu warning

* i18n: zh-tw

---------

Co-authored-by: momomochi987 <as99us301@gmail.com>
 2025-09-13 20:28:56 +08:00
status102
883fb19a27 feat(wpf): allow single copilot task execution 
有人炸就派uuu @ABA2396
 2025-09-13 20:02:58 +08:00
status102
8c3139d851 perf(wpf): wpf自动战斗列表中作业设置按钮左键单击还原为解析指定作业，新增行为修改至右键，解析作业并关闭列表 2025-09-13 19:57:37 +08:00
status102
a191dbdf73 fix: 自动编队缺少干员输出的额外换行 2025-09-13 19:53:18 +08:00
status102
958d48b5fd fix(core): Copilot多任务编队时编队设置残留 2025-09-13 19:35:52 +08:00
uye
9b9b0d4344 fix: 自定义基建换班的班次不会随时间切换 
fix #14092
 2025-09-13 16:03:53 +08:00
uye
beee3c052e fix: "统一 WpfGui 工作目录"后，配置为外服无法运行 MAA 
fix #14090
 2025-09-13 15:42:39 +08:00
Status102
fd33b0ae8c fix: 移除 debug_demo (原Sample) 的对应 resource 额外查找逻辑 (#14081) 
* rft: resource链接生成移动至cmake

* fix: smoke

* fix: smoke

* fix: smoke

* chore: 干脆移除掉好了

* chore: remove blank line

* fix: 移除多余链接创建

* perf: use DINSTALL_RESOURCE

* build: 整理cmake util函数

* chore: wpf link resource由cmake进行

* Revert "chore: wpf link resource由cmake进行"

This reverts commit 0e973734e7.

---------

Co-authored-by: MistEO <mistereo@hotmail.com>
 2025-09-13 12:24:22 +08:00