Commit Graph

7979 Commits

Author SHA1 Message Date
David
749cc103fd fix: OperBox not retrieving Oper Class bar in EN 2023-07-22 22:50:30 +02:00
lhhxxxxx
93c6374618 perf: 优化了互斥规划问题的 dlx 算法实现在一定情况下的速度 2023-07-23 04:36:56 +08:00
MistEO
263dbcc316 chore: 更新deps下载脚本,使用固定版本的deps 2023-07-23 02:40:57 +08:00
MistEO
c4d2a394c9 Release v4.20.0-rc.1 (#5581) 2023-07-22 21:32:59 +08:00
github-actions[bot]
7a7edc9beb docs: Auto Update Changelogs of v4.20.0-rc.1 (#5589)
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-07-22 21:32:48 +08:00
zewoosJ
958e57a272 docs: add tutorial docs for kr (#5590)
Co-authored-by: Clock <snoo91919@gmail.com>
2023-07-22 21:26:51 +08:00
AnnAngela
cd9018a8c9 ci: 打包 macos dylib 2023-07-22 08:37:35 +00:00
Yumi0606
b1b648b582 优化水月部分地图部署逻辑 (#5576)
互助 饥渴 铳与秩序 射手部队 征兆 漩涡 溟痕乐园 狩猎场
2023-07-22 02:24:38 +08:00
MistEO
a198cf6e36 fix: 0时的定时任务无法提前重启 (#5571) 2023-07-21 22:23:29 +08:00
MistEO
bcd8b75e72 Update tasks.json (#5580) 2023-07-21 15:29:12 +08:00
Arcelibs
edc089e782 Update tasks.json
台版 凱爾希 42 銀灰 辨識修正
抄作業時看LOG發現的
2023-07-21 14:14:25 +08:00
Sherkey
4d792ef774 修改第一层提丰放置顺序以及站位 (#5567)
1、将第一层除兽群外所有关卡的提丰首下
2、修改”死囚之夜“提丰位置为[ 7, 4 ]
3、修改”度假村冤魂”提丰位置为[ 1, 2 ]
4、修改“苔手”提丰位置为[ 2, 2 ]
2023-07-21 11:14:35 +08:00
TiSpH
a0be2bf360 chore: 调整窗口标题 2023-07-20 20:54:00 -05:00
樹冠
e818e285e6 Merge branch 'MaaAssistantArknights:dev' into dev 2023-07-20 20:47:54 -05:00
uye
bb17d4a0b1 feat: 全局配置不存在时会优先使用当前配置的字段,并赋值给全局配置 2023-07-21 08:54:39 +08:00
David
c88b8610c4 feat: added missing strings form missing_translate-YostarEN 2023-07-20 23:00:17 +02:00
TiSpH
4b16dc6620 fix: 0时的定时任务无法提前重启 2023-07-20 14:03:45 -05:00
MistEO
de74d5babc chore: Auto Update Game Resources - 2023-07-20 2023-07-20 17:08:01 +00:00
David
b7698bec16 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-07-20 19:00:29 +02:00
David
f9d73b62e4 feat: FC event stages implementation for KR 2023-07-20 19:00:24 +02:00
David
412909bd25 feat: FC event stages implementation for JP 2023-07-20 18:59:15 +02:00
David
cac42e570c feat: FC event stages implementation for EN 2023-07-20 18:58:16 +02:00
MistEO
557f272f95 fix: 修复初次使用多出来一个Global配置的问题 2023-07-20 23:35:54 +08:00
David
d09e98445d docs: added new ignored Sami IS4 images 2023-07-20 17:33:36 +02:00
David
f262298a97 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-07-20 17:09:25 +02:00
David
68d6f87dfd fix: Workaround for EN infrastracture oper regex (#5549) 2023-07-20 17:08:58 +02:00
uye
bfce82991e feat: 未配置全局变量时也进行储存 2023-07-20 23:06:04 +08:00
uye
9843fbc036 fix: 修复定时器配置从未选择时的逻辑错误 2023-07-20 22:41:20 +08:00
uye
ff8d10d107 fix: 定时器保存问题
fix #5524
2023-07-20 22:16:06 +08:00
MistEO
1291a5d774 chore: Auto Update Game Resources - 2023-07-20 2023-07-20 12:08:53 +00:00
MistEO
1e365928fc Improved operator awareness in infrastructure (#5564) 2023-07-20 19:55:40 +08:00
MistEO
e9352c0de7 fix: 修复对ranges支持检测的判断条件 (#5548) 2023-07-20 19:55:10 +08:00
zewoosJ
47fc8b9182 개발 뉴비 영업용 2023-07-20 20:26:25 +09:00
uye
f6e218ae75 fix: 修复输入非法时间时,输入框会重置但却存储错误数据的问题 2023-07-20 18:33:27 +08:00
salenth
e04f75c7f0 修改第一层提丰放置顺序以及站位
1、将第一层除兽群外所有关卡的提丰首下
2、修改”死囚之夜“提丰位置为[ 7, 4 ]
3、修改”度假村冤魂”提丰位置为[ 1, 2 ]
4、修改“苔手”提丰位置为[ 2, 2 ]
2023-07-20 18:30:49 +08:00
zewoosJ
e3011e3dfb Improved operator awareness in infrastructure 2023-07-20 16:28:11 +09:00
MistEO
06fa2f1c23 Release v4.20.0-beta.3 (#5551) 2023-07-20 11:01:39 +08:00
MistEO
a00f5df382 docs: Update CHANGELOG.md 2023-07-20 11:01:17 +08:00
HauKuen
5c7771b98e 新增萨米肉鸽公司纠葛和自然之怒 (#5553)
1.修改了部分代码的缩进,~~莫非上一位用记事本写的怎么是制表符缩进~~

![18a97d0adea824dc9172549e7d7b9904](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/75826243/8310e489-bd02-4a66-841b-e957c5980e25)

2.新增了两个关卡,肉鸽没法卡轴自然之怒最后一波六虎将可能压力有点大
2023-07-20 11:00:44 +08:00
MistEO
3abb8435b2 docs: CHANGELOG 2023-07-20 10:00:55 +08:00
Hao Guan
4b9902b3c7 fix: macOS 修复萨米肉鸽集成参数 2023-07-20 04:56:06 +10:00
Hao Guan
1121980592 fix: 修复对ranges支持检测的判断条件 2023-07-20 04:52:15 +10:00
DavidWang19
fbc0e762c5 根据MAA作业5群意见优化了死囚之夜、度假村冤魂、待宰的兽群、苔手的提丰放置方法 (#5546)
如图所示:
<img width="573" alt="Snipaste_2023-07-20_00-37-36"
src="https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/93087330/80f4bca2-7df4-41c5-b58e-57d2900682fb">

![图片1](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/93087330/207347c1-908f-47fa-9f41-4e9ac981bab6)

![图片2](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/93087330/0493aa62-8563-42a1-84bf-38d46d78410f)

![图片3](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/93087330/62516ec2-4fa7-498e-afde-bf2c4f410db0)

![图片4](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/93087330/87982268-9ab3-418f-9b2e-c60a5db94813)

![图片5](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/93087330/ec2fbff5-7785-447d-a00b-41f95e3d9c81)
希望有帮助,辛苦!
2023-07-19 18:24:00 +01:00
vic233333
4ba4a68b39 Merge branch 'MaaAssistantArknights:dev' into dev 2023-07-20 00:33:08 +08:00
vic233333
952dc4c0f6 根据MAA作业5群意见优化了死囚之夜、度假村冤魂、待宰的兽群、苔手的提丰放置方法 2023-07-20 00:26:06 +08:00
MistEO
857e260566 Release v4.20.0-beta.2 (#5541) 2023-07-19 23:01:48 +08:00
MistEO
5fb73f89cf docs: update changelog 2023-07-19 22:24:57 +08:00
MistEO
27da2cc97d fix: 繁中服干员名识别错误 (#5543) 2023-07-19 22:23:05 +08:00
github-actions[bot]
c625b1a2f3 docs: Auto Update Changelogs of v4.20.0-beta.2 (#5542)
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-07-19 22:22:40 +08:00
Arcelibs
18f166dd49 Update tasks.json
支援煌跟令
2023-07-19 22:16:23 +08:00