mower-ng/mower-ng
4
0
Fork 0
Code Issues 51 Pull requests 1 Wiki Activity

避免顶号报错

Browse source
This commit is contained in:
Elaina 2024-12-26 23:22:47 +08:00
parent 1aad7b06a9
commit bc875e3ff9
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mower/solvers/rogue/node_option_select.py
View file

@ -36,9 +36,7 @@ class NodeOptionSelectSolver(SceneGraphSolver):
return [] return []
def transition(self): def transition(self):
if (scene := self.scene()) == Scene.ROGUE_MAIN: if (scene := self.scene()) == Scene.ROGUE_NODE_OPTION_SELECT:
return True
elif scene == Scene.ROGUE_NODE_OPTION_SELECT:
if pos := self.find("rogue/node_check_to_do"): if pos := self.find("rogue/node_check_to_do"):
self.ctap(pos, 3) self.ctap(pos, 3)
return return
@ -46,6 +44,9 @@ class NodeOptionSelectSolver(SceneGraphSolver):
if pos := find_text(option, 36, scope=((1270, 70), (1920, 940))): if pos := find_text(option, 36, scope=((1270, 70), (1920, 940))):
self.ctap(pos, 3) self.ctap(pos, 3)
return return
elif scene in self.waiting_scene:
else: self.waiting_solver()
elif scene == Scene.ROGUE_NODE_LOADING:
self.scene_graph_step(Scene.ROGUE_MAIN) self.scene_graph_step(Scene.ROGUE_MAIN)
else:
return True

4
mower/solvers/rogue/utils/detect_node.py
View file

@ -7,7 +7,7 @@ from mower.utils.image import loadres, template, thres2
from mower.utils.log import logger from mower.utils.log import logger
from mower.utils.vector import in_scope from mower.utils.vector import in_scope
from .whole_scene import WholeScene from .whole_scene import get_whole_scene
class NodeDetector: class NodeDetector:
@ -15,7 +15,7 @@ class NodeDetector:
self.edges = [] self.edges = []
self.rectangles = [] self.rectangles = []
data.nodes = {} data.nodes = {}
WholeScene().get_whole_scene(draw) data.scene_image = get_whole_scene(draw)
self.detect_roads_and_rectangles() self.detect_roads_and_rectangles()
self.detect_nodes() self.detect_nodes()
self.detect_x_edges() self.detect_x_edges()