mirror of
https://github.com/xuthus83/LittlePaimon.git
synced 2024-12-16 13:40:53 +08:00
🐛 修复深渊战报资源报错
This commit is contained in:
CMHopeSunshine
parent
57d5033fa5
commit
9ba266b038
@ -9,7 +9,9 @@ from LittlePaimon.utils.alias import get_name_by_id, get_chara_icon
|
||||
from .player_info import PlayerInfo
|
||||
|
||||
|
||||
def timestamp_to_datetime(timestamp: Optional[Union[int, str]]) -> Optional[datetime.datetime]:
|
||||
def timestamp_to_datetime(
|
||||
timestamp: Optional[Union[int, str]]
|
||||
) -> Optional[datetime.datetime]:
|
||||
if timestamp is None:
|
||||
return None
|
||||
if isinstance(timestamp, str):
|
||||
@ -22,13 +24,13 @@ class AbyssCharacter(BaseModel):
|
||||
"""角色名称"""
|
||||
character_id: int
|
||||
"""角色id"""
|
||||
rarity: Optional[int]
|
||||
rarity: Optional[int] = None
|
||||
"""稀有度"""
|
||||
level: Optional[int]
|
||||
level: Optional[int] = None
|
||||
"""等级"""
|
||||
icon: Optional[str]
|
||||
icon: Optional[str] = None
|
||||
"""图标"""
|
||||
value: Optional[int]
|
||||
value: Optional[int] = None
|
||||
"""数值"""
|
||||
|
||||
|
||||
@ -68,13 +70,13 @@ class FloorInfo(BaseModel):
|
||||
"""是否已解锁"""
|
||||
stars: List[int]
|
||||
"""星星数"""
|
||||
battles_up: Optional[List[AbyssCharacters]]
|
||||
battles_up: Optional[List[AbyssCharacters]] = None
|
||||
"""上半出战阵容"""
|
||||
battles_down: Optional[List[AbyssCharacters]]
|
||||
battles_down: Optional[List[AbyssCharacters]] = None
|
||||
"""下半出战阵容"""
|
||||
end_times_up: Optional[List[datetime.datetime]]
|
||||
end_times_up: Optional[List[datetime.datetime]] = None
|
||||
"""上半结束时间"""
|
||||
end_times_down: Optional[List[datetime.datetime]]
|
||||
end_times_down: Optional[List[datetime.datetime]] = None
|
||||
"""下半结束时间"""
|
||||
|
||||
|
||||
@ -108,48 +110,54 @@ class Floors(BaseModel):
|
||||
|
||||
class AbyssInfo(Model):
|
||||
id = fields.IntField(pk=True, generated=True, auto_increment=True)
|
||||
user_id: str = fields.CharField(max_length=255)
|
||||
user_id: str = fields.CharField(max_length=255) # type: ignore
|
||||
"""用户id"""
|
||||
uid: str = fields.CharField(max_length=255)
|
||||
uid: str = fields.CharField(max_length=255) # type: ignore
|
||||
"""原神uid"""
|
||||
nickname: str = fields.CharField(max_length=255, null=True)
|
||||
nickname: Optional[str] = fields.CharField(max_length=255, null=True) # type: ignore
|
||||
"""玩家昵称"""
|
||||
start_time: datetime.datetime = fields.DatetimeField(null=True)
|
||||
start_time: Optional[datetime.datetime] = fields.DatetimeField(null=True) # type: ignore
|
||||
"""开始时间"""
|
||||
end_time: datetime.datetime = fields.DatetimeField(null=True)
|
||||
end_time: Optional[datetime.datetime] = fields.DatetimeField(null=True) # type: ignore
|
||||
"""结束时间"""
|
||||
total_battle: int = fields.IntField(null=True)
|
||||
total_battle: Optional[int] = fields.IntField(null=True) # type: ignore
|
||||
"""总战斗次数"""
|
||||
total_star: int = fields.IntField(null=True)
|
||||
total_star: Optional[int] = fields.IntField(null=True) # type: ignore
|
||||
"""总星数"""
|
||||
max_floor: str = fields.CharField(max_length=255, null=True)
|
||||
max_floor: Optional[str] = fields.CharField(max_length=255, null=True) # type: ignore
|
||||
"""到达层数"""
|
||||
max_battle: AbyssCharacters = fields.JSONField(encoder=AbyssCharacters.json, decoder=AbyssCharacters.parse_raw,
|
||||
null=True)
|
||||
max_battle: AbyssCharacters = fields.JSONField(
|
||||
encoder=AbyssCharacters.json, decoder=AbyssCharacters.parse_raw, null=True
|
||||
) # type: ignore
|
||||
"""出战次数最多"""
|
||||
max_defeat: AbyssCharacter = fields.JSONField(encoder=AbyssCharacter.json, decoder=AbyssCharacter.parse_raw,
|
||||
null=True)
|
||||
max_defeat: AbyssCharacter = fields.JSONField(
|
||||
encoder=AbyssCharacter.json, decoder=AbyssCharacter.parse_raw, null=True
|
||||
) # type: ignore
|
||||
"""击败最多"""
|
||||
max_damage: AbyssCharacter = fields.JSONField(encoder=AbyssCharacter.json, decoder=AbyssCharacter.parse_raw,
|
||||
null=True)
|
||||
max_damage: AbyssCharacter = fields.JSONField(
|
||||
encoder=AbyssCharacter.json, decoder=AbyssCharacter.parse_raw, null=True
|
||||
) # type: ignore
|
||||
"""伤害最高"""
|
||||
max_take_damage: AbyssCharacter = fields.JSONField(encoder=AbyssCharacter.json, decoder=AbyssCharacter.parse_raw,
|
||||
null=True)
|
||||
max_take_damage: AbyssCharacter = fields.JSONField(
|
||||
encoder=AbyssCharacter.json, decoder=AbyssCharacter.parse_raw, null=True
|
||||
) # type: ignore
|
||||
"""承受伤害最高"""
|
||||
max_normal_skill: AbyssCharacter = fields.JSONField(encoder=AbyssCharacter.json, decoder=AbyssCharacter.parse_raw,
|
||||
null=True)
|
||||
max_normal_skill: AbyssCharacter = fields.JSONField(
|
||||
encoder=AbyssCharacter.json, decoder=AbyssCharacter.parse_raw, null=True
|
||||
) # type: ignore
|
||||
"""元素战技释放最多"""
|
||||
max_energy_skill: AbyssCharacter = fields.JSONField(encoder=AbyssCharacter.json, decoder=AbyssCharacter.parse_raw,
|
||||
null=True)
|
||||
max_energy_skill: AbyssCharacter = fields.JSONField(
|
||||
encoder=AbyssCharacter.json, decoder=AbyssCharacter.parse_raw, null=True
|
||||
) # type: ignore
|
||||
"""元素爆发释放最多"""
|
||||
floors: Floors = fields.JSONField(encoder=Floors.json, decoder=Floors.parse_raw, default=Floors())
|
||||
floors: Floors = fields.JSONField(encoder=Floors.json, decoder=Floors.parse_raw, default=Floors()) # type: ignore
|
||||
"""楼层具体信息"""
|
||||
update_time: datetime.datetime = fields.DatetimeField(null=True)
|
||||
update_time: datetime.datetime = fields.DatetimeField(null=True) # type: ignore
|
||||
"""更新时间"""
|
||||
|
||||
class Meta:
|
||||
table = 'abyss_info'
|
||||
table_description = '原神玩家深渊信息表'
|
||||
table = "abyss_info"
|
||||
table_description = "原神玩家深渊信息表"
|
||||
|
||||
@classmethod
|
||||
async def update_info(cls, user_id: str, uid: str, data: dict):
|
||||
@ -159,94 +167,123 @@ class AbyssInfo(Model):
|
||||
info.nickname = player_info.nickname
|
||||
else:
|
||||
info.nickname = None
|
||||
info.start_time = timestamp_to_datetime(data.get('start_time'))
|
||||
info.end_time = timestamp_to_datetime(data.get('end_time'))
|
||||
info.total_battle = data.get('total_battle_times')
|
||||
info.total_star = data.get('total_win_times') * 3
|
||||
info.max_floor = data.get('max_floor')
|
||||
if 'reveal_rank' in data and data['reveal_rank']:
|
||||
info.max_battle = AbyssCharacters(characters=[
|
||||
AbyssCharacter(name=get_name_by_id(c['avatar_id']),
|
||||
character_id=c['avatar_id'],
|
||||
icon=c['avatar_icon'].split('/')[-1].replace('.png', ''),
|
||||
rarity=c['rarity'],
|
||||
value=c['value']) for c in data['reveal_rank']
|
||||
])
|
||||
if 'defeat_rank' in data and data['defeat_rank']:
|
||||
info.max_defeat = AbyssCharacter(name=get_name_by_id(data['defeat_rank'][0]['avatar_id']),
|
||||
character_id=data['defeat_rank'][0]['avatar_id'],
|
||||
icon=data['defeat_rank'][0]['avatar_icon'].split('/')[-1].replace('.png',
|
||||
'').replace(
|
||||
'Side_', ''),
|
||||
rarity=data['defeat_rank'][0]['rarity'],
|
||||
value=data['defeat_rank'][0]['value'])
|
||||
if 'damage_rank' in data and data['damage_rank']:
|
||||
info.max_damage = AbyssCharacter(name=get_name_by_id(data['damage_rank'][0]['avatar_id']),
|
||||
character_id=data['damage_rank'][0]['avatar_id'],
|
||||
icon=data['damage_rank'][0]['avatar_icon'].split('/')[-1].replace('.png',
|
||||
'').replace(
|
||||
'Side_', ''),
|
||||
rarity=data['damage_rank'][0]['rarity'],
|
||||
value=data['damage_rank'][0]['value'])
|
||||
if 'take_damage_rank' in data and data['take_damage_rank']:
|
||||
info.max_take_damage = AbyssCharacter(name=get_name_by_id(data['take_damage_rank'][0]['avatar_id']),
|
||||
character_id=data['take_damage_rank'][0]['avatar_id'],
|
||||
icon=data['take_damage_rank'][0]['avatar_icon'].split('/')[
|
||||
-1].replace(
|
||||
'.png', '').replace('Side_', ''),
|
||||
rarity=data['take_damage_rank'][0]['rarity'],
|
||||
value=data['take_damage_rank'][0]['value'])
|
||||
if 'normal_skill_rank' in data and data['normal_skill_rank']:
|
||||
info.max_normal_skill = AbyssCharacter(name=get_name_by_id(data['normal_skill_rank'][0]['avatar_id']),
|
||||
character_id=data['normal_skill_rank'][0]['avatar_id'],
|
||||
icon=data['normal_skill_rank'][0]['avatar_icon'].split('/')[
|
||||
-1].replace(
|
||||
'.png', '').replace('Side_', ''),
|
||||
rarity=data['normal_skill_rank'][0]['rarity'],
|
||||
value=data['normal_skill_rank'][0]['value'])
|
||||
if 'energy_skill_rank' in data and data['energy_skill_rank']:
|
||||
info.max_energy_skill = AbyssCharacter(name=get_name_by_id(data['energy_skill_rank'][0]['avatar_id']),
|
||||
character_id=data['energy_skill_rank'][0]['avatar_id'],
|
||||
icon=data['energy_skill_rank'][0]['avatar_icon'].split('/')[
|
||||
-1].replace(
|
||||
'.png', '').replace('Side_', ''),
|
||||
rarity=data['energy_skill_rank'][0]['rarity'],
|
||||
value=data['energy_skill_rank'][0]['value'])
|
||||
if 'floors' in data and data['floors']:
|
||||
info.start_time = timestamp_to_datetime(data.get("start_time"))
|
||||
info.end_time = timestamp_to_datetime(data.get("end_time"))
|
||||
info.total_battle = data.get("total_battle_times")
|
||||
info.total_star = (
|
||||
(data["total_win_times"] * 3) if data.get("total_win_times") else None
|
||||
)
|
||||
info.max_floor = data.get("max_floor")
|
||||
if "reveal_rank" in data and data["reveal_rank"]:
|
||||
info.max_battle = AbyssCharacters(
|
||||
characters=[
|
||||
AbyssCharacter(
|
||||
name=get_name_by_id(c["avatar_id"]), # type: ignore
|
||||
character_id=c["avatar_id"],
|
||||
icon=get_chara_icon(chara_id=c["avatar_id"]),
|
||||
rarity=c["rarity"],
|
||||
value=c["value"],
|
||||
)
|
||||
for c in data["reveal_rank"]
|
||||
]
|
||||
)
|
||||
if "defeat_rank" in data and data["defeat_rank"]:
|
||||
info.max_defeat = AbyssCharacter(
|
||||
name=get_name_by_id(data["defeat_rank"][0]["avatar_id"]), # type: ignore
|
||||
character_id=data["defeat_rank"][0]["avatar_id"],
|
||||
icon=get_chara_icon(chara_id=data["defeat_rank"][0]["avatar_id"]),
|
||||
rarity=data["defeat_rank"][0]["rarity"],
|
||||
value=data["defeat_rank"][0]["value"],
|
||||
)
|
||||
if "damage_rank" in data and data["damage_rank"]:
|
||||
info.max_damage = AbyssCharacter(
|
||||
name=get_name_by_id(data["damage_rank"][0]["avatar_id"]), # type: ignore
|
||||
character_id=data["damage_rank"][0]["avatar_id"],
|
||||
icon=get_chara_icon(chara_id=data["damage_rank"][0]["avatar_id"]),
|
||||
rarity=data["damage_rank"][0]["rarity"],
|
||||
value=data["damage_rank"][0]["value"],
|
||||
)
|
||||
if "take_damage_rank" in data and data["take_damage_rank"]:
|
||||
info.max_take_damage = AbyssCharacter(
|
||||
name=get_name_by_id(data["take_damage_rank"][0]["avatar_id"]), # type: ignore
|
||||
character_id=data["take_damage_rank"][0]["avatar_id"],
|
||||
icon=get_chara_icon(chara_id=data["take_damage_rank"][0]["avatar_id"]),
|
||||
rarity=data["take_damage_rank"][0]["rarity"],
|
||||
value=data["take_damage_rank"][0]["value"],
|
||||
)
|
||||
if "normal_skill_rank" in data and data["normal_skill_rank"]:
|
||||
info.max_normal_skill = AbyssCharacter(
|
||||
name=get_name_by_id(data["normal_skill_rank"][0]["avatar_id"]), # type: ignore
|
||||
character_id=data["normal_skill_rank"][0]["avatar_id"],
|
||||
icon=get_chara_icon(chara_id=data["normal_skill_rank"][0]["avatar_id"]),
|
||||
rarity=data["normal_skill_rank"][0]["rarity"],
|
||||
value=data["normal_skill_rank"][0]["value"],
|
||||
)
|
||||
if "energy_skill_rank" in data and data["energy_skill_rank"]:
|
||||
info.max_energy_skill = AbyssCharacter(
|
||||
name=get_name_by_id(data["energy_skill_rank"][0]["avatar_id"]), # type: ignore
|
||||
character_id=data["energy_skill_rank"][0]["avatar_id"],
|
||||
icon=get_chara_icon(chara_id=data["energy_skill_rank"][0]["avatar_id"]),
|
||||
rarity=data["energy_skill_rank"][0]["rarity"],
|
||||
value=data["energy_skill_rank"][0]["value"],
|
||||
)
|
||||
if "floors" in data and data["floors"]:
|
||||
info.total_star = 0
|
||||
for floor in data['floors']:
|
||||
if floor['index'] not in [9, 10, 11, 12]:
|
||||
for floor in data["floors"]:
|
||||
if floor["index"] not in [9, 10, 11, 12]:
|
||||
continue
|
||||
floor_info = FloorInfo(index=floor['index'],
|
||||
is_unlock=floor['is_unlock'],
|
||||
stars=[l['star'] for l in floor['levels']])
|
||||
floor_info = FloorInfo(
|
||||
index=floor["index"],
|
||||
is_unlock=floor["is_unlock"],
|
||||
stars=[l["star"] for l in floor["levels"]],
|
||||
)
|
||||
battles_up = []
|
||||
battles_down = []
|
||||
end_times_up = []
|
||||
end_times_down = []
|
||||
for level in floor['levels']:
|
||||
if not level['battles']:
|
||||
for level in floor["levels"]:
|
||||
if not level["battles"]:
|
||||
break
|
||||
end_times_up.append(timestamp_to_datetime(level['battles'][0]['timestamp']))
|
||||
end_times_down.append(timestamp_to_datetime(level['battles'][1]['timestamp']))
|
||||
battles_up.append(AbyssCharacters(characters=[AbyssCharacter(
|
||||
name=get_name_by_id(c['id']),
|
||||
character_id=c['id'],
|
||||
icon=get_chara_icon(chara_id=c['id']),
|
||||
rarity=c['rarity'],
|
||||
level=c['level']) for c in level['battles'][0]['avatars']]))
|
||||
battles_down.append(AbyssCharacters(characters=[AbyssCharacter(
|
||||
name=get_name_by_id(c['id']),
|
||||
character_id=c['id'],
|
||||
icon=get_chara_icon(chara_id=c['id']),
|
||||
rarity=c['rarity'],
|
||||
level=c['level']) for c in level['battles'][1]['avatars']]))
|
||||
end_times_up.append(
|
||||
timestamp_to_datetime(level["battles"][0]["timestamp"])
|
||||
)
|
||||
end_times_down.append(
|
||||
timestamp_to_datetime(level["battles"][1]["timestamp"])
|
||||
)
|
||||
battles_up.append(
|
||||
AbyssCharacters(
|
||||
characters=[
|
||||
AbyssCharacter(
|
||||
name=get_name_by_id(c["id"]), # type: ignore
|
||||
character_id=c["id"],
|
||||
icon=get_chara_icon(chara_id=c["id"]),
|
||||
rarity=c["rarity"],
|
||||
level=c["level"],
|
||||
)
|
||||
for c in level["battles"][0]["avatars"]
|
||||
]
|
||||
)
|
||||
)
|
||||
battles_down.append(
|
||||
AbyssCharacters(
|
||||
characters=[
|
||||
AbyssCharacter(
|
||||
name=get_name_by_id(c["id"]), # type: ignore
|
||||
character_id=c["id"],
|
||||
icon=get_chara_icon(chara_id=c["id"]),
|
||||
rarity=c["rarity"],
|
||||
level=c["level"],
|
||||
)
|
||||
for c in level["battles"][1]["avatars"]
|
||||
]
|
||||
)
|
||||
)
|
||||
floor_info.battles_up = battles_up
|
||||
floor_info.battles_down = battles_down
|
||||
floor_info.end_times_up = end_times_up
|
||||
floor_info.end_times_down = end_times_down
|
||||
info.floors[floor['index']] = floor_info
|
||||
info.total_star += sum(int(l['star']) for l in floor['levels'])
|
||||
info.floors[floor["index"]] = floor_info
|
||||
info.total_star += sum(int(l["star"]) for l in floor["levels"])
|
||||
|
||||
info.update_time = datetime.datetime.now()
|
||||
await info.save()
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user