From b7ac18cebf665a1970257a515eb12ae2031eea9d Mon Sep 17 00:00:00 2001 From: qwerdvd <2450899274@qq.com> Date: Thu, 12 Oct 2023 13:17:53 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Client:=202.1.01=20Data:=2023-10-08?= =?UTF-8?q?-17-52-18-288259?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arknightsuid_resource/constants.py | 10 +-- ArknightsUID/utils/models/common.py | 72 ++----------------- .../utils/models/gamedata/ActivityTable.py | 6 +- .../utils/models/gamedata/AudioData.py | 6 +- .../utils/models/gamedata/BattleEquipTable.py | 2 +- .../utils/models/gamedata/BuildingData.py | 10 +-- .../utils/models/gamedata/CampaignTable.py | 6 +- .../utils/models/gamedata/ChapterTable.py | 2 +- .../utils/models/gamedata/CharMetaTable.py | 6 +- .../utils/models/gamedata/CharPatchTable.py | 6 +- .../utils/models/gamedata/CharacterTable.py | 6 +- .../utils/models/gamedata/CharmTable.py | 6 +- .../utils/models/gamedata/CharwordTable.py | 6 +- .../utils/models/gamedata/CheckinTable.py | 6 +- .../utils/models/gamedata/ClimbTowerTable.py | 6 +- .../utils/models/gamedata/ClueData.py | 2 +- .../utils/models/gamedata/CrisisTable.py | 6 +- .../utils/models/gamedata/DisplayMetaTable.py | 6 +- .../models/gamedata/EnemyHandbookTable.py | 6 +- .../utils/models/gamedata/FavorTable.py | 2 +- .../utils/models/gamedata/GachaTable.py | 6 +- .../utils/models/gamedata/GamedataConst.py | 6 +- .../models/gamedata/HandbookInfoTable.py | 6 +- .../utils/models/gamedata/HandbookTable.py | 2 +- .../models/gamedata/HandbookTeamTable.py | 2 +- .../utils/models/gamedata/ItemTable.py | 6 +- .../utils/models/gamedata/MedalTable.py | 6 +- .../utils/models/gamedata/MissionTable.py | 6 +- .../utils/models/gamedata/OpenServerTable.py | 6 +- .../models/gamedata/PlayerAvatarTable.py | 2 +- .../utils/models/gamedata/RangeTable.py | 6 +- .../utils/models/gamedata/ReplicateTable.py | 6 +- .../utils/models/gamedata/RetroTable.py | 6 +- .../utils/models/gamedata/RoguelikeTable.py | 6 +- .../utils/models/gamedata/SandboxTable.py | 6 +- .../utils/models/gamedata/ShopClientTable.py | 6 +- .../utils/models/gamedata/SkillTable.py | 6 +- .../utils/models/gamedata/SkinTable.py | 2 +- .../utils/models/gamedata/StageTable.py | 6 +- .../models/gamedata/StoryReviewMetaTable.py | 6 +- .../utils/models/gamedata/StoryReviewTable.py | 6 +- .../utils/models/gamedata/StoryTable.py | 6 +- .../utils/models/gamedata/TechBuffTable.py | 6 +- .../utils/models/gamedata/TipTable.py | 2 +- .../utils/models/gamedata/TokenTable.py | 6 +- .../utils/models/gamedata/UniequipData.py | 6 +- .../utils/models/gamedata/UniequipTable.py | 6 +- .../utils/models/gamedata/ZoneTable.py | 6 +- ArknightsUID/utils/resource/resource_map.json | 6 +- ArknightsUID/version.py | 2 +- 50 files changed, 136 insertions(+), 198 deletions(-) diff --git a/ArknightsUID/arknightsuid_resource/constants.py b/ArknightsUID/arknightsuid_resource/constants.py index 34d2299..5f670be 100644 --- a/ArknightsUID/arknightsuid_resource/constants.py +++ b/ArknightsUID/arknightsuid_resource/constants.py @@ -218,9 +218,7 @@ class ExcelTableManager: return self.climb_tower_table_ async def clue_data(self) -> None: - self.clue_data_ = ClueData.convert( - await store.get_excel("clue_data") - ) + self.clue_data_ = ClueData.convert(await store.get_excel("clue_data")) @property def CLUE_DATA(self) -> ClueData: @@ -354,7 +352,7 @@ class ExcelTableManager: async def range_table(self) -> None: self.range_table_ = RangeTable.convert( - {"range": await store.get_excel("range_table")} + {"range_": await store.get_excel("range_table")} ) @property @@ -479,9 +477,7 @@ class ExcelTableManager: return self.tech_buff_table_ async def tip_table(self) -> None: - self.tip_table_ = TipTable.convert( - await store.get_excel("tip_table") - ) + self.tip_table_ = TipTable.convert(await store.get_excel("tip_table")) @property def TIP_TABLE(self) -> TipTable: diff --git a/ArknightsUID/utils/models/common.py b/ArknightsUID/utils/models/common.py index 5181c2a..04e2689 100644 --- a/ArknightsUID/utils/models/common.py +++ b/ArknightsUID/utils/models/common.py @@ -1,10 +1,8 @@ -import base64 -import json from collections.abc import Callable, Iterable, Iterator from copy import copy, deepcopy -from typing import Any, Dict, List, Tuple, Type, TypeVar, Union +from typing import Any, Dict, Tuple, Type, TypeVar, Union -from msgspec import Meta, Struct, UnsetType, convert, field +from msgspec import Struct, UnsetType, convert, field from msgspec import json as mscjson from typing_extensions import dataclass_transform @@ -17,16 +15,12 @@ def transUnset(v: Union[T, UnsetType], d: Any = None) -> Union[T, Any]: @dataclass_transform(field_specifiers=(field,)) -class BaseStruct(Struct, forbid_unknown_fields=True, omit_defaults=True, gc=False): +class BaseStruct( + Struct, forbid_unknown_fields=True, omit_defaults=True, gc=False +): class Config: encoder = mscjson.Encoder() - @classmethod - def json_schema(cls) -> str: - return ( - f"```json\n{json.dumps(mscjson.schema(cls), ensure_ascii=False, indent=2)}" - ) - @classmethod def convert( cls: Type[Model], @@ -45,63 +39,9 @@ class BaseStruct(Struct, forbid_unknown_fields=True, omit_defaults=True, gc=Fals from_attributes=from_attributes, dec_hook=dec_hook, builtin_types=builtin_types, - str_keys=str_keys + str_keys=str_keys, ) - def __post_init__( - self, - validate_whitespace: Union[List[str], None] = None, - validate_num_with_range: Union[List[Tuple[str, Meta]], None] = None, - validate_optional: Union[List[Tuple[str, Meta]], None] = None, - validate_int: Union[List[str], None] = None, - validate_base64: Union[List[str], None] = None, - ) -> None: - if validate_base64 is None: - validate_base64 = [] - if validate_int is None: - validate_int = [] - if validate_optional is None: - validate_optional = [] - if validate_num_with_range is None: - validate_num_with_range = [] - if validate_whitespace is None: - validate_whitespace = [] - for field_name in validate_whitespace: - if (field_value := getattr(self, field_name)) is not None: - if isinstance(field_value, str) and not field_value.strip(): - raise ValueError( - f'child "{field_name}" fails because ["{field_name}" is not allowed to be empty]' - ) - - for field_group in validate_num_with_range: - if (field_value := getattr(self, field_group[0])) is not None: - if field_value > (le := field_group[1].le or field_value): - raise ValueError(f'"{field_group[0]}" must be less than {le}') - if field_value < (ge := field_group[1].ge or field_value): - raise ValueError(f'"{field_group[0]}" must be greater than {ge}') - - for field_group in validate_optional: - if (field_value := getattr(self, field_group[0])) is not None: - if field_value not in field_group[1].examples: - raise ValueError( - f'"{field_group[0]}" must be one of {field_group[1]}' - ) - - for field_name in validate_int: - if (field_value := getattr(self, field_name)) is not None: - if not field_value.isdigit(): - raise ValueError( - f'child "{field_name}" fails because ["{field_name}" must be a number]' - ) - - for field_name in validate_base64: - try: - base64.b64decode(getattr(self, field_name)) - except Exception as e: - raise ValueError( - f'child "{field_name}" fails because ["{field_name}" must be a valid base64 string]' - ) from e - def __iter__(self) -> Iterator[Tuple[str, Any]]: for field_name in self.__struct_fields__: yield field_name, getattr(self, field_name) diff --git a/ArknightsUID/utils/models/gamedata/ActivityTable.py b/ArknightsUID/utils/models/gamedata/ActivityTable.py index 9bc5518..da12989 100644 --- a/ArknightsUID/utils/models/gamedata/ActivityTable.py +++ b/ArknightsUID/utils/models/gamedata/ActivityTable.py @@ -1,9 +1,9 @@ from typing import Any, Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class ActivityTableBasicData(BaseStruct): id_: str = field(name='id') @@ -2452,7 +2452,7 @@ class ActivityTableExtraData(BaseStruct): class ActivityTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' basicInfo: Dict[str, ActivityTableBasicData] homeActConfig: Dict[str, ActivityTableHomeActivityConfig] diff --git a/ArknightsUID/utils/models/gamedata/AudioData.py b/ArknightsUID/utils/models/gamedata/AudioData.py index c5c3529..01786d7 100644 --- a/ArknightsUID/utils/models/gamedata/AudioData.py +++ b/ArknightsUID/utils/models/gamedata/AudioData.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class BGMBank(BaseStruct): name: str @@ -74,7 +74,7 @@ class BattleVoiceData(BaseStruct): class AudioData(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' bgmBanks: List[BGMBank] soundFXBanks: List[SoundFXBank] diff --git a/ArknightsUID/utils/models/gamedata/BattleEquipTable.py b/ArknightsUID/utils/models/gamedata/BattleEquipTable.py index 4db6230..568ccf0 100644 --- a/ArknightsUID/utils/models/gamedata/BattleEquipTable.py +++ b/ArknightsUID/utils/models/gamedata/BattleEquipTable.py @@ -78,6 +78,6 @@ class BattleEquipData(BaseStruct): class BattleEquipTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' equips: Dict[str, BattleEquipData] diff --git a/ArknightsUID/utils/models/gamedata/BuildingData.py b/ArknightsUID/utils/models/gamedata/BuildingData.py index 420805b..7531dd4 100644 --- a/ArknightsUID/utils/models/gamedata/BuildingData.py +++ b/ArknightsUID/utils/models/gamedata/BuildingData.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class BuildingDataRoomUnlockCondCondItem(BaseStruct): type_: str = field(name='type') @@ -318,7 +318,9 @@ class BuildingDataCustomDataDiyUISortTemplateListData(BaseStruct): expandState: str defaultTemplateIndex: int defaultTemplateOrder: str - templates: List[BuildingDataCustomDataDiyUISortTemplateListDataDiyUISortTemplateData] + templates: List[ + BuildingDataCustomDataDiyUISortTemplateListDataDiyUISortTemplateData + ] class BuildingDataCustomData(BaseStruct): @@ -421,7 +423,7 @@ class BuildingDataCreditFormula(BaseStruct): class BuildingData(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' controlSlotId: str meetingSlotId: str diff --git a/ArknightsUID/utils/models/gamedata/CampaignTable.py b/ArknightsUID/utils/models/gamedata/CampaignTable.py index 6b2e429..73c1385 100644 --- a/ArknightsUID/utils/models/gamedata/CampaignTable.py +++ b/ArknightsUID/utils/models/gamedata/CampaignTable.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class ItemBundle(BaseStruct): id_: str = field(name='id') @@ -145,7 +145,7 @@ class CampaignTrainingAllOpenTimeData(BaseStruct): class CampaignTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' campaigns: Dict[str, CampaignData] campaignGroups: Dict[str, CampaignGroupData] diff --git a/ArknightsUID/utils/models/gamedata/ChapterTable.py b/ArknightsUID/utils/models/gamedata/ChapterTable.py index 21d0a9d..e3cafe9 100644 --- a/ArknightsUID/utils/models/gamedata/ChapterTable.py +++ b/ArknightsUID/utils/models/gamedata/ChapterTable.py @@ -15,6 +15,6 @@ class ChapterData(BaseStruct): class ChapterTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' chapters: Dict[str, ChapterData] diff --git a/ArknightsUID/utils/models/gamedata/CharMetaTable.py b/ArknightsUID/utils/models/gamedata/CharMetaTable.py index 0b56206..94fc15c 100644 --- a/ArknightsUID/utils/models/gamedata/CharMetaTable.py +++ b/ArknightsUID/utils/models/gamedata/CharMetaTable.py @@ -1,9 +1,9 @@ from typing import Dict, List -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class ItemBundle(BaseStruct): id_: str = field(name='id') @@ -21,7 +21,7 @@ class SpCharMissionData(BaseStruct): class CharMetaTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' spCharGroups: Dict[str, List[str]] spCharMissions: Dict[str, Dict[str, SpCharMissionData]] diff --git a/ArknightsUID/utils/models/gamedata/CharPatchTable.py b/ArknightsUID/utils/models/gamedata/CharPatchTable.py index 5f21e47..68aca0e 100644 --- a/ArknightsUID/utils/models/gamedata/CharPatchTable.py +++ b/ArknightsUID/utils/models/gamedata/CharPatchTable.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class CharPatchDataPatchInfo(BaseStruct): tmplIds: List[str] @@ -191,7 +191,7 @@ class CharPatchDataPatchDetailInfo(BaseStruct): class CharPatchTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' infos: Dict[str, CharPatchDataPatchInfo] patchChars: Dict[str, CharacterData] diff --git a/ArknightsUID/utils/models/gamedata/CharacterTable.py b/ArknightsUID/utils/models/gamedata/CharacterTable.py index 53651ff..28301c4 100644 --- a/ArknightsUID/utils/models/gamedata/CharacterTable.py +++ b/ArknightsUID/utils/models/gamedata/CharacterTable.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class CharacterDataUnlockCondition(BaseStruct): phase: int @@ -175,7 +175,7 @@ class CharacterData(BaseStruct): class CharacterTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' chars: Dict[str, CharacterData] diff --git a/ArknightsUID/utils/models/gamedata/CharmTable.py b/ArknightsUID/utils/models/gamedata/CharmTable.py index ea28d37..edd1aac 100644 --- a/ArknightsUID/utils/models/gamedata/CharmTable.py +++ b/ArknightsUID/utils/models/gamedata/CharmTable.py @@ -1,9 +1,9 @@ from typing import List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class RuneDataSelector(BaseStruct): professionMask: Union[int, str] @@ -58,6 +58,6 @@ class CharmItemData(BaseStruct): class CharmTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' charmList: List[CharmItemData] diff --git a/ArknightsUID/utils/models/gamedata/CharwordTable.py b/ArknightsUID/utils/models/gamedata/CharwordTable.py index da97493..c017efa 100644 --- a/ArknightsUID/utils/models/gamedata/CharwordTable.py +++ b/ArknightsUID/utils/models/gamedata/CharwordTable.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class CharWordUnlockParam(BaseStruct): valueStr: Union[str, None] @@ -55,7 +55,7 @@ class NewVoiceTimeData(BaseStruct): class CharwordTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' charWords: Dict[str, CharWordData] voiceLangDict: Dict[str, VoiceLangData] diff --git a/ArknightsUID/utils/models/gamedata/CheckinTable.py b/ArknightsUID/utils/models/gamedata/CheckinTable.py index d8aaa97..21a6efe 100644 --- a/ArknightsUID/utils/models/gamedata/CheckinTable.py +++ b/ArknightsUID/utils/models/gamedata/CheckinTable.py @@ -1,9 +1,9 @@ from typing import Dict, List -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class ItemBundle(BaseStruct): id_: str = field(name='id') @@ -36,7 +36,7 @@ class MonthlyDailyBonusGroup(BaseStruct): class CheckinTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' groups: Dict[str, MonthlySignInGroupData] monthlySubItem: Dict[str, List[MonthlyDailyBonusGroup]] diff --git a/ArknightsUID/utils/models/gamedata/ClimbTowerTable.py b/ArknightsUID/utils/models/gamedata/ClimbTowerTable.py index 99791e1..0c1bc92 100644 --- a/ArknightsUID/utils/models/gamedata/ClimbTowerTable.py +++ b/ArknightsUID/utils/models/gamedata/ClimbTowerTable.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class ItemBundle(BaseStruct): id_: str = field(name='id') @@ -240,7 +240,7 @@ class MissionGroup(BaseStruct): class ClimbTowerTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' towers: Dict[str, ClimbTowerSingleTowerData] levels: Dict[str, ClimbTowerSingleLevelData] diff --git a/ArknightsUID/utils/models/gamedata/ClueData.py b/ArknightsUID/utils/models/gamedata/ClueData.py index 2e74ce4..4205a1e 100644 --- a/ArknightsUID/utils/models/gamedata/ClueData.py +++ b/ArknightsUID/utils/models/gamedata/ClueData.py @@ -21,7 +21,7 @@ class MeetingClueDataReceiveTimeBonus(BaseStruct): class ClueData(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' clues: List[MeetingClueDataClueData] clueTypes: List[MeetingClueDataClueTypeData] diff --git a/ArknightsUID/utils/models/gamedata/CrisisTable.py b/ArknightsUID/utils/models/gamedata/CrisisTable.py index 046d202..b5021ec 100644 --- a/ArknightsUID/utils/models/gamedata/CrisisTable.py +++ b/ArknightsUID/utils/models/gamedata/CrisisTable.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class ItemBundle(BaseStruct): id_: str = field(name='id') @@ -34,7 +34,7 @@ class CrisisMapRankInfo(BaseStruct): class CrisisTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' seasonInfo: List[CrisisClientDataSeasonInfo] tempAppraise: List[StringKeyFrames] diff --git a/ArknightsUID/utils/models/gamedata/DisplayMetaTable.py b/ArknightsUID/utils/models/gamedata/DisplayMetaTable.py index 166c777..3287853 100644 --- a/ArknightsUID/utils/models/gamedata/DisplayMetaTable.py +++ b/ArknightsUID/utils/models/gamedata/DisplayMetaTable.py @@ -1,9 +1,9 @@ from typing import Dict, List -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class PlayerAvatarPerData(BaseStruct): avatarId: str @@ -76,7 +76,7 @@ class HomeBackgroundData(BaseStruct): class DisplayMetaTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' playerAvatarData: PlayerAvatarData homeBackgroundData: HomeBackgroundData diff --git a/ArknightsUID/utils/models/gamedata/EnemyHandbookTable.py b/ArknightsUID/utils/models/gamedata/EnemyHandbookTable.py index 343a0e1..c4416cf 100644 --- a/ArknightsUID/utils/models/gamedata/EnemyHandbookTable.py +++ b/ArknightsUID/utils/models/gamedata/EnemyHandbookTable.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class EnemyHandBookDataAbilty(BaseStruct): text: str @@ -54,7 +54,7 @@ class EnemyHandbookRaceData(BaseStruct): class EnemyHandbookTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' levelInfoList: List[EnemyHandbookLevelInfoData] enemyData: Dict[str, EnemyHandBookData] diff --git a/ArknightsUID/utils/models/gamedata/FavorTable.py b/ArknightsUID/utils/models/gamedata/FavorTable.py index 8fb24e1..c4a50a2 100644 --- a/ArknightsUID/utils/models/gamedata/FavorTable.py +++ b/ArknightsUID/utils/models/gamedata/FavorTable.py @@ -15,7 +15,7 @@ class FavorDataFrames(BaseStruct): class FavorTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' maxFavor: int favorFrames: List[FavorDataFrames] diff --git a/ArknightsUID/utils/models/gamedata/GachaTable.py b/ArknightsUID/utils/models/gamedata/GachaTable.py index c85fad9..b40245a 100644 --- a/ArknightsUID/utils/models/gamedata/GachaTable.py +++ b/ArknightsUID/utils/models/gamedata/GachaTable.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class GachaDataLinkageTenGachaTkt(BaseStruct): itemId: str @@ -131,7 +131,7 @@ class GachaDataFesGachaPoolRelateItem(BaseStruct): class GachaTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' gachaTags: List[GachaTag] carousel: List[GachaDataCarouselData] diff --git a/ArknightsUID/utils/models/gamedata/GamedataConst.py b/ArknightsUID/utils/models/gamedata/GamedataConst.py index 8297e2a..d076bfc 100644 --- a/ArknightsUID/utils/models/gamedata/GamedataConst.py +++ b/ArknightsUID/utils/models/gamedata/GamedataConst.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class ItemBundle(BaseStruct): id_: str = field(name='id') @@ -23,7 +23,7 @@ class TermDescriptionData(BaseStruct): class GamedataConst(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' addedRewardDisplayZone: str advancedGachaCrystalCost: int diff --git a/ArknightsUID/utils/models/gamedata/HandbookInfoTable.py b/ArknightsUID/utils/models/gamedata/HandbookInfoTable.py index 542cded..fcbe869 100644 --- a/ArknightsUID/utils/models/gamedata/HandbookInfoTable.py +++ b/ArknightsUID/utils/models/gamedata/HandbookInfoTable.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class HandbookUnlockParam(BaseStruct): unlockType: int @@ -122,7 +122,7 @@ class HandbookInfoData(BaseStruct): class HandbookInfoTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' handbookDict: Dict[str, HandbookInfoData] npcDict: Dict[str, NPCData] diff --git a/ArknightsUID/utils/models/gamedata/HandbookTable.py b/ArknightsUID/utils/models/gamedata/HandbookTable.py index 956276f..d554dd7 100644 --- a/ArknightsUID/utils/models/gamedata/HandbookTable.py +++ b/ArknightsUID/utils/models/gamedata/HandbookTable.py @@ -40,6 +40,6 @@ class CharHandbook(BaseStruct): class HandbookTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' char_102_texas: CharHandbook diff --git a/ArknightsUID/utils/models/gamedata/HandbookTeamTable.py b/ArknightsUID/utils/models/gamedata/HandbookTeamTable.py index c050bb7..c7f5e62 100644 --- a/ArknightsUID/utils/models/gamedata/HandbookTeamTable.py +++ b/ArknightsUID/utils/models/gamedata/HandbookTeamTable.py @@ -15,6 +15,6 @@ class HandbookTeam(BaseStruct): class HandbookTeamTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' team: Dict[str, HandbookTeam] diff --git a/ArknightsUID/utils/models/gamedata/ItemTable.py b/ArknightsUID/utils/models/gamedata/ItemTable.py index 1a2f95d..205acaa 100644 --- a/ArknightsUID/utils/models/gamedata/ItemTable.py +++ b/ArknightsUID/utils/models/gamedata/ItemTable.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class ItemDataStageDropInfo(BaseStruct): stageId: str @@ -98,7 +98,7 @@ class ServerItemReminderInfo(BaseStruct): class ItemTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' activityPotentialCharacters: Dict[str, ActivityPotentialCharacterInfo] apSupplies: Dict[str, ApSupplyFeature] diff --git a/ArknightsUID/utils/models/gamedata/MedalTable.py b/ArknightsUID/utils/models/gamedata/MedalTable.py index 53ae6de..ccc9624 100644 --- a/ArknightsUID/utils/models/gamedata/MedalTable.py +++ b/ArknightsUID/utils/models/gamedata/MedalTable.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class MedalExpireTime(BaseStruct): start: int @@ -61,7 +61,7 @@ class MedalPerData(BaseStruct): class MedalTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' medalList: List[MedalPerData] medalTypeData: Dict[str, MedalTypeData] diff --git a/ArknightsUID/utils/models/gamedata/MissionTable.py b/ArknightsUID/utils/models/gamedata/MissionTable.py index d0fd388..a7ac5be 100644 --- a/ArknightsUID/utils/models/gamedata/MissionTable.py +++ b/ArknightsUID/utils/models/gamedata/MissionTable.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class MissionDisplayRewards(BaseStruct): type_: str = field(name='type') @@ -78,7 +78,7 @@ class MissionData(BaseStruct): class MissionTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' missions: Dict[str, MissionData] missionGroups: Dict[str, MissionGroup] diff --git a/ArknightsUID/utils/models/gamedata/OpenServerTable.py b/ArknightsUID/utils/models/gamedata/OpenServerTable.py index 0bd7823..11a104a 100644 --- a/ArknightsUID/utils/models/gamedata/OpenServerTable.py +++ b/ArknightsUID/utils/models/gamedata/OpenServerTable.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class RewardItem(BaseStruct): type_: str = field(name='type') @@ -269,7 +269,7 @@ class OpenServerNewbieCheckInPackage(BaseStruct): class OpenServerTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' schedule: List[OpenServerScheduleItem] dataMap: Dict[str, OpenServerData] diff --git a/ArknightsUID/utils/models/gamedata/PlayerAvatarTable.py b/ArknightsUID/utils/models/gamedata/PlayerAvatarTable.py index 5d492d9..84a18bb 100644 --- a/ArknightsUID/utils/models/gamedata/PlayerAvatarTable.py +++ b/ArknightsUID/utils/models/gamedata/PlayerAvatarTable.py @@ -21,7 +21,7 @@ class PlayerAvatarPerData(BaseStruct): class PlayerAvatarTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' avatarList: List[PlayerAvatarPerData] avatarTypeData: Dict[str, PlayerAvatarGroupData] diff --git a/ArknightsUID/utils/models/gamedata/RangeTable.py b/ArknightsUID/utils/models/gamedata/RangeTable.py index ff6dc8d..ff0c7ef 100644 --- a/ArknightsUID/utils/models/gamedata/RangeTable.py +++ b/ArknightsUID/utils/models/gamedata/RangeTable.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class GridPosition(BaseStruct): row: int @@ -25,6 +25,6 @@ class Stage(BaseStruct): class RangeTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' range_: Dict[str, Stage] diff --git a/ArknightsUID/utils/models/gamedata/ReplicateTable.py b/ArknightsUID/utils/models/gamedata/ReplicateTable.py index c26643a..142b854 100644 --- a/ArknightsUID/utils/models/gamedata/ReplicateTable.py +++ b/ArknightsUID/utils/models/gamedata/ReplicateTable.py @@ -1,9 +1,9 @@ from typing import Dict, List -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class ItemBundle(BaseStruct): id_: str = field(name='id') @@ -21,6 +21,6 @@ class ReplicateList(BaseStruct): class ReplicateTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' replicate: Dict[str, ReplicateList] diff --git a/ArknightsUID/utils/models/gamedata/RetroTable.py b/ArknightsUID/utils/models/gamedata/RetroTable.py index 4476fba..cd59b95 100644 --- a/ArknightsUID/utils/models/gamedata/RetroTable.py +++ b/ArknightsUID/utils/models/gamedata/RetroTable.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class ItemBundle(BaseStruct): id_: str = field(name='id') @@ -414,7 +414,7 @@ class RetroStageOverrideInfo(BaseStruct): class RetroTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' customData: ActivityCustomData initRetroCoin: int diff --git a/ArknightsUID/utils/models/gamedata/RoguelikeTable.py b/ArknightsUID/utils/models/gamedata/RoguelikeTable.py index 378b8c4..4f12c14 100644 --- a/ArknightsUID/utils/models/gamedata/RoguelikeTable.py +++ b/ArknightsUID/utils/models/gamedata/RoguelikeTable.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class Blackboard(BaseStruct): key: str @@ -193,7 +193,7 @@ class RoguelikeConstTable(BaseStruct): class RoguelikeTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' constTable: RoguelikeConstTable itemTable: RoguelikeItemTable diff --git a/ArknightsUID/utils/models/gamedata/SandboxTable.py b/ArknightsUID/utils/models/gamedata/SandboxTable.py index 809a341..5f773ef 100644 --- a/ArknightsUID/utils/models/gamedata/SandboxTable.py +++ b/ArknightsUID/utils/models/gamedata/SandboxTable.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class SandboxMapConstTable(BaseStruct): directionNames: List[str] @@ -398,7 +398,7 @@ class SandboxItemData(BaseStruct): class SandboxTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' sandboxActTables: Dict[str, SandboxActTable] itemDatas: Dict[str, SandboxItemData] diff --git a/ArknightsUID/utils/models/gamedata/ShopClientTable.py b/ArknightsUID/utils/models/gamedata/ShopClientTable.py index 8381501..d9943c3 100644 --- a/ArknightsUID/utils/models/gamedata/ShopClientTable.py +++ b/ArknightsUID/utils/models/gamedata/ShopClientTable.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class ShopRecommendData(BaseStruct): imgId: str @@ -144,7 +144,7 @@ class LMTGSShopOverlaySchedule(BaseStruct): class ShopClientTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' recommendList: List[ShopRecommendItem] creditUnlockGroup: Dict[str, ShopCreditUnlockGroup] diff --git a/ArknightsUID/utils/models/gamedata/SkillTable.py b/ArknightsUID/utils/models/gamedata/SkillTable.py index bda58a6..4cd47d0 100644 --- a/ArknightsUID/utils/models/gamedata/SkillTable.py +++ b/ArknightsUID/utils/models/gamedata/SkillTable.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class ItemBundle(BaseStruct): id_: str = field(name='id') @@ -46,6 +46,6 @@ class SkillDataBundle(BaseStruct): class SkillTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' skills: Dict[str, SkillDataBundle] diff --git a/ArknightsUID/utils/models/gamedata/SkinTable.py b/ArknightsUID/utils/models/gamedata/SkinTable.py index 3718be4..93e5bf4 100644 --- a/ArknightsUID/utils/models/gamedata/SkinTable.py +++ b/ArknightsUID/utils/models/gamedata/SkinTable.py @@ -82,7 +82,7 @@ class SpecialSkinInfo(BaseStruct): class SkinTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' charSkins: Dict[str, CharSkinData] buildinEvolveMap: Dict[str, Dict[str, str]] diff --git a/ArknightsUID/utils/models/gamedata/StageTable.py b/ArknightsUID/utils/models/gamedata/StageTable.py index 9520f05..6e36b91 100644 --- a/ArknightsUID/utils/models/gamedata/StageTable.py +++ b/ArknightsUID/utils/models/gamedata/StageTable.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class StageDataConditionDesc(BaseStruct): stageId: str @@ -240,7 +240,7 @@ class ApProtectZoneInfo(BaseStruct): class StageTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' stages: Dict[str, StageData] runeStageGroups: Dict[str, RuneStageGroupData] diff --git a/ArknightsUID/utils/models/gamedata/StoryReviewMetaTable.py b/ArknightsUID/utils/models/gamedata/StoryReviewMetaTable.py index c605885..3ec0a70 100644 --- a/ArknightsUID/utils/models/gamedata/StoryReviewMetaTable.py +++ b/ArknightsUID/utils/models/gamedata/StoryReviewMetaTable.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class MiniActTrialDataRuleData(BaseStruct): ruleType: str @@ -211,7 +211,7 @@ class ActArchiveComponentTable(BaseStruct): class StoryReviewMetaTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' miniActTrialData: MiniActTrialData actArchiveResData: ActArchiveResData diff --git a/ArknightsUID/utils/models/gamedata/StoryReviewTable.py b/ArknightsUID/utils/models/gamedata/StoryReviewTable.py index a6d96af..4027bfa 100644 --- a/ArknightsUID/utils/models/gamedata/StoryReviewTable.py +++ b/ArknightsUID/utils/models/gamedata/StoryReviewTable.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class ItemBundle(BaseStruct): id_: str = field(name='id') @@ -60,6 +60,6 @@ class StoryReviewGroupClientData(BaseStruct): class StoryReviewTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' storyreviewtable: Dict[str, StoryReviewGroupClientData] diff --git a/ArknightsUID/utils/models/gamedata/StoryTable.py b/ArknightsUID/utils/models/gamedata/StoryTable.py index 978032c..de2e5d4 100644 --- a/ArknightsUID/utils/models/gamedata/StoryTable.py +++ b/ArknightsUID/utils/models/gamedata/StoryTable.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class StoryDataTrigger(BaseStruct): type_: str = field(name='type') @@ -46,6 +46,6 @@ class StoryData(BaseStruct): class StoryTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' stories: Dict[str, StoryData] diff --git a/ArknightsUID/utils/models/gamedata/TechBuffTable.py b/ArknightsUID/utils/models/gamedata/TechBuffTable.py index c436c9c..612cfe7 100644 --- a/ArknightsUID/utils/models/gamedata/TechBuffTable.py +++ b/ArknightsUID/utils/models/gamedata/TechBuffTable.py @@ -1,9 +1,9 @@ from typing import List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class RuneDataSelector(BaseStruct): professionMask: int @@ -35,6 +35,6 @@ class PackedRuneData(BaseStruct): class TechBuffTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' runes: List[PackedRuneData] diff --git a/ArknightsUID/utils/models/gamedata/TipTable.py b/ArknightsUID/utils/models/gamedata/TipTable.py index a39b472..1fc3f67 100644 --- a/ArknightsUID/utils/models/gamedata/TipTable.py +++ b/ArknightsUID/utils/models/gamedata/TipTable.py @@ -17,7 +17,7 @@ class WorldViewTip(BaseStruct): class TipTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' tips: List[TipData] worldViewTips: List[WorldViewTip] diff --git a/ArknightsUID/utils/models/gamedata/TokenTable.py b/ArknightsUID/utils/models/gamedata/TokenTable.py index ed49942..0decb25 100644 --- a/ArknightsUID/utils/models/gamedata/TokenTable.py +++ b/ArknightsUID/utils/models/gamedata/TokenTable.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class CharacterDataUnlockCondition(BaseStruct): phase: int @@ -170,6 +170,6 @@ class TokenCharacterData(BaseStruct): class TokenTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' tokens: Dict[str, TokenCharacterData] diff --git a/ArknightsUID/utils/models/gamedata/UniequipData.py b/ArknightsUID/utils/models/gamedata/UniequipData.py index 4e8cde9..5554c63 100644 --- a/ArknightsUID/utils/models/gamedata/UniequipData.py +++ b/ArknightsUID/utils/models/gamedata/UniequipData.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class ItemBundle(BaseStruct): id_: str = field(name='id') @@ -59,7 +59,7 @@ class SubProfessionData(BaseStruct): class UniequipData(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' equipDict: Dict[str, UniEquipData] missionList: Dict[str, UniEquipMissionData] diff --git a/ArknightsUID/utils/models/gamedata/UniequipTable.py b/ArknightsUID/utils/models/gamedata/UniequipTable.py index 315cddf..fea6fbd 100644 --- a/ArknightsUID/utils/models/gamedata/UniequipTable.py +++ b/ArknightsUID/utils/models/gamedata/UniequipTable.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class ItemBundle(BaseStruct): id_: str = field(name='id') @@ -61,7 +61,7 @@ class UniEquipTimeInfo(BaseStruct): class UniEquipTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' equipDict: Dict[str, UniEquipData] missionList: Dict[str, UniEquipMissionData] diff --git a/ArknightsUID/utils/models/gamedata/ZoneTable.py b/ArknightsUID/utils/models/gamedata/ZoneTable.py index 9eead77..b897f9e 100644 --- a/ArknightsUID/utils/models/gamedata/ZoneTable.py +++ b/ArknightsUID/utils/models/gamedata/ZoneTable.py @@ -1,9 +1,9 @@ from typing import Dict, List, Union -from ..common import BaseStruct - from msgspec import field +from ..common import BaseStruct + class ZoneData(BaseStruct): zoneID: str @@ -101,7 +101,7 @@ class ZoneMetaData(BaseStruct): class ZoneTable(BaseStruct): - __version__ = '23-09-29-15-41-03-569cae' + __version__ = '23-10-08-17-52-18-288259' zones: Dict[str, ZoneData] weeklyAdditionInfo: Dict[str, WeeklyZoneData] diff --git a/ArknightsUID/utils/resource/resource_map.json b/ArknightsUID/utils/resource/resource_map.json index 45ffc55..05b0da7 100644 --- a/ArknightsUID/utils/resource/resource_map.json +++ b/ArknightsUID/utils/resource/resource_map.json @@ -11,7 +11,7 @@ }, "battle_equip_table.json": { "size": 3127845, - "url": "http://182.43.43.40:8765/UploadPic/8b3cfa00047fa4f9f852a680ce12d68a.json" + "url": "http://182.43.43.40:8765/UploadPic/7a116d92fc3edfb118eadc6d445a9634.json" }, "building_data.json": { "size": 3751638, @@ -66,8 +66,8 @@ "url": "http://182.43.43.40:8765/UploadPic/e2e1b6bc43b67c1f167d802ba9a737ea.json" }, "enemy_handbook_table.json": { - "size": 1039110, - "url": "http://182.43.43.40:8765/UploadPic/e14f75361e65108bb2f5243f7b1270b9.json" + "size": 1039317, + "url": "http://182.43.43.40:8765/UploadPic/b96d9eea501ac8e2288b04a2547a7317.json" }, "favor_table.json": { "size": 39045, diff --git a/ArknightsUID/version.py b/ArknightsUID/version.py index 1daace4..3398828 100644 --- a/ArknightsUID/version.py +++ b/ArknightsUID/version.py @@ -1,3 +1,3 @@ ArknightsUID_version = "0.1.0" Arknights_Client_version = "2.1.01" -Arknights_Res_version = "23-09-29-15-41-03-569cae" +Arknights_Res_version = "23-10-08-17-52-18-288259"