重写领取邮件；tap_element并入tap
This commit is contained in:
parent
fd7b82892d
commit
4d01bf76cf
53 changed files with 206 additions and 178 deletions
|
|
@ -290,7 +290,7 @@ class ReclamationAlgorithm(SceneGraphSolver):
|
|||
logger.debug(f"剩余决断次数：{self.ap}")
|
||||
|
||||
def map_back(self):
|
||||
self.tap_element("ra/map_back", thres=200)
|
||||
self.tap("ra/map_back", thres=200)
|
||||
|
||||
def detect_score(self, scope=None, find_max=True):
|
||||
if find_max and self.find("ra/max", scope=scope, score=0.7):
|
||||
|
|
@ -338,7 +338,7 @@ class ReclamationAlgorithm(SceneGraphSolver):
|
|||
elif scene == Scene.TERMINAL_MAIN:
|
||||
self.tap_terminal_button("longterm")
|
||||
elif scene == Scene.TERMINAL_LONGTERM:
|
||||
self.tap_element("terminal_longterm_reclamation_algorithm")
|
||||
self.tap("terminal_longterm_reclamation_algorithm")
|
||||
|
||||
# 从生息演算主页进入生息演算
|
||||
elif scene == Scene.RA_MAIN:
|
||||
|
|
@ -346,7 +346,7 @@ class ReclamationAlgorithm(SceneGraphSolver):
|
|||
if pos := self.find("ra/start_button"):
|
||||
self.tap(pos, interval=8)
|
||||
else:
|
||||
self.tap_element("ra/continue_button", interval=3)
|
||||
self.tap("ra/continue_button", interval=3)
|
||||
|
||||
# 剧情
|
||||
elif scene == Scene.RA_GUIDE_ENTRANCE:
|
||||
|
|
@ -354,7 +354,7 @@ class ReclamationAlgorithm(SceneGraphSolver):
|
|||
self.tap(pos, x_rate=2, y_rate=1.5, interval=0.5)
|
||||
elif scene == Scene.RA_GUIDE_BATTLE_ENTRANCE:
|
||||
self.battle_wait = 3
|
||||
self.tap_element("ra/start_action", interval=5)
|
||||
self.tap("ra/start_action", interval=5)
|
||||
elif scene == Scene.RA_GUIDE_DIALOG:
|
||||
self.battle_wait = 0
|
||||
self.fast_tap((1631, 675))
|
||||
|
|
@ -364,7 +364,7 @@ class ReclamationAlgorithm(SceneGraphSolver):
|
|||
if self.battle_task in self.task_queue:
|
||||
self.task_queue.remove(self.battle_task)
|
||||
self.ap -= 1
|
||||
self.tap_element("ra/start_action")
|
||||
self.tap("ra/start_action")
|
||||
elif scene == Scene.RA_BATTLE:
|
||||
if self.battle_wait > 0:
|
||||
self.battle_wait -= 1
|
||||
|
|
@ -375,9 +375,9 @@ class ReclamationAlgorithm(SceneGraphSolver):
|
|||
else:
|
||||
config.recog.update()
|
||||
elif scene == Scene.RA_BATTLE_EXIT_CONFIRM:
|
||||
self.tap_element("ra/confirm_green", interval=0.5)
|
||||
self.tap("ra/confirm_green", interval=0.5)
|
||||
elif scene == Scene.RA_BATTLE_COMPLETE:
|
||||
self.tap_element("ra/battle_complete", interval=0.5)
|
||||
self.tap("ra/battle_complete", interval=0.5)
|
||||
|
||||
# 结算界面
|
||||
elif scene == Scene.RA_DAY_COMPLETE:
|
||||
|
|
@ -521,9 +521,9 @@ class ReclamationAlgorithm(SceneGraphSolver):
|
|||
self.battle_task = place
|
||||
config.recog.update()
|
||||
elif scene == Scene.RA_DAY_DETAIL:
|
||||
self.tap_element("ra/waste_time_button", interval=0.5)
|
||||
self.tap("ra/waste_time_button", interval=0.5)
|
||||
elif scene == Scene.RA_WASTE_TIME_DIALOG:
|
||||
self.tap_element("ra/confirm_green")
|
||||
self.tap("ra/confirm_green")
|
||||
|
||||
# 作战编队
|
||||
elif scene == Scene.RA_SQUAD_EDIT:
|
||||
|
|
@ -531,34 +531,34 @@ class ReclamationAlgorithm(SceneGraphSolver):
|
|||
self.left_kitchen = False
|
||||
self.tap((1430, 1015), interval=0.5)
|
||||
else:
|
||||
self.tap_element("ra/squad_edit_start_button", interval=0.5)
|
||||
self.tap("ra/squad_edit_start_button", interval=0.5)
|
||||
elif scene == Scene.RA_SQUAD_EDIT_DIALOG:
|
||||
self.tap_element("ra/confirm_red", interval=6)
|
||||
self.tap("ra/confirm_red", interval=6)
|
||||
elif scene == Scene.RA_SQUAD_ABNORMAL:
|
||||
self.tap_element("ra/confirm_red", interval=6)
|
||||
self.tap("ra/confirm_red", interval=6)
|
||||
|
||||
# 烹饪台
|
||||
elif scene == Scene.RA_KITCHEN:
|
||||
if self.left_kitchen:
|
||||
self.tap_element("ra/return_from_kitchen", x_rate=0.07)
|
||||
self.tap("ra/return_from_kitchen", x_rate=0.07)
|
||||
return
|
||||
last_drink = self.detect_prepared()
|
||||
while last_drink < 2:
|
||||
self.tap_element("ra/auto+1", interval=0.5)
|
||||
self.tap("ra/auto+1", interval=0.5)
|
||||
drink = self.detect_prepared()
|
||||
if drink == last_drink:
|
||||
logger.debug("饮料无法合成，返回地图，清空任务列表")
|
||||
self.task_queue = []
|
||||
self.tap_element("ra/return_from_kitchen", x_rate=0.07)
|
||||
self.tap_element("ra/squad_back")
|
||||
self.tap("ra/return_from_kitchen", x_rate=0.07)
|
||||
self.tap("ra/squad_back")
|
||||
self.map_back()
|
||||
return
|
||||
last_drink = drink
|
||||
self.tap_element("ra/cook_button", interval=0.5)
|
||||
self.tap("ra/cook_button", interval=0.5)
|
||||
|
||||
# 能量饮料不足
|
||||
elif scene == Scene.RA_INSUFFICIENT_DRINK:
|
||||
self.tap_element("ra/dialog_cancel")
|
||||
self.tap("ra/dialog_cancel")
|
||||
|
||||
# 获得物资
|
||||
elif scene == Scene.RA_GET_ITEM:
|
||||
|
|
@ -569,7 +569,7 @@ class ReclamationAlgorithm(SceneGraphSolver):
|
|||
self.tap((428, 411), interval=0.5)
|
||||
else:
|
||||
self.left_kitchen = True
|
||||
self.tap_element("ra/return_from_kitchen", x_rate=0.07)
|
||||
self.tap("ra/return_from_kitchen", x_rate=0.07)
|
||||
else:
|
||||
self.sleep(0.5)
|
||||
|
||||
|
|
@ -585,15 +585,15 @@ class ReclamationAlgorithm(SceneGraphSolver):
|
|||
if scene == Scene.CONNECTING:
|
||||
self.sleep()
|
||||
elif scene in [Scene.RA_MAIN, Scene.TERMINAL_LONGTERM, Scene.TERMINAL_MAIN]:
|
||||
self.tap_element("nav_button", x_rate=0.21)
|
||||
self.tap("nav_button", x_rate=0.21)
|
||||
elif scene in [Scene.RA_MAP, Scene.RA_DAY_DETAIL, Scene.RA_BATTLE_ENTRANCE]:
|
||||
self.map_back()
|
||||
elif scene == Scene.RA_SQUAD_EDIT:
|
||||
self.tap_element("ra/squad_back")
|
||||
self.tap("ra/squad_back")
|
||||
elif scene == Scene.RA_KITCHEN:
|
||||
self.tap_element("ra/return_from_kitchen", x_rate=0.07)
|
||||
self.tap("ra/return_from_kitchen", x_rate=0.07)
|
||||
elif scene in [Scene.RA_SQUAD_EDIT_DIALOG, Scene.RA_WASTE_TIME_DIALOG]:
|
||||
self.tap_element("ra/dialog_cancel")
|
||||
self.tap("ra/dialog_cancel")
|
||||
elif 900 < scene < 1000:
|
||||
self.move_forward(scene)
|
||||
else:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue