From e583920b07492e038f711d5a9df1dde7660cf498 Mon Sep 17 00:00:00 2001 From: qwerdvd <105906879+qwerdvd@users.noreply.github.com> Date: Thu, 2 Nov 2023 15:37:02 +0800 Subject: [PATCH] add constants --- ArknightsUID/arknightsuid_resource/constants.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/ArknightsUID/arknightsuid_resource/constants.py b/ArknightsUID/arknightsuid_resource/constants.py index 5f670be..e62b8f6 100644 --- a/ArknightsUID/arknightsuid_resource/constants.py +++ b/ArknightsUID/arknightsuid_resource/constants.py @@ -1,4 +1,3 @@ -import asyncio import inspect from ..utils.models.gamedata.ActivityTable import ActivityTable @@ -16,6 +15,7 @@ from ..utils.models.gamedata.CheckinTable import CheckinTable from ..utils.models.gamedata.ClimbTowerTable import ClimbTowerTable from ..utils.models.gamedata.ClueData import ClueData from ..utils.models.gamedata.CrisisTable import CrisisTable +from ..utils.models.gamedata.CrisisV2Table import CrisisV2Table from ..utils.models.gamedata.DisplayMetaTable import DisplayMetaTable from ..utils.models.gamedata.EnemyHandbookTable import EnemyHandbookTable from ..utils.models.gamedata.FavorTable import FavorTable @@ -67,6 +67,7 @@ class ExcelTableManager: climb_tower_table_: ClimbTowerTable clue_data_: ClueData crisis_table_: CrisisTable + crisis_v2_table_: CrisisV2Table display_meta_table_: DisplayMetaTable enemy_handbook_table_: EnemyHandbookTable favor_table_: FavorTable @@ -233,6 +234,15 @@ class ExcelTableManager: def CRISIS_TABLE(self) -> CrisisTable: return self.crisis_table_ + async def crisis_v2_table(self) -> None: + self.crisis_v2_table_ = CrisisV2Table.convert( + await store.get_excel("crisis_v2_table") + ) + + @property + def CRISIS_V2_TABLE(self) -> CrisisV2Table: + return self.crisis_v2_table_ + async def display_meta_table(self) -> None: self.display_meta_table_ = DisplayMetaTable.convert( await store.get_excel("display_meta_table") @@ -520,7 +530,6 @@ class ExcelTableManager: return self.zone_table_ async def preload_table(self) -> None: - tasks = [] for name, method in inspect.getmembers(self): if ( inspect.iscoroutinefunction(method) @@ -528,7 +537,6 @@ class ExcelTableManager: and name != "preload_table" ): await method() - await asyncio.gather(*tasks) Excel = ExcelTableManager()