From 5bcbbc1ee448b31056aba6591422540a90e54937 Mon Sep 17 00:00:00 2001 From: qwerdvd <105906879+qwerdvd@users.noreply.github.com> Date: Tue, 5 Dec 2023 10:48:34 +0800 Subject: [PATCH] Client:2.1.41 Data:23-12-02-09-28-50-918524 --- .../utils/models/gamedata/ActivityTable.py | 2 +- ArknightsUID/utils/models/gamedata/AudioData.py | 2 +- .../utils/models/gamedata/BattleEquipTable.py | 2 +- .../utils/models/gamedata/BuildingData.py | 2 +- .../utils/models/gamedata/CampaignTable.py | 2 +- .../utils/models/gamedata/ChapterTable.py | 2 +- .../utils/models/gamedata/CharMetaTable.py | 2 +- .../utils/models/gamedata/CharPatchTable.py | 3 ++- .../utils/models/gamedata/CharacterTable.py | 3 ++- ArknightsUID/utils/models/gamedata/CharmTable.py | 2 +- .../utils/models/gamedata/CharwordTable.py | 2 +- .../utils/models/gamedata/CheckinTable.py | 2 +- .../utils/models/gamedata/ClimbTowerTable.py | 2 +- ArknightsUID/utils/models/gamedata/ClueData.py | 2 +- .../utils/models/gamedata/CrisisTable.py | 2 +- .../utils/models/gamedata/CrisisV2Table.py | 2 +- .../utils/models/gamedata/DisplayMetaTable.py | 2 +- .../utils/models/gamedata/EnemyHandbookTable.py | 2 +- ArknightsUID/utils/models/gamedata/FavorTable.py | 2 +- ArknightsUID/utils/models/gamedata/GachaTable.py | 2 +- .../utils/models/gamedata/GamedataConst.py | 2 +- .../utils/models/gamedata/HandbookInfoTable.py | 2 +- .../utils/models/gamedata/HandbookTable.py | 2 +- .../utils/models/gamedata/HandbookTeamTable.py | 2 +- ArknightsUID/utils/models/gamedata/ItemTable.py | 2 +- ArknightsUID/utils/models/gamedata/MedalTable.py | 2 +- .../utils/models/gamedata/MissionTable.py | 2 +- .../utils/models/gamedata/OpenServerTable.py | 2 +- .../utils/models/gamedata/PlayerAvatarTable.py | 2 +- ArknightsUID/utils/models/gamedata/RangeTable.py | 2 +- .../utils/models/gamedata/ReplicateTable.py | 2 +- ArknightsUID/utils/models/gamedata/RetroTable.py | 2 +- .../utils/models/gamedata/RoguelikeTable.py | 2 +- .../utils/models/gamedata/RoguelikeTopicTable.py | 9 +++++++++ .../utils/models/gamedata/SandboxTable.py | 2 +- .../utils/models/gamedata/ShopClientTable.py | 3 ++- ArknightsUID/utils/models/gamedata/SkillTable.py | 2 +- ArknightsUID/utils/models/gamedata/SkinTable.py | 2 +- ArknightsUID/utils/models/gamedata/StageTable.py | 2 +- .../models/gamedata/StoryReviewMetaTable.py | 2 +- .../utils/models/gamedata/StoryReviewTable.py | 2 +- ArknightsUID/utils/models/gamedata/StoryTable.py | 2 +- .../utils/models/gamedata/TechBuffTable.py | 2 +- ArknightsUID/utils/models/gamedata/TipTable.py | 2 +- ArknightsUID/utils/models/gamedata/TokenTable.py | 3 ++- .../utils/models/gamedata/UniequipData.py | 2 +- .../utils/models/gamedata/UniequipTable.py | 2 +- ArknightsUID/utils/models/gamedata/ZoneTable.py | 2 +- ArknightsUID/utils/models/gamedata/common.py | 16 +++++++--------- ArknightsUID/version.py | 4 ++-- 50 files changed, 69 insertions(+), 58 deletions(-) diff --git a/ArknightsUID/utils/models/gamedata/ActivityTable.py b/ArknightsUID/utils/models/gamedata/ActivityTable.py index 0d29155..22671d8 100644 --- a/ArknightsUID/utils/models/gamedata/ActivityTable.py +++ b/ArknightsUID/utils/models/gamedata/ActivityTable.py @@ -2605,7 +2605,7 @@ class ActivityTableExtraData(BaseStruct): class ActivityTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' 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 2433ab2..15c9841 100644 --- a/ArknightsUID/utils/models/gamedata/AudioData.py +++ b/ArknightsUID/utils/models/gamedata/AudioData.py @@ -91,7 +91,7 @@ class AudioDataFadeStyle(BaseStruct): class AudioData(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' bgmBanks: List[BGMBank] soundFXBanks: List[SoundFXBank] diff --git a/ArknightsUID/utils/models/gamedata/BattleEquipTable.py b/ArknightsUID/utils/models/gamedata/BattleEquipTable.py index 42fd10e..77f9a74 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-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' equips: Dict[str, BattleEquipData] diff --git a/ArknightsUID/utils/models/gamedata/BuildingData.py b/ArknightsUID/utils/models/gamedata/BuildingData.py index 871c54c..76de7f6 100644 --- a/ArknightsUID/utils/models/gamedata/BuildingData.py +++ b/ArknightsUID/utils/models/gamedata/BuildingData.py @@ -421,7 +421,7 @@ class BuildingDataCreditFormula(BaseStruct): class BuildingData(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' controlSlotId: str meetingSlotId: str diff --git a/ArknightsUID/utils/models/gamedata/CampaignTable.py b/ArknightsUID/utils/models/gamedata/CampaignTable.py index 40f7d85..6d478d0 100644 --- a/ArknightsUID/utils/models/gamedata/CampaignTable.py +++ b/ArknightsUID/utils/models/gamedata/CampaignTable.py @@ -145,7 +145,7 @@ class CampaignTrainingAllOpenTimeData(BaseStruct): class CampaignTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' 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 5ce6e23..a28fd28 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-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' chapters: Dict[str, ChapterData] diff --git a/ArknightsUID/utils/models/gamedata/CharMetaTable.py b/ArknightsUID/utils/models/gamedata/CharMetaTable.py index 4535c5f..3488292 100644 --- a/ArknightsUID/utils/models/gamedata/CharMetaTable.py +++ b/ArknightsUID/utils/models/gamedata/CharMetaTable.py @@ -21,7 +21,7 @@ class SpCharMissionData(BaseStruct): class CharMetaTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' 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 cd8ee24..673e98a 100644 --- a/ArknightsUID/utils/models/gamedata/CharPatchTable.py +++ b/ArknightsUID/utils/models/gamedata/CharPatchTable.py @@ -57,6 +57,7 @@ class AttributesData(BaseStruct): sleepImmune: bool frozenImmune: bool levitateImmune: bool + disarmedCombatImmune: bool class CharacterDataAttributesKeyFrame(BaseStruct): @@ -191,7 +192,7 @@ class CharPatchDataPatchDetailInfo(BaseStruct): class CharPatchTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' 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 46ab0a6..290a8a3 100644 --- a/ArknightsUID/utils/models/gamedata/CharacterTable.py +++ b/ArknightsUID/utils/models/gamedata/CharacterTable.py @@ -53,6 +53,7 @@ class AttributesData(BaseStruct): sleepImmune: bool frozenImmune: bool levitateImmune: bool + disarmedCombatImmune: bool class CharacterDataAttributesKeyFrame(BaseStruct): @@ -175,7 +176,7 @@ class CharacterData(BaseStruct): class CharacterTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' chars: Dict[str, CharacterData] diff --git a/ArknightsUID/utils/models/gamedata/CharmTable.py b/ArknightsUID/utils/models/gamedata/CharmTable.py index f2efaed..4c34e64 100644 --- a/ArknightsUID/utils/models/gamedata/CharmTable.py +++ b/ArknightsUID/utils/models/gamedata/CharmTable.py @@ -58,6 +58,6 @@ class CharmItemData(BaseStruct): class CharmTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' charmList: List[CharmItemData] diff --git a/ArknightsUID/utils/models/gamedata/CharwordTable.py b/ArknightsUID/utils/models/gamedata/CharwordTable.py index 4c208e2..6ed62f9 100644 --- a/ArknightsUID/utils/models/gamedata/CharwordTable.py +++ b/ArknightsUID/utils/models/gamedata/CharwordTable.py @@ -55,7 +55,7 @@ class NewVoiceTimeData(BaseStruct): class CharwordTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' 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 12415b9..988155d 100644 --- a/ArknightsUID/utils/models/gamedata/CheckinTable.py +++ b/ArknightsUID/utils/models/gamedata/CheckinTable.py @@ -36,7 +36,7 @@ class MonthlyDailyBonusGroup(BaseStruct): class CheckinTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' 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 846dc99..451fe2e 100644 --- a/ArknightsUID/utils/models/gamedata/ClimbTowerTable.py +++ b/ArknightsUID/utils/models/gamedata/ClimbTowerTable.py @@ -240,7 +240,7 @@ class MissionGroup(BaseStruct): class ClimbTowerTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' 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 0a3f862..3d30c4b 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-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' clues: List[MeetingClueDataClueData] clueTypes: List[MeetingClueDataClueTypeData] diff --git a/ArknightsUID/utils/models/gamedata/CrisisTable.py b/ArknightsUID/utils/models/gamedata/CrisisTable.py index 941433d..47f170e 100644 --- a/ArknightsUID/utils/models/gamedata/CrisisTable.py +++ b/ArknightsUID/utils/models/gamedata/CrisisTable.py @@ -34,7 +34,7 @@ class CrisisMapRankInfo(BaseStruct): class CrisisTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' seasonInfo: List[CrisisClientDataSeasonInfo] meta: str diff --git a/ArknightsUID/utils/models/gamedata/CrisisV2Table.py b/ArknightsUID/utils/models/gamedata/CrisisV2Table.py index ed41d4c..c3180fc 100644 --- a/ArknightsUID/utils/models/gamedata/CrisisV2Table.py +++ b/ArknightsUID/utils/models/gamedata/CrisisV2Table.py @@ -45,7 +45,7 @@ class CrisisV2ScoreLevelToAppraiseData(BaseStruct): class CrisisV2Table(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' seasonInfoDataMap: Dict scoreLevelToAppraiseDataMap: Dict[str, CrisisV2ScoreLevelToAppraiseData] diff --git a/ArknightsUID/utils/models/gamedata/DisplayMetaTable.py b/ArknightsUID/utils/models/gamedata/DisplayMetaTable.py index e92453c..a5674b3 100644 --- a/ArknightsUID/utils/models/gamedata/DisplayMetaTable.py +++ b/ArknightsUID/utils/models/gamedata/DisplayMetaTable.py @@ -76,7 +76,7 @@ class HomeBackgroundData(BaseStruct): class DisplayMetaTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' playerAvatarData: PlayerAvatarData homeBackgroundData: HomeBackgroundData diff --git a/ArknightsUID/utils/models/gamedata/EnemyHandbookTable.py b/ArknightsUID/utils/models/gamedata/EnemyHandbookTable.py index c4464dd..ada7a2d 100644 --- a/ArknightsUID/utils/models/gamedata/EnemyHandbookTable.py +++ b/ArknightsUID/utils/models/gamedata/EnemyHandbookTable.py @@ -54,7 +54,7 @@ class EnemyHandbookRaceData(BaseStruct): class EnemyHandbookTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' levelInfoList: List[EnemyHandbookLevelInfoData] enemyData: Dict[str, EnemyHandBookData] diff --git a/ArknightsUID/utils/models/gamedata/FavorTable.py b/ArknightsUID/utils/models/gamedata/FavorTable.py index 4863e7c..a20858a 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-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' maxFavor: int favorFrames: List[FavorDataFrames] diff --git a/ArknightsUID/utils/models/gamedata/GachaTable.py b/ArknightsUID/utils/models/gamedata/GachaTable.py index 18bb9d5..4ce9c9a 100644 --- a/ArknightsUID/utils/models/gamedata/GachaTable.py +++ b/ArknightsUID/utils/models/gamedata/GachaTable.py @@ -131,7 +131,7 @@ class GachaDataFesGachaPoolRelateItem(BaseStruct): class GachaTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' gachaTags: List[GachaTag] carousel: List[GachaDataCarouselData] diff --git a/ArknightsUID/utils/models/gamedata/GamedataConst.py b/ArknightsUID/utils/models/gamedata/GamedataConst.py index 3eb6c8e..6767def 100644 --- a/ArknightsUID/utils/models/gamedata/GamedataConst.py +++ b/ArknightsUID/utils/models/gamedata/GamedataConst.py @@ -23,7 +23,7 @@ class TermDescriptionData(BaseStruct): class GamedataConst(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' addedRewardDisplayZone: str advancedGachaCrystalCost: int diff --git a/ArknightsUID/utils/models/gamedata/HandbookInfoTable.py b/ArknightsUID/utils/models/gamedata/HandbookInfoTable.py index 5c5b061..76d7bbd 100644 --- a/ArknightsUID/utils/models/gamedata/HandbookInfoTable.py +++ b/ArknightsUID/utils/models/gamedata/HandbookInfoTable.py @@ -122,7 +122,7 @@ class HandbookInfoData(BaseStruct): class HandbookInfoTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' 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 e50e377..415ce58 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-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' char_102_texas: CharHandbook diff --git a/ArknightsUID/utils/models/gamedata/HandbookTeamTable.py b/ArknightsUID/utils/models/gamedata/HandbookTeamTable.py index ba6bb04..5018bf8 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-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' team: Dict[str, HandbookTeam] diff --git a/ArknightsUID/utils/models/gamedata/ItemTable.py b/ArknightsUID/utils/models/gamedata/ItemTable.py index 3d69282..eb4b962 100644 --- a/ArknightsUID/utils/models/gamedata/ItemTable.py +++ b/ArknightsUID/utils/models/gamedata/ItemTable.py @@ -98,7 +98,7 @@ class ServerItemReminderInfo(BaseStruct): class ItemTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' 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 00b8c89..0f89ad8 100644 --- a/ArknightsUID/utils/models/gamedata/MedalTable.py +++ b/ArknightsUID/utils/models/gamedata/MedalTable.py @@ -61,7 +61,7 @@ class MedalPerData(BaseStruct): class MedalTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' medalList: List[MedalPerData] medalTypeData: Dict[str, MedalTypeData] diff --git a/ArknightsUID/utils/models/gamedata/MissionTable.py b/ArknightsUID/utils/models/gamedata/MissionTable.py index 518aef1..9b778ac 100644 --- a/ArknightsUID/utils/models/gamedata/MissionTable.py +++ b/ArknightsUID/utils/models/gamedata/MissionTable.py @@ -78,7 +78,7 @@ class MissionData(BaseStruct): class MissionTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' 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 2d86b68..7fdd291 100644 --- a/ArknightsUID/utils/models/gamedata/OpenServerTable.py +++ b/ArknightsUID/utils/models/gamedata/OpenServerTable.py @@ -269,7 +269,7 @@ class OpenServerNewbieCheckInPackage(BaseStruct): class OpenServerTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' schedule: List[OpenServerScheduleItem] dataMap: Dict[str, OpenServerData] diff --git a/ArknightsUID/utils/models/gamedata/PlayerAvatarTable.py b/ArknightsUID/utils/models/gamedata/PlayerAvatarTable.py index d1590a4..0a0ccf8 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-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' avatarList: List[PlayerAvatarPerData] avatarTypeData: Dict[str, PlayerAvatarGroupData] diff --git a/ArknightsUID/utils/models/gamedata/RangeTable.py b/ArknightsUID/utils/models/gamedata/RangeTable.py index 2436c25..5c28dbe 100644 --- a/ArknightsUID/utils/models/gamedata/RangeTable.py +++ b/ArknightsUID/utils/models/gamedata/RangeTable.py @@ -25,6 +25,6 @@ class Stage(BaseStruct): class RangeTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' range_: Dict[str, Stage] diff --git a/ArknightsUID/utils/models/gamedata/ReplicateTable.py b/ArknightsUID/utils/models/gamedata/ReplicateTable.py index bfeb9f8..7cdd24b 100644 --- a/ArknightsUID/utils/models/gamedata/ReplicateTable.py +++ b/ArknightsUID/utils/models/gamedata/ReplicateTable.py @@ -21,6 +21,6 @@ class ReplicateList(BaseStruct): class ReplicateTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' replicate: Dict[str, ReplicateList] diff --git a/ArknightsUID/utils/models/gamedata/RetroTable.py b/ArknightsUID/utils/models/gamedata/RetroTable.py index 05e62e3..fee6bb4 100644 --- a/ArknightsUID/utils/models/gamedata/RetroTable.py +++ b/ArknightsUID/utils/models/gamedata/RetroTable.py @@ -430,7 +430,7 @@ class RetroStageOverrideInfo(BaseStruct): class RetroTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' customData: ActivityCustomData initRetroCoin: int diff --git a/ArknightsUID/utils/models/gamedata/RoguelikeTable.py b/ArknightsUID/utils/models/gamedata/RoguelikeTable.py index 0bd0a4b..aa7a7c2 100644 --- a/ArknightsUID/utils/models/gamedata/RoguelikeTable.py +++ b/ArknightsUID/utils/models/gamedata/RoguelikeTable.py @@ -193,7 +193,7 @@ class RoguelikeConstTable(BaseStruct): class RoguelikeTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' constTable: RoguelikeConstTable itemTable: RoguelikeItemTable diff --git a/ArknightsUID/utils/models/gamedata/RoguelikeTopicTable.py b/ArknightsUID/utils/models/gamedata/RoguelikeTopicTable.py index d40ac4a..0c7eb27 100644 --- a/ArknightsUID/utils/models/gamedata/RoguelikeTopicTable.py +++ b/ArknightsUID/utils/models/gamedata/RoguelikeTopicTable.py @@ -165,6 +165,11 @@ class RoguelikeTopicChallenge(BaseStruct): challengeStoryId: Union[str, None] = None +class RoguelikeTopicDifficultyRuleDescReplacement(BaseStruct): + enrollId: str + ruleDesc: str + + class RoguelikeTopicDifficulty(BaseStruct): modeDifficulty: str grade: int @@ -176,6 +181,7 @@ class RoguelikeTopicDifficulty(BaseStruct): canUnlockItem: bool doMonthTask: bool ruleDesc: str + ruleDescReplacements: Union[List[RoguelikeTopicDifficultyRuleDescReplacement], None] failTitle: str failImageId: str failForceDesc: str @@ -389,6 +395,8 @@ class RoguelikeTopicDetailConst(BaseStruct): outerBuffTokenSum: int needAllFrontNode: bool showBlurBack: bool + endingIconBorderDifficulty: int + endingIconBorderCount: int predefinedLevelTable: Union[ Dict[str, RoguelikeTopicDetailConstPredefinedPlayerLevelData], None, @@ -436,6 +444,7 @@ class RoguelikeGameZoneData(BaseStruct): clockPerformance: Union[str, None] displayTime: Union[str, None] description: str + buffDescription: Union[str, None] endingDescription: str backgroundId: str zoneIconId: str diff --git a/ArknightsUID/utils/models/gamedata/SandboxTable.py b/ArknightsUID/utils/models/gamedata/SandboxTable.py index 9e7e9c7..bdacca6 100644 --- a/ArknightsUID/utils/models/gamedata/SandboxTable.py +++ b/ArknightsUID/utils/models/gamedata/SandboxTable.py @@ -398,7 +398,7 @@ class SandboxItemData(BaseStruct): class SandboxTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' 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 0076685..942af79 100644 --- a/ArknightsUID/utils/models/gamedata/ShopClientTable.py +++ b/ArknightsUID/utils/models/gamedata/ShopClientTable.py @@ -33,6 +33,7 @@ class ShopRecommendTemplateNormalGiftParam(BaseStruct): logoId: str color: str haveMark: bool + availCount: int class ShopRecommendTemplateNormalSkinParam(BaseStruct): @@ -144,7 +145,7 @@ class LMTGSShopOverlaySchedule(BaseStruct): class ShopClientTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' recommendList: List[ShopRecommendItem] creditUnlockGroup: Dict[str, ShopCreditUnlockGroup] diff --git a/ArknightsUID/utils/models/gamedata/SkillTable.py b/ArknightsUID/utils/models/gamedata/SkillTable.py index f0b0be9..2154f1f 100644 --- a/ArknightsUID/utils/models/gamedata/SkillTable.py +++ b/ArknightsUID/utils/models/gamedata/SkillTable.py @@ -46,6 +46,6 @@ class SkillDataBundle(BaseStruct): class SkillTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' skills: Dict[str, SkillDataBundle] diff --git a/ArknightsUID/utils/models/gamedata/SkinTable.py b/ArknightsUID/utils/models/gamedata/SkinTable.py index 3b1ce72..9ef7482 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-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' 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 3d88ee8..45d87b1 100644 --- a/ArknightsUID/utils/models/gamedata/StageTable.py +++ b/ArknightsUID/utils/models/gamedata/StageTable.py @@ -241,7 +241,7 @@ class ApProtectZoneInfo(BaseStruct): class StageTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' 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 395abac..3c32cfe 100644 --- a/ArknightsUID/utils/models/gamedata/StoryReviewMetaTable.py +++ b/ArknightsUID/utils/models/gamedata/StoryReviewMetaTable.py @@ -229,7 +229,7 @@ class ActArchiveComponentTable(BaseStruct): class StoryReviewMetaTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' miniActTrialData: MiniActTrialData actArchiveResData: ActArchiveResData diff --git a/ArknightsUID/utils/models/gamedata/StoryReviewTable.py b/ArknightsUID/utils/models/gamedata/StoryReviewTable.py index bf81c40..83e0ceb 100644 --- a/ArknightsUID/utils/models/gamedata/StoryReviewTable.py +++ b/ArknightsUID/utils/models/gamedata/StoryReviewTable.py @@ -60,6 +60,6 @@ class StoryReviewGroupClientData(BaseStruct): class StoryReviewTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' storyreviewtable: Dict[str, StoryReviewGroupClientData] diff --git a/ArknightsUID/utils/models/gamedata/StoryTable.py b/ArknightsUID/utils/models/gamedata/StoryTable.py index 8a223db..ccfa3cb 100644 --- a/ArknightsUID/utils/models/gamedata/StoryTable.py +++ b/ArknightsUID/utils/models/gamedata/StoryTable.py @@ -46,6 +46,6 @@ class StoryData(BaseStruct): class StoryTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' stories: Dict[str, StoryData] diff --git a/ArknightsUID/utils/models/gamedata/TechBuffTable.py b/ArknightsUID/utils/models/gamedata/TechBuffTable.py index e330622..85b8108 100644 --- a/ArknightsUID/utils/models/gamedata/TechBuffTable.py +++ b/ArknightsUID/utils/models/gamedata/TechBuffTable.py @@ -35,6 +35,6 @@ class PackedRuneData(BaseStruct): class TechBuffTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' runes: List[PackedRuneData] diff --git a/ArknightsUID/utils/models/gamedata/TipTable.py b/ArknightsUID/utils/models/gamedata/TipTable.py index 168d025..7ebc015 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-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' tips: List[TipData] worldViewTips: List[WorldViewTip] diff --git a/ArknightsUID/utils/models/gamedata/TokenTable.py b/ArknightsUID/utils/models/gamedata/TokenTable.py index ab15426..8cd53a4 100644 --- a/ArknightsUID/utils/models/gamedata/TokenTable.py +++ b/ArknightsUID/utils/models/gamedata/TokenTable.py @@ -52,6 +52,7 @@ class AttributesData(BaseStruct): sleepImmune: bool frozenImmune: bool levitateImmune: bool + disarmedCombatImmune: bool class CharacterDataAttributesKeyFrame(BaseStruct): @@ -170,6 +171,6 @@ class TokenCharacterData(BaseStruct): class TokenTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' tokens: Dict[str, TokenCharacterData] diff --git a/ArknightsUID/utils/models/gamedata/UniequipData.py b/ArknightsUID/utils/models/gamedata/UniequipData.py index 8a46a80..5495b3a 100644 --- a/ArknightsUID/utils/models/gamedata/UniequipData.py +++ b/ArknightsUID/utils/models/gamedata/UniequipData.py @@ -59,7 +59,7 @@ class SubProfessionData(BaseStruct): class UniequipData(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' 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 24ffa6b..c513e55 100644 --- a/ArknightsUID/utils/models/gamedata/UniequipTable.py +++ b/ArknightsUID/utils/models/gamedata/UniequipTable.py @@ -61,7 +61,7 @@ class UniEquipTimeInfo(BaseStruct): class UniEquipTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' 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 1db5732..2a64a0e 100644 --- a/ArknightsUID/utils/models/gamedata/ZoneTable.py +++ b/ArknightsUID/utils/models/gamedata/ZoneTable.py @@ -101,7 +101,7 @@ class ZoneMetaData(BaseStruct): class ZoneTable(BaseStruct): - __version__ = '23-10-31-11-47-45-d410ff' + __version__ = '23-12-02-09-28-50-918524' zones: Dict[str, ZoneData] weeklyAdditionInfo: Dict[str, WeeklyZoneData] diff --git a/ArknightsUID/utils/models/gamedata/common.py b/ArknightsUID/utils/models/gamedata/common.py index b8a4131..5270158 100644 --- a/ArknightsUID/utils/models/gamedata/common.py +++ b/ArknightsUID/utils/models/gamedata/common.py @@ -2,25 +2,23 @@ from __future__ import annotations from collections.abc import Callable, Iterable, Iterator from copy import copy, deepcopy -from typing import Any, TypeVar +from typing import Any, Dict, Tuple, TypeVar, Union +from typing_extensions import dataclass_transform from msgspec import ( Struct, UnsetType, convert, field, -) -from msgspec import ( json as mscjson, ) -from typing_extensions import dataclass_transform Model = TypeVar('Model', bound='BaseStruct') T1 = TypeVar('T1') T2 = TypeVar('T2') -def transUnset(v: T1 | UnsetType, d: T2 = None) -> T1 | T2: +def transUnset(v: Union[T1, UnsetType], d: T2 = None) -> Union[T1, T2]: return v if not isinstance(v, UnsetType) else d @@ -41,8 +39,8 @@ class BaseStruct( *, strict: bool = True, from_attributes: bool = False, - dec_hook: Callable[[type, Any], Any] | None = None, - builtin_types: Iterable[type] | None = None, + dec_hook: Union[Callable[[type, Any], Any], None] = None, + builtin_types: Union[Iterable[type], None] = None, str_keys: bool = False, ) -> Model: if obj is None: @@ -59,7 +57,7 @@ class BaseStruct( str_keys=str_keys, ) - def __iter__(self) -> Iterator[tuple[str, Any]]: + def __iter__(self) -> Iterator[Tuple[str, Any]]: for field_name in self.__struct_fields__: yield field_name, getattr(self, field_name) @@ -70,7 +68,7 @@ class BaseStruct( for field_name in self.__struct_fields__: yield getattr(self, field_name) - def model_dump(self) -> dict[str, Any]: + def model_dump(self) -> Dict[str, Any]: return mscjson.decode(mscjson.encode(self)) def dump_child(self, target: str) -> Any: diff --git a/ArknightsUID/version.py b/ArknightsUID/version.py index 0659ef3..919b6ec 100644 --- a/ArknightsUID/version.py +++ b/ArknightsUID/version.py @@ -1,3 +1,3 @@ ArknightsUID_version = '0.1.0' -Arknights_Client_version = '2.1.21' -Arknights_Res_version = '23-10-31-11-47-45-d410ff' +Arknights_Client_version = '2.1.41' +Arknights_Res_version = '23-12-02-09-28-50-918524'