!2 fight bear disacard date

dongri_pic.py

@@ -268,7 +268,7 @@ class special_activity_img:
     move_down = (234,624,237,488)
 
     bigMonster = R'dongri_img\special_activity\bigMonster.png'
-    bigMonster_2 = R'dongri_img\monster\bigMonster_2.png'
+    bigMonster_2 = R'dongri_img\special_activity\bigMonster_2.png'
     owning = R'dongri_img\special_activity\owning.png'
     owning2 = R'dongri_img\special_activity\owning2.png'
     owning_120 = R'dongri_img\special_activity\owning_120.png'

dongri_task.py

@@ -1134,7 +1134,7 @@ class task_activity_lianmeng(dongri_task):
             return False
 
         
-
+        doTask_arr = [special_activity_img.shili_120_2, special_activity_img.shili_860_2, special_activity_img.shili_430, special_activity_img.bigMonster_2]
         
         waitClickImg_noWait_withBool(special_activity_img.task_done, 1, 0.5)
         
@@ -1142,7 +1142,7 @@ class task_activity_lianmeng(dongri_task):
             down_tryTimes = 3
             while down_tryTimes > 0:
                 down_tryTimes -= 1
-                if waitClickImg_noWait_withBool((special_activity_img.shili_120_2, special_activity_img.shili_860_2, special_activity_img.shili_430), 1, 0.5, True) == True:
+                if waitClickImg_noWait_withBool(doTask_arr, 1, 0.5, True) == True:
                     if waitClickImg_noWait_withBool(special_activity_img.accept_task, 2, 1) == False:
                         return False
                     break
@@ -1220,6 +1220,18 @@ class task_checkActivities(dongri_task):
         if activityStr:
             todo_msg = activityStr
             print(todo_msg)
+
+            date_pattern = r"\d{4}-\d{2}-\d{2}"
+
+            for i, item in enumerate(todo_msg):
+                if re.fullmatch(date_pattern, item):  # 检查是否完全匹配日期格式
+                    activityStr = todo_msg[:i]  # 保留日期之前的内容
+                    break
+            else:
+                activityStr = todo_msg  # 如果没有找到日期，保留全部
+
+            print("去掉日期",activityStr)
+
             result = []
             
             judianArr = self.find_all_matching_events(activityStr, "据点")
@@ -1516,6 +1528,7 @@ class task_duanwu(dongri_task):
 
 
 if __name__ == '__main__':
+    #task_checkActivities().run()
     #print(get_todo_time("巨熊行动"))
     #task_check_Research().run()
     #save_game_screen()