diff --git a/LittlePaimon/config/data/alias.json b/LittlePaimon/config/data/alias.json index 76467d3..530133b 100644 --- a/LittlePaimon/config/data/alias.json +++ b/LittlePaimon/config/data/alias.json @@ -61,6 +61,7 @@ "10000073": ["纳西妲", "草神", "艹神", "小草王", "小吉祥草王", "草萝莉", "艹萝莉", "羽毛球", "布耶尔"], "10000074": ["莱依拉", "莱伊拉"], "10000075": ["流浪者", "散兵", "伞兵", "国崩", "卢本伟", "大炮", "sb"], + "10000076": ["珐露珊", "法露珊", "珐妹","初音", "miku"], "10000103": ["迪希雅"], "10000104": ["艾尔海森", "苏", "海哥"], "10000105": ["白术"], @@ -839,6 +840,11 @@ "沙上楼阁史话", "沙上", "沙套" + ], + "乐园遗落之花": [ + "乐园遗落之花", + "乐园套", + "绽放套" ] }, "原魔": [ diff --git a/LittlePaimon/plugins/Paimon_Gacha_Log/draw.py b/LittlePaimon/plugins/Paimon_Gacha_Log/draw.py index d10e222..19a8fe4 100644 --- a/LittlePaimon/plugins/Paimon_Gacha_Log/draw.py +++ b/LittlePaimon/plugins/Paimon_Gacha_Log/draw.py @@ -151,6 +151,7 @@ async def draw_four_star(info: FourStarItem) -> PMImage: async def draw_four_star_detail(data: List[FourStarItem]): + data.sort(key=lambda x: sum(x.num['角色祈愿'] + x.num['武器祈愿'] + x.num['常驻祈愿'] + x.num['新手祈愿']), reverse=True) bar = await load_image(RESOURCE_BASE_PATH / 'gacha_log' / 'four_star_bar.png') total_height = 105 + 260 * math.ceil(len(data) / 5) bg = PMImage(size=(1008, total_height), mode='RGBA', color=(255, 255, 255, 0)) @@ -160,7 +161,7 @@ async def draw_four_star_detail(data: List[FourStarItem]): async def draw_gacha_log(user_id: str, uid: str, nickname: Optional[str], signature: Optional[str], gacha_log: GachaLogInfo): - img = PMImage(size=(1080, 8000), mode='RGBA', color=(255, 255, 255, 0)) + img = PMImage(size=(1080, 12000), mode='RGBA', color=(255, 255, 255, 0)) bg = PMImage(await load_image(RESOURCE_BASE_PATH / 'gacha_log' / 'bg.png')) line = await load_image(RESOURCE_BASE_PATH / 'general' / 'line.png') # 头像