!2 web add jina function

app_dongri.py

@@ -172,7 +172,7 @@ def auto_participate():
 
 
 
-def add_auto_task(isMaxCollect, isSimple = False):
+def add_auto_task(isMaxCollect, isJina, isSimple = False):
     collectType = 0
     if isMaxCollect:
         collectType = 5
@@ -186,8 +186,10 @@ def add_auto_task(isMaxCollect, isSimple = False):
         task_queue.appendleft(check_buildOrResearch())
         task_queue.appendleft(task_cure())
         if not isSimple:
-            #task_queue.appendleft(task_fightMonster(False, True, isSimple))
-            task_queue.appendleft(task_fight_jina(True))
+            if isJina:
+                task_queue.appendleft(task_fight_jina(True))
+            else:
+                task_queue.appendleft(task_fightMonster(False, True, isSimple))
         task_queue.appendleft(task_collect(collectType, isSimple))
         task_queue.appendleft(task_train(False))
         task_queue.appendleft(task_collect(collectType, isSimple))
@@ -250,27 +252,20 @@ def auto_task(data):
     if data == None:
         isMaxCollect = False
         isSimple = False
+        isJina = False
     else:
         isMaxCollect = data['maxCollect']
         isSimple = data['simple']
+        isJina = data['jina']
     send_status(f'开始自动模式')
-    executor.submit(add_auto_task, isMaxCollect, isSimple)
-    '''
-    autoTask = threading.Thread(target=add_auto_task, args=(isMaxCollect,))#启动线程往里面添加任务
-    autoTask.daemon = True
-    autoTask.start()
-    '''
+    executor.submit(add_auto_task, isMaxCollect, isJina, isSimple)
+
 
 @socketio.on('begin_auto_participate')
 def handle_auto_participate():
     global autoTask
     send_status(f'开始自动集结模式')
     executor.submit(auto_participate)
-    '''
-    autoTask = threading.Thread(target=auto_participate)#启动线程往里面添加任务
-    autoTask.daemon = True
-    autoTask.start()
-    '''
 
 
 if __name__ == '__main__':

templates/index_dongri.html

@@ -38,6 +38,7 @@
         <h3>任务列表：</h3>
         <div id="hint_message"></div>
         <label><input type="checkbox" id="maxCollectCheckbox"> 是否最大收集</label>
+        <label><input type="checkbox" id="JiNaCheckbox"> 是否吉娜</label>
         <label><input type="checkbox" id="SimpleCheckbox"> 是否小号</label>
         <button class="custom-button" id="atuo_btn" onclick="begin_paticipate()">自动集结</button>
         <button class="custom-button" id="resetScript_btn" onclick="reset_script()">重置脚本</button>
@@ -75,8 +76,10 @@
         socket.on('processing_cfg', (msg) => {
             console.log(msg)
             const isMaxCollect = document.getElementById('maxCollectCheckbox');
+            const isJiNa = document.getElementById('JiNaCheckbox');
             const isSimple = document.getElementById('SimpleCheckbox');
             isMaxCollect.checked = msg['maxCollect']
+            isJiNa.checked = msg['jina']
             isSimple.checked = msg['simple']
 
             //var messageBox = document.getElementById('title_message');
@@ -118,8 +121,9 @@
 
         function begin_auto() {
             const isMaxCollect = document.getElementById('maxCollectCheckbox').checked;
+            const isJiNa = document.getElementById('JiNaCheckbox').checked;
             const isSimple = document.getElementById('SimpleCheckbox').checked;
-            socket.emit('begin_auto', { maxCollect: isMaxCollect, simple: isSimple });
+            socket.emit('begin_auto', { maxCollect: isMaxCollect, jina: isJiNa, simple: isSimple });
         }
 
         function begin_paticipate(){