|
@@ -316,19 +316,19 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
|
|
|
task_queue.appendleft(task_fight_jina_only())
|
|
|
task_queue.appendleft(task_collect(collectArr, isSimple, isAddStrengh))
|
|
|
task_queue.appendleft(task_train(train_type))
|
|
|
- task_queue.appendleft(task_checkActivities())
|
|
|
- if not isAddStrengh: # 如果不是添加体力,则添加一次采集
|
|
|
- task_queue.appendleft(task_collect(collectArr, isSimple, isAddStrengh))
|
|
|
|
|
|
-
|
|
|
- task_queue.appendleft(task_cure(False, g_cureNum))
|
|
|
- if isSimple:
|
|
|
- task_queue.appendleft(check_buildOrResearch())
|
|
|
- else:
|
|
|
+
|
|
|
+
|
|
|
+ if isSimple == False:
|
|
|
+ task_queue.appendleft(task_checkActivities())
|
|
|
+ if not isAddStrengh: # 如果不是添加体力,则添加一次采集
|
|
|
+ task_queue.appendleft(task_collect(collectArr, isSimple, isAddStrengh))
|
|
|
+ task_queue.appendleft(task_cure(False, g_cureNum))
|
|
|
if isJina == 'monster' and isAddStrengh:
|
|
|
task_queue.appendleft(task_fightMonster(isAddStrengh, False, isSimple))
|
|
|
else:
|
|
|
task_queue.appendleft(task_collect(collectArr, isSimple, isAddStrengh))
|
|
|
+ task_queue.appendleft(task_information())
|
|
|
|
|
|
|
|
|
g_times += 1
|
|
@@ -352,9 +352,9 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
|
|
|
handle_restart_game()
|
|
|
else:
|
|
|
if isAddStrengh:
|
|
|
- myTimeSleep(random.randint(300, 350), send_status)
|
|
|
+ myTimeSleep(random.randint(150, 150), send_status)
|
|
|
else:
|
|
|
- myTimeSleep(random.randint(400, 500), send_status)
|
|
|
+ myTimeSleep(random.randint(150, 150), send_status)
|
|
|
|
|
|
|
|
|
task_queue.clear()
|