From a7bb06a225e02b7e91bd2676f574ca7eeab13fc6 Mon Sep 17 00:00:00 2001 From: Status102 <102887808+status102@users.noreply.github.com> Date: Wed, 31 Dec 2025 20:03:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=A7=E5=9C=B0=E5=9B=BE=E6=8A=80?= =?UTF-8?q?=E8=83=BD,=20=E6=92=A4=E7=A6=BB=E6=8C=89=E9=92=AE=E5=8F=8A?= =?UTF-8?q?=E7=9B=B8=E6=9C=BA=E5=81=8F=E7=A7=BB=E4=BF=AE=E5=A4=8D,=20?= =?UTF-8?q?=E8=BF=9E=E5=B8=A6=E5=BC=95=E8=88=AA=E8=80=85S6=E5=9C=B0?= =?UTF-8?q?=E5=9B=BETN-2=20~=20TN-4=20view[1]=20(#15252)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: TN-2 * fix: 技能&撤退 大地图视角偏移 Co-authored-by: status102 <102887808+status102@users.noreply.github.com> * chore: TN-3&TN-4 * perf: const --------- Co-authored-by: Weiyou Wang <44151844+Alan-Charred@users.noreply.github.com> --- 3rdparty/include/Arknights-Tile-Pos/TileCalc2.hpp | 4 ++-- ...ossrush_02-activities-act6bossrush-level_bossrush6_02.json | 4 +--- ...ossrush_03-activities-act6bossrush-level_bossrush6_03.json | 4 +--- ...ossrush_04-activities-act6bossrush-level_bossrush6_04.json | 4 +--- resource/version.json | 2 +- src/MaaCore/Task/BattleHelper.cpp | 2 +- 6 files changed, 7 insertions(+), 13 deletions(-) diff --git a/3rdparty/include/Arknights-Tile-Pos/TileCalc2.hpp b/3rdparty/include/Arknights-Tile-Pos/TileCalc2.hpp index 4bda0b8cfa..9a69639e12 100644 --- a/3rdparty/include/Arknights-Tile-Pos/TileCalc2.hpp +++ b/3rdparty/include/Arknights-Tile-Pos/TileCalc2.hpp @@ -117,13 +117,13 @@ static constexpr double rel_pos_z = -0.3967874050140381; inline auto get_retreat_screen_pos(const Level& level) { - const vec3d relative_pos = { -rel_pos_x, +rel_pos_y, rel_pos_z }; + const vec3d relative_pos = { -rel_pos_x + level.view[0].x, +rel_pos_y, rel_pos_z }; return world_to_screen(level, relative_pos, true); } inline auto get_skill_screen_pos(const Level& level) { - const vec3d relative_pos = { +rel_pos_x, -rel_pos_y, rel_pos_z }; + const vec3d relative_pos = { +rel_pos_x + level.view[0].x, -rel_pos_y, rel_pos_z }; return world_to_screen(level, relative_pos, true); } diff --git a/resource/Arknights-Tile-Pos/act6bossrush_02-activities-act6bossrush-level_bossrush6_02.json b/resource/Arknights-Tile-Pos/act6bossrush_02-activities-act6bossrush-level_bossrush6_02.json index 0f0a95aac9..4f1d3f245c 100644 --- a/resource/Arknights-Tile-Pos/act6bossrush_02-activities-act6bossrush-level_bossrush6_02.json +++ b/resource/Arknights-Tile-Pos/act6bossrush_02-activities-act6bossrush-level_bossrush6_02.json @@ -1993,9 +1993,7 @@ -9.76 ], [ - -6.44125193356232, - -6.6, - -11.914085001901128 +-6.56142893 , -6.58700198, -10.61876491 ] ], "width": 28 diff --git a/resource/Arknights-Tile-Pos/act6bossrush_03-activities-act6bossrush-level_bossrush6_03.json b/resource/Arknights-Tile-Pos/act6bossrush_03-activities-act6bossrush-level_bossrush6_03.json index 8161c2816f..ad00da6b2d 100644 --- a/resource/Arknights-Tile-Pos/act6bossrush_03-activities-act6bossrush-level_bossrush6_03.json +++ b/resource/Arknights-Tile-Pos/act6bossrush_03-activities-act6bossrush-level_bossrush6_03.json @@ -1858,9 +1858,7 @@ -12.370000000000001 ], [ - -6.480434066357736, - -8.1, - -14.571257326096456 +-6.58477799, -8.0842036, -13.14269852 ] ], "width": 29 diff --git a/resource/Arknights-Tile-Pos/act6bossrush_04-activities-act6bossrush-level_bossrush6_04.json b/resource/Arknights-Tile-Pos/act6bossrush_04-activities-act6bossrush-level_bossrush6_04.json index 917710704d..7a954aa597 100644 --- a/resource/Arknights-Tile-Pos/act6bossrush_04-activities-act6bossrush-level_bossrush6_04.json +++ b/resource/Arknights-Tile-Pos/act6bossrush_04-activities-act6bossrush-level_bossrush6_04.json @@ -1984,9 +1984,7 @@ -10.63 ], [ - -7.767389648510402, - -7.1, - -13.031340013522145 +-7.91026368 , -7.09102322, -11.50721891 ] ], "width": 31 diff --git a/resource/version.json b/resource/version.json index c8d9e1ac8f..c12337643c 100644 --- a/resource/version.json +++ b/resource/version.json @@ -7,5 +7,5 @@ "pool": "跨年欢庆·中坚", "time": 1766606400 }, - "last_updated": "2025-12-29 07:30:07.000" + "last_updated": "2025-12-31 10:30:07.000" } diff --git a/src/MaaCore/Task/BattleHelper.cpp b/src/MaaCore/Task/BattleHelper.cpp index 13421e696b..b93506fcaa 100644 --- a/src/MaaCore/Task/BattleHelper.cpp +++ b/src/MaaCore/Task/BattleHelper.cpp @@ -355,7 +355,7 @@ cv::Mat asst::BattleHelper::get_top_view(const cv::Mat& cam_img, bool side) }; std::vector screen_points; for (const auto& point : world_points) { - cv::Vec3d temp { point.x, -point.y, -0.3967874050140381 }; + cv::Vec3d temp { point.x + m_map_data.view[0].x, -point.y, Map::TileCalc2::rel_pos_z }; auto screen_pt = Map::TileCalc2::world_to_screen(m_map_data, temp, true); screen_points.push_back(screen_pt); }