!2 Add participate team

app_dongri.py

@@ -189,7 +189,7 @@ def auto_participate():
 
 
 
-def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False, activity = 'None'):
+def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False, activity = 'None', isAutoParticipate = True):
     collectArr = [int(x) for x in isMaxCollect.split(",")]
     print("collectArr", collectArr)
     times = 0
@@ -236,7 +236,7 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
             task_queue.appendleft(task_checkDonata())
             task_queue.appendleft(task_useAnnimalSkill())
             task_queue.appendleft(task_checkHelp(False))
-            if not isSimple:
+            if not auto_participate:
                 task_queue.appendleft(task_checkConfilits())
         if times == 10:
             handle_end_game()
@@ -287,14 +287,16 @@ def auto_task(data):
         isJina = 'jina'
         isAddStrengh = False
         activity = 'none'
+        participateJijie = False
     else:
         isMaxCollect = data['maxCollect']
         isSimple = data['simple']
         isJina = data['jina']
         isAddStrengh = data['add_strength']
         activity = data['activity']
+        participateJijie = data['participate_jijie']
     send_status(f'开始自动模式')
-    executor.submit(add_auto_task, isMaxCollect, isJina, isSimple, isAddStrengh, activity)
+    executor.submit(add_auto_task, isMaxCollect, isJina, isSimple, isAddStrengh, activity, participateJijie)
 
 
 @socketio.on('begin_auto_participate')

templates/index_dongri.html

@@ -69,14 +69,14 @@
             </label>
             <label><input type="checkbox" id="SimpleCheckbox"> 是否小号</label>
             <label><input type="checkbox" id="AddStrenghCheckbox"> 是否添加体力</label>
+            <label><input type="checkbox" id="participateJijieCheckbox"> 是否参与集结</label>
         </div>
         <div class="operate-container">
-            <button class="custom-button" id="atuo_btn" onclick="begin_paticipate()">自动集结</button>
+            <button class="custom-button" id="atuo_btn" onclick="begin_paticipate()">自动打熊</button>
             <button class="custom-button" id="resetScript_btn" onclick="reset_script()">重置脚本</button>
             <button class="custom-button" id="restartgame_btn" onclick="restart_game()">重新关闭并自动游戏</button>
             <button class="custom-button" id="atuo_btn" onclick="begin_auto()">自动模式</button>
         </div>
-        
     </div>
     
     <script src="https://cdnjs.loli.net/ajax/libs/socket.io/4.2.0/socket.io.js"></script>
@@ -115,7 +115,8 @@
             const jiNaSelect = document.getElementById('JiNaCheckbox'); // 下拉列表
             const simpleCheckbox = document.getElementById('SimpleCheckbox'); // 复选框
             const AddStrenghCheckbox = document.getElementById('AddStrenghCheckbox'); // 复选框
-            const AcitivitySelect = document.getElementById('AcitivityCheckbox'); // 下拉列表
+            const participateJijieCheckbox = document.getElementById('participateJijieCheckbox'); // 复选框
+            const AcitivitySelect = document.getElementById('AcitivityCheckbox'); // 下拉列表 
 
 
             // 设置值
@@ -124,6 +125,8 @@
             simpleCheckbox.checked = msg['simple']; // 设置复选框的状态
             AddStrenghCheckbox.checked = msg['add_strength']; // 设置复选框的状态
             AcitivitySelect.value = msg['activity']; // 设置下拉列表的值
+            participateJijieCheckbox.checked = msg['participate_jijie']; // 设置复选框的状态
+
 
 
             // 如果需要显示消息，可以取消注释以下代码
@@ -170,6 +173,10 @@
             const isSimple = document.getElementById('SimpleCheckbox').checked; // 获取复选框的状态
             const isAddStrengh = document.getElementById('AddStrenghCheckbox').checked; // 获取复选框的状态
             const activityValue = document.getElementById('AcitivityCheckbox').value; // 获取下拉列表的值
+            const participateJijie = document.getElementById('participateJijieCheckbox').checked; // 获取复选框的状态
+
+            
+
 
             // 发出数据
             socket.emit('begin_auto', {
@@ -178,6 +185,7 @@
                 simple: isSimple // 发送复选框的状态
                 ,add_strength:isAddStrengh
                 ,activity:activityValue
+                ,participate_jijie:participateJijie
             });
         }
 
@@ -225,7 +233,7 @@
             get_title();
             read_cfg();
             executeTask();
-            setTimeout(stopPageAndCloseSocket, 600000); // 1分钟 = 60000毫秒
+            setTimeout(stopPageAndCloseSocket, 60000); // 1分钟 = 60000毫秒
         };
         
     </script>