!2 update task listcheck

dongri_pic.py

@@ -276,6 +276,10 @@ class special_activity_img:
     # 安全矿
     collection_friend = R'dongri_img\special_activity\collection_friend.png'
     big_collect = R'dongri_img\special_activity\big_collect.png'
+
+    # 查找每日列表
+    beijing_time = R'dongri_img\special_activity\beijing_time.png'
+    task_refresh = R'dongri_img\special_activity\task_refresh.png'
     
 def change_direction(direction):
     if len(direction) == 4:

dongri_task.py

@@ -50,6 +50,14 @@ def get_todo_msgList():
         todo_str += f'{item["item"]}:{item["time"]}</br>'
     return todo_str
 
+def get_todo_time(todo_str):
+    global todo_list
+
+    for item in todo_list:
+        if item['item'] == todo_str:
+            return item['time']
+    return None
+
 def fing_todoList_time(taskStr):
     for item in todo_list:
         if item['task'] == taskStr:
@@ -1075,6 +1083,9 @@ class task_checkActivities(dongri_task):
         if waitFindImg_withBool(check_img.todoList, 2, 1) == False:
             return False
         
+        if waitFindImg_withBool(special_activity_img.beijing_time, 1, 0) == True:
+            waitClickImg_noWait_withBool(special_activity_img.task_refresh, 1, 0)
+        
         activityStr = yys_ocrAuto(check_img.todo_region)
         if activityStr:
             todo_msg = activityStr
@@ -1082,15 +1093,15 @@ class task_checkActivities(dongri_task):
             result = []
             
             judianArr = self.find_all_matching_events(activityStr, "据点")
-            result.extend(judianArr)
+            #result.extend(judianArr)
             
             baoleiArr = self.find_all_matching_events(activityStr, "堡垒")
-            result.extend(baoleiArr)
+            #result.extend(baoleiArr)
             
             juxiongArr = self.find_all_matching_events(activityStr, "巨熊")
             result.extend(juxiongArr)
             yaosaiArr = self.find_all_matching_events(activityStr, "要塞")
-            result.extend(yaosaiArr)
+            #result.extend(yaosaiArr)
             todo_list = result
             print(todo_list)
             
@@ -1317,7 +1328,7 @@ class check_safe_collect(dongri_task):
             maxTryTimes -= 1
             myTimeSleep_big()
             mid_enemy_pos = get_yys_random_point(special_activity_img.mid_enemy_region)
-            pcacc_mouse.click(mid_enemy_pos[0], mid_enemy_pos[1])
+            pcacc_mouse.click(mid_enemy_pos[0], mid_enemy_pos[1]-20)
             myTimeSleep_big()
         
         if waitClickImg_noWait_withBool(special_activity_img.big_collect, 2, 1) == False:
@@ -1350,13 +1361,13 @@ if __name__ == '__main__':
     #task_gotoTree().run()
     #task_fight_jina_only().run()
     #task_checkConfilits().run()
-    #task_checkActivities().run()
+    task_checkActivities().run()
     #task_checkMaster().run()
     #basic_operate.get_line_num()
     #yys_ocrAuto(check_img.line_orc)
     #basic_operate.go_town()
     #basic_operate.add_strength()
-    task_fightMonster(False, False,False).run()
+    #task_fightMonster(False, False,False).run()
     #task_checkHelp().run()
     #task_checkStoreRoom().run()
     #task_start_game(0)