diff --git a/ArknightsUID/arknightsuid_user/deal_skd_cred.py b/ArknightsUID/arknightsuid_user/deal_skd_cred.py index c09e9d4..870849e 100644 --- a/ArknightsUID/arknightsuid_user/deal_skd_cred.py +++ b/ArknightsUID/arknightsuid_user/deal_skd_cred.py @@ -10,7 +10,7 @@ async def deal_skd_cred(bot_id: str, cred: str, user_id: str) -> str: uid_list = await ArknightsBind.get_uid_list_by_game(user_id, bot_id) if uid_list is None: return UID_HINT - + match = re.search(r'\S+', cred) if not match: return 'Cred无效!' diff --git a/ArknightsUID/utils/api/skd/request.py b/ArknightsUID/utils/api/skd/request.py index 78d8b97..7508b6c 100644 --- a/ArknightsUID/utils/api/skd/request.py +++ b/ArknightsUID/utils/api/skd/request.py @@ -3,7 +3,7 @@ import hashlib import json import time import hmac -from typing import Any, ClassVar, Dict, Literal, Tuple, Union, cast +from typing import Any, Dict, Literal, Tuple, Union, cast from urllib.parse import urlparse import msgspec @@ -250,7 +250,7 @@ class BaseArkApi: header["dId"] = dId logger.debug(header) return header - + async def ark_request( self, url: str, @@ -298,7 +298,7 @@ class BaseArkApi: raw_data = {} if 'cred' not in header: return 10001 - + async with client.request( method=method, url=url, @@ -318,7 +318,7 @@ class BaseArkApi: # 判断code if raw_data['code'] == 0: return raw_data - + if raw_data['code'] == 10000: # token失效 logger.info(f'{url} {raw_data}') diff --git a/ArknightsUID/utils/error_reply.py b/ArknightsUID/utils/error_reply.py index 3c62475..375d99a 100644 --- a/ArknightsUID/utils/error_reply.py +++ b/ArknightsUID/utils/error_reply.py @@ -10,4 +10,4 @@ def get_error(retcode: Union[int, str]) -> str: return '请勿重复签到!' if retcode == 10003: return '请勿修改设备时间' - return f'API报错, 错误码为{retcode}!' \ No newline at end of file + return f'API报错, 错误码为{retcode}!' diff --git a/ArknightsUID/utils/models/gamedata/ActivityTable.py b/ArknightsUID/utils/models/gamedata/ActivityTable.py index f234d29..187eaff 100644 --- a/ArknightsUID/utils/models/gamedata/ActivityTable.py +++ b/ArknightsUID/utils/models/gamedata/ActivityTable.py @@ -4,8 +4,8 @@ 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 +29,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 +56,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 +76,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): @@ -238,7 +238,7 @@ class Act3D0DataLimitedPoolDetailInfoPoolItemInfo(BaseStruct): perCount: int totalCount: int weight: int - type_: str = field(name='type') + type_: str = field(name="type") orderId: int @@ -253,7 +253,7 @@ class Act3D0DataInfinitePoolDetailInfoPoolItemInfo(BaseStruct): goodType: str perCount: int weight: int - type_: str = field(name='type') + type_: str = field(name="type") orderId: int @@ -486,7 +486,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 +514,7 @@ class Act5D1Data(BaseStruct): class ActivityCollectionDataCollectionInfo(BaseStruct): - id_: int = field(name='id') + id_: int = field(name="id") itemType: str itemId: str itemCnt: int @@ -724,7 +724,7 @@ class Act13SideDataLongTermMissionData(BaseStruct): class Act13SideDataDailyMissionData(BaseStruct): - id_: str = field(name='id') + id_: str = field(name="id") sortId: int description: str missionName: str @@ -917,7 +917,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 +1160,14 @@ 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] = None + currentTmpl: Union[Union[str, None]] = None tmpl: Union[Dict[str, SharedCharDataTmplData], None] = None @@ -1222,8 +1222,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 @@ -1319,15 +1319,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 +1366,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 +1382,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 +1482,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 @@ -1567,7 +1567,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 +1590,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 +1679,7 @@ class Act38D1DataAct38D1DimensionItemData(BaseStruct): class Act38D1DataAct38D1CommentData(BaseStruct): - id_: str = field(name='id') + id_: str = field(name="id") sortId: int desc: str @@ -1714,7 +1714,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 +1833,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 @@ -1893,6 +1893,7 @@ class Act42D0DataMilestoneData(BaseStruct): tokenNum: int item: ItemBundle + class Act42D0DataConstData(BaseStruct): milestoneId: str strifeName: str @@ -1959,8 +1960,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 @@ -2422,7 +2423,7 @@ class ActivityTableExtraData(BaseStruct): class ActivityTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = "23-07-27-18-50-06-aeb568" basicInfo: Dict[str, ActivityTableBasicData] homeActConfig: Dict[str, ActivityTableHomeActivityConfig] diff --git a/ArknightsUID/utils/models/gamedata/GachaTable.py b/ArknightsUID/utils/models/gamedata/GachaTable.py index 194c13f..8490264 100644 --- a/ArknightsUID/utils/models/gamedata/GachaTable.py +++ b/ArknightsUID/utils/models/gamedata/GachaTable.py @@ -30,9 +30,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): @@ -92,8 +92,8 @@ class GachaPoolClientData(BaseStruct): guarantee5Count: int LMTGSID: Union[str, None] openTime: int - dynMeta: Union[Dict[str, object], None, None] = None - linkageParam: Union[Dict[str, object], None, None] = None + dynMeta: Union[Dict[str, object], None] = None + linkageParam: Union[Dict[str, object], None] = None linkageRuleId: Union[str, None] = None @@ -129,7 +129,7 @@ class GachaDataFesGachaPoolRelateItem(BaseStruct): class GachaTable(BaseStruct): - __version__ = '23-07-27-18-50-06-aeb568' + __version__ = "23-07-27-18-50-06-aeb568" gachaTags: List[GachaTag] carousel: List[GachaDataCarouselData] diff --git a/ArknightsUID/utils/models/gamedata/GamedataConst.py b/ArknightsUID/utils/models/gamedata/GamedataConst.py index 9d08c2e..b4ed86a 100644 --- a/ArknightsUID/utils/models/gamedata/GamedataConst.py +++ b/ArknightsUID/utils/models/gamedata/GamedataConst.py @@ -1,7 +1,6 @@ from typing import Dict, List, Union from ..common import BaseStruct from msgspec import field -from msgspec import json as msgjson class ItemBundle(BaseStruct): diff --git a/ArknightsUID/utils/models/gamedata/HandbookTeamTable.py b/ArknightsUID/utils/models/gamedata/HandbookTeamTable.py index 4cb957a..ea72b17 100644 --- a/ArknightsUID/utils/models/gamedata/HandbookTeamTable.py +++ b/ArknightsUID/utils/models/gamedata/HandbookTeamTable.py @@ -1,6 +1,5 @@ from typing import Dict from ..common import BaseStruct -from msgspec import json as msgjson class HandbookTeam(BaseStruct): diff --git a/ArknightsUID/utils/models/gamedata/RangeTable.py b/ArknightsUID/utils/models/gamedata/RangeTable.py index df17543..c723b1e 100644 --- a/ArknightsUID/utils/models/gamedata/RangeTable.py +++ b/ArknightsUID/utils/models/gamedata/RangeTable.py @@ -1,7 +1,6 @@ from typing import Dict, List, Union from ..common import BaseStruct from msgspec import field -from msgspec import json as msgjson class GridPosition(BaseStruct): diff --git a/ArknightsUID/utils/models/gamedata/ReplicateTable.py b/ArknightsUID/utils/models/gamedata/ReplicateTable.py index c8e6044..b76789a 100644 --- a/ArknightsUID/utils/models/gamedata/ReplicateTable.py +++ b/ArknightsUID/utils/models/gamedata/ReplicateTable.py @@ -1,7 +1,6 @@ from typing import Dict, List from ..common import BaseStruct from msgspec import field -from msgspec import json as msgjson class ItemBundle(BaseStruct): diff --git a/ArknightsUID/utils/models/gamedata/RetroTable.py b/ArknightsUID/utils/models/gamedata/RetroTable.py index b1a6458..d5d5773 100644 --- a/ArknightsUID/utils/models/gamedata/RetroTable.py +++ b/ArknightsUID/utils/models/gamedata/RetroTable.py @@ -1,7 +1,6 @@ from typing import Dict, List, Union from ..common import BaseStruct from msgspec import field -from msgspec.inspect import NoneType class ItemBundle(BaseStruct): diff --git a/ArknightsUID/utils/models/gamedata/SkillTable.py b/ArknightsUID/utils/models/gamedata/SkillTable.py index 67a314e..3fbf9e2 100644 --- a/ArknightsUID/utils/models/gamedata/SkillTable.py +++ b/ArknightsUID/utils/models/gamedata/SkillTable.py @@ -1,7 +1,6 @@ from typing import Dict, List, Union from ..common import BaseStruct from msgspec import field -from msgspec import json as msgjson class ItemBundle(BaseStruct): diff --git a/ArknightsUID/utils/models/gamedata/StoryReviewTable.py b/ArknightsUID/utils/models/gamedata/StoryReviewTable.py index 4108369..e8c321a 100644 --- a/ArknightsUID/utils/models/gamedata/StoryReviewTable.py +++ b/ArknightsUID/utils/models/gamedata/StoryReviewTable.py @@ -1,7 +1,6 @@ from typing import Dict, List, Union from ..common import BaseStruct from msgspec import field -from msgspec import json as msgjson class ItemBundle(BaseStruct): diff --git a/ArknightsUID/utils/models/gamedata/StoryTable.py b/ArknightsUID/utils/models/gamedata/StoryTable.py index 3e3bf90..748aa83 100644 --- a/ArknightsUID/utils/models/gamedata/StoryTable.py +++ b/ArknightsUID/utils/models/gamedata/StoryTable.py @@ -1,7 +1,6 @@ from typing import Dict, List, Union from ..common import BaseStruct from msgspec import field -from msgspec import json as msgjson class StoryDataTrigger(BaseStruct): diff --git a/ArknightsUID/utils/models/gamedata/TokenTable.py b/ArknightsUID/utils/models/gamedata/TokenTable.py index 6484132..a66eba1 100644 --- a/ArknightsUID/utils/models/gamedata/TokenTable.py +++ b/ArknightsUID/utils/models/gamedata/TokenTable.py @@ -1,7 +1,6 @@ from typing import Dict, List, Union from ..common import BaseStruct from msgspec import field -from msgspec import json as msgjson class CharacterDataUnlockCondition(BaseStruct): diff --git a/ArknightsUID/utils/models/skland/models.py b/ArknightsUID/utils/models/skland/models.py index 099a17f..0604269 100644 --- a/ArknightsUID/utils/models/skland/models.py +++ b/ArknightsUID/utils/models/skland/models.py @@ -416,7 +416,7 @@ class BuildingTraining(Struct): lastUpdateTime: int remainSecs: int slotState: int - trainee: Union[BuildingTrainingTrainee, None] + trainee: Union[BuildingTrainingTrainee, None] trainer: Union[BuildingTrainingTrainer, None] diff --git a/ArknightsUID/utils/resource/resource_map.json b/ArknightsUID/utils/resource/resource_map.json index bb7d170..2c309cc 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": 3617993, - "url": "http://182.43.43.40:8765/UploadPic/cefe664b0d42100e08a17885956a2064.json" + "size": 6058773, + "url": "http://182.43.43.40:8765/UploadPic/ca02ede211988b47a47d88f768c111af.json" }, "audio_data.json": { - "size": 2708008, - "url": "http://182.43.43.40:8765/UploadPic/3658cfb18cd866d05fa28a380184d1f3.json" + "size": 4041589, + "url": "http://182.43.43.40:8765/UploadPic/379639883b45ae4b7351bb5c9ef50233.json" }, "battle_equip_table.json": { - "size": 1551456, - "url": "http://182.43.43.40:8765/UploadPic/0e85cbe4438a6816bb56ebcb47bcffb8.json" + "size": 3031743, + "url": "http://182.43.43.40:8765/UploadPic/734751c40d12ec638e1cd4ba25a3f53e.json" }, "building_data.json": { - "size": 2425734, - "url": "http://182.43.43.40:8765/UploadPic/df81909eaf509920a870b94570cc381b.json" + "size": 3630102, + "url": "http://182.43.43.40:8765/UploadPic/6ce85982090ce56868a99cd5b9123a68.json" }, "campaign_table.json": { - "size": 189568, - "url": "http://182.43.43.40:8765/UploadPic/b6997e66bf9ff5f3b429aa895510c565.json" + "size": 382494, + "url": "http://182.43.43.40:8765/UploadPic/952e62083418194b3b300797e8cce07e.json" }, "chapter_table.json": { "size": 971, "url": "http://182.43.43.40:8765/UploadPic/37811c39da5a5982909814c1ff30bd5f.json" }, "character_table.json": { - "size": 5538282, - "url": "http://182.43.43.40:8765/UploadPic/b5883032cfeb26e061acb85aa99dfeb9.json" + "size": 10452279, + "url": "http://182.43.43.40:8765/UploadPic/9e05a1615dce99ed63275c39b80a0075.json" }, "charm_table.json": { - "size": 79221, - "url": "http://182.43.43.40:8765/UploadPic/837d8b0a8ce7c2cf1624047088d9fd25.json" + "size": 115959, + "url": "http://182.43.43.40:8765/UploadPic/531ca7c8a0e50ce887cb82c53bfc1735.json" }, "charword_table.json": { - "size": 6076362, - "url": "http://182.43.43.40:8765/UploadPic/31c493f626ee9481e3bfeee9bbac83ca.json" + "size": 8074944, + "url": "http://182.43.43.40:8765/UploadPic/f6dd33d18c18b9a604a9da3d061f468c.json" }, "char_meta_table.json": { - "size": 38796, - "url": "http://182.43.43.40:8765/UploadPic/793b8b9018fac30195b5436ce3bf7019.json" + "size": 68701, + "url": "http://182.43.43.40:8765/UploadPic/92ccb17b677a7c45ccd0d2ba1a47ba97.json" }, "char_patch_table.json": { "size": 32184, @@ -50,8 +50,8 @@ "url": "http://182.43.43.40:8765/UploadPic/66c5b9adff70e540de47ba9727634bd1.json" }, "climb_tower_table.json": { - "size": 190403, - "url": "http://182.43.43.40:8765/UploadPic/58f09936b64e3234c334f5eff95b2d77.json" + "size": 311399, + "url": "http://182.43.43.40:8765/UploadPic/266de955492e71c71352e5a7f15b874a.json" }, "clue_data.json": { "size": 9157, @@ -62,28 +62,28 @@ "url": "http://182.43.43.40:8765/UploadPic/e0ae91a98b61c08815e7cee46d6db028.json" }, "display_meta_table.json": { - "size": 34841, - "url": "http://182.43.43.40:8765/UploadPic/66f32d6721f3687a490d25b11de943ec.json" + "size": 45602, + "url": "http://182.43.43.40:8765/UploadPic/2d6d23ae655c3f21845b5ed867a5b581.json" }, "enemy_handbook_table.json": { - "size": 732668, - "url": "http://182.43.43.40:8765/UploadPic/ddd67d4020ba10df51729a521fdcf7bd.json" + "size": 1013166, + "url": "http://182.43.43.40:8765/UploadPic/666dadfd65d9a33e7bb30bb33e83a05b.json" }, "favor_table.json": { "size": 39045, "url": "http://182.43.43.40:8765/UploadPic/a2aad37d3f67ffae35ce18aaba24898a.json" }, "gacha_table.json": { - "size": 178149, - "url": "http://182.43.43.40:8765/UploadPic/75fb6bfd0b5e357193096aa157ccc906.json" + "size": 242650, + "url": "http://182.43.43.40:8765/UploadPic/e924b4bd3c8b4c979824dd6c20d70ca6.json" }, "gamedata_const.json": { - "size": 35107, - "url": "http://182.43.43.40:8765/UploadPic/63bdad10caad55b5ffddf549f183a979.json" + "size": 48781, + "url": "http://182.43.43.40:8765/UploadPic/9a03b2dac8b88e623576505ec0fc1202.json" }, "handbook_info_table.json": { - "size": 2962186, - "url": "http://182.43.43.40:8765/UploadPic/ab82d40b40b2eb1d6d01c25eb19578bd.json" + "size": 3759461, + "url": "http://182.43.43.40:8765/UploadPic/405a039b90274d8015336d84b3fded72.json" }, "handbook_table.json": { "size": 17270, @@ -94,12 +94,12 @@ "url": "http://182.43.43.40:8765/UploadPic/eb15c058fb2607fd149146b47b0657a3.json" }, "item_table.json": { - "size": 733611, - "url": "http://182.43.43.40:8765/UploadPic/a7a5268a2ec321285b4836b59b9ca208.json" + "size": 1010888, + "url": "http://182.43.43.40:8765/UploadPic/1f27a07800ebb2d9a25eead50fb8f380.json" }, "medal_table.json": { - "size": 674958, - "url": "http://182.43.43.40:8765/UploadPic/1b9781c9b3747128f959890ebc78d5b0.json" + "size": 935542, + "url": "http://182.43.43.40:8765/UploadPic/e2beecafdb5f062084252d86c88c8887.json" }, "mission_table.json": { "size": 605772, @@ -114,60 +114,60 @@ "url": "http://182.43.43.40:8765/UploadPic/ed23f950d5771278aee506281dc0df5d.json" }, "range_table.json": { - "size": 30463, - "url": "http://182.43.43.40:8765/UploadPic/b7dacd2e98938f6bd796328268fea129.json" + "size": 58423, + "url": "http://182.43.43.40:8765/UploadPic/1b5e45111d64a38dccc022c7927ff839.json" }, "replicate_table.json": { "size": 89591, "url": "http://182.43.43.40:8765/UploadPic/808ddd375e78fa52c18746a331e5f3af.json" }, "retro_table.json": { - "size": 1808414, - "url": "http://182.43.43.40:8765/UploadPic/6f0ec38c5c42841815ae755df821b9e4.json" + "size": 2813644, + "url": "http://182.43.43.40:8765/UploadPic/c870b1c49ff24a5ec2aa40492ee4b3d7.json" }, "roguelike_table.json": { "size": 493073, "url": "http://182.43.43.40:8765/UploadPic/f6d59f951312558c0129b7841746574c.json" }, "roguelike_topic_table.json": { - "size": 3528499, - "url": "http://182.43.43.40:8765/UploadPic/479199f6e8d5871a0d45c93397a1126b.json" + "size": 5699885, + "url": "http://182.43.43.40:8765/UploadPic/e5d08eb0896a3e76552baa4fd685e97f.json" }, "sandbox_table.json": { - "size": 502898, - "url": "http://182.43.43.40:8765/UploadPic/2e6122a73a84d1ce026089028447c129.json" + "size": 798748, + "url": "http://182.43.43.40:8765/UploadPic/5bc662e1bd9a3ddfda37d1b3b765098f.json" }, "shop_client_table.json": { - "size": 452691, - "url": "http://182.43.43.40:8765/UploadPic/1d456f06839312222c4fbb64e9431320.json" + "size": 732952, + "url": "http://182.43.43.40:8765/UploadPic/e1dd10935449a82c40bfd7654aca5e54.json" }, "skill_table.json": { - "size": 4662310, - "url": "http://182.43.43.40:8765/UploadPic/59b052619233f98b3149d663698c623b.json" + "size": 7641135, + "url": "http://182.43.43.40:8765/UploadPic/00fbd465651b3d75c6807404b115351e.json" }, "skin_table.json": { - "size": 1515491, - "url": "http://182.43.43.40:8765/UploadPic/e1a03bdefabeaf6cef11d99339c606c2.json" + "size": 2205554, + "url": "http://182.43.43.40:8765/UploadPic/28c8c1de9d67fc2d2a71048063f264c4.json" }, "stage_table.json": { - "size": 7550411, - "url": "http://182.43.43.40:8765/UploadPic/062d60ae8094f9cb5eae375c1337d807.json" + "size": 12741944, + "url": "http://182.43.43.40:8765/UploadPic/de825c46b6305a7c68cb73033f84ff94.json" }, "story_review_meta_table.json": { "size": 442837, "url": "http://182.43.43.40:8765/UploadPic/467a1bfb27b9b105827330aa75ad1f25.json" }, "story_review_table.json": { - "size": 931676, - "url": "http://182.43.43.40:8765/UploadPic/caa32c62eea4bd0a3eaebb500283216c.json" + "size": 1377869, + "url": "http://182.43.43.40:8765/UploadPic/6df7cd52f7907e26fff280c2f8d1fe35.json" }, "story_table.json": { - "size": 749798, - "url": "http://182.43.43.40:8765/UploadPic/23fd7690a328437493b6320ae60265a0.json" + "size": 1060689, + "url": "http://182.43.43.40:8765/UploadPic/5a7a93e2219e135dd236aa5c3743fcd7.json" }, "tech_buff_table.json": { - "size": 7101, - "url": "http://182.43.43.40:8765/UploadPic/ce9e348ca3366b7ed75bce7b600349a4.json" + "size": 12123, + "url": "http://182.43.43.40:8765/UploadPic/7a4b2c5370ec8afc677f531cb8f0281c.json" }, "tip_table.json": { "size": 19659, @@ -182,12 +182,12 @@ "url": "http://182.43.43.40:8765/UploadPic/1d89fb12977515ccb0887b391a781928.json" }, "uniequip_table.json": { - "size": 1299462, - "url": "http://182.43.43.40:8765/UploadPic/d3f868fa8e38152b05031b6cbb655c11.json" + "size": 1748170, + "url": "http://182.43.43.40:8765/UploadPic/9dc60db540be32c8416765505a5054ce.json" }, "zone_table.json": { - "size": 138618, - "url": "http://182.43.43.40:8765/UploadPic/c6562d73503d5f105054d63e18e7b186.json" + "size": 213130, + "url": "http://182.43.43.40:8765/UploadPic/fd68fa523fdd65c2b34c715be8cf5281.json" } } } diff --git a/ArknightsUID/version.py b/ArknightsUID/version.py index 266aa06..68f156f 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' +ArknightsUID_version = "0.1.0" +Arknights_Client_version = "2.0.81" +Arknights_Res_version = "23-09-20-13-28-42-486799" diff --git a/pyproject.toml b/pyproject.toml index 6b5b0a9..46b1dff 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,7 @@ build-backend = "pdm.backend" [tool.black] line-length = 108 -target-version = ["py311"] +target-version = ["py38"] include = '\.pyi?$' skip-string-normalization = true extend-exclude = ''' @@ -60,4 +60,4 @@ select = ["E", "W", "F", "UP", "C", "T", "PYI", "PT", "Q"] ignore = ["C901", "Q000"] line-length = 108 -target-version = ["py38", "py39", "py310", "py311"] +target-version = "py38"