|
@@ -283,7 +283,7 @@ class BaseTask(GlobalGameAssets):
|
|
|
# logger.info(f'Swipe {swipe.name}')
|
|
# logger.info(f'Swipe {swipe.name}')
|
|
|
self.interval_timer[swipe.name].reset()
|
|
self.interval_timer[swipe.name].reset()
|
|
|
|
|
|
|
|
- def click(self, click: Union[RuleClick, RuleLongClick] = None, interval: float = None) -> None:
|
|
|
|
|
|
|
+ def click(self, click: Union[RuleClick, RuleLongClick] = None, interval: float = None) -> bool:
|
|
|
"""
|
|
"""
|
|
|
点击或者长按
|
|
点击或者长按
|
|
|
:param interval:
|
|
:param interval:
|
|
@@ -291,7 +291,7 @@ class BaseTask(GlobalGameAssets):
|
|
|
:return:
|
|
:return:
|
|
|
"""
|
|
"""
|
|
|
if not click:
|
|
if not click:
|
|
|
- return
|
|
|
|
|
|
|
+ return False
|
|
|
|
|
|
|
|
if interval:
|
|
if interval:
|
|
|
if click.name in self.interval_timer:
|
|
if click.name in self.interval_timer:
|
|
@@ -303,7 +303,7 @@ class BaseTask(GlobalGameAssets):
|
|
|
self.interval_timer[click.name] = Timer(interval)
|
|
self.interval_timer[click.name] = Timer(interval)
|
|
|
# 如果时间还没到达,则不执行
|
|
# 如果时间还没到达,则不执行
|
|
|
if not self.interval_timer[click.name].reached():
|
|
if not self.interval_timer[click.name].reached():
|
|
|
- return
|
|
|
|
|
|
|
+ return False
|
|
|
|
|
|
|
|
x, y = click.coord()
|
|
x, y = click.coord()
|
|
|
if isinstance(click, RuleLongClick):
|
|
if isinstance(click, RuleLongClick):
|
|
@@ -314,6 +314,8 @@ class BaseTask(GlobalGameAssets):
|
|
|
# 执行后,如果有限制时间,则重置限制时间
|
|
# 执行后,如果有限制时间,则重置限制时间
|
|
|
if interval:
|
|
if interval:
|
|
|
self.interval_timer[click.name].reset()
|
|
self.interval_timer[click.name].reset()
|
|
|
|
|
+ return True
|
|
|
|
|
+ return False
|
|
|
|
|
|
|
|
def ocr_appear(self, target: RuleOcr, interval: float = None) -> bool:
|
|
def ocr_appear(self, target: RuleOcr, interval: float = None) -> bool:
|
|
|
"""
|
|
"""
|