Upd: move meta_reward execution as subtask under OpsiAshBeacon and AshBeaconAssist

2025-01-08 12:47:32 +08:00 · 2022-10-16 21:44:37 -04:00 · 2022-10-16 21:44:37 -04:00 · 96adc8c4c7
commit 96adc8c4c7
parent d14f0018fa
16 changed files with 5 additions and 134 deletions
--- a/alas.py
+++ b/alas.py
@ -223,10 +223,6 @@ class AzurLaneAutoScript:
        from module.freebies.freebies import Freebies
        Freebies(config=self.config, device=self.device).run()

-    def meta_reward(self):
-        from module.meta_reward.meta_reward import MetaReward
-        MetaReward(config=self.config, device=self.device).run()
-
    def daily(self):
        if self.config.SERVER == 'tw':
            from module.daily.daily_tw import Daily
--- a/config/template.json
+++ b/config/template.json
@ -1230,19 +1230,6 @@
      "WeeklyFreeSupplyPack": true
    }
  },
-  "MetaReward": {
-    "Scheduler": {
-      "Enable": true,
-      "NextRun": "2020-01-01 00:00:00",
-      "Command": "MetaReward",
-      "SuccessInterval": 30,
-      "FailureInterval": 30,
-      "ServerUpdate": "00:00"
-    },
-    "MetaReward": {
-      "MetaReward": true
-    }
-  },
  "Daily": {
    "Scheduler": {
      "Enable": false,
--- a/module/config/argument/args.json
+++ b/module/config/argument/args.json
@ -6337,45 +6337,6 @@
      }
    }
  },
