diff --git a/.github/workflows/release-mirrors.yml b/.github/workflows/release-mirrors.yml index 8369f44bd5..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 }} @@ -43,5 +40,6 @@ jobs: host: ${{ secrets.SSH_MIRROR_0_HOST }} username: ${{ secrets.SSH_MIRROR_0_USER }} key: ${{ secrets.SSH_MIRROR_0_KEY }} - source: "MAA-*" - target: ${{ format('{0}/{1}', '/data/html/MaaAssistantArknights/MaaAssistantArknights/releases/download', env.release_tag) }} + source: "upload-dir/${{ env.release_tag }}" + target: "/data/html/MaaAssistantArknights/MaaAssistantArknights/releases/download" + strip_components: 1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d15f6f0e2..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 @@ -23,17 +26,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 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": [ 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; }