!2 add back4

dongri_pic.py

@@ -14,6 +14,7 @@ class place_img:
     back1 = R'dongri_img\place\back1.png'
     back2 = R'dongri_img\place\back2.png'
     back3 = R'dongri_img\place\back3.png'
+    back4 = R'dongri_img\place\back4.png'
     gameIn = R'dongri_img\place\gameIn.png'
     gameIn2 = R'dongri_img\place\gameIn2.png'
     town = R'dongri_img\place\town.png'

dongri_task.py

@@ -110,7 +110,7 @@ class basic_operate:
         ret |= waitClickImg_noWait_withBool(place_img.back1, 0.6, 0)
         if ret:
             return
-        ret |= waitClickImg_noWait_withBool(place_img.back2, 0.6, 0)
+        ret |= waitClickImg_noWait_withBool([place_img.back2, place_img.back4], 0.6, 0)
         if ret:
             return
         ret, pos = waitFindImg(place_img.title, 1, 0)
@@ -1577,12 +1577,16 @@ class task_testFun(dongri_task):
     def __init__(self):
         super().__init__(f"测试功能")
     def run(self):
-        task_paticipateInTeam().run()
+        ret1, powerPos = pcacc_img.find_img_origin(special_activity_img.power_empty)
+        ret2, plusPos = pcacc_img.find_img_origin(special_activity_img.plus_small)
+        #task_paticipateInTeam().run()
         return True
 
 if __name__ == '__main__':
+    myTimeSleep_big()
     #task_checkPower().run()
-    task_checkActivities().run()
+    task_testFun().run()
+    #task_checkActivities().run()
     #print(get_todo_time("巨熊行动"))
     #task_check_Research().run()
     #save_game_screen()
@@ -1618,7 +1622,7 @@ if __name__ == '__main__':
     #task_collect(3).run()
     #task_collect(4).run()
     #task_returnAllLine().run()
-    task_paticipateInTeam().run()
+    #task_paticipateInTeam().run()
     #task_fight_jina(True).run()
     #task_get_redPackage().run()
     #task_read_mails().run()

scriptBase/imgFind.py

@@ -216,10 +216,10 @@ class pcacc_img:
             dst_x = position.left
             dst_y = position.top
 
-            print(f"{image_path}：({dst_x}, {dst_y})")
+            print(f"{image_path} origin：({dst_x}, {dst_y})")
             return True, (dst_x, dst_y)
         else:
-            print(f"{image_path}图片未找到")
+            print(f"{image_path} origin：图片未找到")
             return False, (-1, -1)
         
     def find_img_down(image_path):