diff --git a/resource/roguelike/JieGarden/map.json b/resource/roguelike/JieGarden/map.json index c2d74ae587..137b4382b2 100644 --- a/resource/roguelike/JieGarden/map.json +++ b/resource/roguelike/JieGarden/map.json @@ -7,7 +7,10 @@ }, { "type": "EmergencyOps", - "template": ["JieGarden@Roguelike@MapNodeEmergencyOps.png", "JieGarden@Roguelike@MapNodeEmergencyOpsGrey.png"] + "template": [ + "JieGarden@Roguelike@MapNodeEmergencyOps.png", + "JieGarden@Roguelike@MapNodeEmergencyOpsGrey.png" + ] }, { "type": "Encounter", @@ -19,7 +22,10 @@ }, { "type": "BoskyPassage", - "template": ["JieGarden@Roguelike@MapNodeBoskyPassage.png", "JieGarden@Roguelike@MapNodeBoskyPassageGrey.png"] + "template": [ + "JieGarden@Roguelike@MapNodeBoskyPassage.png", + "JieGarden@Roguelike@MapNodeBoskyPassageGrey.png" + ] } ] } diff --git a/resource/tasks/Roguelike/JieGarden.json b/resource/tasks/Roguelike/JieGarden.json index 5c8599b518..a39998a0bf 100644 --- a/resource/tasks/Roguelike/JieGarden.json +++ b/resource/tasks/Roguelike/JieGarden.json @@ -436,7 +436,7 @@ "JieGarden@Roguelike@LeaveOperation": { "roi": [41, 22, 78, 71], "action": "ClickSelf", - "next":["JieGarden@Roguelike@GiveUpOperation", "JieGarden@Roguelike@LeaveOperation"] + "next": ["JieGarden@Roguelike@GiveUpOperation", "JieGarden@Roguelike@LeaveOperation"] }, "JieGarden@Roguelike@GiveUpOperation": { "algorithm": "OcrDetect", @@ -450,10 +450,7 @@ "text": ["放弃行动"], "roi": [770, 470, 150, 45], "action": "ClickSelf", - "next": [ - "JieGarden@Roguelike@OperationFailed", - "JieGarden@Roguelike@ConfirmToGiveUp" - ] + "next": ["JieGarden@Roguelike@OperationFailed", "JieGarden@Roguelike@ConfirmToGiveUp"] }, "JieGarden@Roguelike@OperationFailed": { "baseTask": "JieGarden@Roguelike@MissionFailedFlag", diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@DialogConfirmRed.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@DialogConfirmRed.png index fa8e5f88e9..252f82993c 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@DialogConfirmRed.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@DialogConfirmRed.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@LeaveOperation.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@LeaveOperation.png index fa76c90d24..3e13be1d24 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@LeaveOperation.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@LeaveOperation.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoons.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoons.png index 6a71c2cc56..e0dcb73723 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoons.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoons.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoonsGrey.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoonsGrey.png index 77779d4d26..9ca522ceae 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoonsGrey.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoonsGrey.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoskyPassage.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoskyPassage.png index c3d745e36e..fcd9015386 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoskyPassage.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoskyPassage.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoskyPassageGrey.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoskyPassageGrey.png index 5558ca62cc..1ddf57ac25 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoskyPassageGrey.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoskyPassageGrey.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeCombatOps.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeCombatOps.png index 649b8b9626..75b4dc4b4a 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeCombatOps.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeCombatOps.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeCombatOpsGrey.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeCombatOpsGrey.png index f24b0401cb..3f0d5bd968 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeCombatOpsGrey.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeCombatOpsGrey.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEmergencyOps.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEmergencyOps.png index 96d20bea4b..cf29193502 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEmergencyOps.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEmergencyOps.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEmergencyOpsGrey.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEmergencyOpsGrey.png index ddf8f23753..7cea747b65 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEmergencyOpsGrey.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEmergencyOpsGrey.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEncounter.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEncounter.png index f2e98e7f09..0f6ae395c4 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEncounter.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEncounter.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEncounterGrey.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEncounterGrey.png index e7be41d250..a81f52b1dc 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEncounterGrey.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEncounterGrey.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeRogueTrader.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeRogueTrader.png index 0a1c896794..7136ead642 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeRogueTrader.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeRogueTrader.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeRogueTraderGrey.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeRogueTraderGrey.png index 9c33885986..72ad481d41 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeRogueTraderGrey.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeRogueTraderGrey.png differ diff --git a/src/MaaCore/Task/Roguelike/Map/RoguelikeMap.h b/src/MaaCore/Task/Roguelike/Map/RoguelikeMap.h index 1be08a621e..713625b886 100644 --- a/src/MaaCore/Task/Roguelike/Map/RoguelikeMap.h +++ b/src/MaaCore/Task/Roguelike/Map/RoguelikeMap.h @@ -81,8 +81,11 @@ public: // ———————— get map details ——————————————————————————————————————————————————————— [[nodiscard]] size_t size() const { return m_nodes.size(); } + [[nodiscard]] size_t get_num_columns() const { return m_column_indices.size(); } + [[nodiscard]] size_t get_curr_pos() const { return m_curr_pos; } + [[nodiscard]] size_t get_column_begin(const size_t& column) const; [[nodiscard]] size_t get_column_end(const size_t& column) const; [[nodiscard]] size_t get_next_node() const; @@ -113,6 +116,8 @@ private: std::vector m_nodes; std::vector m_column_indices; // m_column_indices[c] 代表列 c 的 node index 的上限 (exclusive) size_t m_curr_pos = 0; // 当前位置的 node index - RoguelikeNodeCostFun m_cost_fun = [&]([[maybe_unused]] const RoguelikeNodePtr& node) { return 0; }; + RoguelikeNodeCostFun m_cost_fun = [&]([[maybe_unused]] const RoguelikeNodePtr& node) { + return 0; + }; }; } diff --git a/src/MaaCore/Task/Roguelike/Map/RoguelikeRoutingTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/Map/RoguelikeRoutingTaskPlugin.cpp index a74664ce7f..7468cb04f0 100644 --- a/src/MaaCore/Task/Roguelike/Map/RoguelikeRoutingTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/Map/RoguelikeRoutingTaskPlugin.cpp @@ -342,7 +342,7 @@ void asst::RoguelikeRoutingTaskPlugin::generate_edges( const int rightmost_y = (rightmost_y_min_p.y + rightmost_y_max_p.y) / 2; if ((std::abs(prev_y - node_y) < m_direction_threshold && - std::abs(leftmost_y - rightmost_y) < m_direction_threshold) || + std::abs(leftmost_y - rightmost_y) < m_direction_threshold) || (prev_y < node_y && leftmost_y < rightmost_y - m_direction_threshold) || (prev_y > node_y && leftmost_y > rightmost_y + m_direction_threshold)) { m_map.add_edge(prev, node); diff --git a/src/MaaCore/Task/Roguelike/Map/RoguelikeRoutingTaskPlugin.h b/src/MaaCore/Task/Roguelike/Map/RoguelikeRoutingTaskPlugin.h index 9d788cb058..a3f4cd94e5 100644 --- a/src/MaaCore/Task/Roguelike/Map/RoguelikeRoutingTaskPlugin.h +++ b/src/MaaCore/Task/Roguelike/Map/RoguelikeRoutingTaskPlugin.h @@ -36,9 +36,8 @@ private: /// 画面最左侧节点 (忽视 init node) 所在列的 index。 /// 按照定义,要求 leftmost_column >= 1。 /// - /// ASST_DEBUG 模式下用于标注识别结果的截图。若为 std::nullopt 则不标注识别结果。 - /// - /// 若有新地图信息,则返回 true, 反之则返回 false。 + /// ASST_DEBUG 模式下用于标注识别结果的截图。若为 std::nullopt + /// 则不标注识别结果。 若有新地图信息,则返回 true, 反之则返回 false。 /// /// /// 画面中最多同时存在三列节点。