소스 검색

!2 add shili 860 2

pcacc 4 달 전
부모
커밋
4984342c37
4개의 변경된 파일5개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 1
      app_dongri.py
  2. BIN
      dongri_img/special_activity/shili_860_2.png
  3. 2 0
      dongri_pic.py
  4. 2 2
      dongri_task.py

+ 1 - 1
app_dongri.py

@@ -248,7 +248,7 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
             task_queue.appendleft(task_cure(True, g_cureNum))
             task_queue.appendleft(task_cure(True, g_cureNum))
             task_queue.appendleft(task_cure(True, g_cureNum))
-            continue
+            return
 
         task_queue.appendleft(task_information())
         

BIN
dongri_img/special_activity/shili_860_2.png


+ 2 - 0
dongri_pic.py

@@ -171,6 +171,8 @@ class special_activity_img:
     shili2 = R'dongri_img\special_activity\shili2.png'
     shili_120 = R'dongri_img\special_activity\shili_120.png'
     shili_860 = R'dongri_img\special_activity\shili_860.png'
+    shili_860_2 = R'dongri_img\special_activity\shili_860_2.png'
+
     bigMonster = R'dongri_img\special_activity\bigMonster.png'
     owning = R'dongri_img\special_activity\owning.png'
     owning_120 = R'dongri_img\special_activity\owning_120.png'

+ 2 - 2
dongri_task.py

@@ -908,11 +908,11 @@ class task_activity_lianmeng(dongri_task):
         waitClickImg_noWait_withBool(special_activity_img.task_done, 2, 1)
         
         if waitFindImg_withBool(special_activity_img.doing_task, 2, 1) == False:
-            if waitClickImg_noWait_withBool((special_activity_img.shili_120, special_activity_img.shili_860, special_activity_img.bigMonster), 2, 1) == True:
+            if waitClickImg_noWait_withBool((special_activity_img.shili_120, special_activity_img.shili_860_2, special_activity_img.bigMonster), 2, 1) == True:
                 if waitClickImg_noWait_withBool(special_activity_img.accept_task, 2, 1) == False:
                     return False
         
-        if waitFindImg_withBool((special_activity_img.shili_120, special_activity_img.shili_860), 2, 1) == False:
+        if waitFindImg_withBool((special_activity_img.shili_120, special_activity_img.shili_860_2), 2, 1) == False:
             maxTryTimes = 2
             while waitClickImg_noWait_withBool((special_activity_img.owning, special_activity_img.owning_120), 2, 1) == True:
                 waitClickImg_noWait_withBool(special_activity_img.refresh_task, 2, 1)