|
@@ -781,9 +781,12 @@ class task_cure(dongri_task):
|
|
|
|
|
|
if waitClickImg_noWait_withBool(check_img.help4, 2, 1) == False:
|
|
if waitClickImg_noWait_withBool(check_img.help4, 2, 1) == False:
|
|
return False
|
|
return False
|
|
|
|
+ else:
|
|
|
|
+ maxTryTimes = 50
|
|
|
|
+ while waitClickImg_noWait_withBool((check_img.cure, check_img.help4), 30, 1) and maxTryTimes >= 0:
|
|
|
|
+ maxTryTimes -= 1
|
|
|
|
+ continue
|
|
|
|
|
|
- while waitClickImg_noWait_withBool((check_img.cure, check_img.help4), 50, 1):
|
|
|
|
- continue
|
|
|
|
|
|
|
|
return True
|
|
return True
|
|
|
|
|
|
@@ -846,7 +849,6 @@ class task_checkMaster(dongri_task):
|
|
return True
|
|
return True
|
|
|
|
|
|
class task_checkActivities(dongri_task):
|
|
class task_checkActivities(dongri_task):
|
|
-
|
|
|
|
def __init__(self):
|
|
def __init__(self):
|
|
super().__init__(f"检查各种活动时间")
|
|
super().__init__(f"检查各种活动时间")
|
|
def find_all_matching_events(parts, input_word):
|
|
def find_all_matching_events(parts, input_word):
|
|
@@ -876,10 +878,16 @@ 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
|
|
- '''
|
|
|
|
|
|
+ print(todo_msg)
|
|
result = []
|
|
result = []
|
|
|
|
+ '''
|
|
|
|
+ ['北京时间', '2025-04-01', '据点争夺', '07:00', '3级科技工程站']
|
|
|
|
+ judianArr = self.find_all_matching_events(activityStr, "据点")
|
|
|
|
+ result.extend(judianArr)
|
|
|
|
+
|
|
baoleiArr = self.find_all_matching_events(activityStr, "堡垒")
|
|
baoleiArr = self.find_all_matching_events(activityStr, "堡垒")
|
|
result.extend(baoleiArr)
|
|
result.extend(baoleiArr)
|
|
|
|
+
|
|
juxiongArr = self.find_all_matching_events(activityStr, "巨熊")
|
|
juxiongArr = self.find_all_matching_events(activityStr, "巨熊")
|
|
result.extend(juxiongArr)
|
|
result.extend(juxiongArr)
|
|
yaosaiArr = self.find_all_matching_events(activityStr, "要塞")
|
|
yaosaiArr = self.find_all_matching_events(activityStr, "要塞")
|
|
@@ -893,7 +901,7 @@ class task_checkActivities(dongri_task):
|
|
|
|
|
|
|
|
|
|
if __name__ == '__main__':
|
|
if __name__ == '__main__':
|
|
- #task_checkActivities().run()
|
|
|
|
|
|
+ task_checkActivities().run()
|
|
#task_checkMaster().run()
|
|
#task_checkMaster().run()
|
|
#basic_operate.get_line_num()
|
|
#basic_operate.get_line_num()
|
|
#yys_ocrAuto(check_img.line_orc)
|
|
#yys_ocrAuto(check_img.line_orc)
|
|
@@ -914,5 +922,5 @@ if __name__ == '__main__':
|
|
#task_collect(3).run()
|
|
#task_collect(3).run()
|
|
#task_collect(4).run()
|
|
#task_collect(4).run()
|
|
#task_returnAllLine().run()
|
|
#task_returnAllLine().run()
|
|
- task_paticipateInTeam().run()
|
|
|
|
|
|
+ #task_paticipateInTeam().run()
|
|
#task_fight_jina(True).run()
|
|
#task_fight_jina(True).run()
|