فهرست منبع

!2 new way to participate in bear team

pcacc 3 هفته پیش
والد
کامیت
9af22ece98
2فایلهای تغییر یافته به همراه13 افزوده شده و 9 حذف شده
  1. 5 5
      app_dongri.py
  2. 8 4
      dongri_task.py

+ 5 - 5
app_dongri.py

@@ -295,15 +295,15 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
                 start_recording()
                 task_queue.appendleft(task_returnAllLine())
                 task_queue.appendleft(task_useAnnimalSkill(True))
+                task_queue.appendleft(task_paticipateInTeam2(not g_switch))
+                task_queue.appendleft(task_paticipateInTeam2(not g_switch))
                 task_queue.appendleft(task_paticipateInTeam(not g_switch))
                 task_queue.appendleft(task_paticipateInTeam(not g_switch))
+                task_queue.appendleft(task_paticipateInTeam2(not g_switch))
+                task_queue.appendleft(task_paticipateInTeam2(not g_switch))
                 task_queue.appendleft(task_paticipateInTeam(not g_switch))
                 task_queue.appendleft(task_paticipateInTeam(not g_switch))
-                task_queue.appendleft(task_paticipateInTeam(not g_switch))
-                task_queue.appendleft(task_paticipateInTeam(not g_switch))
-                task_queue.appendleft(task_paticipateInTeam(not g_switch))
-                task_queue.appendleft(task_paticipateInTeam(not g_switch))
-                task_queue.appendleft(task_paticipateInTeam(not g_switch))
+                task_queue.appendleft(task_paticipateInTeam(False))
                 
             myTimeSleep_big()
             send_status(f'巨熊行动中')

+ 8 - 4
dongri_task.py

@@ -1043,7 +1043,7 @@ class task_returnAllLine(dongri_task):
         return True
 
 class task_paticipateInTeam2(dongri_task):
-    def __init__(self):
+    def __init__(self, checkPower=True):
         typeArr = [1,3,4]
         type = typeArr[random.randint(0, len(typeArr) - 1)]
         if type == 1:
@@ -1054,7 +1054,11 @@ class task_paticipateInTeam2(dongri_task):
             self.line = monster_img.line3
         elif type == 4:
             self.line = monster_img.line4
-        super().__init__(f"参与队伍2")
+        self.checkPower = checkPower
+        hint = "&检查实力"
+        if checkPower == False:
+            hint = "&不检查"
+        super().__init__(f"union队伍{type}{hint}")
     def run(self):
         basic_operate.go_outside()
         if waitClickImg_noWait_withBool((check_img.talk_in,check_img.talk_in2, check_img.talk_in3), 2, 1) == False:
@@ -1684,7 +1688,7 @@ class task_testFun(dongri_task):
         super().__init__(f"测试功能")
     def run(self):
         #task_checkDiamond().run()
-        task_paticipateInTeam().run()
+        task_paticipateInTeam2().run()
         return True
 
 if __name__ == '__main__':
@@ -1730,7 +1734,7 @@ if __name__ == '__main__':
     #task_returnAllLine().run()
     #task_paticipateInTeam().run()
     #task_fight_jina(True).run()
-    task_get_redPackage().run()
+    #task_get_redPackage().run()
     #task_read_mails().run()
     #task_checkBenifitStatus().run()
     #task_checkDiamond().run()