xtaodada/StarRailCopilot
1
0
Fork 0
mirror of https://github.com/LmeSzinc/StarRailCopilot.git synced 2024-11-25 01:49:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Avoid interrupting human contact in daemon

Browse Source
This commit is contained in:
LmeSzinc 2024-01-17 19:08:16 +08:00
parent 6214c8d494
commit 98876f9245
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tasks/base/daemon.py
View File

@ -1,5 +1,6 @@
from module.base.timer import Timer from module.base.timer import Timer
from module.daemon.daemon_base import DaemonBase from module.daemon.daemon_base import DaemonBase
from module.device.method import maatouch
from module.logger import logger from module.logger import logger
from tasks.base.assets.assets_base_daemon import * from tasks.base.assets.assets_base_daemon import *
from tasks.base.main_page import MainPage from tasks.base.main_page import MainPage
@ -10,6 +11,17 @@ from tasks.map.interact.aim import AimDetectorMixin
from tasks.rogue.route.base import RouteBase from tasks.rogue.route.base import RouteBase
class SecondaryMaatouchBuilder(maatouch.MaatouchBuilder):
def __init__(self, device, contact=0, handle_orientation=False):
"""
Click on secondary contact to avoid interruption of real-person contact
"""
super().__init__(device, contact=1, handle_orientation=handle_orientation)
maatouch.MaatouchBuilder = SecondaryMaatouchBuilder
class Daemon(RouteBase, DaemonBase, AimDetectorMixin): class Daemon(RouteBase, DaemonBase, AimDetectorMixin):
aim_interval = Timer(0.3, count=1) aim_interval = Timer(0.3, count=1)
@ -40,6 +52,12 @@ class Daemon(RouteBase, DaemonBase, AimDetectorMixin):
def run(self): def run(self):
# Rebind daemon settings along with rogue settings # Rebind daemon settings along with rogue settings
self.config.bind('Daemon', func_list=['Rogue']) self.config.bind('Daemon', func_list=['Rogue'])
# Check contact
builder = self.device.maatouch_builder
if builder.contact >= 1:
logger.info(f'Maatouch contact on {builder.contact}')
else:
logger.warning(f'Maatouch contact on {builder.contact}, may cause interruptions')
teleport_confirm = Timer(1, count=5) teleport_confirm = Timer(1, count=5)
while 1: while 1: