!2 add auto daily

app_dongri.py

@@ -204,7 +204,7 @@ def auto_participate():
 
 
 
-def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False, activity = 'None', isAutoParticipate = True):  
+def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False, activity = 'None', isAutoParticipate = True, isDailyConfig = False):  
     collectArr = [int(x) for x in isMaxCollect.split(",")]
     print("collectArr", collectArr)
     times = 0
@@ -223,7 +223,7 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
             isLoginTask = False
             fight_big_monster_times = 0
             write_cfg(config)
-        print("isLoginTask", isLoginTask, "fight_big_monster_times", fight_big_monster_times)
+        send_status(f"isLoginTask:{isLoginTask}, fight_big_monster_times:{fight_big_monster_times}")
 
 
         if not isLoginTask:
@@ -231,12 +231,15 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
             set_login_task(config, True)
             write_cfg(config)
 
+        if isDailyConfig and fight_big_monster_times < 10:
+            task_queue.appendleft(task_fightMonster(isAddStrengh, True, isSimple))
+            set_fight_big_monster_times(config, fight_big_monster_times + 1)
+            write_cfg(config)
+
 
         task_queue.appendleft(task_information())
         if activity == 'lianmeng':
             task_queue.appendleft(task_activity_lianmeng())
-        #if not isSimple:
-        #    task_queue.appendleft(task_paticipateInTeam())
         task_queue.appendleft(check_buildOrResearch())
         
         if not isSimple:
@@ -374,6 +377,8 @@ def auto_task(data):
         isAddStrengh = False
         activity = 'none'
         participateJijie = False
+        auto_daily = False
+
     else:
         isMaxCollect = data['maxCollect']
         isSimple = data['simple']
@@ -381,8 +386,9 @@ def auto_task(data):
         isAddStrengh = data['add_strength']
         activity = data['activity']
         participateJijie = data['participate_jijie']
+        auto_daily = data['auto_daily']
     send_status(f'开始自动模式')
-    executor.submit(add_auto_task, isMaxCollect, isJina, isSimple, isAddStrengh, activity, participateJijie)
+    executor.submit(add_auto_task, isMaxCollect, isJina, isSimple, isAddStrengh, activity, participateJijie, auto_daily)
 
 
 @socketio.on('begin_auto_participate')

templates/index_dongri.html

@@ -70,6 +70,7 @@
             <label><input type="checkbox" id="SimpleCheckbox"> 是否小号</label>
             <label><input type="checkbox" id="AddStrenghCheckbox"> 是否添加体力</label>
             <label><input type="checkbox" id="participateJijieCheckbox"> 是否参与集结</label>
+            <label><input type="checkbox" id="autoDaily_checkbox"> 自动每日</label>
         </div>
         <div class="operate-container">
             <button class="custom-button" id="atuo_btn" onclick="begin_paticipate()">自动打熊</button>
@@ -118,6 +119,8 @@
             const AddStrenghCheckbox = document.getElementById('AddStrenghCheckbox'); // 复选框
             const participateJijieCheckbox = document.getElementById('participateJijieCheckbox'); // 复选框
             const AcitivitySelect = document.getElementById('AcitivityCheckbox'); // 下拉列表 
+            const autoDaily_checkbox = document.getElementById('autoDaily_checkbox'); // 复选框
+
 
 
             // 设置值
@@ -127,6 +130,8 @@
             AddStrenghCheckbox.checked = msg['add_strength']; // 设置复选框的状态
             AcitivitySelect.value = msg['activity']; // 设置下拉列表的值
             participateJijieCheckbox.checked = msg['participate_jijie']; // 设置复选框的状态
+            autoDaily_checkbox.checked = msg['auto_daily']; // 设置复选框的状态
+
 
 
 
@@ -175,6 +180,7 @@
             const isAddStrengh = document.getElementById('AddStrenghCheckbox').checked; // 获取复选框的状态
             const activityValue = document.getElementById('AcitivityCheckbox').value; // 获取下拉列表的值
             const participateJijie = document.getElementById('participateJijieCheckbox').checked; // 获取复选框的状态
+            const autoDaily = document.getElementById('autoDaily_checkbox').checked; // 获取复选框的状态
 
             
 
@@ -187,6 +193,7 @@
                 ,add_strength:isAddStrengh
                 ,activity:activityValue
                 ,participate_jijie:participateJijie
+                ,auto_daily:autoDaily
             });
         }