diff --git a/config/template.json b/config/template.json index 7f589e809..01fe70c60 100644 --- a/config/template.json +++ b/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" diff --git a/module/config/argument/args.json b/module/config/argument/args.json index fc52e0831..26c244559 100644 --- a/module/config/argument/args.json +++ b/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" } }, diff --git a/module/config/argument/override.yaml b/module/config/argument/override.yaml index 95f6fda16..55966e6e4 100644 --- a/module/config/argument/override.yaml +++ b/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: diff --git a/module/config/config_manual.py b/module/config/config_manual.py index 8be59086a..afcdc727c 100644 --- a/module/config/config_manual.py +++ b/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 diff --git a/module/raid/run.py b/module/raid/run.py index 5c6e21fb6..2c90aaf1a 100644 --- a/module/raid/run.py +++ b/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)