Browse Source

!2 add function always_cure

pcacc 4 tháng trước cách đây
mục cha
commit
39741ae0e4
3 tập tin đã thay đổi với 15 bổ sung9 xóa
  1. 3 3
      app_dongri.py
  2. 1 1
      daily.json
  3. 11 5
      dongri_task.py

+ 3 - 3
app_dongri.py

@@ -250,7 +250,7 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
         if activity == 'lianmeng':
             task_queue.appendleft(task_activity_lianmeng())
         if activity == 'cure':
-            task_queue.appendleft(task_cure())
+            task_queue.appendleft(task_cure(True))
         task_queue.appendleft(check_buildOrResearch())
         
         if not isSimple:
@@ -262,7 +262,7 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
                 task_queue.appendleft(task_fightMonster(isAddStrengh, False, isSimple))
             elif isJina == 'big_monster':
                 task_queue.appendleft(task_fightMonster(isAddStrengh, True, isSimple))
-        task_queue.appendleft(task_cure())
+        task_queue.appendleft(task_cure(False))
         task_queue.appendleft(task_checkStoreRoom())
         task_queue.appendleft(task_collect(collectArr, isSimple, isAddStrengh))
         task_queue.appendleft(task_train(train_type))
@@ -271,7 +271,7 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
             task_queue.appendleft(task_collect(collectArr, isSimple, isAddStrengh))
         
 
-        task_queue.appendleft(task_cure())
+        task_queue.appendleft(task_cure(False))
         if isSimple:
             task_queue.appendleft(check_buildOrResearch())
         else:

+ 1 - 1
daily.json

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

+ 11 - 5
dongri_task.py

@@ -767,18 +767,24 @@ class task_paticipateInTeam(dongri_task):
         return True        
 
 class task_cure(dongri_task):
-    def __init__(self):
+    def __init__(self, continueCure = False):
         super().__init__(f"治疗")
+        self.continueCure = continueCure
     def run(self):
         basic_operate.go_outside()
         if waitClickImg_noWait_withBool(check_img.soilder_cure, 2, 1) == False:
             return False
         
-        if waitClickImg_noWait_withBool(check_img.cure, 2, 1) == False:
-            return False
+        if self.continueCure == False:
+            if waitClickImg_noWait_withBool(check_img.cure, 2, 1) == False:
+                return False
         
-        if waitClickImg_noWait_withBool(check_img.help4, 2, 1) == False:
-            return False
+            if waitClickImg_noWait_withBool(check_img.help4, 2, 1) == False:
+                return False
+        
+        while waitClickImg_noWait_withBool((check_img.cure, check_img.help4), 50, 1):
+            continue
+
         return True
 
 class task_useAnnimalSkill(dongri_task):