Преглед изворни кода

!2 add attack outside soldier

pcacc пре 4 месеци
родитељ
комит
abbcd44afd

BIN
dongri_img/special_activity/outside_pcacc.png


BIN
dongri_img/special_activity/outside_soilder.png


+ 2 - 0
dongri_pic.py

@@ -233,6 +233,8 @@ class special_activity_img:
     quick_choose = R'dongri_img\special_activity\quick_choose.png'
     choose_zero = R'dongri_img\special_activity\choose_zero.png'
     visit_island = R'dongri_img\special_activity\visit_island.png'
+    outside_soilder = R'dongri_img\special_activity\outside_soilder.png'
+    outside_pcacc = R'dongri_img\special_activity\outside_pcacc.png'
 
     ## 红包
     red_package = R'dongri_img\special_activity\red_package.png'

+ 11 - 3
dongri_task.py

@@ -924,12 +924,14 @@ class task_paticipateInTeam(dongri_task):
 
 class task_cure(dongri_task):
     def __init__(self, continueCure = False, cureNum = None):
+
         cureStr = ""
         if continueCure:
-            cureStr = "50次连续"
+            cureStr = f"连续"
         super().__init__(f"{cureStr}治疗{cureNum}")
         self.continueCure = continueCure
         self.cureNum = cureNum
+        
     def run(self):
         basic_operate.go_town()
         basic_operate.go_outside()
@@ -955,7 +957,8 @@ class task_cure(dongri_task):
             if waitClickImg_noWait_withBool(check_img.help4, 2, 1) == False:
                 return False
         else:
-            maxTryTimes = 50 * 2
+            maxCureSoilder = 30000
+            maxTryTimes = int(maxCureSoilder) // int(self.cureNum) * 2
             while waitClickImg_noWait_withBool((check_img.cure, check_img.help4, check_img.help5), 30, 0.2) and maxTryTimes >= 0:
                 maxTryTimes -= 1
                 continue
@@ -1123,7 +1126,7 @@ class task_fight_enemy(dongri_task):
         if waitClickImg_noWait_withBool(special_activity_img.enemy, 2, 1) == False:
             return False
         
-        attackArr = [monster_img.attack, monster_img.attack2, monster_img.ranshuang_attack]
+        attackArr = [monster_img.attack, monster_img.attack2, monster_img.ranshuang_attack, monster_img.outside_attack]
         
         myTimeSleep_big()
         firstPos = get_yys_random_point(special_activity_img.first_enemy_region)
@@ -1132,6 +1135,11 @@ class task_fight_enemy(dongri_task):
         if waitFindImg_withBool(special_activity_img.visit_island, 1, 1) == True:
             return False
         while waitFindImg_withBool(attackArr, 1, 0) == False and maxTryTimes > 0:
+            if waitClickImg_noWait_withBool(special_activity_img.outside_soilder, 1, 1) == True:
+                if waitFindImg_withBool(special_activity_img.outside_pcacc, 1, 1) == True:
+                    break
+                else:
+                    return False
             maxTryTimes -= 1
             myTimeSleep_big()
             mid_enemy_pos = get_yys_random_point(special_activity_img.mid_enemy_region)