ソースを参照

!2 simplify collect

pcacc 1 ヶ月 前
コミット
9a841cfe93
2 ファイル変更5 行追加6 行削除
  1. 4 5
      app_dongri.py
  2. 1 1
      dongri_task.py

+ 4 - 5
app_dongri.py

@@ -262,8 +262,8 @@ def auto_palace():
     while not event.is_set():
         g_times += 1
         if len(task_queue) < 4:
-            task_queue.appendleft(task_cure(True, g_cureNum))
-            task_queue.appendleft(task_cure(True, g_cureNum))
+            task_queue.appendleft(task_cure(True, g_cureNum * 5))
+            task_queue.appendleft(task_cure(True, g_cureNum * 3))
             task_queue.appendleft(task_fight_enemy())
 
         myTimeSleep_big()
@@ -273,13 +273,12 @@ def auto_palace():
         if elapsed_time >= timeout:
             handle_restart_game()
 
-
-    
-
 def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False, activity = 'None', isAutoParticipate = True, isDailyConfig = False, train_type = 'None', always = False):  
     global g_times, g_cureNum, g_switch, g_isRestart
     collectArr = [int(x) for x in isMaxCollect.split(",")]
     print("collectArr", collectArr)
+    if len(collectArr) == 1:
+        collectArr = collectArr[0]
     while not event.is_set():
         config = read_Dailycfg()
         print("config, check daily", config)

+ 1 - 1
dongri_task.py

@@ -544,7 +544,7 @@ class task_collect(dongri_task):
             typeArr = type
             type = typeArr[random.randint(0, len(typeArr) - 1)]
         elif type == 0:
-            typeArr = [4,4,3,3,3,2,2,2,1,1]
+            typeArr = [4,3,2,1]
             type = typeArr[random.randint(0, len(typeArr) - 1)]
         elif type == 5:
             typeArr = [2,1]