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
9,567 Commits 61 Branches 1,838 Tags
10fbf8650dfd9ddb86250bf26a3bbd7755a70e1b
Commit Graph

9567 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zzyyyl
10fbf8650d style: format 
[skip changelog]
 2023-10-23 11:09:42 +08:00
zzyyyl
5ecf5f20af perf: 优化水月肉鸽策略 (#7043) 2023-10-23 11:06:43 +08:00
北雁 Cryolitia
2929715512 Change to Appimage Package on Linux (#7030) 
build:
https://github.com/Cryolitia/MaaAssistantArknights/actions/runs/6601833217

test:

![image](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/23723294/fcf66055-fb11-42a5-95fe-6271437d6a6d)

PS: 浏览器里写的所以历史有点乱，建议 squash merge
 2023-10-23 10:30:22 +08:00
羽弥Tian_Yumi
80f90d38c1 优化水月肉鸽部署策略 2023-10-23 09:28:45 +08:00
羽弥Tian_Yumi
521c90cec9 增加一些分组 2023-10-23 09:26:19 +08:00
David
965b3c17b0 fix: 繁中服 保全派駐識別修正 (#7041) 2023-10-22 21:30:51 +02:00
uye
2e13801672 style: 删除多余引用 2023-10-23 00:45:55 +08:00
uye
066c446712 fix: 剪切板错误 
fix #7040
 2023-10-23 00:40:56 +08:00
vonnoq
f8fcdc0bd6 繁中服 保全派駐識別修正 2023-10-23 00:19:25 +08:00
David
cdcc0312d3 fix #7027 (#7039) 
fix #7027
 2023-10-22 17:58:07 +02:00
zzyyyl
be4581a47c feat: 声明 baseTask 的任务直接覆盖同名任务 (#7016) 2023-10-22 23:49:31 +08:00
Cryolitia
e25f085ec6 fix #7027 2023-10-22 23:37:05 +08:00
MistEO
976f7bf72c chore: Auto Update Game Resources - 2023-10-22 2023-10-22 11:07:43 +00:00
David
ee4ffdf4ae perf & typo: removed redundant variable & variable typo (#7032) 2023-10-22 12:41:12 +02:00
David
e46b341c4d perf & typo: removed redundant variable & variable typo 2023-10-22 12:37:56 +02:00
uye
8b8dbb039d Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-10-22 17:52:29 +08:00
uye
c5e78bfed8 feat: IS 关卡复刻 2023-10-22 17:49:01 +08:00
MistEO
882d078de5 chore: Auto Update Game Resources - 2023-10-22 2023-10-22 08:28:38 +00:00
quyansiyuanwang
c53350f299 perf & refactor: 重构 tools/AutoLocalization (#6995) 
其中包含部分更优化和跟规范的算法或结构

---------

Co-authored-by: David <56174894+Constrat@users.noreply.github.com>
 2023-10-21 16:17:34 +02:00
David
730ec0fd00 feat: 繁中服 保全派駐 (#7021) 2023-10-21 10:19:08 +02:00
vonnoq
ce72c84f2e 繁中服 保全派駐 2023-10-21 02:07:50 +08:00
zzyyyl
7017129554 style: sort tasks 
[skip changelog]
 2023-10-21 00:13:54 +08:00
zzyyyl
942f367b6f fix: 修复繁中服「照我以火」活動導航 
[skip changelog]
 2023-10-21 00:13:29 +08:00
zzyyyl
aaabc8e775 docs: 更新任务流程协议相关文档 2023-10-20 19:28:59 +08:00
HY
ad1606499f feat: 繁中服「照我以火」活動導航 (#7002) 
台服不知道為什麼左側變成顯示水月肉鴿的東西了，像這樣


![Screenshot_20231019-162333](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/45387477/c948e74f-2b69-4eb6-b4a0-9c7f15105fe6)

~~不能只偷懶改字就好 QQ~~

只好參考其他以圖片當辨識目標的 SideStory 寫法，寫一個照我以火的導航

如果還有需要調整的地方，再麻煩各位大佬了 ( ´•̥̥̥ω•̥̥̥` )

---------

Co-authored-by: David <56174894+Constrat@users.noreply.github.com>
Co-authored-by: zzyyyl <74587068+zzyyyl@users.noreply.github.com>
 2023-10-20 13:24:58 +02:00
zzyyyl
25b70e3777 feat: 多文件任务中直接声明 baseTask 的任务不继承同名任务参数而是直接覆盖 2023-10-20 19:06:09 +08:00
David
9fcb99df16 feat: 日服保全派驻 (#7012) 
添加日服保全派驻的task。测试基本能用。似乎不会选择“无需增调干员”。
 2023-10-20 12:52:39 +02:00
uye
acb9e8f62e feat: 开始任务后强制锁定当前基建配置，强制定时启动时强制刷新基建配置 2023-10-20 17:32:31 +08:00
ManicSteiner
509c3472b3 fix: 日服保全派驻两处选项 2023-10-20 16:30:38 +08:00
ManicSteiner
9d86adc0ee feat: 日服保全派驻 2023-10-20 15:32:08 +08:00
Horror Proton
d38f5b2d6b chore: fix typos [skip changelog] 2023-10-20 11:36:22 +08:00
zzyyyl
7d6ed14536 fix: 修复肉鸽打完退出的问题 2023-10-19 23:50:14 +08:00
Lancarus
fba0d1d8a8 perf: 优化部分肉鸽逻辑 (#7004) 2023-10-19 21:26:46 +08:00
Lancarus
4d20dce53a perf: 优化部分肉鸽逻辑 2023-10-19 21:03:01 +08:00
zzyyyl
af9ff4c0bb style: format [skip changelog] 
python tools\ClangFormatter\clang-formatter.py --input=src\MaaCore --ignore="[\"src/MaaCore/x64\"]"
python tools\ClangFormatter\clang-formatter.py --input=resource\ --ignore="[\"resource/Arknights-Tile-Pos\", \"resource/infrast.json\"]"
 2023-10-19 14:35:06 +08:00
MistEO
378d8205bc chore: Auto Update Game Resources - 2023-10-19 2023-10-19 06:07:53 +00:00
zzyyyl
79428abff8 Revert "feat: 删除无用的 Roguelike@Continue 相关任务" 
This reverts commit c4dc4135e0.
 2023-10-19 12:31:31 +08:00
MistEO
4adfd1f2f4 fix: 修复Wpf自动战斗-战斗列表-批量导入时，缓存文件夹未存在导致报错的bug；调整关卡名匹配规则 (#6988) 2023-10-19 11:09:16 +08:00
status102
30760f9c72 perf: 当清空自动战斗-战斗列表中的所有任务时，移除缓存中的战斗列表文件夹 (#6994) 2023-10-19 11:08:32 +08:00
Lancarus
f1b4d55e3b feat: 萨米肉鸽使用密文板 (#6949) 
Co-authored-by: MistEO <mistereo@hotmail.com>
 2023-10-19 10:57:33 +08:00
status102
56b797275c docs: 补充基建排班协议中period字段不存在时的计划切换动作 (#6998) 2023-10-19 10:56:37 +08:00
status102
7ed13e1088 perf: 拆分赋值 2023-10-19 01:00:14 +08:00
status102
2b3cca74af fix: 移除无用的null check 2023-10-19 00:47:57 +08:00
David
5289a85401 fix: YostarEN Mizuki I.S. Trader + encouter regex (#6993) 
ref:
- #6992
 2023-10-18 18:29:12 +02:00
status102
07f540bbe8 fix: 加点null check 2023-10-18 23:51:50 +08:00
zzyyyl
d094616037 perf: TaskData 优化 (#6844) 
1. 调整 TaskData 的部分内部函数，增加注释
2. 从 TaskData 中拆出 JsonMisc
3. 增加一个任务 MainThemes，表示任务链入口
 2023-10-18 23:48:03 +08:00
zzyyyl
ca3e97aa72 fix: 修复部分模板图片 
close #6889
 2023-10-18 21:52:41 +08:00
zzyyyl
0490b78a39 feat: 增加任务截图插件 (#6973) 
close #6966 
link to #6975
 2023-10-18 21:15:00 +08:00
status102
39e92cb2d0 perf: wpf自动战斗-战斗列表，当文件名 / title由字母、数字、-组成时，直接作为关卡名使用 2023-10-18 21:11:26 +08:00
zzyyyl
14c15f72ef rft: 增加一个任务 MainThemes，表示任务链入口 2023-10-18 20:57:27 +08:00