From f27a203690d7f84e4d4ae1923c84593a434eff9a Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Sun, 23 Jul 2023 02:40:57 +0800
Subject: [PATCH 1/5] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0deps=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E8=84=9A=E6=9C=AC=EF=BC=8C=E4=BD=BF=E7=94=A8=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A=E7=89=88=E6=9C=AC=E7=9A=84deps?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 maadeps-download.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/maadeps-download.py b/maadeps-download.py
index 3694ebcbda..7810b2ac98 100644
--- a/maadeps-download.py
+++ b/maadeps-download.py
@@ -8,6 +8,7 @@ import time
 from pathlib import Path
 import shutil
 
+TARGET_TAG = "2023-04-24-3"
 basedir = Path(__file__).parent
 
 def detect_host_triplet():
@@ -98,7 +99,7 @@ def main():
         target_triplet = sys.argv[1]
     else:
         target_triplet = detect_host_triplet()
-    print("about to download prebuilt dependency libraries for", target_triplet)
+    print(f"about to download prebuilt dependency libraries for {target_triplet} of {TARGET_TAG}")
     if len(sys.argv) == 1:
         print(f"to specify another triplet, run `{sys.argv[0]} <target triplet>`")
         print(f"e.g. `{sys.argv[0]} arm64-windows`")
@@ -119,6 +120,8 @@ def main():
     devel_asset = None
     runtime_asset = None
     for release in releases:
+        if release["tag_name"] != TARGET_TAG:
+            continue
         for asset in release["assets"]:
             target, component = split_asset_name(asset["name"])
             if target == target_triplet:

From ed6000a17b8132f631b319b13b5e3cc983ce76e9 Mon Sep 17 00:00:00 2001
From: lhhxxxxx <91231470+lhhxxxxx@users.noreply.github.com>
Date: Sun, 23 Jul 2023 04:36:56 +0800
Subject: [PATCH 2/5] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E4=BA=86?=
 =?UTF-8?q?=E4=BA=92=E6=96=A5=E8=A7=84=E5=88=92=E9=97=AE=E9=A2=98=E7=9A=84?=
 =?UTF-8?q?=20dlx=20=E7=AE=97=E6=B3=95=E5=AE=9E=E7=8E=B0=E5=9C=A8=E4=B8=80?=
 =?UTF-8?q?=E5=AE=9A=E6=83=85=E5=86=B5=E4=B8=8B=E7=9A=84=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaCore/Utils/Algorithm.hpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/MaaCore/Utils/Algorithm.hpp b/src/MaaCore/Utils/Algorithm.hpp
index a395350134..170d8ff2e0 100644
--- a/src/MaaCore/Utils/Algorithm.hpp
+++ b/src/MaaCore/Utils/Algorithm.hpp
@@ -221,8 +221,10 @@ namespace asst::algorithm
         for (auto& i : group_list) {
             group_name_mapping[i.first] = group_id_mapping.size();
             group_id_mapping.emplace_back(i.first);
+            bool is_empty = true;
             for (auto& j : i.second) {
                 if (char_set.contains(j)) {
+                    is_empty = false;
                     node_id_mapping.emplace_back(i.first, j);
                     if (!char_name_mapping.contains(j)) {
                         char_name_mapping[j] = char_id_mapping.size();
@@ -230,6 +232,9 @@ namespace asst::algorithm
                     }
                 }
             }
+            if (is_empty) {
+                return std::nullopt;
+            }
         }
 
         // 建 01 矩阵

From 574d7380cf5a54fbc22cdb879375cd8ed33c152b Mon Sep 17 00:00:00 2001
From: David <56174894+Constrat@users.noreply.github.com>
Date: Sat, 22 Jul 2023 22:50:30 +0200
Subject: [PATCH 3/5] fix: OperBox not retrieving Oper Class bar in EN

---
 resource/global/YoStarEN/resource/tasks.json  |  16 ++++++++++++++++
 .../resource/template/OperBoxRoleTab.png      | Bin 1542 -> 1231 bytes
 .../template/OperBoxRoleTabSelect.png         | Bin 2069 -> 2495 bytes
 3 files changed, 16 insertions(+)

diff --git a/resource/global/YoStarEN/resource/tasks.json b/resource/global/YoStarEN/resource/tasks.json
index c0ccb5c87d..5b301646ea 100644
--- a/resource/global/YoStarEN/resource/tasks.json
+++ b/resource/global/YoStarEN/resource/tasks.json
@@ -2778,6 +2778,22 @@
             0
         ]
     },
