From 2621b0a77bde859c4266b25f4139252e5482585a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Jan 2026 16:30:53 +0000 Subject: [PATCH 1/8] chore: Auto Update Game Resources - 2026-01-01 https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20641861359 [skip changelog] --- .../resource/tasks/MiniGame/SecretFront.json | 6 +++--- .../resource/tasks/MiniGame/SecretFront.json | 14 +++++++------- .../resource/tasks/MiniGame/SecretFront.json | 12 ++++++------ .../txwy/resource/tasks/MiniGame/SecretFront.json | 12 ++++++------ resource/tasks/MiniGame/SecretFront.json | 6 +++++- 5 files changed, 27 insertions(+), 23 deletions(-) diff --git a/resource/global/YoStarEN/resource/tasks/MiniGame/SecretFront.json b/resource/global/YoStarEN/resource/tasks/MiniGame/SecretFront.json index 019b827d37..ed405c74e3 100644 --- a/resource/global/YoStarEN/resource/tasks/MiniGame/SecretFront.json +++ b/resource/global/YoStarEN/resource/tasks/MiniGame/SecretFront.json @@ -1,7 +1,4 @@ { - "MiniGame@SecretFront@End": { - "roi": [576, 540, 435, 135] - }, "MiniGame@SecretFront@PreClickDetect": { "ocrReplace": [ ["Support Platform", "支援作战平台"], @@ -9,6 +6,9 @@ ["Sly Shadows", "鬼影迷踪"] ] }, + "MiniGame@SecretFront@End": { + "roi": [576, 540, 435, 135] + }, "MiniGame@SecretFront@EventReplace": { "ocrReplace": [ [" ", ""], diff --git a/resource/global/YoStarJP/resource/tasks/MiniGame/SecretFront.json b/resource/global/YoStarJP/resource/tasks/MiniGame/SecretFront.json index b0349ed676..7824df5cd8 100644 --- a/resource/global/YoStarJP/resource/tasks/MiniGame/SecretFront.json +++ b/resource/global/YoStarJP/resource/tasks/MiniGame/SecretFront.json @@ -1,16 +1,16 @@ { - "MiniGame@SecretFront@EventReplace": { - "ocrReplace": [ - [" ", ""], - ["エンディング", "4"] - ], - "roi": [7, 253, 162, 35] - }, "MiniGame@SecretFront@PreClickDetect": { "ocrReplace": [ ["作戦プラットフォーム支援任務", "支援作战平台"], ["遊侠", "游侠"], ["揺蕩う影", "鬼影迷踪"] ] + }, + "MiniGame@SecretFront@EventReplace": { + "ocrReplace": [ + [" ", ""], + ["エンディング", "4"] + ], + "roi": [7, 253, 162, 35] } } diff --git a/resource/global/YoStarKR/resource/tasks/MiniGame/SecretFront.json b/resource/global/YoStarKR/resource/tasks/MiniGame/SecretFront.json index 09a86f5f89..d14e2f315c 100644 --- a/resource/global/YoStarKR/resource/tasks/MiniGame/SecretFront.json +++ b/resource/global/YoStarKR/resource/tasks/MiniGame/SecretFront.json @@ -1,15 +1,15 @@ { - "MiniGame@SecretFront@EventReplace": { - "ocrReplace": [ - [" ", ""], - ["엔딩", "4"] - ] - }, "MiniGame@SecretFront@PreClickDetect": { "ocrReplace": [ ["작전플랫폼지원", "支援作战平台"], ["레인저", "游侠"], ["수상한그림자", "鬼影迷踪"] ] + }, + "MiniGame@SecretFront@EventReplace": { + "ocrReplace": [ + [" ", ""], + ["엔딩", "4"] + ] } } diff --git a/resource/global/txwy/resource/tasks/MiniGame/SecretFront.json b/resource/global/txwy/resource/tasks/MiniGame/SecretFront.json index 7137aac251..b7f069c1a4 100644 --- a/resource/global/txwy/resource/tasks/MiniGame/SecretFront.json +++ b/resource/global/txwy/resource/tasks/MiniGame/SecretFront.json @@ -1,15 +1,15 @@ { - "MiniGame@SecretFront@EventReplace": { - "ocrReplace": [ - [" ", ""], - ["結局", "4"] - ] - }, "MiniGame@SecretFront@PreClickDetect": { "ocrReplace": [ ["支援作戰平台", "支援作战平台"], ["遊俠", "游侠"], ["詭影迷蹤", "鬼影迷踪"] ] + }, + "MiniGame@SecretFront@EventReplace": { + "ocrReplace": [ + [" ", ""], + ["結局", "4"] + ] } } diff --git a/resource/tasks/MiniGame/SecretFront.json b/resource/tasks/MiniGame/SecretFront.json index f15a9c649c..bb98603a14 100644 --- a/resource/tasks/MiniGame/SecretFront.json +++ b/resource/tasks/MiniGame/SecretFront.json @@ -58,7 +58,11 @@ "MiniGame@SecretFront@RouteSelect": { "roi": [0, 280, 150, 230], "preDelay": 1500, - "next": ["MiniGame@SecretFront@EventDetected", "MiniGame@SecretFront@PreClickDetect", "MiniGame@SecretFront@ClickThenActionsDetected"] + "next": [ + "MiniGame@SecretFront@EventDetected", + "MiniGame@SecretFront@PreClickDetect", + "MiniGame@SecretFront@ClickThenActionsDetected" + ] }, "MiniGame@SecretFront@PreClickDetect": { "doc": "隐秘战线:在默认点击前做一次事件识别(供插件拦截并在当前页选卡)", From 03634ae516df7dd692441facc7ba8bb9db0d47e9 Mon Sep 17 00:00:00 2001 From: MistEO Date: Fri, 2 Jan 2026 01:03:13 +0800 Subject: [PATCH 2/8] ci: try to fix linux build --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 82fcc5cfbb..fea12b7fe6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -274,10 +274,10 @@ jobs: - name: Build CLI run: | - cargo build --release --locked --package maa-cli --features vendored-openssl + cargo build --release --locked --package maa-cli cp -v target/$CARGO_BUILD_TARGET/release/maa $GITHUB_WORKSPACE/install/maa cargo build --release --locked --package maa-cli --no-default-features \ - --features git2,vendored-openssl + --features git2 cp -v target/$CARGO_BUILD_TARGET/release/maa $GITHUB_WORKSPACE/appimage-maa working-directory: src/maa-cli From 01b59f54fe6df042d81c20d5de2707e1db78c964 Mon Sep 17 00:00:00 2001 From: MistEO Date: Fri, 2 Jan 2026 01:18:30 +0800 Subject: [PATCH 3/8] ci: limit CI in PRs within the same branch --- .github/workflows/ci.yml | 2 +- .github/workflows/smoke-testing.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fea12b7fe6..1a7e58b65c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ on: workflow_dispatch: concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.ref == 'refs/heads/dev' && github.sha }} + group: ${{ github.workflow }}-${{ github.repository }}-${{ github.ref }}-${{ github.ref == 'refs/heads/dev' && github.sha }} cancel-in-progress: true jobs: diff --git a/.github/workflows/smoke-testing.yml b/.github/workflows/smoke-testing.yml index a093224420..cca4901e78 100644 --- a/.github/workflows/smoke-testing.yml +++ b/.github/workflows/smoke-testing.yml @@ -32,7 +32,7 @@ on: workflow_dispatch: concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.ref == 'refs/heads/dev' && github.sha }} + group: ${{ github.workflow }}-${{ github.repository }}-${{ github.ref }}-${{ github.ref == 'refs/heads/dev' && github.sha }} cancel-in-progress: true jobs: From 21181c2872b7fae6fa96f8ca5a1d016176ac9730 Mon Sep 17 00:00:00 2001 From: MistEO Date: Fri, 2 Jan 2026 01:24:36 +0800 Subject: [PATCH 4/8] ci: try to fix linux arm64 build --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1a7e58b65c..2a99b1e2d4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -274,10 +274,11 @@ jobs: - name: Build CLI run: | - cargo build --release --locked --package maa-cli + # git2 依赖 libssh2-sys/openssl-sys,交叉编译时需要 vendored 模式 + cargo build --release --locked --package maa-cli -F openssl-sys/vendored cp -v target/$CARGO_BUILD_TARGET/release/maa $GITHUB_WORKSPACE/install/maa cargo build --release --locked --package maa-cli --no-default-features \ - --features git2 + --features git2 -F openssl-sys/vendored cp -v target/$CARGO_BUILD_TARGET/release/maa $GITHUB_WORKSPACE/appimage-maa working-directory: src/maa-cli From de4b86fda8e062df12fd8fcdde03dd4f28de8a3f Mon Sep 17 00:00:00 2001 From: Constrat <56174894+Constrat@users.noreply.github.com> Date: Thu, 1 Jan 2026 18:30:45 +0100 Subject: [PATCH 5/8] fix: update Roguelike@TraderRandomShoppingConfirm for EN fix #15264 --- .../Roguelike@TraderRandomShoppingConfirm.png | Bin 8973 -> 6331 bytes .../OptimizeTemplates/optimize_templates.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resource/global/YoStarEN/resource/template/Roguelike/base/Roguelike@TraderRandomShoppingConfirm.png b/resource/global/YoStarEN/resource/template/Roguelike/base/Roguelike@TraderRandomShoppingConfirm.png index e5b68dbd73d08f9425712910c3f1e6ca123910ee..2640b9f817749da4cf865c5566bbb4d71178f1e6 100644 GIT binary patch literal 6331 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

