Bläddra i källkod

!2 get elephant skill

pcacc 4 månader sedan
förälder
incheckning
9acc4078ac
5 ändrade filer med 12 tillägg och 2 borttagningar
  1. 1 1
      app_dongri.py
  2. 6 0
      daily.json
  3. BIN
      dongri_img/check/elephant_skill.png
  4. 1 0
      dongri_pic.py
  5. 4 1
      dongri_task.py

+ 1 - 1
app_dongri.py

@@ -287,7 +287,7 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
             task_queue.appendleft(task_checkHelp(False))
             if auto_participate:
                 task_queue.appendleft(task_checkConfilits())
-        if times == 10:
+        if times == 7:
             handle_end_game()
             if isAddStrengh:
                 myTimeSleep(random.randint(350, 400), send_status)

+ 6 - 0
daily.json

@@ -1,2 +1,8 @@
 {
+    "daily": {
+        "2025-03-29": {
+            "login_task": true,
+            "fight_bigMonster_times": 0
+        }
+    }
 }

BIN
dongri_img/check/elephant_skill.png


+ 1 - 0
dongri_pic.py

@@ -106,6 +106,7 @@ class check_img:
     store_strength = R'dongri_img\check\store_strength.png'
     annimal_skill = R'dongri_img\check\anninal_skill.png'
     wolf_skill = R'dongri_img\check\wolf_skill.png'
+    elephant_skill = R'dongri_img\check\elephant_skill.png'
     use = R'dongri_img\check\use.png'
     use2 = R'dongri_img\check\use2.png'
     pack = R'dongri_img\check\pack.png'

+ 4 - 1
dongri_task.py

@@ -425,6 +425,7 @@ class task_collect(dongri_task):
         else:
             self.type = None
             self.line = None
+            super().__init__(f"采集None")
 
         if isSimple:
             self.line = None
@@ -775,7 +776,7 @@ class task_useAnnimalSkill(dongri_task):
         if waitClickImg_noWait_withBool(check_img.annimal_skill, 2, 1) == False:
             return False
         
-        if waitClickImg_noWait_withBool(check_img.wolf_skill, 2, 1) == False:
+        if waitClickImg_noWait_withBool((check_img.wolf_skill, check_img.elephant_skill), 2, 1) == False:
             return False
         
         if waitClickImg_noWait_withBool((check_img.use, check_img.use2), 2, 1) == False:
@@ -856,6 +857,7 @@ class task_checkActivities(dongri_task):
         activityStr = yys_ocrAuto(check_img.todo_region)
         if activityStr:
             todo_msg = activityStr
+            '''
             result = []
             baoleiArr = self.find_all_matching_events(activityStr, "堡垒")
             result.extend(baoleiArr)
@@ -864,6 +866,7 @@ class task_checkActivities(dongri_task):
             yaosaiArr = self.find_all_matching_events(activityStr, "要塞")
             result.extend(yaosaiArr)
             todo_list = result
+            '''
         return activityStr