|
@@ -296,6 +296,8 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
|
|
|
always = True
|
|
|
update_rungame_type(0)
|
|
|
send_status(f'巨熊行动:在60min内,切换到无尽模式')
|
|
|
+ g_times = 5
|
|
|
+ task_queue.appendleft(task_checkActivities())
|
|
|
elif is_within_n_minutes(get_todo_time("巨熊行动"), 10, 40):
|
|
|
task_queue.appendleft(task_returnAllLine())
|
|
|
if len(task_queue) < 5:
|
|
@@ -307,7 +309,7 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
|
|
|
continue
|
|
|
|
|
|
|
|
|
-
|
|
|
+ # special activity
|
|
|
if activity == 'lianmeng':
|
|
|
task_queue.appendleft(task_activity_lianmeng())
|
|
|
elif activity == 'cure':
|
|
@@ -317,8 +319,12 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
|
|
|
task_queue.appendleft(task_cure(True, g_cureNum))
|
|
|
task_queue.appendleft(task_cure(True, g_cureNum))
|
|
|
return
|
|
|
+
|
|
|
+ # first run
|
|
|
if g_times % 3 == 1:
|
|
|
task_queue.appendleft(check_safe_collect())
|
|
|
+ if get_rungame_type() == 0:
|
|
|
+ task_queue.appendleft(task_checkActivities())
|
|
|
if isSimple == False:
|
|
|
task_queue.appendleft(task_information())
|
|
|
|
|
@@ -348,8 +354,6 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
|
|
|
task_queue.appendleft(task_train(train_type))
|
|
|
|
|
|
if isSimple == False:
|
|
|
- if get_rungame_type() == 0:
|
|
|
- task_queue.appendleft(task_checkActivities())
|
|
|
if not isAddStrengh: # 如果不是添加体力,则添加一次采集
|
|
|
task_queue.appendleft(task_collect(collectArr, isSimple, isAddStrengh))
|
|
|
if isJina == 'monster' and isAddStrengh:
|
|
@@ -379,6 +383,7 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
|
|
|
task_queue.appendleft(task_gotoTree())
|
|
|
#task_queue.appendleft(task_get_redPackage())
|
|
|
restart_times = 7
|
|
|
+ global g_switch
|
|
|
if g_switch:
|
|
|
restart_times = 4
|
|
|
if g_times == restart_times:
|