Opt: Optimized priority of MaaAward

submodule/AlasMaaBridge/config/template.json

@@ -90,7 +90,7 @@
       "Enable": false,
       "NextRun": "2020-01-01 00:00:00",
       "Command": "MaaRecruit",
-      "SuccessInterval": 540,
+      "SuccessInterval": 180,
       "FailureInterval": 120,
       "ServerUpdate": "04:00"
     },
@@ -109,7 +109,7 @@
       "Enable": false,
       "NextRun": "2020-01-01 00:00:00",
       "Command": "MaaInfrast",
-      "SuccessInterval": 1200,
+      "SuccessInterval": 720,
       "FailureInterval": 120,
       "ServerUpdate": "04:00"
     },
@@ -152,7 +152,7 @@
       "Command": "MaaAward",
       "SuccessInterval": 60,
       "FailureInterval": 120,
-      "ServerUpdate": "04:00"
+      "ServerUpdate": "04:00, 16:00"
     }
   },
   "MaaRoguelike": {

submodule/AlasMaaBridge/module/config/argument/args.json

@@ -309,7 +309,7 @@
       },
       "SuccessInterval": {
         "type": "input",
-        "value": 540,
+        "value": 180,
         "display": "hide"
       },
       "FailureInterval": {
@@ -372,7 +372,7 @@
       },
       "SuccessInterval": {
         "type": "input",
-        "value": 1200,
+        "value": 720,
         "display": "hide"
       },
       "FailureInterval": {
@@ -522,7 +522,7 @@
       },
       "ServerUpdate": {
         "type": "input",
-        "value": "04:00",
+        "value": "04:00, 16:00",
         "display": "hide"
       }
     }

submodule/AlasMaaBridge/module/config/argument/override.yaml

@@ -35,9 +35,12 @@ MaaFight:
 
 MaaRecruit:
   Scheduler:
-    SuccessInterval: 540
+    SuccessInterval: 180
 
 MaaInfrast:
   Scheduler:
-    SuccessInterval: 1200
+    SuccessInterval: 720
 
+MaaAward:
+  Scheduler:
+    ServerUpdate: 04:00, 16:00

submodule/AlasMaaBridge/module/config/config.py

@@ -12,9 +12,10 @@ class ArknightsConfig(AzurLaneConfig, ConfigUpdater, GeneratedConfig):
     SCHEDULER_PRIORITY = """
             MaaStartup
             > MaaRecruit > MaaInfrast
-            > MaaVisit > MaaMall > MaaAward
+            > MaaVisit > MaaMall
             > MaaAnnihilation > MaaMaterial
-            > MaaFight > MaaRoguelike
+            > MaaFight > MaaAward
+            > MaaRoguelike
             """
 
     def __init__(self, config_name, task=None):

submodule/AlasMaaBridge/module/handler/handler.py

@@ -53,6 +53,7 @@ class AssistantHandler:
 
     def maa_start(self, task_name, params):
         self.task_id = self.asst.append_task(task_name, params)
+        self.signal = None
         self.params = params
         self.callback_list.append(self.generic_callback)
         self.callback_timer.reset()
@@ -63,8 +64,6 @@ class AssistantHandler:
                 raise RequestHumanTakeover
 
             if self.signal == self.Message.AllTasksCompleted:
-                self.signal = None
-                self.task_id = None
                 self.callback_list.clear()
                 self.asst.stop()
                 return