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
16,531 Commits 61 Branches 1,838 Tags
40c3cccfb2d177d566971cecbb307f8dacec3d07
Commit Graph

16531 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
uye
5bbc46455e chore: 调整 y 存图时间间隔 2025-09-13 12:01:17 +08:00
uye
0593121ec1 feat: 给自定义任务添加 ScreenshotTaskPlugin 插件 2025-09-13 11:16:03 +08:00
MistEO
4cbbdc2b95 fix: 统一 WpfGui 工作目录 (#14072) 
* fix: 统一WpfGui工作目录

* chore: 漏了的cache目录

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

* fix: 多了一层相对目录

* feat: wpf 创建软连接

* feat: 添加 PathsHelper，提取通用地址

* feat: 提取通用目录

* fix: Combine

* fix: 重构依赖后 MaaWpfGui 的 resource 路径丢失 (#14077)

fix: mklink

* chore: 删除弹窗

* chore: 自定义基建使用绝对路径

* perf: 简化命名

* fix: 遗漏的issue rp

* fix: 基建

* perf: config.new

* feat: 去除本地作业前缀

* chore: 怎么改名了

* rft: rename

添加一个Dir后缀, 直接using static

* fix: remove不再使用的../../../resrouce

* perf: 短点

---------

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>
Co-authored-by: Status102 <102887808+status102@users.noreply.github.com>
 2025-09-12 21:25:33 +08:00
uye
6d29c2a4fa fix: 逻辑写错了！ 
[skip changelog]
 2025-09-12 19:04:21 +08:00
uye
4cf3d0d458 chore: 调整定时器触发逻辑 
fix #14083
 2025-09-12 18:51:17 +08:00
Constrat
d1ed40f5c1 ci: reduce building scope for resource updater + rm llvm.sh (#14084) 
* test: pre target / component

* test: temp disable cache

* fix: add libcxx

* ci: remove llvm.sh after execution

* test: reconfigure cache
 2025-09-12 12:46:26 +02:00
uye
9fd8a9be7c chore: 调整未检测到模拟器的输出 2025-09-12 17:21:23 +08:00
status102
f2088efa96 feat(wpf): 战斗列表点击作业时自动关闭列表, 原逻辑迁移至鼠标右键 2025-09-12 13:30:50 +08:00
nekosu
9e2f0731d4 fix: add component for install libcxx only 2025-09-12 11:54:09 +08:00
Status102
5caba0cbc8 fix: 重构依赖后 MaaWpfGui 的 resource 路径丢失 (#14077) 
fix: mklink
 2025-09-12 00:55:40 +08:00
status102
0dde218698 chore: gitignore 
lnk for sln or other
 2025-09-12 00:44:13 +08:00
Constrat
be195acd44 chore: where and how did this come from? 2025-09-11 18:22:00 +02:00
github-actions[bot]
3c790681fb chore: Auto Update Game Resources - 2025-09-11 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17650477221

[skip changelog]
 2025-09-11 16:18:07 +00:00
Constrat
4754e4a632 feat: convert ResourceUpdater to ubuntu-latest (#14076) 
* feat: convert workflow to ubuntu-latest

* fix: missing toolchain

* fix: remove component specification

* fix: apparently I didn't push the deps changes

* fix: apparently I didn't push the cache changes

* fix: build everything

* chore: delete llvm

* fix: version.sh missing indentation

* fix: missing bash
 2025-09-11 17:53:56 +02:00
github-actions[bot]
1045068986 chore: Auto Update Game Resources - 2025-09-11 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17644090943

[skip changelog]
 2025-09-11 12:14:14 +00:00
Constrat
1cfa44cf26 chore: tweak workflow + remove .sln (#14074) 
---------

Co-authored-by: nekosu <liao.hy@outlook.com>
 2025-09-11 14:11:45 +02:00
Constrat
30db10479b style: fix prettier 2025-09-11 13:49:32 +02:00
github-actions[bot]
2c15b4d95d chore: Auto Update Game Resources - 2025-09-11 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17642666189

[skip changelog]
 2025-09-11 11:11:33 +00:00
Constrat
d4f5ad3829 ci: temporarily revert changes to ResourceUpdater to allow caching exe 2025-09-11 13:09:07 +02:00
uye
53d058de06 feat: 添加基建计划 ToolTip 提示 2025-09-11 16:40:05 +08:00
uye
af7c9f0553 chore: 按时间切换基建配置不在任务运行中或任务开始前切换 
fix #14060
 2025-09-11 15:41:12 +08:00
uye
43dd2b1cf2 style: 格式化 2025-09-11 15:28:51 +08:00
uye
a75eb502cb chore: 调整刷新助战日志 2025-09-11 15:15:55 +08:00
uye
2047c3f6fb chore: 调整界面颜色 2025-09-11 15:12:50 +08:00
uye
e8cf1e1a22 fix: 停止中或者空闲状态不允许点击停止按钮 2025-09-11 14:55:46 +08:00
萨拉托加
e4ca3f9fe2 chore: 肉鸽丰川祥子招募策略 (#14035) 
* chore: 肉鸽丰川祥子招募策略

* chore: 调整近卫招募策略
 2025-09-11 14:45:03 +08:00
uye
85f0602981 fix: 鲍勃杂货店拥有四叶草化石且无抗干扰值时卡住 
fix #14052
 2025-09-11 14:44:20 +08:00
uye
7b7136fd4d perf: 优化更新设置中的徽标显示和逻辑 2025-09-11 14:19:00 +08:00
nekosu
18aa60cad6 ci: fix resource updater ignoring problem 2025-09-11 14:17:35 +08:00
github-actions[bot]
75a4809377 chore: Auto Update Game Resources - 2025-09-11 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17634608287

[skip changelog]
 2025-09-11 05:09:14 +00:00