0326更改-01

common.py

@@ -212,7 +212,7 @@ def monitor_battle_status():
     global battle_monitor_timer
     isfire()
     if not zhuoguiisover:
-        battle_monitor_timer = threading.Timer(2, monitor_battle_status)
+        battle_monitor_timer = threading.Timer(3, monitor_battle_status)
         battle_monitor_timer.start()
     else:
         stop_battle_monitor_timer()
@@ -223,7 +223,7 @@ def start_battle_monitor_timer():
     global battle_monitor_timer
     if battle_monitor_timer is not None:
         battle_monitor_timer.cancel()
-    battle_monitor_timer = threading.Timer(2, monitor_battle_status)
+    battle_monitor_timer = threading.Timer(3, monitor_battle_status)
     battle_monitor_timer.start()
     print("战斗状态监控已启动")
 
@@ -234,17 +234,6 @@ def stop_battle_monitor_timer():
         battle_monitor_timer = None
         print("战斗状态监控已停止")
 
-def check_shuangbei():
-    global shuangbeidianshu
-    print("开始检测双倍点数")
-    res_guaji1 = zhaotu("挂机1.png")
-    res_guaji = zhaotu("挂机.png")
-    res_guaji_last = res_guaji or res_guaji1
-    if res_guaji_last is not None:
-        lingqushuangbei.lingqu(res_guaji_last)
-        print("双倍领取完成")
-    else:
-        print("未找到挂机入口，双倍检测失败")
 
 def denglu():
     while True:
@@ -456,7 +445,7 @@ def alllive_task(num):
     # 战斗状态监控
     isfire()
 
-    duiwu.shifoukaping()
+    # duiwu.shifoukaping()
 
     start_alllive_task_timer(num)
 

lingqushuangbei.py

@@ -88,6 +88,7 @@ def lingqu(zuobiao):
         if ylq_num >= 4:
             if ylq_num >= 1000:
                 ylq_num = 1000
+                shuangbeidianshu = ylq_num
             print(f"正常领取结束，开始任务", ylq_num)
             common.shuangbei = True
             common.closeAllbtn()

zhuogui.py

@@ -29,14 +29,15 @@ def zhuogui():
     global battle_count  # 声明全局变量
 
     # 开始时检测一次双倍点数
-    common.check_shuangbei()
+    lingqushuangbei.lingqushuangbei()
     if common.shuangbei is False:
         print("双倍点数不足，停止捉鬼任务")
         return
 
     print("开始捉鬼")
+
     # 先执行退出队伍
-    duiwu.tuichuzudui()
+    # duiwu.tuichuzudui()
 
     # 启动战斗状态监控定时任务
     common.start_battle_monitor_timer()
@@ -61,12 +62,6 @@ def zhuogui():
             common.stop_battle_monitor_timer()
             return
 
-        # 检查战斗状态
-        if common.isfire():
-            print("----------战斗中----------")
-            sleep(60)
-            continue
-
         res_zdsb = common.zhaotu("战斗失败.png")
         if res_zdsb is not None:
             print("找到战斗失败")
@@ -75,12 +70,20 @@ def zhuogui():
             duiwu.tuichuzudui()
             continue
 
+        # 检查战斗状态
+        if common.isfire():
+            print("----------战斗中----------")
+            sleep(60)
+            continue
+        sleep(10)
+
         print("判断状态1")
         if common.isfire():
             print("----------战斗中----------")
             sleep(60)
             continue
         sleep(10)
+
         print("判断状态2")
         if common.isfire():
             print("----------再次判断战斗中----------")