!2 add special activity

app_dongri.py

@@ -174,7 +174,7 @@ def auto_participate():
 
 
 
-def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False):
+def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False, activity = 'None'):
     collectArr = [int(x) for x in isMaxCollect.split(",")]
     print("collectArr", collectArr)
     times = 0
@@ -200,6 +200,8 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False):
                 task_queue.appendleft(task_fightMonster(isAddStrengh, False, isSimple))
             elif isJina == 'big_monster':
                 task_queue.appendleft(task_fightMonster(isAddStrengh, True, isSimple))
+        if activity == 'lianmeng':
+            task_queue.appendleft(task_activity_lianmeng())
         task_queue.appendleft(task_collect(collectArr, isSimple))
         task_queue.appendleft(task_train(False))
         task_queue.appendleft(task_collect(collectArr, isSimple))
@@ -261,13 +263,15 @@ def auto_task(data):
         isSimple = False
         isJina = 'jina'
         isAddStrengh = False
+        activity = 'none'
     else:
         isMaxCollect = data['maxCollect']
         isSimple = data['simple']
         isJina = data['jina']
         isAddStrengh = data['add_strength']
+        activity = data['activity']
     send_status(f'开始自动模式')
-    executor.submit(add_auto_task, isMaxCollect, isJina, isSimple, isAddStrengh)
+    executor.submit(add_auto_task, isMaxCollect, isJina, isSimple, isAddStrengh, activity)
 
 
 @socketio.on('begin_auto_participate')

dongri_pic.py

@@ -132,6 +132,14 @@ class information_img:
     add_strength = R'dongri_img\information\add_strength.png'
 
 
-
+class special_activity_img:
+    # = R'dongri_img\special_activity\.png'
+    normal = R'dongri_img\special_activity\normal.png'
+    lianmeng = R'dongri_img\special_activity\lianmeng.png'
+    shili = R'dongri_img\special_activity\shili.png'
+    owning = R'dongri_img\special_activity\owning.png'
+    refresh_task = R'dongri_img\special_activity\refresh_task.png'
+    accept_task = R'dongri_img\special_activity\accept_task.png'
+    refresh = R'dongri_img\special_activity\refresh.png'
 
 _imported = False

dongri_task.py

@@ -714,6 +714,28 @@ class task_useAnnimalSkill(dongri_task):
         if waitClickImg_noWait_withBool(check_img.use, 2, 1) == False:
             return False
 
+class task_activity_lianmeng(dongri_task):
+    def __init__(self):
+        super().__init__(f"联盟总动员")
+    def run(self):
+        basic_operate.go_town()
+        if waitClickImg_noWait_withBool(special_activity_img.normal, 2, 1) == False:
+            return False
+        if waitClickImg_noWait_withBool(special_activity_img.lianmeng, 2, 1) == False:
+            return False
+        if waitClickImg_noWait_withBool(special_activity_img.shili, 2, 1) == True:
+            if waitClickImg_noWait_withBool(special_activity_img.accept_task, 2, 1) == False:
+                return False
+        maxTryTimes = 2
+        while waitClickImg_noWait_withBool(special_activity_img.owning, 2, 1) == True:
+            maxTryTimes -= 1
+            if maxTryTimes <= 0:
+                break
+            waitClickImg_noWait_withBool(special_activity_img.refresh_task, 2, 1)
+            waitClickImg_noWait_withBool(special_activity_img.refresh, 2, 1)
+        return True
+
+
 
 
 if __name__ == '__main__':
@@ -721,7 +743,8 @@ if __name__ == '__main__':
     #basic_operate.add_strength()
     #task_fightMonster(False, True).run()
     #task_checkHelp().run()
-    task_checkStoreRoom().run()
+    #task_checkStoreRoom().run()
+    task_activity_lianmeng().run()
     #task_fight_yongbing(True).run()
     #task_collect([4,3,2,1]).run()
     #task_train().run()

templates/index_dongri.html

@@ -56,6 +56,13 @@
                     <option value="jina" selected>jina</option>
                 </select>
             </label>
+            <label>
+                活动：
+                <select id="AcitivityCheckbox">
+                    <option value="None" selected>None</option>
+                    <option value="lianmeng">lianmeng</option>
+                </select>
+            </label>
             <label><input type="checkbox" id="SimpleCheckbox"> 是否小号</label>
             <label><input type="checkbox" id="AddStrenghCheckbox"> 是否添加体力</label>
         </div>
@@ -100,12 +107,15 @@
             const jiNaSelect = document.getElementById('JiNaCheckbox'); // 下拉列表
             const simpleCheckbox = document.getElementById('SimpleCheckbox'); // 复选框
             const AddStrenghCheckbox = document.getElementById('AddStrenghCheckbox'); // 复选框
+            const AcitivitySelect = document.getElementById('AcitivityCheckbox'); // 下拉列表
+
 
             // 设置值
             maxCollectInput.value = msg['maxCollect']; // 设置文本输入框的值
             jiNaSelect.value = msg['jina']; // 设置下拉列表的值
             simpleCheckbox.checked = msg['simple']; // 设置复选框的状态
             AddStrenghCheckbox.checked = msg['add_strength']; // 设置复选框的状态
+            AcitivitySelect.value = msg['activity']; // 设置下拉列表的值
 
 
             // 如果需要显示消息，可以取消注释以下代码
@@ -151,6 +161,7 @@
             const jiNaValue = document.getElementById('JiNaCheckbox').value; // 获取下拉列表的值
             const isSimple = document.getElementById('SimpleCheckbox').checked; // 获取复选框的状态
             const isAddStrengh = document.getElementById('AddStrenghCheckbox').checked; // 获取复选框的状态
+            const activityValue = document.getElementById('AcitivityCheckbox').value; // 获取下拉列表的值
 
             // 发出数据
             socket.emit('begin_auto', {
@@ -158,6 +169,7 @@
                 jina: jiNaValue, // 发送下拉列表的值
                 simple: isSimple // 发送复选框的状态
                 ,add_strength:isAddStrengh
+                ,activity:activityValue
             });
         }