diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 82fcc5cfbb..58126be2bd 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.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 a093224420..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.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: 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/YoStarEN/resource/template/Roguelike/base/Roguelike@TraderRandomShoppingConfirm.png b/resource/global/YoStarEN/resource/template/Roguelike/base/Roguelike@TraderRandomShoppingConfirm.png index e5b68dbd73..2640b9f817 100644 Binary files a/resource/global/YoStarEN/resource/template/Roguelike/base/Roguelike@TraderRandomShoppingConfirm.png and b/resource/global/YoStarEN/resource/template/Roguelike/base/Roguelike@TraderRandomShoppingConfirm.png differ 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/YoStarKR/resource/template/MiniGame/SecretFront/MiniGame@SecretFront@ClickAnywhere.png b/resource/global/YoStarKR/resource/template/MiniGame/SecretFront/MiniGame@SecretFront@ClickAnywhere.png index 4a0e052baa..68e6101d4c 100644 Binary files a/resource/global/YoStarKR/resource/template/MiniGame/SecretFront/MiniGame@SecretFront@ClickAnywhere.png and b/resource/global/YoStarKR/resource/template/MiniGame/SecretFront/MiniGame@SecretFront@ClickAnywhere.png differ 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": "隐秘战线:在默认点击前做一次事件识别(供插件拦截并在当前页选卡)", 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 diff --git a/tools/OptimizeTemplates/optimize_templates.json b/tools/OptimizeTemplates/optimize_templates.json index 8284b15169..9f64a5b310 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", @@ -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",