Merge branch 'master' of http://192.168.50.108:37829/pcacc/yys_auto

app_dongri.py

@@ -291,8 +291,8 @@ 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))
             return
-
-        task_queue.appendleft(task_information())
+        if isSimple == False:
+            task_queue.appendleft(task_information())
         
         task_queue.appendleft(check_buildOrResearch())
         task_queue.appendleft(task_cure(False, g_cureNum))
@@ -316,19 +316,19 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
                 task_queue.appendleft(task_fight_jina_only())
         task_queue.appendleft(task_collect(collectArr, isSimple, isAddStrengh))
         task_queue.appendleft(task_train(train_type))
-        task_queue.appendleft(task_checkActivities())
-        if not isAddStrengh: # 如果不是添加体力，则添加一次采集
-            task_queue.appendleft(task_collect(collectArr, isSimple, isAddStrengh))
         
-
-        task_queue.appendleft(task_cure(False, g_cureNum))
-        if isSimple:
-            task_queue.appendleft(check_buildOrResearch())
-        else:
+        
+        
+        if isSimple == False:
+            task_queue.appendleft(task_checkActivities())
+            if not isAddStrengh: # 如果不是添加体力，则添加一次采集
+                task_queue.appendleft(task_collect(collectArr, isSimple, isAddStrengh))
+            task_queue.appendleft(task_cure(False, g_cureNum))
             if isJina == 'monster' and isAddStrengh:
                 task_queue.appendleft(task_fightMonster(isAddStrengh, False, isSimple))
             else:
                 task_queue.appendleft(task_collect(collectArr, isSimple, isAddStrengh))
+            task_queue.appendleft(task_information())
         
 
         g_times += 1
@@ -352,9 +352,9 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
             handle_restart_game()
         else:
             if isAddStrengh:
-                myTimeSleep(random.randint(300, 350), send_status)
+                myTimeSleep(random.randint(350, 400), send_status)
             else:
-                myTimeSleep(random.randint(400, 500), send_status)
+                myTimeSleep(random.randint(350, 400), send_status)
             
         
     task_queue.clear()

dongri_pic.py

@@ -188,6 +188,7 @@ class special_activity_img:
     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'
+    shili_860_3 = R'dongri_img\special_activity\shili_860_3.png'
 
     bigMonster = R'dongri_img\special_activity\bigMonster.png'
     owning = R'dongri_img\special_activity\owning.png'

dongri_task.py

@@ -838,7 +838,20 @@ class task_information(dongri_task):
         if waitClickImg_noWait_withBool(information_img.information, 1, 1) == False:
             return False
         
-        if waitClickImg_noWait_withBool([information_img.hero0, information_img.hero1, information_img.hero2], 0.5, 0.5):
+        hero_arr = [information_img.hero0, information_img.hero1, information_img.hero2]
+        camp_arr = [information_img.camp1, information_img.camp2]
+        wolf_arr = [information_img.wolf0, information_img.wolf1, information_img.wolf2]
+        total_arr = []
+        total_arr.append(hero_arr)
+        total_arr.append(camp_arr)
+        total_arr.append(wolf_arr)
+        
+        if waitFindImg_withBool(total_arr, 2, 1) == False:
+            return False
+
+
+
+        if waitClickImg_noWait_withBool(hero_arr, 0.5, 0.5):
             if waitClickImg_noWait_withBool(information_img.gotosee, 1, 1) == False:
                 return False
             if waitClickImg_noWait_withBool(information_img.explore, 1, 1) == False:
@@ -848,13 +861,13 @@ class task_information(dongri_task):
             
             myTimeSleep_big()
             return True
-        elif waitClickImg_noWait_withBool([information_img.camp1, information_img.camp2], 0.5, 0.5):
+        elif waitClickImg_noWait_withBool(camp_arr, 0.5, 0.5):
             if waitClickImg_noWait_withBool(information_img.gotosee, 1, 1) == False:
                 return False
             if waitClickImg_noWait_withBool(information_img.survive, 1, 1) == False:
                 return False
             return True
-        elif waitClickImg_noWait_withBool([information_img.wolf0, information_img.wolf1, information_img.wolf2], 0.5, 0.5):
+        elif waitClickImg_noWait_withBool(wolf_arr, 0.5, 0.5):
             if waitClickImg_noWait_withBool(information_img.gotosee, 1, 1) == False:
                 return False
             if waitClickImg_noWait_withBool(information_img.fight, 1, 1) == False:
@@ -992,13 +1005,13 @@ 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_2, special_activity_img.bigMonster), 2, 1) == True:
+            if waitClickImg_noWait_withBool((special_activity_img.shili_120, special_activity_img.shili_860_3, 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), 2, 1) == False:
+        if waitFindImg_withBool((special_activity_img.shili_120, special_activity_img.shili_860_3), 2, 1) == False:
             maxTryTimes = 2
-            while waitClickImg_noWait_withBool((special_activity_img.owning, special_activity_img.owning_120), 2, 1) == True:
+            while waitClickImg_noWait_withBool((special_activity_img.owning), 2, 1) == True:
                 waitClickImg_noWait_withBool(special_activity_img.refresh_task, 2, 1)
                 waitClickImg_noWait_withBool(special_activity_img.refresh, 2, 1)
                 maxTryTimes -= 1
@@ -1146,7 +1159,7 @@ class task_fight_enemy(dongri_task):
 
 if __name__ == '__main__':
     #task_cure(True, 85).run()
-    task_fight_enemy().run()
+    #task_fight_enemy().run()
     #task_fight_ranshuang().run()
     #task_gotoTree().run()
     #task_fight_jina_only().run()
@@ -1160,7 +1173,7 @@ if __name__ == '__main__':
     #task_fightMonster(False, False,False).run()
     #task_checkHelp().run()
     #task_checkStoreRoom().run()
-    #task_activity_lianmeng().run()
+    task_activity_lianmeng().run()
     #task_fight_yongbing(True).run()
     #task_collect([4,3,2,1]).run()
     #task_train("upgrade").run()

scriptBase/imgFind.py

@@ -147,7 +147,7 @@ class pcacc_img:
     def find_img(image_path):
 
         # 设置查找的置信度（confidence）阈值，范围从0到1，默认为0.999
-        confidence_threshold = 0.90
+        confidence_threshold = 0.95
 
         # 查找模糊图片在屏幕上的位置
         position = pyautogui.locateOnScreen(image_path, confidence=confidence_threshold)

templates/index_dongri.html

@@ -281,6 +281,7 @@
         }
 
         function isWorkingHours() {
+            return false;
             const now = new Date();
             const day = now.getDay(); // 0是周日，1是周一，...，6是周六
             const hours = now.getHours();