~ZwO1uis==VNogITkolNGi)541tW zvqdEX@jRbw{QPKr(rLskv8X*~B{7VZT+ZFvI2PD>xMN=m#h&Exd6a(vGW4BOk+_B| z*H@Lnczt~-S9i=>7sLnnSpxU7LgIPQJ8M4ivnm0*edMGWv{@M}j`6jX9RcC|z{t6M z*!38LleNU_@4u0HW@joDqT&!Z7VzCqKR)CTpwH`tRm6b0qgk3`7viDh7RT@>mgmMg zXYZ0se7BXllF@iLX7f`>H#mTDVDV`*wAq+zLr4m4*kWiCdMG1zNaY zxJrP@j&3!$ZsHl%J9SkEGrg~HQ@2W7h4+adciDM5xtol5!UDy)ie_AMS@Y?%$%WrF zs<*8>skQmsO)_G-SD6T+4X;v$r|aB1Kf8dg4EFo|E+O=U8n4y5|Fz!lRT+<+;%SVJ z)*p#D>d$T|DL5U$uhd1?B`LcX!{2v8<5qdqft6{%-eqxWsDg>9 nrd)~m_8--e%ffVG*dzR39RQo+oQ2|j00000NkvXXu0mjfwokqP diff --git a/tools/OptimizeTemplates/optimize_templates.json b/tools/OptimizeTemplates/optimize_templates.json index 8284b15169..618cf41588 100644 --- a/tools/OptimizeTemplates/optimize_templates.json +++ b/tools/OptimizeTemplates/optimize_templates.json @@ -528,7 +528,7 @@ "resource/global/YoStarEN/resource/template/Roguelike/base/Roguelike@StageTraderRefresh": "1e9c7f0d0f2157107035d262b780fb47ca33f7e6e3743dab3250d8ee14023d28", "resource/global/YoStarEN/resource/template/Roguelike/base/Roguelike@StartAction": "e91264662c6f688e55b79e6cb2c2f3225a6d73a278e4c5f1d9228d9e04d83a2d", "resource/global/YoStarEN/resource/template/Roguelike/base/Roguelike@TempRecruitFlag": "a99c1388f1076b931a70527256652e34025cb222987bc0d1234887a60dc56b11", - "resource/global/YoStarEN/resource/template/Roguelike/base/Roguelike@TraderRandomShoppingConfirm": "aedbd79ea7d901a489ca397a752ff7732f163af7b61ea20edad5993e5e3b9e8a", + "resource/global/YoStarEN/resource/template/Roguelike/base/Roguelike@TraderRandomShoppingConfirm": "dfe29e973f96949cc9fcaed80e1e3fd9f1b5c132544d50d04adcf0ffb4227d02", "resource/global/YoStarEN/resource/template/Roguelike/base/RoguelikeBattleAbandon": "5ce466b056b074438c18e3abf3437062836c8c9124ff8ea3ba1d47c674ba591c", "resource/global/YoStarEN/resource/template/Roguelike/base/RoguelikeBattleAbandonConfirm": "67e9adbf4dfdcc77915381dffa50c29777c598591598177aac46499e63206752", "resource/global/YoStarEN/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@Abandon": "a4ce47ab3e4cdc807913370661309112541382ca30c7edb9f1b12c3b7c2bfb83", From e0c226f7bb04b656977fa29d39ecf0d8c1bfe83a Mon Sep 17 00:00:00 2001 From: Constrat <56174894+Constrat@users.noreply.github.com> Date: Thu, 1 Jan 2026 18:30:58 +0100 Subject: [PATCH 6/8] chore: optimize template [skip changelog] --- .../MiniGame@SecretFront@ClickAnywhere.png | Bin 2595 -> 2541 bytes .../OptimizeTemplates/optimize_templates.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resource/global/YoStarKR/resource/template/MiniGame/SecretFront/MiniGame@SecretFront@ClickAnywhere.png b/resource/global/YoStarKR/resource/template/MiniGame/SecretFront/MiniGame@SecretFront@ClickAnywhere.png index 4a0e052baa57e416fdcfafe837c3ce336a0d7597..68e6101d4cc08bde594b21a1d37f26eecf882c2b 100644 GIT binary patch delta 2497 zcmV;y2|o6t6zvm`Mt_n?L_t(|+H8@53IZ_lrF$Ln@IQffZg%%JP+ zqr++n>zRs)_>GQrtem+tq$EbmJ;%8z$*Kd$R5yXFj~TU$u78BTKNU)oJDF<{p#?kj z^&baOa@)5A0nYd=rTgV1pH`iH`K}5!$AKGKL%>NkuoPZqIxaK+<}$a(cgwt43T~Le zai6VN-+U=dNS=`=deW0d2AEiKPF5Y*@iBF+sOrwEH`u=0=^lJ|XM^DXHykckVr~JF zZWuS`r)(vCwtt_$@cR4^ZZ6IW*$k#c?Bl3Jk_xC6R#qd41cdCvW9sUXR#nqS_Hb)j za%q{d(0(N6)9I&tZeex9-)D96oFBO%jMeG-GihL_3N{f zF}FvPb5k>6NQGQFpLt{~A}Zg6-|L$Igm$Y{D^~;xN`E9y&CbFG2>o8~=HlF2xivZH#e;V0Am4d^Y3p`Fs--)~*t{0`icUCs3Yl1iig}zX@qDfCeve7zrOa zZ48pr>0DahoQXy?w}zd1-EO(~bbfTyYBp@wNSwbU*gQv+^dbEprHRAgG9eBIwMvz} zj?wG(On*)2+WZHR88?MmRn^t4Z8lo-ct`=*Hg=!$e5cg{*$5HMaap8GWXRU@7mF+F zZm)+aHysXxARqqz_g=R{ZWhzk#9*SZq69-}Pqqw~tyUXc5}DViRB4f{lra>UETJ38 zl=Yomb~j@NrVY&7#i>*%fQPg>JDAXtdL$BEUVq+)I9+p#%guVd zm@ja=eSSaZuNe@@jGn3!XRHszp(Vp$e`u2CDH4@ZnE=!E-s^9|P^y0ThF>f}N2w6G z)o!;*v)C-;q^id3`gQnB%RG2sZHu z1%E_}5}!IYJg3763ejH@+*~GIuhxb(q{QOVXaR$YI7(l)_wk>98#_AbBc7394#5zk z#ARV37@CbmvC?eRPY?Dfd5{Ikg@xHz!lh|=i&caqA{mtplm|$oT_Ka>5xPdLZgT-^ zaBZIe(+=soJDkGDYejcB?BCy{Mt_$1{itakkA_m-?X+8s`u%OH+ipujbr!8* z;DKOBRUMcvq|>ctolNibx(~OvGqE_-p0e5N^Aqyb{K{H59;dR-N1$26M_DEmu2!r0 ze|+l~dD_VWBY{p51-f++8x{tGw7U2fklM=1d?a;i->B9eU z`L~ZL5t2gOgr-A=&Ih-KMXutgXq*e+EAx6|_eF4O3gX@M<<;3K zs=wxOZ|=RAi9}GiK$YV!pR68+f@DSsZ%m+vz+HnupTaH65?g69MUrV=w|}WL)+m$A zQKFYI=nd+XD${VFn`6-L!kC1gwWt3Ua&E<}Exfw_+uC zx7RB@x{vJAcG&Q|@+$x-Kh< zswil$%mlCo4t{I}s-o!GU<|HiXyLdJ7M}`@S`CReIX#VP)b zKGPVF5*2ZQlq8`o+IqH!3*bHe`juHytyTG`ak;f{A_loxZ_?cauUIIcc~KnB?U%34 z4iC}(_=E843)()Let%%PjyaeH^e<13pS}4OIE?S$

}aY&cb+mbt&XIz3_a<&8}& zk<18GDpq2y5m_{^j}%{j=X>K1p_ZO!!t1egK+jQ>B=h^=!~5_3{1<3vRyMZ$!4Md$ zX<9fIGxMZYy*NJRq_-VBdi3IPb#juJUqqKZ9gd(A2ajM3G=Eyn=KhCw*~bUy*qwM7 zkf_=+P8E4B;^E-(<@)Y6ArXMt&ymbX!OeH6l=to1^_?AmD3n-OPN4-}0{I9=nJbMv~Cs7qhshH25?tjJ80Be#kx)e4sqeNEmIvr5lM`j)@uh2(O zb7~r$C(swI)PMVf^TWeRxg3td$3Caqjr?iUYw&I%mxIeqkalpyaEasb?#@i?*(*HE zz<1~sOTd)L;1PjtVP^`DGbD(_6V!%6eg6ELeOVsX2Zhsjv?6^C=&NK*H76D z@HiZ5zi(Dc^bl5XEj&Ul8GKNX9O_PL&Z{l8$6~rwNQn8n3pJSOZ(3c1jkT68E7|>|z zotMvPnN>)X6_q4bW(_u+WtxyA))X1TlZJSUIL5YTD|tdRLnYpgK^p3VX01l^ygVkO zKWNnY5P#5Zin%1(4R4Cr#$|&9bI`>99-@g7NgO7@FO*CF1rj>(*1!Jz7Y-k5vzj=- za{KX(EEHnJztRXD&mVmLPw4J@sh6qZU0J)LJrO{&JVn#%3eewN{zj5h0%X!wS$Htgz@WQVDwP*91%PJP0P#&o)sgcrTu>3y(>)g=sl6QdN6Mt{gjL_t(|+ND?NQya+@pVo|yk%SPJ4iL8u7=vxR-fV5{hkVIa zr7GX@?`A7iNv-3>$J$`PU>hvUAPIy3-S

>h9^DqbN3&mS*(k^_%YZdsjb^zyIxL zlMTg`!w^4WQZYC~QRs~gHbo^YKEKH|70RH}{DUEWv_tzf^ zrS))_2>{#L<`cnhH=77Hj)-Ft57b&db^XcK;=R>SBrKwBGMPkxyngCv-4K~YxyaEDzeF+i!X$5yM=@>XTUJzJU1IP;debY&}foF(7c2qpWf*0@yh9P9(2k*R) zuT`ps1u3(*#3wLV5l89kbl<%A6%1!VcAt@m9C>8PG~i+*@v+2o8Z(W0?eP6BOCDsw z?7~7~Iuq1&d}S4Joa_cG8z>K;_^P0p;eX+}dbLJ(WN2a99`_Pu=5slm)#=$;(3ER{ zZy3FAU$R`YSPV5S9M)0FJMC7pUiXj zK=o_SfBA=La!gm{vWD`Y$kb#sQGd+IWMcE_v-spBCTf+NcKI?g5{r(;ao5B8i+}zC zd)a%w*@eZaWD*bAPoIt|yEq%!B+Ot%=8)0uv>87b2oCp?R>7AzAz6W^$Xrrj-Ia}p zz(X;qKH`JS>yVB~QN>Zw_>R1Q^4-@qx8f5MAaf_5kB<&f{q=C@!K1CIRDTME3!!rG z?swY5FeeSYgfAHAA@Eke-(&7Zt0T0;k4k*Fv!w8LlM1J$m*@w}b^EoOiU`C0U^x1{ z9=`2%8#I^#kwI+zD%a0cHEm{o4i84ZxAXGVb-85aF!^)puV~3K3k&;i-`Jb-d@g%^ zITX7n=J8^^R%ag6^$63FC4YS=9AW%WD0F{)olcO^u?a`n1i>IN8c(%q_04~NrR7|~ z2aTXPpuqb5ZnxWRw!R*J4(VYC10-ObX0xDM&6Zdq91N*6xjWtN)#Zig$#A?d?II(i zHp>pL{I?wI0Fkbks@+^O{$wf*838_#PBVTqHu~_%GldRX{g{v!5`Vqgt#eVU|Z+vnRH8Y?43ML|XW_Dhb$Dkf!SkY&iPA`cfE`yR$Xp7b# zKf(j>9_;LhD5+E{;(w?KhV*1+8g!%9U~e;cZiZ_jCSVU+IlQLhJT3Fbv-#fJ1<@<;D?(cp=dg>~6Yj9T^P?QhT5 z9&b(0%%UnVp?~tl`Qh#k{tXC8M({_u2=x-xO3u@AF8j#BDYXi}q*y@Lah@=FyOx7q z|Kr}?&GmIM4I4)Tp%C(?UaP{orSo%`dAYAjT_AwrWpuhYuN3yaDFa5*Hi()PV>0R-el$@`Q;KauY#NKl z?T_|Wl3_y~!fdSOeZ7(h%deI^oh-S5|vNY zKuMjXgnv|A(2PNdkhDh(zJlk)Ehk*{$!%kcqZ#=1Kr#mXMzzZLV%kNcKd4uGAkb~f zTyp9SYud57X_FDdK^eCXhl+$z!c9)Qz)K!Tv=eXs_OE|S_nF?+<)B>|K0Hq(JYxGL z9G&35fBSnl907fvFS^&iW5~SD9iQM&5Xj3?Nq^``7ADdT<14N>bh^khyojMY5wt6j z5|{~wHZxSBJU&OV!zECy1}wBxyJcx~ZW#)TiK|(U|gj?U+obt!g zNtSP~?Y%j6x0gI;fY(v{5|Bm{cBwl8?+!3rY01Aci~d(&a@$)o>c3ceanov#q1pfd N002ovPDHLkV1l*4{(=Ai diff --git a/tools/OptimizeTemplates/optimize_templates.json b/tools/OptimizeTemplates/optimize_templates.json index 618cf41588..9f64a5b310 100644 --- a/tools/OptimizeTemplates/optimize_templates.json +++ b/tools/OptimizeTemplates/optimize_templates.json @@ -1358,7 +1358,7 @@ "resource/global/YoStarKR/resource/template/InfrastPic/Trade/DeliverableOrder": "d8cd57c7421b6e5045af496ce739d9a9efe2bb2cb4d97a431cbe0e96f70d6b57", "resource/global/YoStarKR/resource/template/MiniGame/SecretFront/MiniGame@SecretFront@ActionContinue": "798eeb6aec5979d8fca18339cbd843cc24a7992511993ad804c1bf00348e500e", "resource/global/YoStarKR/resource/template/MiniGame/SecretFront/MiniGame@SecretFront@Available": "e5252a799d24a2e3edb9d604d4bcec376bbca590f81028e7ce78647d17976754", - "resource/global/YoStarKR/resource/template/MiniGame/SecretFront/MiniGame@SecretFront@ClickAnywhere": "784a5c9696f1a5704cceadc7041801756bcd54b4c6fb60400daa75a7229447b3", + "resource/global/YoStarKR/resource/template/MiniGame/SecretFront/MiniGame@SecretFront@ClickAnywhere": "79f279c3d06f2f144c9e6c300c0627812752ba6915e3beefbe50c2592e04e786", "resource/global/YoStarKR/resource/template/MiniGame/SecretFront/MiniGame@SecretFront@ContinueResult": "b6e251b39cbc0567723becc322e5810e665c67676e2d9a0bc3323de2ff2507bb", "resource/global/YoStarKR/resource/template/MiniGame/SecretFront/MiniGame@SecretFront@End": "476e483b19170b993cf8f20585db26f56bc9af2f2b08cb666f985f2f6a8b000c", "resource/global/YoStarKR/resource/template/MiniGame/SecretFront/MiniGame@SecretFront@EventContinue": "5196f97f20a20f79d053838a961219d78a34af607505cc46197acc1fa13c704e", From c7c8466b109a9146b2cf9c3c252ff3dcb44e60ad Mon Sep 17 00:00:00 2001 From: MistEO Date: Fri, 2 Jan 2026 02:16:31 +0800 Subject: [PATCH 7/8] ci: fix linux build (#15268) --- .github/workflows/ci.yml | 5 ++--- src/maa-cli | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2a99b1e2d4..0c2de500d3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -274,11 +274,10 @@ jobs: - name: Build CLI run: | - # git2 依赖 libssh2-sys/openssl-sys,交叉编译时需要 vendored 模式 - cargo build --release --locked --package maa-cli -F openssl-sys/vendored + cargo build --release --locked --package maa-cli --features vendored-openssl cp -v target/$CARGO_BUILD_TARGET/release/maa $GITHUB_WORKSPACE/install/maa cargo build --release --locked --package maa-cli --no-default-features \ - --features git2 -F openssl-sys/vendored + --features git2,vendored-openssl cp -v target/$CARGO_BUILD_TARGET/release/maa $GITHUB_WORKSPACE/appimage-maa working-directory: src/maa-cli diff --git a/src/maa-cli b/src/maa-cli index 77987e7678..3346edc1e4 160000 --- a/src/maa-cli +++ b/src/maa-cli @@ -1 +1 @@ -Subproject commit 77987e76783fb91d22cabd4b3377503ca0477fce +Subproject commit 3346edc1e430e82a66ac34f8a9cf61cd4077cd4a From 7397e1ac008ee4e8cec1af13d218e11ffc6f6579 Mon Sep 17 00:00:00 2001 From: MistEO Date: Fri, 2 Jan 2026 02:28:55 +0800 Subject: [PATCH 8/8] ci: fix concurrency group (#15269) --- .github/workflows/ci.yml | 6 +++++- .github/workflows/smoke-testing.yml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0c2de500d3..58126be2bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ on: workflow_dispatch: concurrency: - group: ${{ github.workflow }}-${{ github.repository }}-${{ github.ref }}-${{ github.ref == 'refs/heads/dev' && github.sha }} + group: ${{ github.workflow }}-${{ github.event.pull_request.head.repo.full_name || github.repository }}-${{ github.head_ref || github.ref_name }}${{ github.ref == 'refs/heads/dev' && format('-{0}', github.sha) || '' }} cancel-in-progress: true jobs: @@ -41,6 +41,10 @@ jobs: tag: ${{ steps.set_tag.outputs.tag }} prerelease: ${{ steps.set_pre.outputs.prerelease }} steps: + - name: Show concurrency group + run: | + echo "Concurrency Group: ${{ github.workflow }}-${{ github.event.pull_request.head.repo.full_name || github.repository }}-${{ github.head_ref || github.ref_name }}${{ github.ref == 'refs/heads/dev' && format('-{0}', github.sha) || '' }}" + - name: Checkout repository uses: actions/checkout@v6 with: diff --git a/.github/workflows/smoke-testing.yml b/.github/workflows/smoke-testing.yml index cca4901e78..9e7849a538 100644 --- a/.github/workflows/smoke-testing.yml +++ b/.github/workflows/smoke-testing.yml @@ -32,7 +32,7 @@ on: workflow_dispatch: concurrency: - group: ${{ github.workflow }}-${{ github.repository }}-${{ github.ref }}-${{ github.ref == 'refs/heads/dev' && github.sha }} + group: ${{ github.workflow }}-${{ github.event.pull_request.head.repo.full_name || github.repository }}-${{ github.head_ref || github.ref_name }}${{ github.ref == 'refs/heads/dev' && format('-{0}', github.sha) || '' }} cancel-in-progress: true jobs: