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

选人后左滑到最左边

Browse source
This commit is contained in:
EightyDollars 2024-11-02 15:57:21 +08:00
parent 5165c635aa
commit 49a8a9b1da
2 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
mower/solvers/infra/base_choose.py
View file

@ -28,6 +28,7 @@ class RIIC_ChooseSolver(SceneGraphSolver):
# self.final_check = False # self.final_check = False
# self.check = [] # self.check = []
self.tmp_data = None self.tmp_data = None
self.tmp_left = None
self.wait_time = wait_time self.wait_time = wait_time
self.room = room self.room = room
@ -58,16 +59,23 @@ class RIIC_ChooseSolver(SceneGraphSolver):
agent_name = self.agent[0] agent_name = self.agent[0]
if agent_name == "Free": if agent_name == "Free":
RIIC_FreeFillSolver().run() self.choosed.append(RIIC_FreeFillSolver().run())
self.agent = None self.agent = None
return return
agents = dict(operator_room_select(config.recog.img)) agents = dict(operator_room_select(config.recog.img))
for i in agents:
if self.is_choosed(agents[i]):
if i not in self.agents and i not in self.choosed:
self.tap_element("choose_agent/clear", interval=0.1)
return
if agent_name in agents.keys(): if agent_name in agents.keys():
if self.is_choosed(agents[agent_name]): if self.is_choosed(agents[agent_name]):
logger.debug(f"干员选好：{self.agent}") logger.debug(f"干员选好：{self.agent}")
self.choosed.append(agent_name) self.choosed.append(agent_name)
self.tmp_left = None
self.agent = None self.agent = None
return return
@ -80,6 +88,16 @@ class RIIC_ChooseSolver(SceneGraphSolver):
) )
return return
elif self.agent[1]: # 筛一下职业 elif self.agent[1]: # 筛一下职业
logger.info(f"{self.tmp_left} {list(agents.keys())[0]} ")
if self.tmp_left is None:
self.tmp_left = list(agents.keys())[0]
self.swipe_noinertia((1000, 540), (300, 0))
return
elif self.tmp_left != list(agents.keys())[0]:
self.swipe_noinertia((1000, 540), (1000, 0))
self.tmp_left = list(agents.keys())[0]
return
if agent_name == "阿米娅": if agent_name == "阿米娅":
tag = "ALL" tag = "ALL"
else: else:
@ -88,7 +106,7 @@ class RIIC_ChooseSolver(SceneGraphSolver):
self.agent[1] = False self.agent[1] = False
self.sleep(self.interval) self.sleep(self.interval)
return return
if list(agents.keys())[-1] == self.tmp_data or list(agents.keys())[-1] is None: if list(agents.keys())[-1] == self.tmp_data or list(agents.keys())[-1] is None:
raise ValueError(f"选择干员: {self.agent}失败 滑动次数过多") raise ValueError(f"选择干员: {self.agent}失败 滑动次数过多")
@ -155,6 +173,7 @@ class RIIC_ChooseSolver(SceneGraphSolver):
self.sleep(self.check_wait_time()) self.sleep(self.check_wait_time())
self.tap_element("confirm_blue") self.tap_element("confirm_blue")
self.success = True self.success = True
elif self.find("room_detail"): elif self.find("room_detail"):
if self.success: if self.success:
return True return True

4
mower/solvers/infra/riic_free_fill.py
View file

@ -15,7 +15,9 @@ class RIIC_FreeFillSolver(SceneGraphSolver):
self.agent = None self.agent = None
self.filterd = False self.filterd = False
self.tap_time = datetime.now() # 临时解决 self.tap_time = datetime.now() # 临时解决
return super().run() super().run()
return self.agent
def fill_agent(self): def fill_agent(self):
if (self.tap_time - datetime.now()).total_seconds() > 180: if (self.tap_time - datetime.now()).total_seconds() > 180: