From 3ac81f0abd7903d155d931feab2845462bd15e98 Mon Sep 17 00:00:00 2001 From: qwerdvd <2450899274@qq.com> Date: Sun, 8 Oct 2023 13:50:42 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Client:=202.1.01=20Data:=2023-09-29?= =?UTF-8?q?-15-41-03-569cae?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utils/models/gamedata/ActivityTable.py | 127 +++++++++++------- .../utils/models/gamedata/AudioData.py | 4 +- .../utils/models/gamedata/BattleEquipTable.py | 3 +- .../utils/models/gamedata/BuildingData.py | 21 ++- .../utils/models/gamedata/CampaignTable.py | 4 +- .../utils/models/gamedata/ChapterTable.py | 3 +- .../utils/models/gamedata/CharMetaTable.py | 4 +- .../utils/models/gamedata/CharPatchTable.py | 4 +- .../utils/models/gamedata/CharacterTable.py | 4 +- .../utils/models/gamedata/CharmTable.py | 4 +- .../utils/models/gamedata/CharwordTable.py | 4 +- .../utils/models/gamedata/CheckinTable.py | 4 +- .../utils/models/gamedata/ClimbTowerTable.py | 9 +- .../utils/models/gamedata/ClueData.py | 3 +- .../utils/models/gamedata/CrisisTable.py | 4 +- .../utils/models/gamedata/DisplayMetaTable.py | 17 ++- .../models/gamedata/EnemyHandbookTable.py | 4 +- .../utils/models/gamedata/FavorTable.py | 3 +- .../utils/models/gamedata/GachaTable.py | 13 +- .../utils/models/gamedata/GamedataConst.py | 4 +- .../models/gamedata/HandbookInfoTable.py | 4 +- .../utils/models/gamedata/HandbookTable.py | 3 +- .../models/gamedata/HandbookTeamTable.py | 3 +- .../utils/models/gamedata/ItemTable.py | 24 ++-- .../utils/models/gamedata/MedalTable.py | 4 +- .../utils/models/gamedata/MissionTable.py | 4 +- .../utils/models/gamedata/OpenServerTable.py | 4 +- .../models/gamedata/PlayerAvatarTable.py | 3 +- .../utils/models/gamedata/RangeTable.py | 6 +- .../utils/models/gamedata/ReplicateTable.py | 4 +- .../utils/models/gamedata/RetroTable.py | 5 +- .../utils/models/gamedata/RoguelikeTable.py | 4 +- .../models/gamedata/RoguelikeTopicTable.py | 30 ++++- .../utils/models/gamedata/SandboxTable.py | 4 +- .../utils/models/gamedata/ShopClientTable.py | 52 ++++++- .../utils/models/gamedata/SkillTable.py | 4 +- .../utils/models/gamedata/SkinTable.py | 3 +- .../utils/models/gamedata/StageTable.py | 4 +- .../models/gamedata/StoryReviewMetaTable.py | 4 +- .../utils/models/gamedata/StoryReviewTable.py | 4 +- .../utils/models/gamedata/StoryTable.py | 4 +- .../utils/models/gamedata/TechBuffTable.py | 4 +- .../utils/models/gamedata/TipTable.py | 3 +- .../utils/models/gamedata/TokenTable.py | 4 +- .../utils/models/gamedata/UniequipData.py | 4 +- .../utils/models/gamedata/UniequipTable.py | 4 +- .../utils/models/gamedata/ZoneTable.py | 8 +- ArknightsUID/utils/resource/resource_map.json | 110 +++++++-------- ArknightsUID/version.py | 4 +- 49 files changed, 387 insertions(+), 174 deletions(-) diff --git a/ArknightsUID/utils/models/gamedata/ActivityTable.py b/ArknightsUID/utils/models/gamedata/ActivityTable.py index 187eaff..9bc5518 100644 --- a/ArknightsUID/utils/models/gamedata/ActivityTable.py +++ b/ArknightsUID/utils/models/gamedata/ActivityTable.py @@ -1,11 +1,13 @@ from typing import Any, Dict, List, Union + from ..common import BaseStruct + from msgspec import field class ActivityTableBasicData(BaseStruct): - id_: str = field(name="id") - type_: str = field(name="type") + id_: str = field(name='id') + type_: str = field(name='type') name: str startTime: int endTime: int @@ -29,16 +31,16 @@ class ActivityTableHomeActivityConfig(BaseStruct): class MissionDisplayRewards(BaseStruct): - type_: str = field(name="type") - id_: str = field(name="id") + type_: str = field(name='type') + id_: str = field(name='id') count: int class MissionData(BaseStruct): - id_: str = field(name="id") + id_: str = field(name='id') sortId: int description: str - type_: str = field(name="type") + type_: str = field(name='type') itemBgType: str preMissionIds: Union[List[str], None] template: str @@ -56,9 +58,9 @@ class MissionData(BaseStruct): class MissionGroup(BaseStruct): - id_: str = field(name="id") + id_: str = field(name='id') title: Union[str, None] - type_: str = field(name="type") + type_: str = field(name='type') preMissionGroup: Union[str, None] period: Union[List[int], None] rewards: Union[List[MissionDisplayRewards], None] @@ -76,9 +78,9 @@ class DefaultZoneData(BaseStruct): class ItemBundle(BaseStruct): - id_: str = field(name="id") + id_: str = field(name='id') count: int - type_: str = field(name="type") + type_: str = field(name='type') class DefaultShopData(BaseStruct): @@ -149,7 +151,10 @@ class DefaultCheckInDataExtraCheckinDailyInfo(BaseStruct): class DefaultCheckInData(BaseStruct): checkInList: Dict[str, DefaultCheckInDataCheckInDailyInfo] apSupplyOutOfDateDict: Dict[str, int] - extraCheckinList: Union[List[DefaultCheckInDataExtraCheckinDailyInfo], None] + extraCheckinList: Union[ + List[DefaultCheckInDataExtraCheckinDailyInfo], + None, + ] dynCheckInData: Union[DefaultCheckInDataDynamicCheckInData, None] = None @@ -238,7 +243,7 @@ class Act3D0DataLimitedPoolDetailInfoPoolItemInfo(BaseStruct): perCount: int totalCount: int weight: int - type_: str = field(name="type") + type_: str = field(name='type') orderId: int @@ -253,7 +258,7 @@ class Act3D0DataInfinitePoolDetailInfoPoolItemInfo(BaseStruct): goodType: str perCount: int weight: int - type_: str = field(name="type") + type_: str = field(name='type') orderId: int @@ -486,7 +491,7 @@ class RuneData(BaseStruct): class RuneTablePackedRuneData(BaseStruct): - id_: str = field(name="id") + id_: str = field(name='id') points: float mutexGroupKey: Union[str, None] description: str @@ -514,7 +519,7 @@ class Act5D1Data(BaseStruct): class ActivityCollectionDataCollectionInfo(BaseStruct): - id_: int = field(name="id") + id_: int = field(name='id') itemType: str itemId: str itemCnt: int @@ -593,7 +598,10 @@ class Act9D0Data(BaseStruct): hasSubMission: bool apSupplyOutOfDateDict: Dict[str, int] newsInfoList: Union[Dict[str, Act9D0DataActivityNewsInfo], None] - newsServerInfoList: Union[Dict[str, Act9D0DataActivityNewsServerInfo], None] + newsServerInfoList: Union[ + Dict[str, Act9D0DataActivityNewsServerInfo], + None, + ] miscHub: Dict[str, str] @@ -724,7 +732,7 @@ class Act13SideDataLongTermMissionData(BaseStruct): class Act13SideDataDailyMissionData(BaseStruct): - id_: str = field(name="id") + id_: str = field(name='id') sortId: int description: str missionName: str @@ -774,7 +782,10 @@ class Act13SideData(BaseStruct): principalDataMap: Dict[str, Act13SideDataPrincipalData] longTermMissionDataMap: Dict[str, Act13SideDataLongTermMissionData] dailyMissionDataList: List[Act13SideDataDailyMissionData] - dailyRewardGroupDataMap: Dict[str, Act13SideDataDailyMissionRewardGroupData] + dailyRewardGroupDataMap: Dict[ + str, + Act13SideDataDailyMissionRewardGroupData, + ] archiveItemUnlockData: Dict[str, Act13SideDataArchiveItemUnlockData] hiddenAreaData: Dict[str, ActivityTableActivityHiddenAreaData] zoneAddtionDataMap: Dict[str, Act13SideDataZoneAdditionData] @@ -917,7 +928,7 @@ class Act17sideDataMainlineChapterData(BaseStruct): chapterDes: str chapterIcon: str unlockDes: str - id_: str = field(name="id") + id_: str = field(name='id') class Act17sideDataMainlineData(BaseStruct): @@ -1160,14 +1171,17 @@ class SharedCharData(BaseStruct): evolvePhase: int level: int favorPoint: int - currentEquip: Union[str, None] = field(name="currentEquip", default=None) - equips: Union[Dict[str, SharedCharDataCharEquipInfo], None] = field(name="equip", default={}) + currentEquip: Union[str, None] = field(name='currentEquip', default=None) + equips: Union[Dict[str, SharedCharDataCharEquipInfo], None] = field( + name='equip', + default={}, + ) skillIndex: Union[int, None] = None skinId: Union[str, None] = None skin: Union[str, None] = None skills: Union[List[SharedCharDataSharedCharSkillData], None] = None crisisRecord: Union[Dict[str, int], None] = None - currentTmpl: Union[Union[str, None]] = None + currentTmpl: Union[str, None] = None tmpl: Union[Dict[str, SharedCharDataTmplData], None] = None @@ -1192,7 +1206,10 @@ class ActivityInterlockData(BaseStruct): treasureMonsterMap: Dict[str, ActivityInterlockDataTreasureMonsterData] specialAssistData: SharedCharData mileStoneItemList: List[ActivityInterlockDataMileStoneItemInfo] - finalStageProgressMap: Dict[str, List[ActivityInterlockDataFinalStageProgressData]] + finalStageProgressMap: Dict[ + str, + List[ActivityInterlockDataFinalStageProgressData], + ] class ActivityBossRushDataZoneAdditionData(BaseStruct): @@ -1222,8 +1239,8 @@ class ActivityBossRushDataBossRushStageAdditionData(BaseStruct): class ActivityBossRushDataDisplayDetailRewards(BaseStruct): occPercent: int dropCount: int - type_: str = field(name="type") - id_: str = field(name="id") + type_: str = field(name='type') + id_: str = field(name='id') dropType: int @@ -1289,9 +1306,18 @@ class ActivityBossRushDataConstData(BaseStruct): class ActivityBossRushData(BaseStruct): zoneAdditionDataMap: Dict[str, ActivityBossRushDataZoneAdditionData] stageGroupMap: Dict[str, ActivityBossRushDataBossRushStageGroupData] - stageAdditionDataMap: Dict[str, ActivityBossRushDataBossRushStageAdditionData] - stageDropDataMap: Dict[str, Dict[str, ActivityBossRushDataBossRushDropInfo]] - missionAdditionDataMap: Dict[str, ActivityBossRushDataBossRushMissionAdditionData] + stageAdditionDataMap: Dict[ + str, + ActivityBossRushDataBossRushStageAdditionData, + ] + stageDropDataMap: Dict[ + str, + Dict[str, ActivityBossRushDataBossRushDropInfo], + ] + missionAdditionDataMap: Dict[ + str, + ActivityBossRushDataBossRushMissionAdditionData, + ] teamDataMap: Dict[str, ActivityBossRushDataBossRushTeamData] relicList: List[ActivityBossRushDataRelicData] relicLevelInfoDataMap: Dict[str, ActivityBossRushDataRelicLevelInfoData] @@ -1319,15 +1345,15 @@ class ActivityFloatParadeDataDailyData(BaseStruct): class ActivityFloatParadeDataRewardPool(BaseStruct): grpId: str - id_: str = field(name="id") - type_: str = field(name="type") + id_: str = field(name='id') + type_: str = field(name='type') name: str desc: Union[str, None] reward: ItemBundle class ActivityFloatParadeDataTactic(BaseStruct): - id_: int = field(name="id") + id_: int = field(name='id') name: str packName: str briefName: str @@ -1366,7 +1392,7 @@ class ActSandboxData(BaseStruct): class ActivityMainlineBuffDataMissionGroupData(BaseStruct): - id_: str = field(name="id") + id_: str = field(name='id') bindBanner: str sortId: int zoneId: str @@ -1382,7 +1408,7 @@ class ActivityMainlineBuffDataPeriodDataStepData(BaseStruct): class ActivityMainlineBuffDataPeriodData(BaseStruct): - id_: str = field(name="id") + id_: str = field(name='id') startTime: int endTime: int favorUpCharDesc: str @@ -1482,23 +1508,23 @@ class Act24SideDataMissionExtraData(BaseStruct): class WeightItemBundle(BaseStruct): - id_: str = field(name="id") - type_: str = field(name="type") + id_: str = field(name='id') + type_: str = field(name='type') dropType: str count: int weight: int class StageDataDisplayRewards(BaseStruct): - type_: str = field(name="type") - id_: str = field(name="id") + type_: str = field(name='type') + id_: str = field(name='id') dropType: int class StageDataDisplayDetailRewards(BaseStruct): occPercent: int - type_: str = field(name="type") - id_: str = field(name="id") + type_: str = field(name='type') + id_: str = field(name='id') dropType: int @@ -1525,7 +1551,10 @@ class Act24SideData(BaseStruct): mealDataList: Dict[str, Act24SideDataMealData] meldingDict: Dict[str, Act24SideDataMeldingItemData] meldingGachaBoxDataList: Dict[str, Act24SideDataMeldingGachaBoxData] - meldingGachaBoxGoodDataMap: Dict[str, List[Act24SideDataMeldingGachaBoxGoodData]] + meldingGachaBoxGoodDataMap: Dict[ + str, + List[Act24SideDataMeldingGachaBoxGoodData], + ] mealWelcomeTxtDataMap: Dict[str, str] zoneAdditionDataMap: Dict[str, Act24SideDataZoneAdditionData] questStageList: List[QuestStageData] @@ -1567,7 +1596,7 @@ class Act25SideDataArchiveItemData(BaseStruct): class Act25SideDataArchiveMapInfoData(BaseStruct): objectId: str - type_: int = field(name="type") + type_: int = field(name='type') numberId: str areaId: str sortId: int @@ -1590,7 +1619,7 @@ class Act25SideDataAreaInfoData(BaseStruct): class Act25SideDataAreaMissionData(BaseStruct): - id_: str = field(name="id") + id_: str = field(name='id') areaId: str preposedMissionId: Union[str, None] sortId: int @@ -1679,7 +1708,7 @@ class Act38D1DataAct38D1DimensionItemData(BaseStruct): class Act38D1DataAct38D1CommentData(BaseStruct): - id_: str = field(name="id") + id_: str = field(name='id') sortId: int desc: str @@ -1714,7 +1743,7 @@ class Act38D1Data(BaseStruct): class Act27SideDataAct27SideGoodData(BaseStruct): - id_: str = field(name="id") + id_: str = field(name='id') name: str typeDesc: str iconId: str @@ -1833,7 +1862,7 @@ class Act42D0DataEffectGroupInfoData(BaseStruct): class Act42D0DataEffectInfoRuneData(BaseStruct): - id_: str = field(name="id") + id_: str = field(name='id') points: int mutexGroupKey: Union[str, None] description: str @@ -1960,8 +1989,8 @@ class ActivityThemeDataTimeNode(BaseStruct): class ActivityThemeData(BaseStruct): - id_: str = field(name="id") - type_: str = field(name="type") + id_: str = field(name='id') + type_: str = field(name='type') funcId: str endTs: int sortId: int @@ -2183,7 +2212,7 @@ class AprilFoolTable(BaseStruct): class CartComponents(BaseStruct): compId: str sortId: int - type: str + type_: str = field(name='type') posList: List[str] posIdDict: Dict[str, List[str]] name: str @@ -2423,7 +2452,7 @@ class ActivityTableExtraData(BaseStruct): class ActivityTable(BaseStruct): - __version__ = "23-07-27-18-50-06-aeb568" + __version__ = '23-09-29-15-41-03-569cae' 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 831a2bf..c5c3529 100644 --- a/ArknightsUID/utils/models/gamedata/AudioData.py +++ b/ArknightsUID/utils/models/gamedata/AudioData.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -72,7 +74,7 @@ class BattleVoiceData(BaseStruct): class AudioData(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' bgmBanks: List[BGMBank] soundFXBanks: List[SoundFXBank] diff --git a/ArknightsUID/utils/models/gamedata/BattleEquipTable.py b/ArknightsUID/utils/models/gamedata/BattleEquipTable.py index 9d0d14e..4db6230 100644 --- a/ArknightsUID/utils/models/gamedata/BattleEquipTable.py +++ b/ArknightsUID/utils/models/gamedata/BattleEquipTable.py @@ -1,4 +1,5 @@ from typing import Dict, List, Union + from ..common import BaseStruct @@ -77,6 +78,6 @@ class BattleEquipData(BaseStruct): class BattleEquipTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' equips: Dict[str, BattleEquipData] diff --git a/ArknightsUID/utils/models/gamedata/BuildingData.py b/ArknightsUID/utils/models/gamedata/BuildingData.py index 6e3b55a..420805b 100644 --- a/ArknightsUID/utils/models/gamedata/BuildingData.py +++ b/ArknightsUID/utils/models/gamedata/BuildingData.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -247,6 +249,7 @@ class BuildingDataCustomDataFurnitureData(BaseStruct): canBeDestroy: bool isOnly: int quantity: int + musicId: str interactType: Union[str, None] = None @@ -301,7 +304,9 @@ class BuildingDataCustomDataInteractItem(BaseStruct): skinId: str -class BuildingDataCustomDataDiyUISortTemplateListDataDiyUISortTemplateData(BaseStruct): +class BuildingDataCustomDataDiyUISortTemplateListDataDiyUISortTemplateData( + BaseStruct, +): name: str sequences: List[str] stableSequence: str @@ -322,9 +327,15 @@ class BuildingDataCustomData(BaseStruct): groups: Dict[str, BuildingDataCustomDataGroupData] types: Dict[str, BuildingDataCustomDataFurnitureTypeData] subTypes: Dict[str, BuildingDataCustomDataFurnitureSubTypeData] - defaultFurnitures: Dict[str, List[BuildingDataCustomDataDormitoryDefaultFurnitureItem]] + defaultFurnitures: Dict[ + str, + List[BuildingDataCustomDataDormitoryDefaultFurnitureItem], + ] interactGroups: Dict[str, List[BuildingDataCustomDataInteractItem]] - diyUISortTemplates: Dict[str, Dict[str, BuildingDataCustomDataDiyUISortTemplateListData]] + diyUISortTemplates: Dict[ + str, + Dict[str, BuildingDataCustomDataDiyUISortTemplateListData], + ] class BuildingDataManufactFormulaUnlockRoom(BaseStruct): @@ -407,12 +418,10 @@ class BuildingDataCreditFormulaValueModel(BaseStruct): class BuildingDataCreditFormula(BaseStruct): initiative: Dict passive: Dict - # initiative: Union[BuildingDataCreditFormulaValueModel, Dict] - # passive: Union[BuildingDataCreditFormulaValueModel, Dict] class BuildingData(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' controlSlotId: str meetingSlotId: str diff --git a/ArknightsUID/utils/models/gamedata/CampaignTable.py b/ArknightsUID/utils/models/gamedata/CampaignTable.py index 51227ea..6b2e429 100644 --- a/ArknightsUID/utils/models/gamedata/CampaignTable.py +++ b/ArknightsUID/utils/models/gamedata/CampaignTable.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -143,7 +145,7 @@ class CampaignTrainingAllOpenTimeData(BaseStruct): class CampaignTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' 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 d58aaad..21d0a9d 100644 --- a/ArknightsUID/utils/models/gamedata/ChapterTable.py +++ b/ArknightsUID/utils/models/gamedata/ChapterTable.py @@ -1,4 +1,5 @@ from typing import Dict, Union + from ..common import BaseStruct @@ -14,6 +15,6 @@ class ChapterData(BaseStruct): class ChapterTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' chapters: Dict[str, ChapterData] diff --git a/ArknightsUID/utils/models/gamedata/CharMetaTable.py b/ArknightsUID/utils/models/gamedata/CharMetaTable.py index 9a6acec..0b56206 100644 --- a/ArknightsUID/utils/models/gamedata/CharMetaTable.py +++ b/ArknightsUID/utils/models/gamedata/CharMetaTable.py @@ -1,5 +1,7 @@ from typing import Dict, List + from ..common import BaseStruct + from msgspec import field @@ -19,7 +21,7 @@ class SpCharMissionData(BaseStruct): class CharMetaTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' 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 1ceaef4..5f21e47 100644 --- a/ArknightsUID/utils/models/gamedata/CharPatchTable.py +++ b/ArknightsUID/utils/models/gamedata/CharPatchTable.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -189,7 +191,7 @@ class CharPatchDataPatchDetailInfo(BaseStruct): class CharPatchTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' 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 d4e532a..53651ff 100644 --- a/ArknightsUID/utils/models/gamedata/CharacterTable.py +++ b/ArknightsUID/utils/models/gamedata/CharacterTable.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -173,7 +175,7 @@ class CharacterData(BaseStruct): class CharacterTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' chars: Dict[str, CharacterData] diff --git a/ArknightsUID/utils/models/gamedata/CharmTable.py b/ArknightsUID/utils/models/gamedata/CharmTable.py index 2840435..ea28d37 100644 --- a/ArknightsUID/utils/models/gamedata/CharmTable.py +++ b/ArknightsUID/utils/models/gamedata/CharmTable.py @@ -1,5 +1,7 @@ from typing import List, Union + from ..common import BaseStruct + from msgspec import field @@ -56,6 +58,6 @@ class CharmItemData(BaseStruct): class CharmTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' charmList: List[CharmItemData] diff --git a/ArknightsUID/utils/models/gamedata/CharwordTable.py b/ArknightsUID/utils/models/gamedata/CharwordTable.py index 4b8a1f5..da97493 100644 --- a/ArknightsUID/utils/models/gamedata/CharwordTable.py +++ b/ArknightsUID/utils/models/gamedata/CharwordTable.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -53,7 +55,7 @@ class NewVoiceTimeData(BaseStruct): class CharwordTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' 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 a2a1136..d8aaa97 100644 --- a/ArknightsUID/utils/models/gamedata/CheckinTable.py +++ b/ArknightsUID/utils/models/gamedata/CheckinTable.py @@ -1,5 +1,7 @@ from typing import Dict, List + from ..common import BaseStruct + from msgspec import field @@ -34,7 +36,7 @@ class MonthlyDailyBonusGroup(BaseStruct): class CheckinTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' 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 3c3998d..99791e1 100644 --- a/ArknightsUID/utils/models/gamedata/ClimbTowerTable.py +++ b/ArknightsUID/utils/models/gamedata/ClimbTowerTable.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -24,7 +26,10 @@ class ClimbTowerSingleTowerData(BaseStruct): towerType: str levels: List[str] hardLevels: Union[List[str], None] - taskInfo: Union[List[ClimbTowerSingleTowerDataClimbTowerTaskRewardData], None] + taskInfo: Union[ + List[ClimbTowerSingleTowerDataClimbTowerTaskRewardData], + None, + ] preTowerId: Union[str, None] medalId: Union[str, None] hiddenMedalId: Union[str, None] @@ -235,7 +240,7 @@ class MissionGroup(BaseStruct): class ClimbTowerTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' 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 c44df58..2e74ce4 100644 --- a/ArknightsUID/utils/models/gamedata/ClueData.py +++ b/ArknightsUID/utils/models/gamedata/ClueData.py @@ -1,4 +1,5 @@ from typing import List + from ..common import BaseStruct @@ -20,7 +21,7 @@ class MeetingClueDataReceiveTimeBonus(BaseStruct): class ClueData(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' clues: List[MeetingClueDataClueData] clueTypes: List[MeetingClueDataClueTypeData] diff --git a/ArknightsUID/utils/models/gamedata/CrisisTable.py b/ArknightsUID/utils/models/gamedata/CrisisTable.py index 9eb689d..046d202 100644 --- a/ArknightsUID/utils/models/gamedata/CrisisTable.py +++ b/ArknightsUID/utils/models/gamedata/CrisisTable.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -32,7 +34,7 @@ class CrisisMapRankInfo(BaseStruct): class CrisisTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' seasonInfo: List[CrisisClientDataSeasonInfo] tempAppraise: List[StringKeyFrames] diff --git a/ArknightsUID/utils/models/gamedata/DisplayMetaTable.py b/ArknightsUID/utils/models/gamedata/DisplayMetaTable.py index 6b65d91..166c777 100644 --- a/ArknightsUID/utils/models/gamedata/DisplayMetaTable.py +++ b/ArknightsUID/utils/models/gamedata/DisplayMetaTable.py @@ -1,5 +1,7 @@ from typing import Dict, List + from ..common import BaseStruct + from msgspec import field @@ -49,6 +51,18 @@ class HomeBackgroundThemeData(BaseStruct): tmUsage: str obtainApproach: str unlockDesList: List[str] + isLimitObtain: bool + + +class ThemeLimitInfo(BaseStruct): + startTime: int + endTime: int + invalidObtainDesc: str + + +class HomeBackgroundThemeLimitData(BaseStruct): + id_: str = field(name='id') + limitInfos: List[ThemeLimitInfo] class HomeBackgroundData(BaseStruct): @@ -56,12 +70,13 @@ class HomeBackgroundData(BaseStruct): defaultThemeId: str homeBgDataList: List[HomeBackgroundSingleData] themeList: List[HomeBackgroundThemeData] + themeLimitData: Dict[str, HomeBackgroundThemeLimitData] defaultBgMusicId: str themeStartTime: int class DisplayMetaTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' playerAvatarData: PlayerAvatarData homeBackgroundData: HomeBackgroundData diff --git a/ArknightsUID/utils/models/gamedata/EnemyHandbookTable.py b/ArknightsUID/utils/models/gamedata/EnemyHandbookTable.py index 837f8c2..343a0e1 100644 --- a/ArknightsUID/utils/models/gamedata/EnemyHandbookTable.py +++ b/ArknightsUID/utils/models/gamedata/EnemyHandbookTable.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -52,7 +54,7 @@ class EnemyHandbookRaceData(BaseStruct): class EnemyHandbookTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' levelInfoList: List[EnemyHandbookLevelInfoData] enemyData: Dict[str, EnemyHandBookData] diff --git a/ArknightsUID/utils/models/gamedata/FavorTable.py b/ArknightsUID/utils/models/gamedata/FavorTable.py index 475364c..8fb24e1 100644 --- a/ArknightsUID/utils/models/gamedata/FavorTable.py +++ b/ArknightsUID/utils/models/gamedata/FavorTable.py @@ -1,4 +1,5 @@ from typing import List + from ..common import BaseStruct @@ -14,7 +15,7 @@ class FavorDataFrames(BaseStruct): class FavorTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' maxFavor: int favorFrames: List[FavorDataFrames] diff --git a/ArknightsUID/utils/models/gamedata/GachaTable.py b/ArknightsUID/utils/models/gamedata/GachaTable.py index 8490264..c85fad9 100644 --- a/ArknightsUID/utils/models/gamedata/GachaTable.py +++ b/ArknightsUID/utils/models/gamedata/GachaTable.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -30,9 +32,9 @@ class GachaDataCarouselData(BaseStruct): class ItemBundle(BaseStruct): - id_: str = field(name="id") + id_: str = field(name='id') count: int - type_: str = field(name="type") + type_: str = field(name='type') class GachaDataRecruitRange(BaseStruct): @@ -129,13 +131,16 @@ class GachaDataFesGachaPoolRelateItem(BaseStruct): class GachaTable(BaseStruct): - __version__ = "23-07-27-18-50-06-aeb568" + __version__ = '23-09-29-15-41-03-569cae' gachaTags: List[GachaTag] carousel: List[GachaDataCarouselData] classicPotentialMaterialConverter: PotentialMaterialConverterConfig dicRecruit6StarHint: Union[Dict[str, str], None] - fesGachaPoolRelateItem: Union[Dict[str, GachaDataFesGachaPoolRelateItem], None] + fesGachaPoolRelateItem: Union[ + Dict[str, GachaDataFesGachaPoolRelateItem], + None, + ] freeGacha: List[GachaDataFreeLimitGachaData] gachaPoolClient: List[GachaPoolClientData] limitTenGachaItem: List[GachaDataLimitTenGachaTkt] diff --git a/ArknightsUID/utils/models/gamedata/GamedataConst.py b/ArknightsUID/utils/models/gamedata/GamedataConst.py index b4ed86a..8297e2a 100644 --- a/ArknightsUID/utils/models/gamedata/GamedataConst.py +++ b/ArknightsUID/utils/models/gamedata/GamedataConst.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -21,7 +23,7 @@ class TermDescriptionData(BaseStruct): class GamedataConst(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' addedRewardDisplayZone: str advancedGachaCrystalCost: int diff --git a/ArknightsUID/utils/models/gamedata/HandbookInfoTable.py b/ArknightsUID/utils/models/gamedata/HandbookInfoTable.py index 1291120..542cded 100644 --- a/ArknightsUID/utils/models/gamedata/HandbookInfoTable.py +++ b/ArknightsUID/utils/models/gamedata/HandbookInfoTable.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -120,7 +122,7 @@ class HandbookInfoData(BaseStruct): class HandbookInfoTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' 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 dd8a3a7..956276f 100644 --- a/ArknightsUID/utils/models/gamedata/HandbookTable.py +++ b/ArknightsUID/utils/models/gamedata/HandbookTable.py @@ -1,4 +1,5 @@ from typing import List, Union + from ..common import BaseStruct @@ -39,6 +40,6 @@ class CharHandbook(BaseStruct): class HandbookTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' char_102_texas: CharHandbook diff --git a/ArknightsUID/utils/models/gamedata/HandbookTeamTable.py b/ArknightsUID/utils/models/gamedata/HandbookTeamTable.py index ea72b17..c050bb7 100644 --- a/ArknightsUID/utils/models/gamedata/HandbookTeamTable.py +++ b/ArknightsUID/utils/models/gamedata/HandbookTeamTable.py @@ -1,4 +1,5 @@ from typing import Dict + from ..common import BaseStruct @@ -14,6 +15,6 @@ class HandbookTeam(BaseStruct): class HandbookTeamTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' team: Dict[str, HandbookTeam] diff --git a/ArknightsUID/utils/models/gamedata/ItemTable.py b/ArknightsUID/utils/models/gamedata/ItemTable.py index 13416b4..1a2f95d 100644 --- a/ArknightsUID/utils/models/gamedata/ItemTable.py +++ b/ArknightsUID/utils/models/gamedata/ItemTable.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -55,21 +57,27 @@ class ExpItemFeature(BaseStruct): gainExp: int +class ItemDataVoucherRelateInfo(BaseStruct): + voucherId: str + voucherItemType: str + + class ItemData(BaseStruct): itemId: str name: str - description: Union[str, None] rarity: int iconId: str - overrideBkg: None - stackIconId: Union[str, None] sortId: int - usage: Union[str, None] - obtainApproach: Union[str, None] classifyType: str itemType: str - stageDropList: List[ItemDataStageDropInfo] - buildingProductList: List[ItemDataBuildingProductInfo] + stageDropList: List[Union[ItemDataStageDropInfo, None]] = [] + buildingProductList: List[Union[ItemDataBuildingProductInfo, None]] = [] + voucherRelateList: List[Union[ItemDataVoucherRelateInfo, None]] = [] + overrideBkg: Union[str, None] = None + usage: Union[str, None] = None + description: Union[str, None] = None + stackIconId: Union[str, None] = None + obtainApproach: Union[str, None] = None hideInItemGet: Union[bool, None] = None @@ -90,7 +98,7 @@ class ServerItemReminderInfo(BaseStruct): class ItemTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' 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 065e613..53ae6de 100644 --- a/ArknightsUID/utils/models/gamedata/MedalTable.py +++ b/ArknightsUID/utils/models/gamedata/MedalTable.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -59,7 +61,7 @@ class MedalPerData(BaseStruct): class MedalTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' medalList: List[MedalPerData] medalTypeData: Dict[str, MedalTypeData] diff --git a/ArknightsUID/utils/models/gamedata/MissionTable.py b/ArknightsUID/utils/models/gamedata/MissionTable.py index 29f02f5..d0fd388 100644 --- a/ArknightsUID/utils/models/gamedata/MissionTable.py +++ b/ArknightsUID/utils/models/gamedata/MissionTable.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -76,7 +78,7 @@ class MissionData(BaseStruct): class MissionTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' 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 8a8eaf7..0bd7823 100644 --- a/ArknightsUID/utils/models/gamedata/OpenServerTable.py +++ b/ArknightsUID/utils/models/gamedata/OpenServerTable.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -267,7 +269,7 @@ class OpenServerNewbieCheckInPackage(BaseStruct): class OpenServerTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' schedule: List[OpenServerScheduleItem] dataMap: Dict[str, OpenServerData] diff --git a/ArknightsUID/utils/models/gamedata/PlayerAvatarTable.py b/ArknightsUID/utils/models/gamedata/PlayerAvatarTable.py index c789d9d..5d492d9 100644 --- a/ArknightsUID/utils/models/gamedata/PlayerAvatarTable.py +++ b/ArknightsUID/utils/models/gamedata/PlayerAvatarTable.py @@ -1,4 +1,5 @@ from typing import Dict, List + from ..common import BaseStruct @@ -20,7 +21,7 @@ class PlayerAvatarPerData(BaseStruct): class PlayerAvatarTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' avatarList: List[PlayerAvatarPerData] avatarTypeData: Dict[str, PlayerAvatarGroupData] diff --git a/ArknightsUID/utils/models/gamedata/RangeTable.py b/ArknightsUID/utils/models/gamedata/RangeTable.py index c723b1e..ff6dc8d 100644 --- a/ArknightsUID/utils/models/gamedata/RangeTable.py +++ b/ArknightsUID/utils/models/gamedata/RangeTable.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -23,6 +25,6 @@ class Stage(BaseStruct): class RangeTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' - range: Dict[str, Stage] + range_: Dict[str, Stage] diff --git a/ArknightsUID/utils/models/gamedata/ReplicateTable.py b/ArknightsUID/utils/models/gamedata/ReplicateTable.py index b76789a..c26643a 100644 --- a/ArknightsUID/utils/models/gamedata/ReplicateTable.py +++ b/ArknightsUID/utils/models/gamedata/ReplicateTable.py @@ -1,5 +1,7 @@ from typing import Dict, List + from ..common import BaseStruct + from msgspec import field @@ -19,6 +21,6 @@ class ReplicateList(BaseStruct): class ReplicateTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' replicate: Dict[str, ReplicateList] diff --git a/ArknightsUID/utils/models/gamedata/RetroTable.py b/ArknightsUID/utils/models/gamedata/RetroTable.py index d5d5773..4476fba 100644 --- a/ArknightsUID/utils/models/gamedata/RetroTable.py +++ b/ArknightsUID/utils/models/gamedata/RetroTable.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -287,6 +289,7 @@ class ActivityCustomData(BaseStruct): TYPE_ACT17SIDE: Dict[str, Act17sideData] TYPE_ACT25SIDE: Dict[str, ActivityCustomDataAct25sideCustomData] TYPE_ACT20SIDE: Dict[str, ActivityCustomDataAct20sideCustomData] + TYPE_ACT21SIDE: Dict[str, None] class RetroTrailRuleData(BaseStruct): @@ -411,7 +414,7 @@ class RetroStageOverrideInfo(BaseStruct): class RetroTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' customData: ActivityCustomData initRetroCoin: int diff --git a/ArknightsUID/utils/models/gamedata/RoguelikeTable.py b/ArknightsUID/utils/models/gamedata/RoguelikeTable.py index 6f70a31..378b8c4 100644 --- a/ArknightsUID/utils/models/gamedata/RoguelikeTable.py +++ b/ArknightsUID/utils/models/gamedata/RoguelikeTable.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -191,7 +193,7 @@ class RoguelikeConstTable(BaseStruct): class RoguelikeTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' constTable: RoguelikeConstTable itemTable: RoguelikeItemTable diff --git a/ArknightsUID/utils/models/gamedata/RoguelikeTopicTable.py b/ArknightsUID/utils/models/gamedata/RoguelikeTopicTable.py index 9cccdff..45ead55 100644 --- a/ArknightsUID/utils/models/gamedata/RoguelikeTopicTable.py +++ b/ArknightsUID/utils/models/gamedata/RoguelikeTopicTable.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -139,6 +141,13 @@ class RoguelikeTopicMonthSquad(BaseStruct): taskDes: Union[str, None] +class RoguelikeTopicChallengeTask(BaseStruct): + taskId: str + taskDes: str + completionClass: str + completionParams: List[str] + + class RoguelikeTopicChallenge(BaseStruct): challengeId: str sortId: int @@ -150,9 +159,8 @@ class RoguelikeTopicChallenge(BaseStruct): challengeUnlockToastDesc: Union[str, None] challengeDes: str challengeConditionDes: List[str] - taskDes: str - completionClass: str - completionParams: List[str] + challengeTasks: Dict[str, RoguelikeTopicChallengeTask] + defaultTaskId: str rewards: List[ItemBundle] @@ -179,6 +187,7 @@ class RoguelikeTopicDifficulty(BaseStruct): isHard: bool unlockText: Union[str, None] displayIconId: Union[str, None] + hideEndingStory: bool class RoguelikeTopicBankReward(BaseStruct): @@ -312,6 +321,7 @@ class RoguelikeArchiveComponentData(BaseStruct): buff: ActArchiveBuffData totem: Union[ActArchiveTotemData, None] chaos: Union[ActArchiveChaosData, None] + challengeBook: Dict[str, Dict[str, None]] class RoguelikeArchiveUnlockCondDesc(BaseStruct): @@ -380,6 +390,7 @@ class RoguelikeGameInitData(BaseStruct): modeId: str modeGrade: int predefinedId: Union[str, None] + predefinedStyle: Union[str, None] initialBandRelic: List[str] initialRecruitGroup: Union[List[str], None] initialHp: int @@ -628,6 +639,7 @@ class RoguelikeGameConst(BaseStruct): relicDesc: Union[str, None] buffDesc: Union[str, None] portalZones: List[str] + exploreExpOnKill: Union[str, None] class RoguelikeTopicCapsule(BaseStruct): @@ -714,6 +726,11 @@ class RoguelikeDifficultyUpgradeRelicGroupData(BaseStruct): relicData: List[RoguelikeDifficultyUpgradeRelicData] +class RoguelikePredefinedStyleData(BaseStruct): + styleId: str + styleConfig: int + + class RoguelikeTopicDetail(BaseStruct): updates: List[RoguelikeTopicUpdate] enrolls: Dict[str, RoguelikeTopicEnroll] @@ -757,7 +774,12 @@ class RoguelikeTopicDetail(BaseStruct): bandRef: Dict[str, RoguelikeBandRefData] endingDetailList: List[RoguelikeEndingDetailText] treasures: Dict[str, List[RoguelikeGameTreasureData]] - difficultyUpgradeRelicGroups: Dict[str, RoguelikeDifficultyUpgradeRelicGroupData] + difficultyUpgradeRelicGroups: Dict[ + str, + RoguelikeDifficultyUpgradeRelicGroupData, + ] + styleConfig: Dict[str, RoguelikePredefinedStyleData] + styles: Union[Dict[str, RoguelikePredefinedStyleData], None] = {} class RoguelikeModuleBaseData(BaseStruct): diff --git a/ArknightsUID/utils/models/gamedata/SandboxTable.py b/ArknightsUID/utils/models/gamedata/SandboxTable.py index f9cf03e..809a341 100644 --- a/ArknightsUID/utils/models/gamedata/SandboxTable.py +++ b/ArknightsUID/utils/models/gamedata/SandboxTable.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -396,7 +398,7 @@ class SandboxItemData(BaseStruct): class SandboxTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' 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 685906b..8381501 100644 --- a/ArknightsUID/utils/models/gamedata/ShopClientTable.py +++ b/ArknightsUID/utils/models/gamedata/ShopClientTable.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -22,6 +24,52 @@ class ShopKeeperWord(BaseStruct): text: str +class ShopRecommendTemplateNormalGiftParam(BaseStruct): + showStartTs: int + showEndTs: int + goodId: str + giftPackageName: str + price: int + logoId: str + color: str + haveMark: bool + + +class ShopRecommendTemplateNormalSkinParam(BaseStruct): + showStartTs: int + showEndTs: int + skinIds: List[str] + skinGroupName: str + brandIconId: str + colorBack: str + colorText: str + text: str + + +class ShopRecommendTemplateNormalFurnParam(BaseStruct): + showStartTs: int + showEndTs: int + furnPackId: str + isNew: bool + isPackSell: bool + count: int + colorBack: str + colorText: str + actId: Union[str, None] = None + + +class ShopRecommendTemplateReturnSkinParam(BaseStruct): + showStartTs: int + showEndTs: int + + +class ShopRecommendTemplateParam(BaseStruct): + normalGiftParam: Union[ShopRecommendTemplateNormalGiftParam, None] = None + normalSkinParam: Union[ShopRecommendTemplateNormalSkinParam, None] = None + normalFurnParam: Union[ShopRecommendTemplateNormalFurnParam, None] = None + returnSkinParam: Union[ShopRecommendTemplateReturnSkinParam, None] = None + + class ShopRecommendItem(BaseStruct): tagId: str displayType: str @@ -32,6 +80,8 @@ class ShopRecommendItem(BaseStruct): endDatetime: int groupList: List[ShopRecommendGroup] tagWord: ShopKeeperWord + templateType: str + templateParam: Union[ShopRecommendTemplateParam, None] class ShopCreditUnlockItem(BaseStruct): @@ -94,7 +144,7 @@ class LMTGSShopOverlaySchedule(BaseStruct): class ShopClientTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' recommendList: List[ShopRecommendItem] creditUnlockGroup: Dict[str, ShopCreditUnlockGroup] diff --git a/ArknightsUID/utils/models/gamedata/SkillTable.py b/ArknightsUID/utils/models/gamedata/SkillTable.py index 3fbf9e2..bda58a6 100644 --- a/ArknightsUID/utils/models/gamedata/SkillTable.py +++ b/ArknightsUID/utils/models/gamedata/SkillTable.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -44,6 +46,6 @@ class SkillDataBundle(BaseStruct): class SkillTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' skills: Dict[str, SkillDataBundle] diff --git a/ArknightsUID/utils/models/gamedata/SkinTable.py b/ArknightsUID/utils/models/gamedata/SkinTable.py index db6776b..3718be4 100644 --- a/ArknightsUID/utils/models/gamedata/SkinTable.py +++ b/ArknightsUID/utils/models/gamedata/SkinTable.py @@ -1,4 +1,5 @@ from typing import Dict, List, Union + from ..common import BaseStruct @@ -81,7 +82,7 @@ class SpecialSkinInfo(BaseStruct): class SkinTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' 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 c5a863f..9520f05 100644 --- a/ArknightsUID/utils/models/gamedata/StageTable.py +++ b/ArknightsUID/utils/models/gamedata/StageTable.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -238,7 +240,7 @@ class ApProtectZoneInfo(BaseStruct): class StageTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' 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 bc3f095..c605885 100644 --- a/ArknightsUID/utils/models/gamedata/StoryReviewMetaTable.py +++ b/ArknightsUID/utils/models/gamedata/StoryReviewMetaTable.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -209,7 +211,7 @@ class ActArchiveComponentTable(BaseStruct): class StoryReviewMetaTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' miniActTrialData: MiniActTrialData actArchiveResData: ActArchiveResData diff --git a/ArknightsUID/utils/models/gamedata/StoryReviewTable.py b/ArknightsUID/utils/models/gamedata/StoryReviewTable.py index e8c321a..a6d96af 100644 --- a/ArknightsUID/utils/models/gamedata/StoryReviewTable.py +++ b/ArknightsUID/utils/models/gamedata/StoryReviewTable.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -58,6 +60,6 @@ class StoryReviewGroupClientData(BaseStruct): class StoryReviewTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' storyreviewtable: Dict[str, StoryReviewGroupClientData] diff --git a/ArknightsUID/utils/models/gamedata/StoryTable.py b/ArknightsUID/utils/models/gamedata/StoryTable.py index 748aa83..978032c 100644 --- a/ArknightsUID/utils/models/gamedata/StoryTable.py +++ b/ArknightsUID/utils/models/gamedata/StoryTable.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -44,6 +46,6 @@ class StoryData(BaseStruct): class StoryTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' stories: Dict[str, StoryData] diff --git a/ArknightsUID/utils/models/gamedata/TechBuffTable.py b/ArknightsUID/utils/models/gamedata/TechBuffTable.py index e4ede90..c436c9c 100644 --- a/ArknightsUID/utils/models/gamedata/TechBuffTable.py +++ b/ArknightsUID/utils/models/gamedata/TechBuffTable.py @@ -1,5 +1,7 @@ from typing import List, Union + from ..common import BaseStruct + from msgspec import field @@ -33,6 +35,6 @@ class PackedRuneData(BaseStruct): class TechBuffTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' runes: List[PackedRuneData] diff --git a/ArknightsUID/utils/models/gamedata/TipTable.py b/ArknightsUID/utils/models/gamedata/TipTable.py index 0734c34..a39b472 100644 --- a/ArknightsUID/utils/models/gamedata/TipTable.py +++ b/ArknightsUID/utils/models/gamedata/TipTable.py @@ -1,4 +1,5 @@ from typing import List + from ..common import BaseStruct @@ -16,7 +17,7 @@ class WorldViewTip(BaseStruct): class TipTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' tips: List[TipData] worldViewTips: List[WorldViewTip] diff --git a/ArknightsUID/utils/models/gamedata/TokenTable.py b/ArknightsUID/utils/models/gamedata/TokenTable.py index a66eba1..ed49942 100644 --- a/ArknightsUID/utils/models/gamedata/TokenTable.py +++ b/ArknightsUID/utils/models/gamedata/TokenTable.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -168,6 +170,6 @@ class TokenCharacterData(BaseStruct): class TokenTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' tokens: Dict[str, TokenCharacterData] diff --git a/ArknightsUID/utils/models/gamedata/UniequipData.py b/ArknightsUID/utils/models/gamedata/UniequipData.py index 6781d7b..4e8cde9 100644 --- a/ArknightsUID/utils/models/gamedata/UniequipData.py +++ b/ArknightsUID/utils/models/gamedata/UniequipData.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -57,7 +59,7 @@ class SubProfessionData(BaseStruct): class UniequipData(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' 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 26505cb..315cddf 100644 --- a/ArknightsUID/utils/models/gamedata/UniequipTable.py +++ b/ArknightsUID/utils/models/gamedata/UniequipTable.py @@ -1,5 +1,7 @@ from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field @@ -59,7 +61,7 @@ class UniEquipTimeInfo(BaseStruct): class UniEquipTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' 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 75adf9b..9eead77 100644 --- a/ArknightsUID/utils/models/gamedata/ZoneTable.py +++ b/ArknightsUID/utils/models/gamedata/ZoneTable.py @@ -1,12 +1,14 @@ -from typing import Dict, Union, List +from typing import Dict, List, Union + from ..common import BaseStruct + from msgspec import field class ZoneData(BaseStruct): zoneID: str zoneIndex: int - type: str + type_: str = field(name='type') zoneNameFirst: Union[str, None] zoneNameSecond: Union[str, None] zoneNameTitleCurrent: Union[str, None] @@ -99,7 +101,7 @@ class ZoneMetaData(BaseStruct): class ZoneTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = '23-09-29-15-41-03-569cae' 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 2c309cc..45ffc55 100644 --- a/ArknightsUID/utils/resource/resource_map.json +++ b/ArknightsUID/utils/resource/resource_map.json @@ -2,44 +2,44 @@ "resource": { "gamedata": { "activity_table.json": { - "size": 6058773, - "url": "http://182.43.43.40:8765/UploadPic/ca02ede211988b47a47d88f768c111af.json" + "size": 6073859, + "url": "http://182.43.43.40:8765/UploadPic/a0f1ede97d3319a1bc54aa71f8e0d3b7.json" }, "audio_data.json": { - "size": 4041589, - "url": "http://182.43.43.40:8765/UploadPic/379639883b45ae4b7351bb5c9ef50233.json" + "size": 4148762, + "url": "http://182.43.43.40:8765/UploadPic/086fc0b514b092ee4b0848339c0c390b.json" }, "battle_equip_table.json": { - "size": 3031743, - "url": "http://182.43.43.40:8765/UploadPic/734751c40d12ec638e1cd4ba25a3f53e.json" + "size": 3127845, + "url": "http://182.43.43.40:8765/UploadPic/8b3cfa00047fa4f9f852a680ce12d68a.json" }, "building_data.json": { - "size": 3630102, - "url": "http://182.43.43.40:8765/UploadPic/6ce85982090ce56868a99cd5b9123a68.json" + "size": 3751638, + "url": "http://182.43.43.40:8765/UploadPic/004cc0bee9a859b1288ad11d88d6cc92.json" }, "campaign_table.json": { - "size": 382494, - "url": "http://182.43.43.40:8765/UploadPic/952e62083418194b3b300797e8cce07e.json" + "size": 383164, + "url": "http://182.43.43.40:8765/UploadPic/d4ce0f19d3dbbe30e1047193cb93368c.json" }, "chapter_table.json": { "size": 971, - "url": "http://182.43.43.40:8765/UploadPic/37811c39da5a5982909814c1ff30bd5f.json" + "url": "http://182.43.43.40:8765/UploadPic/93372e99a20ee65da8835e7ab14cd0ae.json" }, "character_table.json": { - "size": 10452279, - "url": "http://182.43.43.40:8765/UploadPic/9e05a1615dce99ed63275c39b80a0075.json" + "size": 10590926, + "url": "http://182.43.43.40:8765/UploadPic/31c6cfc69ca4b5efe5f2aaeb361dc0a5.json" }, "charm_table.json": { "size": 115959, "url": "http://182.43.43.40:8765/UploadPic/531ca7c8a0e50ce887cb82c53bfc1735.json" }, "charword_table.json": { - "size": 8074944, - "url": "http://182.43.43.40:8765/UploadPic/f6dd33d18c18b9a604a9da3d061f468c.json" + "size": 8185744, + "url": "http://182.43.43.40:8765/UploadPic/a8fd59b7bba9cf3ab8e8ba20ee1d7d9b.json" }, "char_meta_table.json": { - "size": 68701, - "url": "http://182.43.43.40:8765/UploadPic/92ccb17b677a7c45ccd0d2ba1a47ba97.json" + "size": 68999, + "url": "http://182.43.43.40:8765/UploadPic/e6916f811f3cf9106dc93c952b501605.json" }, "char_patch_table.json": { "size": 32184, @@ -62,28 +62,28 @@ "url": "http://182.43.43.40:8765/UploadPic/e0ae91a98b61c08815e7cee46d6db028.json" }, "display_meta_table.json": { - "size": 45602, - "url": "http://182.43.43.40:8765/UploadPic/2d6d23ae655c3f21845b5ed867a5b581.json" + "size": 47570, + "url": "http://182.43.43.40:8765/UploadPic/e2e1b6bc43b67c1f167d802ba9a737ea.json" }, "enemy_handbook_table.json": { - "size": 1013166, - "url": "http://182.43.43.40:8765/UploadPic/666dadfd65d9a33e7bb30bb33e83a05b.json" + "size": 1039110, + "url": "http://182.43.43.40:8765/UploadPic/e14f75361e65108bb2f5243f7b1270b9.json" }, "favor_table.json": { "size": 39045, "url": "http://182.43.43.40:8765/UploadPic/a2aad37d3f67ffae35ce18aaba24898a.json" }, "gacha_table.json": { - "size": 242650, - "url": "http://182.43.43.40:8765/UploadPic/e924b4bd3c8b4c979824dd6c20d70ca6.json" + "size": 245310, + "url": "http://182.43.43.40:8765/UploadPic/b6bb888244e34863e01c2f415d4867e5.json" }, "gamedata_const.json": { - "size": 48781, - "url": "http://182.43.43.40:8765/UploadPic/9a03b2dac8b88e623576505ec0fc1202.json" + "size": 49035, + "url": "http://182.43.43.40:8765/UploadPic/b4c46b3446b303750618749edd76abe0.json" }, "handbook_info_table.json": { - "size": 3759461, - "url": "http://182.43.43.40:8765/UploadPic/405a039b90274d8015336d84b3fded72.json" + "size": 3831976, + "url": "http://182.43.43.40:8765/UploadPic/ad15a21aca6c0d4b75fa4e1bd6707a79.json" }, "handbook_table.json": { "size": 17270, @@ -94,20 +94,20 @@ "url": "http://182.43.43.40:8765/UploadPic/eb15c058fb2607fd149146b47b0657a3.json" }, "item_table.json": { - "size": 1010888, - "url": "http://182.43.43.40:8765/UploadPic/1f27a07800ebb2d9a25eead50fb8f380.json" + "size": 1040831, + "url": "http://182.43.43.40:8765/UploadPic/351a4853e13a2ff7c54e7e6002195646.json" }, "medal_table.json": { - "size": 935542, - "url": "http://182.43.43.40:8765/UploadPic/e2beecafdb5f062084252d86c88c8887.json" + "size": 944151, + "url": "http://182.43.43.40:8765/UploadPic/64ba969ce848d8978396f912c7c13b66.json" }, "mission_table.json": { - "size": 605772, - "url": "http://182.43.43.40:8765/UploadPic/56c25cd7e4d3a066db26147ec813ae91.json" + "size": 615067, + "url": "http://182.43.43.40:8765/UploadPic/e462b6ea559050bc90d74f194cd778e4.json" }, "open_server_table.json": { - "size": 140679, - "url": "http://182.43.43.40:8765/UploadPic/409ed506ad8384719284aa1bdd4f0922.json" + "size": 148892, + "url": "http://182.43.43.40:8765/UploadPic/b025b4ed419d97af9a3f355e3ff611f8.json" }, "player_avatar_table.json": { "size": 9277, @@ -122,48 +122,48 @@ "url": "http://182.43.43.40:8765/UploadPic/808ddd375e78fa52c18746a331e5f3af.json" }, "retro_table.json": { - "size": 2813644, - "url": "http://182.43.43.40:8765/UploadPic/c870b1c49ff24a5ec2aa40492ee4b3d7.json" + "size": 2979414, + "url": "http://182.43.43.40:8765/UploadPic/d6fe932d4b7240a842cea2cedff2aaac.json" }, "roguelike_table.json": { "size": 493073, "url": "http://182.43.43.40:8765/UploadPic/f6d59f951312558c0129b7841746574c.json" }, "roguelike_topic_table.json": { - "size": 5699885, - "url": "http://182.43.43.40:8765/UploadPic/e5d08eb0896a3e76552baa4fd685e97f.json" + "size": 5714268, + "url": "http://182.43.43.40:8765/UploadPic/eb9d00b6c99ce7c76896c60a9efd77b4.json" }, "sandbox_table.json": { "size": 798748, "url": "http://182.43.43.40:8765/UploadPic/5bc662e1bd9a3ddfda37d1b3b765098f.json" }, "shop_client_table.json": { - "size": 732952, - "url": "http://182.43.43.40:8765/UploadPic/e1dd10935449a82c40bfd7654aca5e54.json" + "size": 775150, + "url": "http://182.43.43.40:8765/UploadPic/39f38721154e730ee421572a9576049a.json" }, "skill_table.json": { - "size": 7641135, - "url": "http://182.43.43.40:8765/UploadPic/00fbd465651b3d75c6807404b115351e.json" + "size": 7751259, + "url": "http://182.43.43.40:8765/UploadPic/9e45ef441a762f3593f660b15e558a73.json" }, "skin_table.json": { - "size": 2205554, - "url": "http://182.43.43.40:8765/UploadPic/28c8c1de9d67fc2d2a71048063f264c4.json" + "size": 2237674, + "url": "http://182.43.43.40:8765/UploadPic/b3faf166fe4cf20258e5c0c33326ce14.json" }, "stage_table.json": { - "size": 12741944, - "url": "http://182.43.43.40:8765/UploadPic/de825c46b6305a7c68cb73033f84ff94.json" + "size": 13500695, + "url": "http://182.43.43.40:8765/UploadPic/49100618d819fa0ed09071b67dee8aec.json" }, "story_review_meta_table.json": { "size": 442837, "url": "http://182.43.43.40:8765/UploadPic/467a1bfb27b9b105827330aa75ad1f25.json" }, "story_review_table.json": { - "size": 1377869, - "url": "http://182.43.43.40:8765/UploadPic/6df7cd52f7907e26fff280c2f8d1fe35.json" + "size": 1412606, + "url": "http://182.43.43.40:8765/UploadPic/82def473c33916cd6bcc446dce6cbf93.json" }, "story_table.json": { - "size": 1060689, - "url": "http://182.43.43.40:8765/UploadPic/5a7a93e2219e135dd236aa5c3743fcd7.json" + "size": 1084715, + "url": "http://182.43.43.40:8765/UploadPic/6cfdfc4f03b2ded83ed821c5f6a8ec97.json" }, "tech_buff_table.json": { "size": 12123, @@ -182,12 +182,12 @@ "url": "http://182.43.43.40:8765/UploadPic/1d89fb12977515ccb0887b391a781928.json" }, "uniequip_table.json": { - "size": 1748170, - "url": "http://182.43.43.40:8765/UploadPic/9dc60db540be32c8416765505a5054ce.json" + "size": 1803714, + "url": "http://182.43.43.40:8765/UploadPic/66690ea4301738ea5f72c3d6f19a88c1.json" }, "zone_table.json": { - "size": 213130, - "url": "http://182.43.43.40:8765/UploadPic/fd68fa523fdd65c2b34c715be8cf5281.json" + "size": 238807, + "url": "http://182.43.43.40:8765/UploadPic/db9bbeb891e1d72d1a1b2f8e3d4bd72a.json" } } } diff --git a/ArknightsUID/version.py b/ArknightsUID/version.py index 68f156f..1daace4 100644 --- a/ArknightsUID/version.py +++ b/ArknightsUID/version.py @@ -1,3 +1,3 @@ ArknightsUID_version = "0.1.0" -Arknights_Client_version = "2.0.81" -Arknights_Res_version = "23-09-20-13-28-42-486799" +Arknights_Client_version = "2.1.01" +Arknights_Res_version = "23-09-29-15-41-03-569cae"