!2 add finsta mode

app_dongri.py

@@ -165,7 +165,7 @@ def auto_participate():
 
 
 
-def add_auto_task(isMaxCollect):
+def add_auto_task(isMaxCollect, isSimple = False):
     collectType = 0
     if isMaxCollect:
         collectType = 5
@@ -173,16 +173,19 @@ def add_auto_task(isMaxCollect):
     while not event.is_set():
         task_queue.appendleft(task_information())
         task_queue.appendleft(task_checkHelp(False))
-        task_queue.appendleft(task_paticipateInTeam())
+        if not isSimple:
+            task_queue.appendleft(task_paticipateInTeam())
         task_queue.appendleft(check_buildOrResearch())
-        task_queue.appendleft(task_fightMonster(False, True))
+        if not isSimple:
+            task_queue.appendleft(task_fightMonster(False, True))
         task_queue.appendleft(task_collect(collectType))
         task_queue.appendleft(task_train(False))
         task_queue.appendleft(task_collect(collectType))
         task_queue.appendleft(task_train(False))
         task_queue.appendleft(task_collect(collectType))
         task_queue.appendleft(task_checkStoreRoom())
-        task_queue.appendleft(task_checkConfilits())
+        if not isSimple:
+            task_queue.appendleft(task_checkConfilits())
         task_queue.appendleft(task_checkDonata())
         #task_queue.appendleft(task_waitTime())
         times += 1
@@ -210,10 +213,12 @@ def auto_task(data):
     global autoTask
     if data == None:
         isMaxCollect = False
+        isSimple = False
     else:
         isMaxCollect = data['maxCollect']
+        isSimple = data['simple']
     send_status(f'开始自动模式')
-    executor.submit(add_auto_task, isMaxCollect)
+    executor.submit(add_auto_task, isMaxCollect, isSimple)
     '''
     autoTask = threading.Thread(target=add_auto_task, args=(isMaxCollect,))#启动线程往里面添加任务
     autoTask.daemon = True

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="SimpleCheckbox"> 是否小号</label>
         <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>
@@ -105,7 +106,8 @@
 
         function begin_auto() {
             const isMaxCollect = document.getElementById('maxCollectCheckbox').checked;
-            socket.emit('begin_auto', { maxCollect: isMaxCollect });
+            const isSimple = document.getElementById('SimpleCheckbox').checked;
+            socket.emit('begin_auto', { maxCollect: isMaxCollect, simple: isSimple });
         }
 
         function begin_paticipate(){