!2 add train type

app_dongri.py

@@ -202,7 +202,7 @@ def auto_participate():
 
 
 
-def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False, activity = 'None', isAutoParticipate = True, isDailyConfig = False):  
+def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False, activity = 'None', isAutoParticipate = True, isDailyConfig = False, train_type = 'None'):  
     collectArr = [int(x) for x in isMaxCollect.split(",")]
     print("collectArr", collectArr)
     times = 0
@@ -256,7 +256,7 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
         task_queue.appendleft(task_cure())
         task_queue.appendleft(task_checkStoreRoom())
         task_queue.appendleft(task_collect(collectArr, isSimple, isAddStrengh))
-        task_queue.appendleft(task_train(False))
+        task_queue.appendleft(task_train(train_type))
         if not isAddStrengh: # 如果不是添加体力，则添加一次采集
             task_queue.appendleft(task_collect(collectArr, isSimple, isAddStrengh))
         
@@ -276,7 +276,7 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
         if times % 3 == 0:
             task_queue.appendleft(task_checkDonata())
             task_queue.appendleft(task_checkAdventure())
-            task_queue.appendleft(task_train(False))
+            task_queue.appendleft(task_train(train_type))
             task_queue.appendleft(task_useAnnimalSkill())
             task_queue.appendleft(task_checkHelp(False))
             if auto_participate:
@@ -407,7 +407,7 @@ def auto_task(data):
         activity = 'none'
         participateJijie = False
         auto_daily = False
-
+        train_type = 'none'
     else:
         isMaxCollect = data['maxCollect']
         isSimple = data['simple']
@@ -416,8 +416,9 @@ def auto_task(data):
         activity = data['activity']
         participateJijie = data['participate_jijie']
         auto_daily = data['auto_daily']
+        train_type = data['train']
     send_status(f'开始自动模式')
-    executor.submit(add_auto_task, isMaxCollect, isJina, isSimple, isAddStrengh, activity, participateJijie, auto_daily)
+    executor.submit(add_auto_task, isMaxCollect, isJina, isSimple, isAddStrengh, activity, participateJijie, auto_daily, train_type)
 
 
 @socketio.on('begin_auto_participate')

dongri_task.py

@@ -451,9 +451,10 @@ class task_collect(dongri_task):
         return True
         
 class task_train(dongri_task):
-    def __init__(self, force_lv1 = False):
-        super().__init__(f"检查训练")
-        self.force_lv1 = force_lv1
+    def __init__(self, train_type = None):
+        super().__init__(f"检查训练{train_type}")
+        self.train_type = train_type
+
     def run(self):
         basic_operate.go_town()
         if waitClickImg_noWait_withBool(train_img.quick_panel, 2, 1) == False:
@@ -468,12 +469,16 @@ class task_train(dongri_task):
             if waitClickImg_noWait_withBool(train_img.train, 2, 1):
                 break
         
-        waitClickImg_noWait_withBool(train_img.soilder_lv8, 2, 1)
-        if self.force_lv1:
+        
+        if self.train_type == 'lv1':
             myTimeSleep_big()
             yys_dragAuto(train_img.move_left)
             yys_dragAuto(train_img.move_left)
             waitClickImg_noWait_withBool(train_img.soilder_lv1, 2, 1)
+        elif self.train_type == 'lv8':
+            waitClickImg_noWait_withBool(train_img.soilder_lv8, 2, 1)
+        elif self.train_type == 'lv9':
+            waitClickImg_noWait_withBool(train_img.soilder_lv9, 2, 1)
 
         return basic_operate.enter_auto_supply_resource(train_img.begin_train)
 

templates/index_dongri.html

@@ -67,6 +67,15 @@
                     <option value="lianmeng">lianmeng</option>
                 </select>
             </label>
+            <label>
+                训练方式：
+                <select id="trainCheckbox">
+                    <option value="None" selected>None</option>
+                    <option value="lv1">优先lv1</option>
+                    <option value="lv8">优先lv8</option>
+                    <option value="lv9">优先lv9</option>
+                </select>
+            </label>
             <label><input type="checkbox" id="SimpleCheckbox"> 是否小号</label>
             <label><input type="checkbox" id="AddStrenghCheckbox"> 是否添加体力</label>
             <label><input type="checkbox" id="participateJijieCheckbox"> 是否参与集结</label>
@@ -120,6 +129,8 @@
             const participateJijieCheckbox = document.getElementById('participateJijieCheckbox'); // 复选框
             const AcitivitySelect = document.getElementById('AcitivityCheckbox'); // 下拉列表 
             const autoDaily_checkbox = document.getElementById('autoDaily_checkbox'); // 复选框
+            const trainSelect = document.getElementById('trainCheckbox'); // 下拉列表
+
 
 
 
@@ -181,6 +192,8 @@
             const activityValue = document.getElementById('AcitivityCheckbox').value; // 获取下拉列表的值
             const participateJijie = document.getElementById('participateJijieCheckbox').checked; // 获取复选框的状态
             const autoDaily = document.getElementById('autoDaily_checkbox').checked; // 获取复选框的状态
+            const trainValue = document.getElementById('trainCheckbox').value; // 获取下拉列表的值
+
 
             
 
@@ -194,6 +207,7 @@
                 ,activity:activityValue
                 ,participate_jijie:participateJijie
                 ,auto_daily:autoDaily
+                ,train:trainValue
             });
         }