Эх сурвалжийг харах

Revert "!2 reduce switch"

This reverts commit 24dc045f3a34cff7357a45e6eb84b04a6f3a4d49.
pcacc 1 сар өмнө
parent
commit
e8df8d6739
1 өөрчлөгдсөн 13 нэмэгдсэн , 16 устгасан
  1. 13 16
      app_dongri.py

+ 13 - 16
app_dongri.py

@@ -328,14 +328,14 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
                     GlobalState.g_firstRunBear -= 1
                     GlobalState.task_queue.appendleft(task_useAnnimalSkill(True))
                     GlobalState.task_queue.appendleft(task_returnAllLine())
-                GlobalState.task_queue.appendleft(task_paticipateInTeam(True))
-                GlobalState.task_queue.appendleft(task_paticipateInTeam(True))
-                GlobalState.task_queue.appendleft(task_paticipateInTeam(True))
-                GlobalState.task_queue.appendleft(task_paticipateInTeam(True))
-                GlobalState.task_queue.appendleft(task_paticipateInTeam(True))
-                GlobalState.task_queue.appendleft(task_paticipateInTeam(True))
-                GlobalState.task_queue.appendleft(task_paticipateInTeam(True))
-                GlobalState.task_queue.appendleft(task_paticipateInTeam(True))
+                GlobalState.task_queue.appendleft(task_paticipateInTeam(not GlobalState.g_switch))
+                GlobalState.task_queue.appendleft(task_paticipateInTeam(not GlobalState.g_switch))
+                GlobalState.task_queue.appendleft(task_paticipateInTeam(not GlobalState.g_switch))
+                GlobalState.task_queue.appendleft(task_paticipateInTeam(not GlobalState.g_switch))
+                GlobalState.task_queue.appendleft(task_paticipateInTeam(not GlobalState.g_switch))
+                GlobalState.task_queue.appendleft(task_paticipateInTeam(not GlobalState.g_switch))
+                GlobalState.task_queue.appendleft(task_paticipateInTeam(not GlobalState.g_switch))
+                GlobalState.task_queue.appendleft(task_paticipateInTeam(not GlobalState.g_switch))
                 GlobalState.task_queue.appendleft(task_paticipateInTeam(False))
                 
             myTimeSleep_big()
@@ -349,20 +349,17 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
             send_status(f'巨熊行动:在60min内,切换到无尽模式')
         
         print("add special activity")
-        curNum = GlobalState.g_cureNum
-        if get_rungame_type() == 1:
-            curNum = curNum / 10
         # special activity
         if activity == 'lianmeng':
             GlobalState.task_queue.appendleft(task_activity_lianmeng())
         elif activity == 'zhuguang':
             GlobalState.task_queue.appendleft(task_zhuguang())
         elif activity == 'cure':
-            GlobalState.task_queue.appendleft(task_cure(True, curNum))
+            GlobalState.task_queue.appendleft(task_cure(True, GlobalState.g_cureNum))
         elif activity == 'only_cure':
-            GlobalState.task_queue.appendleft(task_cure(True, curNum))
-            GlobalState.task_queue.appendleft(task_cure(True, curNum))
-            GlobalState.task_queue.appendleft(task_cure(True, curNum))
+            GlobalState.task_queue.appendleft(task_cure(True, GlobalState.g_cureNum))
+            GlobalState.task_queue.appendleft(task_cure(True, GlobalState.g_cureNum))
+            GlobalState.task_queue.appendleft(task_cure(True, GlobalState.g_cureNum))
             return
         
         print("add normal activity")
@@ -413,7 +410,7 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
         if GlobalState.g_times % 5 == 0:
             if GlobalState.g_switch and get_rungame_type() == 0:
                 GlobalState.task_queue.appendleft(check_buildOrResearch())
-            GlobalState.task_queue.appendleft(task_cure(True, curNum))
+            GlobalState.task_queue.appendleft(task_cure(True, GlobalState.g_cureNum))
             GlobalState.task_queue.appendleft(task_information())
             GlobalState.task_queue.appendleft(task_checkDonata())
             GlobalState.task_queue.appendleft(task_checkMaster())