!2 reduce unnecessary code

app_dongri.py

@@ -107,6 +107,7 @@ def send_status(msg):#软件执行状态
 
             #print(sendStr)
             emit('processing_status', sendStr)
+            print(sendStr)
         
         # 如果消息是 "结束"，发送所有状态并清空列表
         if msg == "结束":
@@ -280,39 +281,11 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
     collectArr = [int(x) for x in isMaxCollect.split(",")]
     print("collectArr", collectArr)
     while not event.is_set():
-        isLoginTask = True
-        fight_big_monster_times = 0
         config = read_Dailycfg()
-        print("config", config)
-        
-        
-        if check_daily_config(config):
-            today = datetime.now().strftime('%Y-%m-%d')
-            isLoginTask = bool(config['daily'][today]["login_task"])
-            fight_big_monster_times = int(config['daily'][today]["fight_bigMonster_times"])
-        else:
-            set_login_task(config, False)
-            set_fight_big_monster_times(config, 0)
-            clean_old_daily_configs(config)
-            isLoginTask = False
-            fight_big_monster_times = 0
-            write_Dailycfg(config)
-
-        send_status(f"isLoginTask:{isLoginTask}, fight_big_monster_times:{fight_big_monster_times}")
-
-
-        if not isLoginTask:
-            task_queue.appendleft(task_checkMaster())
-            set_login_task(config, True)
-            write_Dailycfg(config)
-        
-        if isDailyConfig and fight_big_monster_times < 10:
-            isSuccess = task_fightMonster(isAddStrengh, True, isSimple)
-            if isSuccess:
-                set_fight_big_monster_times(config, fight_big_monster_times + 1)
-                write_Dailycfg(config)
+        print("config, check daily", config)
         
         if isSimple == False and is_within_n_minutes(get_todo_time("巨熊行动"), 20, 30):
+            print("in fight bear")
             if len(task_queue) < 5:
                 task_queue.appendleft(task_returnAllLine())
                 task_queue.appendleft(task_useAnnimalSkill(True))
@@ -335,7 +308,7 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
             update_rungame_type(0)
             send_status(f'巨熊行动:在60min内,切换到无尽模式')
         
-
+        print("add special activity")
         # special activity
         if activity == 'lianmeng':
             task_queue.appendleft(task_activity_lianmeng())
@@ -347,10 +320,11 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
             task_queue.appendleft(task_cure(True, g_cureNum))
             return
         
+        print("add normal activity")
         task_queue.appendleft(task_checkActivities())
         if g_switch == True:
             task_queue.appendleft(task_checkBenifitStatus())
-        
+    
         # first run
         #if g_times % 3 == 1:
         #    task_queue.appendleft(check_safe_collect())
@@ -358,8 +332,6 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
         if isSimple == False:
             task_queue.appendleft(task_information())
 
-        
-        
         task_queue.appendleft(task_check_Research())
         task_queue.appendleft(task_checkStoreRoom())
         if not isSimple:
@@ -391,9 +363,9 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
                 task_queue.appendleft(task_collect(collectArr, isSimple, isAddStrengh))
         else:
             task_queue.appendleft(task_collect(collectArr, isSimple, isAddStrengh))
-        
-        
-        if g_times % 5 == 0:
+    
+        print("add rare activity")
+        if g_times % 5 == 1:
             if get_rungame_type() == 0:
                 task_queue.appendleft(check_buildOrResearch())
             task_queue.appendleft(task_cure(True, g_cureNum))
@@ -415,11 +387,9 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
             task_queue.appendleft(task_gotoTree())
             task_queue.appendleft(task_checkHelp())
 
-        
-        
-        
         #task_queue.appendleft(task_get_redPackage())
 
+        print("check restart")
         g_times += 1
         restart_times = 7
         if g_switch:
@@ -437,10 +407,7 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
             if g_isRestart:
                 handle_restart_game()
         else:
-            if isAddStrengh:
-                myTimeSleep(random.randint(350, 400), send_status)
-            else:
-                myTimeSleep(random.randint(350, 400), send_status)
+            myTimeSleep(random.randint(100, 150), send_status)
             
         
     task_queue.clear()