Merge dev branch to master

config/template.json

@@ -1369,7 +1369,7 @@
       "Command": "RaidDaily",
       "SuccessInterval": 30,
       "FailureInterval": 30,
-      "ServerUpdate": "00:00"
+      "ServerUpdate": "00:00, 06:00, 12:00, 18:00, 21:00"
     },
     "RaidDaily": {
       "StageFilter": "hard > normal > easy"

module/config/argument/args.json

@@ -7119,7 +7119,7 @@
       },
       "ServerUpdate": {
         "type": "input",
-        "value": "00:00",
+        "value": "00:00, 06:00, 12:00, 18:00, 21:00",
         "display": "hide"
       }
     },

module/config/argument/override.yaml

@@ -238,7 +238,7 @@ RaidDaily:
   Scheduler:
     SuccessInterval: 30
     FailureInterval: 30
-    ServerUpdate: 00:00
+    ServerUpdate: 00:00, 06:00, 12:00, 18:00, 21:00
   Campaign:
     Name: dynamic
     Event:

module/config/config_manual.py

@@ -16,7 +16,7 @@ class ManualConfig:
     > Dorm > Meowfficer > Guild > Gacha
     > Reward
     > ShopFrequent > ShopOnce > Shipyard > Freebies > Daily > Hard 
-    > Oilkeep > Event 
+    > Oilkeep > Event > RaidDaily
     > PrivateQuarters
     > OpsiExplore
     > EventStory > Smallevent > Minigame > Awaken
@@ -25,7 +25,7 @@ class ManualConfig:
     > OpsiAbyssal > OpsiStronghold > OpsiObscure > OpsiArchive
     > OpsiAshBeacon > OpsiAshAssist > OpsiMonthBoss
     > Sos > EventSp > EventA > EventB > EventC > EventD
-    > RaidDaily > CoalitionSp > WarArchives > MaritimeEscort
+    > CoalitionSp > WarArchives > MaritimeEscort
     > Event2 > Event3 > Raid > Hospital > Coalition > Main3 > Main > Main2
     > ShipIr
     > OpsiMeowfficerFarming

module/raid/run.py

@@ -40,6 +40,7 @@ class RaidRun(Raid, CampaignEvent):
             if skip_first_screenshot:
                 skip_first_screenshot = False
             else:
+                self.device.sleep(0.5)
                 self.device.screenshot()
 
             ocr = raid_ocr(raid=self.config.Campaign_Event, mode=mode)