From 460f533b57f9b60cdad1dfeb0c37bc5d138bb4c8 Mon Sep 17 00:00:00 2001 From: ishkong <19740260+ishkong@users.noreply.github.com> Date: Mon, 9 Dec 2024 15:26:12 +0800 Subject: [PATCH 1/8] Update models.py --- ArknightsUID/utils/models/skland/models.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ArknightsUID/utils/models/skland/models.py b/ArknightsUID/utils/models/skland/models.py index 1e659d9..1d81215 100644 --- a/ArknightsUID/utils/models/skland/models.py +++ b/ArknightsUID/utils/models/skland/models.py @@ -608,6 +608,12 @@ class PlayerStatusSecretary(Struct): class PlayerStatusAvatar(Struct): type_: str = field(name="type") id_: str = field(name="id") + url: str + + +class PlayerStatusExp(Struct): + current: int + max: int class PlayerStatus(Struct): @@ -626,6 +632,7 @@ class PlayerStatus(Struct): furnitureCnt: int skinCnt: int avatar: Union[PlayerStatusAvatar, None] = None + exp: PlayerStatusExp class DisplayShowConfig(Struct): From 1a1210c56c3cfd4d78f00c74e2481832d73841ed Mon Sep 17 00:00:00 2001 From: ishkong <19740260+ishkong@users.noreply.github.com> Date: Mon, 9 Dec 2024 15:29:56 +0800 Subject: [PATCH 2/8] Update models.py --- ArknightsUID/utils/models/skland/models.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ArknightsUID/utils/models/skland/models.py b/ArknightsUID/utils/models/skland/models.py index 1d81215..e9da2ea 100644 --- a/ArknightsUID/utils/models/skland/models.py +++ b/ArknightsUID/utils/models/skland/models.py @@ -571,6 +571,7 @@ class PlayerInfoChar(Struct): class PlayerAssistCharEquip(Struct): id_: str = field(name="id") level: int + locked: bool class PlayerAssistChar(Struct): From f97d77aece5ef2e53613e42c3359020bc96153c1 Mon Sep 17 00:00:00 2001 From: ishkong <19740260+ishkong@users.noreply.github.com> Date: Mon, 9 Dec 2024 15:35:37 +0800 Subject: [PATCH 3/8] Update PlayerInfoChar --- ArknightsUID/utils/models/skland/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ArknightsUID/utils/models/skland/models.py b/ArknightsUID/utils/models/skland/models.py index e9da2ea..714a73b 100644 --- a/ArknightsUID/utils/models/skland/models.py +++ b/ArknightsUID/utils/models/skland/models.py @@ -550,6 +550,7 @@ class PlayerInfoCharSkill(Struct): class PlayerInfoCharEquip(Struct): id_: str = field(name="id") level: int + locked: bool class PlayerInfoChar(Struct): @@ -565,7 +566,6 @@ class PlayerInfoChar(Struct): defaultSkillId: str gainTime: int defaultEquipId: str - specializeLevelCount: Union[int, None] = 0 class PlayerAssistCharEquip(Struct): From b7b7b7e8abcaac1fa70b126e83f77a7511e4f3b9 Mon Sep 17 00:00:00 2001 From: ishkong <19740260+ishkong@users.noreply.github.com> Date: Mon, 9 Dec 2024 15:56:11 +0800 Subject: [PATCH 4/8] Update PlayerSkinInfo --- ArknightsUID/utils/models/skland/models.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ArknightsUID/utils/models/skland/models.py b/ArknightsUID/utils/models/skland/models.py index 714a73b..dec6f73 100644 --- a/ArknightsUID/utils/models/skland/models.py +++ b/ArknightsUID/utils/models/skland/models.py @@ -240,7 +240,8 @@ class PlayerSkinInfo(Struct): brandId: str sortId: int displayTagId: str - name: Union[str, None] = None + name: str + charId: str brandName: Union[str, None] = None brandCapitalName: Union[str, None] = None illustId: Union[str, None] = None From 86c7ec1193599c477a263354b879522982ccf24f Mon Sep 17 00:00:00 2001 From: ishkong <19740260+ishkong@users.noreply.github.com> Date: Mon, 9 Dec 2024 16:00:41 +0800 Subject: [PATCH 5/8] Update PlayerActivityInfo --- ArknightsUID/utils/models/skland/models.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ArknightsUID/utils/models/skland/models.py b/ArknightsUID/utils/models/skland/models.py index dec6f73..dfe4c8f 100644 --- a/ArknightsUID/utils/models/skland/models.py +++ b/ArknightsUID/utils/models/skland/models.py @@ -227,6 +227,10 @@ class PlayerActivityInfo(Struct): rewardEndTime: int isReplicate: bool type_: str = field(name="type") + dropItemIds: List[str] + shopGoodItemIds: List[str] + favorUpList: List[str] + picUrl: str class PlayerStageInfo(Struct): From 95f1e437b4fb6478914d3fd95d6ed7b69edc65f8 Mon Sep 17 00:00:00 2001 From: ishkong <19740260+ishkong@users.noreply.github.com> Date: Mon, 9 Dec 2024 16:02:02 +0800 Subject: [PATCH 6/8] Update PlayerTowerInfo --- ArknightsUID/utils/models/skland/models.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ArknightsUID/utils/models/skland/models.py b/ArknightsUID/utils/models/skland/models.py index dfe4c8f..f0734f3 100644 --- a/ArknightsUID/utils/models/skland/models.py +++ b/ArknightsUID/utils/models/skland/models.py @@ -210,6 +210,7 @@ class PlayerTowerInfo(Struct): id_: str = field(name="id") name: str subName: str + picUrl: str hasHard: Union[bool, None] = None stageNum: Union[int, None] = None From 267f7b46dc475ba5fd85a75427d6c15aaadc3d15 Mon Sep 17 00:00:00 2001 From: ishkong <19740260+ishkong@users.noreply.github.com> Date: Mon, 9 Dec 2024 16:04:06 +0800 Subject: [PATCH 7/8] Update PlayerRogueInfo & PlayerCampaignInfo --- ArknightsUID/utils/models/skland/models.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ArknightsUID/utils/models/skland/models.py b/ArknightsUID/utils/models/skland/models.py index f0734f3..959bedd 100644 --- a/ArknightsUID/utils/models/skland/models.py +++ b/ArknightsUID/utils/models/skland/models.py @@ -198,12 +198,14 @@ class PlayerCampaignInfo(Struct): id_: str = field(name="id") name: str campaignZoneId: str + picUrl: str class PlayerRogueInfo(Struct): id_: str = field(name="id") name: str sort: int + picUrl: str class PlayerTowerInfo(Struct): From b597a971ae61f598fbd1b0363289ccd6baba5b75 Mon Sep 17 00:00:00 2001 From: ishkong <19740260+ishkong@users.noreply.github.com> Date: Mon, 9 Dec 2024 16:11:05 +0800 Subject: [PATCH 8/8] Update PlayerEquipmentInfo --- ArknightsUID/utils/models/skland/models.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ArknightsUID/utils/models/skland/models.py b/ArknightsUID/utils/models/skland/models.py index 959bedd..16401f7 100644 --- a/ArknightsUID/utils/models/skland/models.py +++ b/ArknightsUID/utils/models/skland/models.py @@ -183,6 +183,7 @@ class PlayerEquipmentInfo(Struct): shiningColor: str desc: Union[str, None] = None typeName1: Union[str, None] = None + typeName2: Union[str, None] = None class PlayerCampaignZoneInfo(Struct):