mirror of
https://github.com/MaaAssistantArknights/MaaAssistantArknights.git
synced 2026-07-15 17:30:27 +08:00
Release v6.1.1 (#15270)
## Summary by Sourcery CI: - 调整 CI 和冒烟测试工作流的并发组配置,在键中加入仓库和分支信息,以更好地隔离各次运行。 <details> <summary>Original summary in English</summary> ## Summary by Sourcery CI: - Adjust CI and smoke test workflow concurrency groups to include repository and branch in the key to better isolate runs. </details>
This commit is contained in:
6
.github/workflows/ci.yml
vendored
6
.github/workflows/ci.yml
vendored
@@ -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.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:
|
||||
|
||||
2
.github/workflows/smoke-testing.yml
vendored
2
.github/workflows/smoke-testing.yml
vendored
@@ -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.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:
|
||||
|
||||
@@ -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": [
|
||||
[" ", ""],
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 8.8 KiB After Width: | Height: | Size: 6.2 KiB |
@@ -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]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
{
|
||||
"MiniGame@SecretFront@EventReplace": {
|
||||
"ocrReplace": [
|
||||
[" ", ""],
|
||||
["엔딩", "4"]
|
||||
]
|
||||
},
|
||||
"MiniGame@SecretFront@PreClickDetect": {
|
||||
"ocrReplace": [
|
||||
["작전플랫폼지원", "支援作战平台"],
|
||||
["레인저", "游侠"],
|
||||
["수상한그림자", "鬼影迷踪"]
|
||||
]
|
||||
},
|
||||
"MiniGame@SecretFront@EventReplace": {
|
||||
"ocrReplace": [
|
||||
[" ", ""],
|
||||
["엔딩", "4"]
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 2.5 KiB |
@@ -1,15 +1,15 @@
|
||||
{
|
||||
"MiniGame@SecretFront@EventReplace": {
|
||||
"ocrReplace": [
|
||||
[" ", ""],
|
||||
["結局", "4"]
|
||||
]
|
||||
},
|
||||
"MiniGame@SecretFront@PreClickDetect": {
|
||||
"ocrReplace": [
|
||||
["支援作戰平台", "支援作战平台"],
|
||||
["遊俠", "游侠"],
|
||||
["詭影迷蹤", "鬼影迷踪"]
|
||||
]
|
||||
},
|
||||
"MiniGame@SecretFront@EventReplace": {
|
||||
"ocrReplace": [
|
||||
[" ", ""],
|
||||
["結局", "4"]
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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": "隐秘战线:在默认点击前做一次事件识别(供插件拦截并在当前页选卡)",
|
||||
|
||||
Submodule src/maa-cli updated: 77987e7678...3346edc1e4
@@ -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",
|
||||
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user