|
@@ -295,6 +295,7 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
|
|
|
# 设置无尽运行和启动的游戏为0
|
|
|
always = True
|
|
|
update_rungame_type(0)
|
|
|
+ send_status(f'巨熊行动:在60min内,切换到无尽模式')
|
|
|
elif is_within_n_minutes(get_todo_time("巨熊行动"), 10, 40):
|
|
|
task_queue.appendleft(task_returnAllLine())
|
|
|
if len(task_queue) < 5:
|
|
@@ -302,6 +303,7 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
|
|
|
task_queue.appendleft(task_paticipateInTeam())
|
|
|
task_queue.appendleft(task_paticipateInTeam())
|
|
|
myTimeSleep_big()
|
|
|
+ send_status(f'巨熊行动中')
|
|
|
continue
|
|
|
|
|
|
|
|
@@ -345,10 +347,9 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
|
|
|
task_queue.appendleft(task_collect(collectArr, isSimple, isAddStrengh))
|
|
|
task_queue.appendleft(task_train(train_type))
|
|
|
|
|
|
-
|
|
|
-
|
|
|
if isSimple == False:
|
|
|
- task_queue.appendleft(task_checkActivities())
|
|
|
+ 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:
|
|
@@ -440,6 +441,17 @@ def update_rungame_type(dstType=None):
|
|
|
write_Dailycfg(config)
|
|
|
print(f"更新下次启动{config[runTypeStr]}")
|
|
|
return value
|
|
|
+
|
|
|
+def get_rungame_type():
|
|
|
+ config = read_Dailycfg()
|
|
|
+ runTypeStr = 'runType'
|
|
|
+ if runTypeStr not in config:
|
|
|
+ return 0
|
|
|
+ else:
|
|
|
+ if config[runTypeStr] == 1:
|
|
|
+ return 0
|
|
|
+ else:
|
|
|
+ return 1
|
|
|
|
|
|
# 修改或添加 "login_task" 的值
|
|
|
def set_login_task(config, value):
|