From 0fffe0dcc791562c76f2a2ee906fe54d05b985ac Mon Sep 17 00:00:00 2001 From: MistEO Date: Tue, 7 Feb 2023 23:35:59 +0800 Subject: [PATCH 1/9] docs: fix changlog's format --- CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d15f6f0e2..9d710b989e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,17 +23,13 @@ - Fixed overseas clients infrast dorm/power issue @liuyifan-eric - Added resource stage pathfinding for all overseas clients @liuyifan-eric - - Added support for trial function in copilot of YoStarJP @liuyifan-eric - Updated YoStarJP operator json regex @liuyifan-eric - - Added Copilot function for YoStarKR @178619 - Fixed OCR for YoStarKR @178619 - Fixed some recognition bugs, updated resources and documentation for YoStarKR @178619 - Updated Korean translation @178619 - - Fixed Base function stuck and some minor issues for YostarEN @RiichiTsumo - - 更新 繁中服 基建和 `愚人号` 模板图片、修复导航功能、修复部分识别问题 @vonnoq ### For develops From 52bcc58da57d966d65bb4d3e7c9ac2bfb8dca293 Mon Sep 17 00:00:00 2001 From: uye <2396806385@qq.com> Date: Wed, 8 Feb 2023 00:27:54 +0800 Subject: [PATCH 2/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Ds=E7=B3=BB?= =?UTF-8?q?=E5=88=97=E5=85=B3=E5=8D=A1=E5=AF=BC=E8=88=AA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix #3628 --- resource/tasks.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resource/tasks.json b/resource/tasks.json index 1b3c7f2e20..05d2e97eca 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -527,6 +527,10 @@ [ " ", "" + ], + [ + "s", + "S" ] ], "roi": [ From 18d1e728e63c7ef4c8205d31d7b539471db6a744 Mon Sep 17 00:00:00 2001 From: Congcong Cai Date: Wed, 8 Feb 2023 08:05:27 +0800 Subject: [PATCH 3/9] fix: `check_and_use_skill` logic bug --- src/MaaCore/Task/BattleHelper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MaaCore/Task/BattleHelper.cpp b/src/MaaCore/Task/BattleHelper.cpp index 319f97fe64..74534efbe6 100644 --- a/src/MaaCore/Task/BattleHelper.cpp +++ b/src/MaaCore/Task/BattleHelper.cpp @@ -510,7 +510,7 @@ bool asst::BattleHelper::check_and_use_skill(const Point& loc, bool& has_error, return false; } - has_error = use_skill(loc, false); + has_error = !use_skill(loc, false); return true; } From f512cd1f41f644150faf1384583650b3d9fc2a33 Mon Sep 17 00:00:00 2001 From: GalvinGao Date: Wed, 8 Feb 2023 02:12:56 -0500 Subject: [PATCH 4/9] build: fix release-mirrors --- .github/workflows/release-mirrors.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-mirrors.yml b/.github/workflows/release-mirrors.yml index 8369f44bd5..73db0aabde 100644 --- a/.github/workflows/release-mirrors.yml +++ b/.github/workflows/release-mirrors.yml @@ -43,5 +43,5 @@ jobs: host: ${{ secrets.SSH_MIRROR_0_HOST }} username: ${{ secrets.SSH_MIRROR_0_USER }} key: ${{ secrets.SSH_MIRROR_0_KEY }} - source: "MAA-*" + source: "upload-dir/MAA-*" target: ${{ format('{0}/{1}', '/data/html/MaaAssistantArknights/MaaAssistantArknights/releases/download', env.release_tag) }} From 97fa75f7f7f311fc2d4170aceca489bf27ed33a5 Mon Sep 17 00:00:00 2001 From: GalvinGao Date: Wed, 8 Feb 2023 02:15:07 -0500 Subject: [PATCH 5/9] build: fix release-mirrors --- .github/workflows/release-mirrors.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-mirrors.yml b/.github/workflows/release-mirrors.yml index 73db0aabde..61e61160bd 100644 --- a/.github/workflows/release-mirrors.yml +++ b/.github/workflows/release-mirrors.yml @@ -35,6 +35,7 @@ jobs: mkdir -pv upload-dir/${{ env.release_tag }} cd upload-dir/${{ env.release_tag }} gh release download ${{ env.release_tag }} --repo 'MaaAssistantArknights/MaaAssistantArknights' --pattern "MAA-${{ env.release_tag }}-*" --clobber + ls env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: "Upload to mirror 0" @@ -43,5 +44,5 @@ jobs: host: ${{ secrets.SSH_MIRROR_0_HOST }} username: ${{ secrets.SSH_MIRROR_0_USER }} key: ${{ secrets.SSH_MIRROR_0_KEY }} - source: "upload-dir/MAA-*" + source: "*" target: ${{ format('{0}/{1}', '/data/html/MaaAssistantArknights/MaaAssistantArknights/releases/download', env.release_tag) }} From c9b109e39cbb6ba86d0fd2dd86c832f0ebf46f2c Mon Sep 17 00:00:00 2001 From: GalvinGao Date: Wed, 8 Feb 2023 02:19:04 -0500 Subject: [PATCH 6/9] build: fix release-mirrors --- .github/workflows/release-mirrors.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-mirrors.yml b/.github/workflows/release-mirrors.yml index 61e61160bd..450a6057eb 100644 --- a/.github/workflows/release-mirrors.yml +++ b/.github/workflows/release-mirrors.yml @@ -35,7 +35,8 @@ jobs: mkdir -pv upload-dir/${{ env.release_tag }} cd upload-dir/${{ env.release_tag }} gh release download ${{ env.release_tag }} --repo 'MaaAssistantArknights/MaaAssistantArknights' --pattern "MAA-${{ env.release_tag }}-*" --clobber - ls + # list all files under current directory, join with comma, and save to env + echo "release_files=$(ls -1 | paste -sd ',' -)" >> $GITHUB_ENV env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: "Upload to mirror 0" @@ -44,5 +45,5 @@ jobs: host: ${{ secrets.SSH_MIRROR_0_HOST }} username: ${{ secrets.SSH_MIRROR_0_USER }} key: ${{ secrets.SSH_MIRROR_0_KEY }} - source: "*" + source: ${{ env.release_files }} target: ${{ format('{0}/{1}', '/data/html/MaaAssistantArknights/MaaAssistantArknights/releases/download', env.release_tag) }} From b81b5587b3c1e26524880c9d3e83e7bb4dc51fb2 Mon Sep 17 00:00:00 2001 From: GalvinGao Date: Wed, 8 Feb 2023 02:21:38 -0500 Subject: [PATCH 7/9] build: fix release-mirrors --- .github/workflows/release-mirrors.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-mirrors.yml b/.github/workflows/release-mirrors.yml index 450a6057eb..842f493dd3 100644 --- a/.github/workflows/release-mirrors.yml +++ b/.github/workflows/release-mirrors.yml @@ -35,8 +35,6 @@ jobs: mkdir -pv upload-dir/${{ env.release_tag }} cd upload-dir/${{ env.release_tag }} gh release download ${{ env.release_tag }} --repo 'MaaAssistantArknights/MaaAssistantArknights' --pattern "MAA-${{ env.release_tag }}-*" --clobber - # list all files under current directory, join with comma, and save to env - echo "release_files=$(ls -1 | paste -sd ',' -)" >> $GITHUB_ENV env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: "Upload to mirror 0" @@ -45,5 +43,6 @@ jobs: host: ${{ secrets.SSH_MIRROR_0_HOST }} username: ${{ secrets.SSH_MIRROR_0_USER }} key: ${{ secrets.SSH_MIRROR_0_KEY }} - source: ${{ env.release_files }} + source: "upload-dir/${{ env.release_tag }}" target: ${{ format('{0}/{1}', '/data/html/MaaAssistantArknights/MaaAssistantArknights/releases/download', env.release_tag) }} + strip_components: 1 From 290e9311a40cf528fc209281476583219039b97d Mon Sep 17 00:00:00 2001 From: GalvinGao Date: Wed, 8 Feb 2023 02:35:52 -0500 Subject: [PATCH 8/9] build: fix release-mirrors --- .github/workflows/release-mirrors.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/release-mirrors.yml b/.github/workflows/release-mirrors.yml index 842f493dd3..57af4df579 100644 --- a/.github/workflows/release-mirrors.yml +++ b/.github/workflows/release-mirrors.yml @@ -15,9 +15,6 @@ jobs: upload-mirrors: runs-on: "ubuntu-latest" steps: - - uses: actions/checkout@v3 - with: - path: MaaAssistantArknights - name: "Fetch release info" env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -44,5 +41,5 @@ jobs: username: ${{ secrets.SSH_MIRROR_0_USER }} key: ${{ secrets.SSH_MIRROR_0_KEY }} source: "upload-dir/${{ env.release_tag }}" - target: ${{ format('{0}/{1}', '/data/html/MaaAssistantArknights/MaaAssistantArknights/releases/download', env.release_tag) }} + target: "/data/html/MaaAssistantArknights/MaaAssistantArknights/releases/download" strip_components: 1 From 5af75c0456582acf328e78c22c7a4f7b913920ee Mon Sep 17 00:00:00 2001 From: MistEO Date: Wed, 8 Feb 2023 16:12:08 +0800 Subject: [PATCH 9/9] docs: changelogs --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d710b989e..26c683ea7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,11 @@ -## v4.10.7-beta.1 +## v4.10.7 - 优化 界面关卡选择及提示支持外服 @liuyifan-eric @ABA2396 +- 修复 自动战斗 技能开启错误 @HerrCai0907 +- 修复 关卡 导航识别错误 @ABA2396 - 修复 Unix 的 socket 连接错误 @HerrCai0907 - 修复 IssueBot 文档链接错误 @Rbqwow +- 修复 发版镜像 @GalvinGao ## v4.10.6