From e3933288f07d08bbdbc1f18bd2f5813b3aea9451 Mon Sep 17 00:00:00 2001 From: ishkong <19740260+ishkong@users.noreply.github.com> Date: Mon, 9 Dec 2024 15:04:49 +0800 Subject: [PATCH 1/2] Update ArknightsAttendanceStruct --- ArknightsUID/utils/models/skland/models.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/ArknightsUID/utils/models/skland/models.py b/ArknightsUID/utils/models/skland/models.py index 1c3d89e..26cdfef 100644 --- a/ArknightsUID/utils/models/skland/models.py +++ b/ArknightsUID/utils/models/skland/models.py @@ -11,6 +11,11 @@ class ArknightsAttendanceAwardResource(Struct): type_: str = field(name="type") name: str rarity: int + sortId: int + othersource: List[str] + classifyType: str + stageDropList: List[ArknightsAttendanceStageDropListItem] + buildingProductList: List[ArknightsAttendanceBuildingProductListItem] class ArknightsAttendanceRecord(Struct): @@ -35,6 +40,16 @@ class ArknightsAttendanceCalendarModel(Struct): resourceInfoMap: Dict[str, ArknightsAttendanceAwardResource] +class ArknightsAttendanceStageDropListItem(Struct): + stageId: str + occPer: int + + +class ArknightsAttendanceBuildingProductListItem(Struct): + formulaId: str + roomType: str + + ################ # ArknightsAttendance Start ################ @@ -47,6 +62,7 @@ class ArknightsAttendanceAward(Struct): class ArknightsAttendanceModel(Struct): ts: str awards: List[ArknightsAttendanceAward] + resourceInfoMap: dict ################ From 290d721f79ac3807f4f254957e071f36d1f13579 Mon Sep 17 00:00:00 2001 From: ishkong <19740260+ishkong@users.noreply.github.com> Date: Mon, 9 Dec 2024 15:06:17 +0800 Subject: [PATCH 2/2] Update models.py --- 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 26cdfef..ba7d029 100644 --- a/ArknightsUID/utils/models/skland/models.py +++ b/ArknightsUID/utils/models/skland/models.py @@ -12,7 +12,7 @@ class ArknightsAttendanceAwardResource(Struct): name: str rarity: int sortId: int - othersource: List[str] + otherSource: List[str] classifyType: str stageDropList: List[ArknightsAttendanceStageDropListItem] buildingProductList: List[ArknightsAttendanceBuildingProductListItem]