!2 add max line check

app_dongri.py

@@ -468,6 +468,8 @@ def auto_task(data):
         train_type = 'none'
         always = False
         cureNumber = 500
+        lineCheck = False
+        
     else:
         isMaxCollect = data['maxCollect']
         isSimple = data['simple']
@@ -479,8 +481,10 @@ def auto_task(data):
         train_type = data['train']
         always = data['always']
         cureNumber = data['cureNumber']
+        lineCheck = data['lineCheck']
 
     g_cureNum = cureNumber
+    set_lineCheck(lineCheck)
     send_status(f'开始自动模式')
     executor.submit(add_auto_task, isMaxCollect, isJina, isSimple, isAddStrengh, activity, participateJijie, auto_daily, train_type, always)
 

dongri_task.py

@@ -32,6 +32,12 @@ from dongri_pic import _imported
 
 todo_msg = ''
 todo_list = []
+g_task_lineCheck = False
+
+def set_lineCheck(val):
+    global g_task_lineCheck
+    g_task_lineCheck = val
+
 def get_todo_msg():
     global todo_msg
     return todo_msg
@@ -435,6 +441,7 @@ class task_fightMonster(dongri_task):
             self.attack = monster_img.attack
 
     def run(self):
+        global g_task_lineCheck
         basic_operate.go_outside()
 
         if False == waitFindImg_withBool(monster_img.enough_strengh, 2, 1):
@@ -445,7 +452,12 @@ class task_fightMonster(dongri_task):
                 print("没有足够的体力了")
                 return False
             
-        if self.add_strengh and basic_operate.get_line_num() >= 6:
+        maxLineNum = 6
+        if self.isSimple:
+            maxLineNum = 4
+        else:
+            maxLineNum = 6
+        if basic_operate.get_line_num() >= maxLineNum:
             return False
 
         if False == basic_operate.click_outside_search():
@@ -524,18 +536,19 @@ class task_collect(dongri_task):
         
 
     def run(self):
+        global g_task_lineCheck
         if self.type == None:
             return True
         basic_operate.go_outside()
 
         maxLineNum = 6
         if self.isSimple:
-            if self.isAddStrenghth:
+            if self.isAddStrenghth  or g_task_lineCheck:
                 maxLineNum = 3
             else:
                 maxLineNum = 4
         else:
-            if self.isAddStrenghth:
+            if self.isAddStrenghth  or g_task_lineCheck:
                 maxLineNum = 5
             else:
                 maxLineNum = 6

templates/index_dongri.html

@@ -89,6 +89,7 @@
                 </select>
             </label>
             <label><input type="checkbox" id="SimpleCheckbox"> 是否小号</label>
+            <label><input type="checkbox" id="lineCheckbox"> 预留队列</label>
             <label><input type="checkbox" id="AddStrenghCheckbox"> 是否添加体力</label>
             <label><input type="checkbox" id="participateJijieCheckbox"> 是否参与集结</label>
             <label><input type="checkbox" id="autoDaily_checkbox"> 自动每日</label>
@@ -146,6 +147,7 @@
             const cureNumberInput = document.getElementById('cureNumberCheckbox'); // 文本输入框
             const jiNaSelect = document.getElementById('JiNaCheckbox'); // 下拉列表
             const simpleCheckbox = document.getElementById('SimpleCheckbox'); // 复选框
+            const lineCheckbox = document.getElementById('lineCheckbox'); // 复选框
             const AddStrenghCheckbox = document.getElementById('AddStrenghCheckbox'); // 复选框
             const participateJijieCheckbox = document.getElementById('participateJijieCheckbox'); // 复选框
             const AcitivitySelect = document.getElementById('AcitivityCheckbox'); // 下拉列表 
@@ -213,6 +215,7 @@
             const cureNumberValue = document.getElementById('cureNumberCheckbox').value; // 获取文本输入框的值
             const jiNaValue = document.getElementById('JiNaCheckbox').value; // 获取下拉列表的值
             const isSimple = document.getElementById('SimpleCheckbox').checked; // 获取复选框的状态
+            const lineCheck = document.getElementById('lineCheckbox').checked; // 获取复选框的状态
             const isAddStrengh = document.getElementById('AddStrenghCheckbox').checked; // 获取复选框的状态
             const activityValue = document.getElementById('AcitivityCheckbox').value; // 获取下拉列表的值
             const participateJijie = document.getElementById('participateJijieCheckbox').checked; // 获取复选框的状态
@@ -230,6 +233,7 @@
                 cureNumber: cureNumberValue, // 发送文本输入框的值
                 jina: jiNaValue, // 发送下拉列表的值
                 simple: isSimple // 发送复选框的状态
+                ,lineCheck:lineCheck
                 ,add_strength:isAddStrengh
                 ,activity:activityValue
                 ,participate_jijie:participateJijie