-  "MetaReward": {
-    "Scheduler": {
-      "Enable": {
-        "type": "checkbox",
-        "value": true
-      },
-      "NextRun": {
-        "type": "datetime",
-        "value": "2020-01-01 00:00:00",
-        "validate": "datetime"
-      },
-      "Command": {
-        "type": "input",
-        "value": "MetaReward",
-        "display": "hide"
-      },
-      "SuccessInterval": {
-        "type": "input",
-        "value": 30,
-        "display": "hide"
-      },
-      "FailureInterval": {
-        "type": "input",
-        "value": 30,
-        "display": "hide"
-      },
-      "ServerUpdate": {
-        "type": "input",
-        "value": "00:00",
-        "display": "hide"
-      }
-    },
-    "MetaReward": {
-      "MetaReward": {
-        "type": "checkbox",
-        "value": true
-      }
-    }
-  },
  "Daily": {
    "Scheduler": {
      "Enable": {
--- a/module/config/argument/argument.yaml
+++ b/module/config/argument/argument.yaml
@ -466,8 +466,6 @@ Mail:
  Delete: false
 SupplyPack:
  WeeklyFreeSupplyPack: true
-MetaReward:
-  MetaReward: true

 # ==================== Daily ====================

--- a/module/config/argument/default.yaml
+++ b/module/config/argument/default.yaml
@ -54,9 +54,6 @@ Reward:
 Freebies:
  Scheduler:
    Enable: true
-MetaReward:
-  Scheduler:
-    Enable: true

 # ==================== DailyMission ====================

--- a/module/config/argument/menu.json
+++ b/module/config/argument/menu.json
@ -38,8 +38,7 @@
      "ShopOnce",
      "Shipyard",
      "Gacha",
-      "Freebies",
-      "MetaReward"
+      "Freebies"
    ],
    "DailyMission": [
      "Daily",
--- a/module/config/argument/override.yaml
+++ b/module/config/argument/override.yaml
@ -265,11 +265,6 @@ Freebies:
    SuccessInterval: 30
    FailureInterval: 30
    ServerUpdate: 00:00
-MetaReward:
-  Scheduler:
-    SuccessInterval: 30
-    FailureInterval: 30
-    ServerUpdate: 00:00

 # ==================== Daily ====================

--- a/module/config/argument/task.yaml
+++ b/module/config/argument/task.yaml
@ -193,9 +193,6 @@ Freebies:
  - DataKey
  - Mail
  - SupplyPack
-MetaReward:
-  - Scheduler
-  - MetaReward

 # ==================== DailyMission ====================

--- a/module/config/config_generated.py
+++ b/module/config/config_generated.py
@ -300,9 +300,6 @@ class GeneratedConfig:
    # Group `SupplyPack`
    SupplyPack_WeeklyFreeSupplyPack = True

-    # Group `MetaReward`
-    MetaReward_MetaReward = True
-
    # Group `Daily`
    Daily_UseDailySkip = True
    Daily_EscortMission = 'first'  # skip, first, second, third
--- a/module/config/config_manual.py
+++ b/module/config/config_manual.py
@ -13,7 +13,7 @@ class ManualConfig:
    > Commission > Tactical > Research
    > Exercise
    > Dorm > Meowfficer > Guild > Gacha
-    > Reward > MetaReward
+    > Reward
    > ShopFrequent > ShopOnce > Shipyard > Freebies
    > OpsiExplore
    > OpsiAshBeacon
--- a/module/config/i18n/en-US.json
+++ b/module/config/i18n/en-US.json
@ -158,10 +158,6 @@
      "name": "Freebies",
      "help": ""
    },
-    "MetaReward": {
-      "name": "Meta Reward",
-      "help": ""
-    },
    "Daily": {
      "name": "Daily",
      "help": ""
@ -1735,16 +1731,6 @@
      "help": ""
    }
  },
-  "MetaReward": {
-    "_info": {
-      "name": "Meta Reward Settings",
-      "help": ""
-    },
-    "MetaReward": {
-      "name": "Receive META rewards",
-      "help": ""
-    }
-  },
  "Daily": {
    "_info": {
      "name": "Daily Settings",
--- a/module/config/i18n/ja-JP.json
+++ b/module/config/i18n/ja-JP.json
@ -158,10 +158,6 @@
      "name": "Task.Freebies.name",
      "help": "Task.Freebies.help"
    },
-    "MetaReward": {
-      "name": "Task.MetaReward.name",
-      "help": "Task.MetaReward.help"
-    },
    "Daily": {
      "name": "Task.Daily.name",
      "help": "Task.Daily.help"
@ -1735,16 +1731,6 @@
      "help": "SupplyPack.WeeklyFreeSupplyPack.help"
    }
  },
-  "MetaReward": {
-    "_info": {
-      "name": "MetaReward._info.name",
-      "help": "MetaReward._info.help"
-    },
-    "MetaReward": {
-      "name": "MetaReward.MetaReward.name",
-      "help": "MetaReward.MetaReward.help"
-    }
-  },
  "Daily": {
    "_info": {
      "name": "Daily._info.name",
--- a/module/config/i18n/zh-CN.json
+++ b/module/config/i18n/zh-CN.json
@ -158,10 +158,6 @@
      "name": "Task.Freebies.name",
      "help": "Task.Freebies.help"
    },
-    "MetaReward": {
-      "name": "Meta奖励",
-      "help": ""
-    },
    "Daily": {
      "name": "每日任务",
      "help": ""
@ -1735,16 +1731,6 @@
      "help": ""
    }
  },
-  "MetaReward": {
-    "_info": {
-      "name": "Meta 奖励",
-      "help": ""
-    },
-    "MetaReward": {
-      "name": "领取 Meta 奖励",
-      "help": ""
-    }
-  },
  "Daily": {
    "_info": {
      "name": "每日任务",
--- a/module/config/i18n/zh-TW.json
+++ b/module/config/i18n/zh-TW.json
@ -158,10 +158,6 @@
      "name": "Task.Freebies.name",
      "help": "Task.Freebies.help"
    },
-    "MetaReward": {
-      "name": "Meta獎勵",
-      "help": ""
-    },
    "Daily": {
      "name": "每日任務",
      "help": ""
@ -1735,16 +1731,6 @@
      "help": ""
    }
  },
-  "MetaReward": {
-    "_info": {
-      "name": "META 獎勵",
-      "help": ""
-    },
-    "MetaReward": {
-      "name": "領取 META 獎勵",
-      "help": ""
-    }
-  },
  "Daily": {
    "_info": {
      "name": "每日任務",
--- a/module/meta_reward/meta_reward.py
+++ b/module/meta_reward/meta_reward.py
@ -99,5 +99,3 @@ class MetaReward(Combat, UI):
        if self.meta_reward_notice_appear():
            self.meta_reward_enter()
            self.meta_reward_receive()
-
-        self.config.task_delay(server_update=True)
--- a/module/os_ash/meta.py
+++ b/module/os_ash/meta.py
@ -3,6 +3,7 @@ from enum import Enum
 import module.config.server as server
 from module.combat.combat import BATTLE_PREPARATION
 from module.logger import logger
+from module.meta_reward.meta_reward import MetaReward
 from module.ocr.ocr import DigitCounter, Digit
 from module.os_ash.ash import AshCombat
 from module.os_ash.assets import *
@ -374,7 +375,7 @@ class OpsiAshBeacon(Meta):

        with self.config.multi_set():
            if self._meta_receive_count > 0:
-                self.config.task_call('MetaReward', force_call=False)
+                MetaReward(self.config, self.device).run()
            self.config.task_delay(server_update=True)


@ -478,4 +479,5 @@ class AshBeaconAssist(Meta):
    def run(self):
        self.ui_ensure(page_reward)
        self._begin_meta_assist()
+        MetaReward(self.config, self.device).run()
        self.config.task_delay(server_update=True)