|
|
@@ -87,8 +87,6 @@ def send_status(msg):#软件执行状态
|
|
|
#print(sendStr)
|
|
|
emit('processing_status', sendStr)
|
|
|
|
|
|
-
|
|
|
-
|
|
|
# 如果消息是 "结束"，发送所有状态并清空列表
|
|
|
if msg == "结束":
|
|
|
g_status_list = [] # 清空列表
|
|
|
@@ -216,7 +214,6 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
|
|
|
|
|
|
if check_daily_config(config):
|
|
|
today = datetime.now().strftime('%Y-%m-%d')
|
|
|
- print("today", today)
|
|
|
isLoginTask = bool(config['daily'][today]["login_task"])
|
|
|
fight_big_monster_times = int(config['daily'][today]["fight_bigMonster_times"])
|
|
|
else:
|
|
|
@@ -227,15 +224,12 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
|
|
|
fight_big_monster_times = 0
|
|
|
write_Dailycfg(config)
|
|
|
|
|
|
- print("111")
|
|
|
send_status(f"isLoginTask:{isLoginTask}, fight_big_monster_times:{fight_big_monster_times}")
|
|
|
- print("222")
|
|
|
|
|
|
if not isLoginTask:
|
|
|
task_queue.appendleft(task_checkMaster())
|
|
|
set_login_task(config, True)
|
|
|
write_Dailycfg(config)
|
|
|
- print("333")
|
|
|
|
|
|
if isDailyConfig and fight_big_monster_times < 10:
|
|
|
task_queue.appendleft(task_fightMonster(isAddStrengh, True, isSimple))
|
