!2 添加次数和添加无尽模式

app_dongri.py

@@ -24,6 +24,7 @@ last_process = ''
 isGameBegin = True
 autoTask = None
 isReset = False
+g_times = 0
 
 @app.after_request
 def add_no_cache_header(response):
@@ -71,11 +72,11 @@ def send_todo():
     emit('processing_todo', get_todo_msg())
 
 def send_status(msg):#软件执行状态
-    global g_status_list
+    global g_status_list, g_times
     try:
         if not msg == "":
             # 添加新的状态消息和时间到列表
-            timestamp = datetime.now().strftime('%Y-%m-%d %H:%M:%S')  # 获取当前时间
+            timestamp = datetime.now().strftime('%H:%M:%S')  # 获取当前时间
             status_entry = {'msg': msg, 'time': timestamp}  # 存储消息和时间
             g_status_list.append(status_entry)
 
@@ -85,7 +86,7 @@ def send_status(msg):#软件执行状态
         else:
             sendStr = ''
             for item in g_status_list:
-                sendStr = sendStr + f"{item['time']}-{item['msg']}<br>" 
+                sendStr = sendStr + f"{g_times}次-{item['time']}-{item['msg']}<br>" 
 
             #print(sendStr)
             emit('processing_status', sendStr)
@@ -206,10 +207,10 @@ def auto_participate():
 
 
 
-def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False, activity = 'None', isAutoParticipate = True, isDailyConfig = False, train_type = 'None'):  
+def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False, activity = 'None', isAutoParticipate = True, isDailyConfig = False, train_type = 'None', always = False):  
+    global g_times
     collectArr = [int(x) for x in isMaxCollect.split(",")]
     print("collectArr", collectArr)
-    times = 0
     while not event.is_set():
         isLoginTask = True
         fight_big_monster_times = 0
@@ -279,8 +280,8 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
         
 
         #task_queue.appendleft(task_waitTime())
-        times += 1
-        if times % 3 == 0:
+        g_times += 1
+        if g_times % 3 == 0:
             task_queue.appendleft(task_checkDonata())
             task_queue.appendleft(task_checkAdventure())
             task_queue.appendleft(task_train(train_type))
@@ -288,7 +289,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 == 7:
+        if always == False and g_times == 7:
             handle_end_game()
             if isAddStrengh:
                 myTimeSleep(random.randint(350, 400), send_status)
@@ -415,6 +416,7 @@ def auto_task(data):
         participateJijie = False
         auto_daily = False
         train_type = 'none'
+        always = False
     else:
         isMaxCollect = data['maxCollect']
         isSimple = data['simple']
@@ -424,8 +426,9 @@ def auto_task(data):
         participateJijie = data['participate_jijie']
         auto_daily = data['auto_daily']
         train_type = data['train']
+        always = data['always']
     send_status(f'开始自动模式')
-    executor.submit(add_auto_task, isMaxCollect, isJina, isSimple, isAddStrengh, activity, participateJijie, auto_daily, train_type)
+    executor.submit(add_auto_task, isMaxCollect, isJina, isSimple, isAddStrengh, activity, participateJijie, auto_daily, train_type, always)
 
 
 @socketio.on('begin_auto_participate')

templates/index_dongri.html

@@ -82,6 +82,7 @@
             <label><input type="checkbox" id="AddStrenghCheckbox"> 是否添加体力</label>
             <label><input type="checkbox" id="participateJijieCheckbox"> 是否参与集结</label>
             <label><input type="checkbox" id="autoDaily_checkbox"> 自动每日</label>
+            <label><input type="checkbox" id="always_checkbox"> 无尽运行</label>
         </div>
         <div class="operate-container">
             <button class="custom-button" id="atuo_btn" onclick="begin_paticipate()">自动打熊</button>
@@ -137,6 +138,8 @@
             const AcitivitySelect = document.getElementById('AcitivityCheckbox'); // 下拉列表 
             const autoDaily_checkbox = document.getElementById('autoDaily_checkbox'); // 复选框
             const trainSelect = document.getElementById('trainCheckbox'); // 下拉列表
+            const always_checkbox = document.getElementById('always_checkbox'); // 复选框
+
 
 
 
@@ -150,6 +153,7 @@
             participateJijieCheckbox.checked = msg['participate_jijie']; // 设置复选框的状态
             autoDaily_checkbox.checked = msg['auto_daily']; // 设置复选框的状态
             trainSelect.value = msg['train']; // 设置下拉列表的值
+            always_checkbox.checked = msg['always']; // 设置复选框的状态
 
 
             // 如果需要显示消息，可以取消注释以下代码
@@ -199,6 +203,7 @@
             const participateJijie = document.getElementById('participateJijieCheckbox').checked; // 获取复选框的状态
             const autoDaily = document.getElementById('autoDaily_checkbox').checked; // 获取复选框的状态
             const trainValue = document.getElementById('trainCheckbox').value; // 获取下拉列表的值
+            const always = document.getElementById('always_checkbox').checked; // 获取复选框的状态
 
 
             
@@ -214,6 +219,7 @@
                 ,participate_jijie:participateJijie
                 ,auto_daily:autoDaily
                 ,train:trainValue
+                ,always:always
             });
         }