+    "OperBoxRoleTab": {
+        "roi": [
+            1169,
+            0,
+            111,
+            119
+        ]
+    },
+    "OperBoxRoleTabSelect": {
+        "roi": [
+            1159,
+            0,
+            121,
+            122
+        ]
+    },
     "PRTS2": {
         "text": [
             "Takeover"
diff --git a/resource/global/YoStarEN/resource/template/OperBoxRoleTab.png b/resource/global/YoStarEN/resource/template/OperBoxRoleTab.png
index 2aa1cb0406ad9e9b623375d142bf164b3f4f0a6d..034b93fa31a4de05c1e811de999bf44575e5976b 100644
GIT binary patch
literal 1231
zcmW+$4@?tR9B$7;Xd_9z!WNtf^|*rQ1SKlW37l|)J1V8Q0n<<`%QS9^IE{gs@~7C4
z+0hPKixaER(2~hqX$)hPkpf1yMNlFzZ2VI@Hw7&#Pz#g;DtqN6@4dXdFJHd*`+eV2
zNyORV+znh7ixp0h1P%7>VDiHtupT@RMY34%C5qUWPloTh9mpFkhx)yKTYmqqTTAH0
zeots7|4U6qnJTWy=F@FjG7LL2TUB#r!3O-H4=(FD$jO`PC>ZfqE>!p{?Yj2%?~dq6
zoUOum6enzRR3nL_s)z<0;=p>fLea24x8MS1A|NQotkaTg4gslPOozjI5)*3AP@9^5
z+8-kjM6tmLfia{(PYO`o`UVo?0VqWYkT9w(DK{$w11N!!fVgCqDnfz^V`=~}9$+}S
zoTFFNT#U-lt@}0;GbzT;bia7W(yL(<f}oL-p-VZ36$(hF#arj5)`o?VbW=wxppx7e
zb9X&?G+)-|%1+winO|m@KLg4&Fknz1@jDF<=$m(iKvGP+!;#FBBnU@G3ve7Q@)Y)r
z$qpS#P5n4VXq>q-5b#gSou!}QI4A;JNE;;|j{D95^}!d;%+5w|2tiXvp;nLl^3-Q3
zl+WE(c8-o#q@^b%C7oShe6@F83=9NhR$DiN{xDd%xO^^UBdP_0bIb}@hX6`p%>_7i
z?07B#vA?nv-F7QOyQL#nT3Rk&-nee9-0H7deB&B)Rac)rJv_Z)l{TmB-TUnMV`laZ
zABh(j6@N{3-SnPDg*qHhI`xiuk9bMbmPafte!g&a=Ea@b+S+Gisa!rWX{~l#cdRVh
z`VzM}<E8c|o-(U!+p}B4Q)iodpSt2`(BAt)yG3oSW`c$g&d*k>2+IIe`*6Ib@L_3c
z)$)ShRngh$bI%!)4~xam?Mt5V@w#rN+hj6z9XmlKFrOcN_4mvS<I6=ONgVIbxOqAH
zo>GT!V1ksSq<$31!N}uXzbO=F+IOY9j@z08|2}?TNKQ^}nVyc0;MU5kdu>bZvAIcy
z+%B{AuoDs!t5f#4J1i6id>5>K(0e=yg0+vi`x}Rc-@gCK=j(h|{I$v1Y%olo-BVXr
zmniG~#&0cequ)HYr=L7|GTG2+mz}coH1`LV2K$!ZR#kqnrjbNL%rdK{zJ99~X(te7
z-c!V0Ut=yjC2(|9o?DvtIGuK-QdwjxeQ<wg)v`BHBod{sOiWlTmMnYkty>G`(Sy<h
zul=Fde$30Zs;m6Y=<>2MnP&<$9?4JGb?lg^4KWhINN6<STKsO1nW=a;bS*u9%cm33
z>0<q$Ty8zwTk*JL_r&=4(2#iW)myLEdok`>PkCR!ed9!Q+AO!Wb@BDE>EcCx@ad`u
zgeQTtt4RcPbZge4>UvF{SgihD#>_cZny+4!N~JHevSQ=nM8E%2ygel?ZOR|Y=N~OD
zDXA#=Z@}xl$1vHEdQymJ^#pe_(1+;|%B_ilA|)t01fy|$)#5k~%(Q>?5CX$6L8Fv?
zM`q5d2m<5rB;YEc9p;i4$f!{fjFX@Sj@A63HWN^z>$(}V2n_-G5Ym)Nb%7Ls7{kG~
a&8&RD-!YQVCANZ(ibZ`QCOR^T&;Jj|)F);D

literal 1542
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

diff --git a/resource/global/YoStarEN/resource/template/OperBoxRoleTabSelect.png b/resource/global/YoStarEN/resource/template/OperBoxRoleTabSelect.png
index 95601c483dac2f8309ac2df72507df30fe013f1d..0ad11c47932cef98477a0156f1617e26bf9474ae 100644
GIT binary patch
literal 2495
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

literal 2069
zcmV+w2<rEVP)<h;3K|Lk000e1NJLTq001@s000>X1^@s6dcWO1000NvNkl<ZScQF9
zOKcoT8UCued!8B3j34ncYdek;Z@i0R!s9@8l|5u5?p(rQg^)m;S!t!+)rwrW?13|n
z!%8ejaDoFM4uA**g+$AuCEC~<f)f(U@nh^6d!GHOLRCG}-BsN~+iut6|Nr{`zrO#k
zznYAXPjC)^01*GfhjXnN^!b1?oaWJ68;i!dHmcIb*#cd-CQ9K{hIxE0W(XAx(jO;?
z+90tWiDt=QAR>%-l`#@yB`NZwMtqE@lS(u35N$fvp;9a%30VZGcB!V2ghhcUO_|U*
zk}h92E}<pSEl82C4NxBMX&MDO2jgV0I2qWa!-J%FI_UEuG^)eYH6nbFKmZTD*bj$+
zmlVqIp(G|-_iR!DqR^4JKn;dzJOl~i6t|PaKcWao-yz*;RL4%J)=+rHJQPzhsV~uZ
zl1@tZV0z!2TtMYJKR{-A9Wcxx#zhSpCJt?(D2}2rt{9*PpyoJzJRuwX9INeU>V6Uw
zU;hR&%a>95+M6)SV_|-dKRm`u<AF=`L;z(%T{vM^GCmdK(jXY3A{m<+veEt9uizg%
zgL!5J<!`+YqdJvvLOec=?BYu|iQNTZEH)YWFJv?fa5EFc3}*_&Lfs4ttb7{C7D3z|
zh&aE77^k5YN;--eH=tw9Lpb+u!&+K{HNOh$+&bK?e}T1+BhHvN41WFFH_i4TjMmX`
zZwtXAr{T@5NPN?FU2{U8CSQVc@l~+uG>qCdi0}NrEl!18${qx7&cM5EI1lc?TDk;l
z{vvW~SK(~l1#8vSEG^PKD~-XKTLlP>P)H3BYA8zh)oJurUV%4tE(upk10M0?bmeX-
zh!?WN-w>w_8br5A@|nsQtMB3XgLmQAwqcCVV&v=Zz??e|TA5H>WLT?LZh|pnwjThQ
z9K6$uaON(;8=nU<d8s7Jm*Fm~1x8T=MyCOI4*ZFE_@lG%D^u`C=RiCgg!v%dCTQ~j
z$mZZpo`rX2Rnl@x$m@a^D)6Vz1#s)Nq!azgvtZ>(P^SZ!S@=`u;J>g6HZc!aIq5L?
zt~8E!PGEm}2iDwqSc@+qyLtuA<~{iJz0fd|3nt-VO5x00KyT$$FcC{4>oA7gXSYE*
zC(=+>timG{?!*EzP8Yq^tMDe5VAP+3p48;R&hnQ*d>2N2M>@h;c?H}sBqGFo_S0Ju
zR`&W=VLtvRvLF8rtS|!S(sc+2(|f;$e|iz_i&wx0JMB8i-2bDb=ggP2Cp&nG_8)$R
z@*CfSQJqBLwHt7^J_!Lyg#nq}M>61@`8By{>Gsd%pYW1Be+fpjhU~xZz&v<@?B;Fc
zHvig(TYwMi$tTEv{2N$}=b^`Vp#*nvUG7lf)`!Ud<wFqPgS+rKkWLe%a|~9V0MD1e
zDpTP35$O!^cuSY%PUimf0djx-X)w01CTRz8O$%k@zjz%aSCsR;kAANn(6n;`v#|re
zSOF`JN;vUM4m?u;ac!_-87w~n;yM8HK?U4gJFM8v+EZBD4?sJ|fbWIIvO*QSSOr`g
zJev>T<T>DC4Z=YiyWoW?*vN!5Ovt14U2w5pu>uIk<%-}|HqfawDiJdXztWAjky-tU
z+|kBQ-h#7nPf0%}J5_}z;-l9FH%ze71nh;+2iFNJ3*-0zg!}3N8c!ac4JxyrmJG~{
zgdnd>!aaLA*hP_1PY$H9#?g+9JCQ+IWfH{h1jZK2GGVal4BVwJ^cSHZCp8(rVug`!
zejnMjt8$IwAAT3k#vSkwLH*^0r-WgdoejAoMz4j;?nCK8e)tT;>4CQDV1=^6NYYFA
zsL%aihg)@+JD&xas`fN6pxp?R^;~$<=fSfDX|RY>KX)qNJ2?pWgdVkLfJic(21;+-
zM0V{p@Ln6uU%Urr<1XOXst#iJsojP@GA8j)?UoF1>+l(@{l_wRMPSPVSsdVmfM@dH
zhSfhnQ)<9Lt=4OS+8qf$0atTxOCI1nSCU54lYMERH+uoRSb@=a4(fJ6x+l_j0exft
z35>nRvM?akDU95B2f54F!0iqiKYA1P{afH}SAk&P>oASxA-vHUaMMC&ZwtMJb#z|7
zCX<6RwJZ&kii!oDF5H>(Fl+yXal8-xiEo-X#LeADa9?;Cy|rr~o+o*&?F|qSo?_?f
zJK)P-0@@AGeyXO;L&@jOz1Yu`KD?O=7(X+OO#irP{_=hJPdC9`H}a~y)<lQ2Q7Vth
zbIdy2hIzCtPjCTE5x~OJxyS#2*{n&=i;T%mje)v0%;V?5nbtajDIhBn2Q`AYY#quB
zDvtnhMvcvZ7s@dAw_yF}Bhc1Su-lvmN5k$Tm^%-HGK_g30;&Qn<7XtFm?sbK!mx5^
z|MtglH~$VkfS*>Wgn3|Qc9tujFhtUzRuBWe4bIf>7u@Kdah?kf7BX`66}`o;NF*}R
zI6=&W0+Zi1;@8&z@(2!QsYmkrN_?GAf0;aFEyDwN3@#GP4G9T}1W9j*49G)DaKghm
z9)pDP_8i2461HVQ-8Y6rYlL*36DlwDh|AXLwFV87bgV`tP(RkBT@933y~>ZL{=_v%
zFM#7$lwrkjd|F>CSvrdzjT;kQrb&u%+SjbqtIg0Nm!uISi+;@!sfLD3DYt-77Vm!=
z&<K>iQhulEm((Y9!Sr1nW`HhZ=o8m(@POcdgQYOuypSSg00000NkvXXu0mjf`I6iz


From dc6f1e33f2c99cbc390957146fb1884f9dc1a193 Mon Sep 17 00:00:00 2001
From: AnnAngela <naganjue@vip.qq.com>
Date: Sun, 23 Jul 2023 15:18:24 +0800
Subject: [PATCH 4/5] =?UTF-8?q?ci:=20=E4=BF=AE=E5=A4=8D=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/release-ota.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-ota.yml b/.github/workflows/release-ota.yml
index bbbf9f7fb5..4995fe59a1 100644
--- a/.github/workflows/release-ota.yml
+++ b/.github/workflows/release-ota.yml
@@ -137,7 +137,7 @@ jobs:
       - name: Unpack the .dmg files for .dylib
         run: |
           mkdir -p ${{ runner.temp }}/dylib
-          hdiutil attach MAA-${{ needs.create-tag.outputs.release_tag }}-macos-universal.dmg
+          hdiutil attach packages/MAA-${{ needs.create-tag.outputs.release_tag }}-macos-universal.dmg
           cp /Volumes/MAA/MAA.app/Contents/Frameworks/*.dylib ${{ runner.temp }}/dylib
           zip -X9 packages/MAA-${{ needs.create-tag.outputs.release_tag }}-macos-runtime-universal.zip ${{ runner.temp }}/dylib/*
       - name: Upload to MaaRelease

From 30128df17ddc616782f8205d794c7640e361ad36 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 23 Jul 2023 16:02:10 +0800
Subject: [PATCH 5/5] docs: Auto Update Changelogs of v4.20.0 (#5606)

Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
---
 CHANGELOG.md | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 44 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e593a4ebc2..dd9caa3718 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,21 +1,48 @@
-## v4.20.0-rc.1
+## v4.20.0
+
+### 新增
+
+- 适配萨米肉鸽 (#5393) @DavidWang19 @SherkeyXD @LingXii @qxdqhr @HauKuen @yyjdelete @Ziqing19 @mathlover @yc080713 @mikucy @hguandl @vic233333 @salenth
+- 定时任务可切换配置 (#5323) @ABA2396 @MistEO
 
 ### 改进
 
-- 修改萨米第一层提丰放置顺序以及站位 (#5567) @salenth
+- 自动关闭“检测到有未下载的语音资源”窗口 (#5396) @Hydrogina
+- 肉鸽debug日志写入图片前限制文件夹内图片数量 (#5325) @BladeHiker
+- 优化HttpClient构建过程 (#5357) @ChingCdesu @HisAtri
+- 自动检测更新的随机延迟改为一小时 @ABA2396
+- 更改更新弹窗格式 @ABA2396
 - 优化水月部分地图部署逻辑 (#5576) @Yumi0606
 - 全局配置不存在时会优先使用当前配置的字段，并赋值给全局配置 @ABA2396
 - 调整窗口标题 @TiSpH
 
 ### 修复
 
+- 添加定时器缺少的判断 @ABA2396
+- 点击技能启动按钮时，验证按钮已消失，防止卡死在子弹时间中 (#5374) @chaserhkj
+- 添加山的干员名字纠错规则 (#5372) @chaserhkj
+- add CloseEvent task for Phantom Roguelike (#5358) @chaserhkj
+- 强制启动定时任务未在运行时不关闭方舟 #5346 @ABA2396
+- 尝试修复运行时下载完成更新包后卡死 (#5327) @ABA2396
+- 强制定时启动无法保存; 配置名称过长显示问题 (#5532) @TiSpH
+- 定时功能设置无法更新 @ABA2396
 - 0 时的定时任务无法提前重启 (#5571) @TiSpH
 - 修复定时器配置从未选择时的逻辑错误 @ABA2396
-- 定时器保存问题 @ABA2396
 - 修复输入非法时间时，输入框会重置但却存储错误数据的问题 @ABA2396
 
 ### 其他
 
+- 优化了互斥规划问题的 dlx 算法实现在一定情况下的速度 @lhhxxxxx
+- 更新裁图小工具 @MistEO
+- 在文档的导航栏里加上前往官网的链接 @AnnAngela
+- 修改关卡重连描述 @ABA2396
+- 代码清理 @ABA2396
+- fix typo in AsstCaller.h (#5435) @eltociear
+- 添加一键编译macOS Core的脚本 @hguandl
+- 在用户有代理的情况下，提升国外镜像的优先级 (s3限速上行50Mbps) @ChingCdesu
+- AsstConf.h 对 clang-tidy 不友好的问题 (#5510) @hxdnshx
+- 规范化step name (#5517) @SherkeyXD
+- 删除export后面多余的空格 (#5515) @SherkeyXD
 - 修复对ranges支持检测的判断条件 (#5548) @hguandl
 - 修复初次使用多出来一个Global配置的问题 @MistEO
 - added new ignored Sami IS4 images @Constrat
@@ -29,7 +56,12 @@
 
 #### YostarEN
 
-- added missing strings form  missing_translate-YostarEN @Constrat
+- raised threshold for StageAnnihilation.png (#5234) @Constrat
+- Added correct StageAnnihilation.png after update @Constrat
+- Visiting only 1 Friend Clue Exchange in YostarEN (#5424) @Constrat
+- Missing .png for YostarEN and modified tools/ignore_list_of_templates.txt (lack of Chinese characters) (#5458) @Constrat
+- OperBox not retrieving Oper Class bar in EN @Constrat
+- added missing strings form missing_translate-YostarEN @Constrat
 - Workaround for EN infrastracture oper regex (#5549) @Constrat
 
 #### YostarKR
@@ -39,4 +71,11 @@
 
 #### txwy
 
-- 修复干员名识别 (#5580) @Arcelibs
+- 繁中服干员名识别错误 @Arcelibs
+
+### For dev
+
+- Python api 更新 同时请求多个url下载 (#5390) @HisAtri
+- 使用字典推导式 (#5381) @HisAtri
+- 修复Python更新器中重试次数的问题 (#5402) @Q-ModifiedJ
+- 适配pythonAPI到最新版 (#5347) @DoyoDia