|
@@ -425,6 +425,7 @@ class task_collect(dongri_task):
|
|
else:
|
|
else:
|
|
self.type = None
|
|
self.type = None
|
|
self.line = None
|
|
self.line = None
|
|
|
|
+ super().__init__(f"采集None")
|
|
|
|
|
|
if isSimple:
|
|
if isSimple:
|
|
self.line = None
|
|
self.line = None
|
|
@@ -775,7 +776,7 @@ class task_useAnnimalSkill(dongri_task):
|
|
if waitClickImg_noWait_withBool(check_img.annimal_skill, 2, 1) == False:
|
|
if waitClickImg_noWait_withBool(check_img.annimal_skill, 2, 1) == False:
|
|
return False
|
|
return False
|
|
|
|
|
|
- if waitClickImg_noWait_withBool(check_img.wolf_skill, 2, 1) == False:
|
|
|
|
|
|
+ if waitClickImg_noWait_withBool((check_img.wolf_skill, check_img.elephant_skill), 2, 1) == False:
|
|
return False
|
|
return False
|
|
|
|
|
|
if waitClickImg_noWait_withBool((check_img.use, check_img.use2), 2, 1) == False:
|
|
if waitClickImg_noWait_withBool((check_img.use, check_img.use2), 2, 1) == False:
|
|
@@ -856,6 +857,7 @@ class task_checkActivities(dongri_task):
|
|
activityStr = yys_ocrAuto(check_img.todo_region)
|
|
activityStr = yys_ocrAuto(check_img.todo_region)
|
|
if activityStr:
|
|
if activityStr:
|
|
todo_msg = activityStr
|
|
todo_msg = activityStr
|
|
|
|
+ '''
|
|
result = []
|
|
result = []
|
|
baoleiArr = self.find_all_matching_events(activityStr, "堡垒")
|
|
baoleiArr = self.find_all_matching_events(activityStr, "堡垒")
|
|
result.extend(baoleiArr)
|
|
result.extend(baoleiArr)
|
|
@@ -864,6 +866,7 @@ class task_checkActivities(dongri_task):
|
|
yaosaiArr = self.find_all_matching_events(activityStr, "要塞")
|
|
yaosaiArr = self.find_all_matching_events(activityStr, "要塞")
|
|
result.extend(yaosaiArr)
|
|
result.extend(yaosaiArr)
|
|
todo_list = result
|
|
todo_list = result
|
|
|
|
+ '''
|
|
return activityStr
|
|
return activityStr
|
|
|
|
|
|
|
|
|