|
|
@@ -255,7 +255,7 @@ def auto_palace():
|
|
|
|
|
|
|
|
|
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
|
|
|
+ global g_times, g_cureNum, g_switch
|
|
|
collectArr = [int(x) for x in isMaxCollect.split(",")]
|
|
|
print("collectArr", collectArr)
|
|
|
while not event.is_set():
|
|
|
@@ -323,7 +323,7 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
|
|
|
# first run
|
|
|
if g_times % 3 == 1:
|
|
|
task_queue.appendleft(check_safe_collect())
|
|
|
- if get_rungame_type() == 0:
|
|
|
+ if g_switch == False or get_rungame_type() == 0:
|
|
|
task_queue.appendleft(task_checkActivities())
|
|
|
|
|
|
if isSimple == False:
|
|
|
@@ -384,7 +384,6 @@ 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:
|
