diff --git a/.github/workflows/release-ota.yml b/.github/workflows/release-ota.yml index 7fcee697dd..52ffdb347a 100644 --- a/.github/workflows/release-ota.yml +++ b/.github/workflows/release-ota.yml @@ -94,7 +94,7 @@ jobs: - x64 steps: - name: Download release config - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v4 - name: Fetch MaaRelease uses: actions/checkout@v5 @@ -134,6 +134,15 @@ jobs: prerelease: ${{ fromJSON(needs.create-tag.outputs.prerelease) }} overwrite: true + - name: Create issue if failed + if: failure() + uses: actions-cool/issues-helper@v3 + with: + actions: "create-issue" + title: "Failed make release OTA for Windows" + body: | + ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} + make-ota-mac: needs: create-tag runs-on: macos-14 @@ -177,6 +186,15 @@ jobs: prerelease: ${{ fromJSON(needs.create-tag.outputs.prerelease) }} overwrite: true + - name: Create issue if failed + if: failure() + uses: actions-cool/issues-helper@v3 + with: + actions: "create-issue" + title: "Failed make release OTA for macos" + body: | + ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} + release: needs: - make-ota diff --git a/CHANGELOG.md b/CHANGELOG.md index 12c40c4512..3a4fe00c29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## v5.25.0-beta.2 +## v5.25.0-beta.3 ### 新增 | New @@ -17,6 +17,7 @@ ### 修复 | Fix +* 修复 minitouch 爆炸 @MistEO * 刷开局奖励只选票券时行为异常 @ABA2396 * Copilot多任务编队时编队设置残留 @status102 * 自定义基建换班的班次不会随时间切换 @ABA2396 diff --git a/src/MaaCore/Controller/MinitouchController.h b/src/MaaCore/Controller/MinitouchController.h index 959a369e14..aaa108dc7e 100644 --- a/src/MaaCore/Controller/MinitouchController.h +++ b/src/MaaCore/Controller/MinitouchController.h @@ -144,7 +144,8 @@ protected: [[nodiscard]] std::string down_cmd(int x, int y, int wait_ms = DefaultClickDelay, bool with_commit = true, int contact = 0) { - std::string str = std::format("d {} {} {} {}\n", contact, x, y, m_props.max_pressure); + auto [c_x, c_y] = scale(x, y); + std::string str = std::format("d {} {} {} {}\n", contact, c_x, c_y, m_props.max_pressure); if (with_commit) { str += commit_cmd(); @@ -158,7 +159,8 @@ protected: [[nodiscard]] std::string move_cmd(int x, int y, int wait_ms = DefaultSwipeDelay, bool with_commit = true, int contact = 0) { - std::string str = std::format("m {} {} {} {}\n", contact, x, y, m_props.max_pressure); + auto [c_x, c_y] = scale(x, y); + std::string str = std::format("m {} {} {} {}\n", contact, c_x, c_y, m_props.max_pressure); if (with_commit) { str += commit_cmd();