!2 add pet check

app_dongri.py

@@ -244,7 +244,7 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
             task_queue.appendleft(task_checkDonata())
             task_queue.appendleft(task_useAnnimalSkill())
             task_queue.appendleft(task_checkHelp(False))
-            if not auto_participate:
+            if auto_participate:
                 task_queue.appendleft(task_checkConfilits())
         if times == 10:
             handle_end_game()

dongri_pic.py

@@ -114,7 +114,7 @@ class check_img:
     detect = R'dongri_img\check\detect.png'
     yongbing_fight = R'dongri_img\check\yongbing_fight.png'
     line_orc = (193,159,250,180)
-    pet_findtreature = R'dongri_img\check\pet_findtreature.png'
+    pet_findtreature = R'dongri_img\check\pet_findtreasure.png'
     pet_success = R'dongri_img\check\pet_success.png'
     pet_getRegion = (252, 485, 340, 537)
     pet_advance = R'dongri_img\check\pet_advance.png'

dongri_task.py

@@ -500,14 +500,25 @@ class task_checkStoreRoom(dongri_task):
         if waitClickImg_noWait_withBool((train_img.train_success, check_img.needgo), 2, 1) == False:
             return False
         myTimeSleep_big()
-        pcacc_mouse.quickclick_current()
-        if waitClickImg_noWait_withBool((check_img.storeroom, check_img.storeroom2, check_img.invite_free), 2, 1) == False:
-            return False
-        
-        pcacc_mouse.quickclick_current()
+        if waitFindImg_withBool(check_img.pet_findtreature, 2, 1) == False:
+            pcacc_mouse.quickclick_current()
+            if waitClickImg_noWait_withBool((check_img.storeroom, check_img.storeroom2, check_img.invite_free), 2, 1) == False:
+                return False
+            
+            pcacc_mouse.quickclick_current()
+
+            waitClickImg_noWait_withBool(check_img.store_strength, 2, 1)
+            waitClickImg_noWait_withBool((check_img.get,check_img.bigGet), 2, 1)
+        else:
+            if waitClickImg_noWait_withBool(check_img.pet_success, 2, 1):
+                dstPos = get_yys_random_point(check_img.pet_getRegion)
+                pcacc_mouse.click(dstPos[0], dstPos[1])
+            elif waitClickImg_noWait_withBool((check_img.pet_advance, check_img.pet_senior, check_img.pet_junior), 2, 1):
+                waitClickImg_noWait_withBool(check_img.pet_gotreature, 2, 1)
+                waitClickImg_noWait_withBool(check_img.pet_begintreature, 2, 1)
+
+
 
-        waitClickImg_noWait_withBool(check_img.store_strength, 2, 1)
-        waitClickImg_noWait_withBool((check_img.get,check_img.bigGet), 2, 1)
         return True
     
 class task_checkConfilits(dongri_task):
@@ -774,13 +785,13 @@ class task_activity_lianmeng(dongri_task):
 
 
 if __name__ == '__main__':
-    basic_operate.get_line_num()
+    #basic_operate.get_line_num()
     #yys_ocrAuto(check_img.line_orc)
     #basic_operate.go_town()
     #basic_operate.add_strength()
     #task_fightMonster(False, True).run()
     #task_checkHelp().run()
-    #task_checkStoreRoom().run()
+    task_checkStoreRoom().run()
     #task_activity_lianmeng().run()
     #task_fight_yongbing(True).run()
     #task_collect([4,3,2,1]).run()