nonebot-plugin-osubot 6.20.1__py3-none-any.whl → 6.21.0__py3-none-any.whl

nonebot_plugin_osubot/draw/catch_preview_templates/js/catch/catch.js

@@ -673,9 +673,10 @@ Catch.prototype.draw2 = function (SCALE, SPEED = 1, params = {}) {
     // 按总物件数/时间控制密度
     let totalTime = this.fullCatchObjects[this.fullCatchObjects.length - 1].time - this.fullCatchObjects[0].time;
     if (this.fullCatchObjects.length * 1000 / totalTime > 2) comboSplit = Math.ceil(this.fullCatchObjects.length * 1000 / totalTime) * 10;
-    // 按0.5*位数修约
-    let roundBy = Math.pow(10, comboSplit.toString().length) * 0.5;
+    // 按0.5*(10^(位数-1&&最小为2))修约  60=>50  270=>250  820=>800  1434=>1500  1834=>2000
+    let roundBy = Math.pow(10, Math.max(comboSplit.toString().length - 1, 2)) * 0.5;
     comboSplit = Math.round(comboSplit / roundBy) * roundBy;
+    if (comboSplit <= 0) comboSplit = 20;
     for (let i = 0; i < this.fullCatchObjects.length; i++) {
         let showCombo = null;
         if (objs[i].type === "Fruit" || objs[i].type === "Droplet") {
@@ -799,4 +800,4 @@ Catch.prototype.processProgressBar = function (ctx, totalTime) {
             ctx.fillRect(ctxwidth * time / totalTime, 0, ctxwidth * (endtime - time) / totalTime, ctxheight);
         }
     }
-};
+};

nonebot_plugin_osubot/draw/score.py

@@ -28,14 +28,18 @@ from .utils import (
     open_user_icon,
     filter_scores_with_regex,
     trim_text_with_ellipsis,
+    draw_text_with_outline,
 )
 from .static import (
     Image,
     IconLs,
-    Venera_75,
+    Venera_60,
+    Torus_Regular_15,
     Torus_Regular_20,
-    Torus_Regular_30,
-    Torus_Regular_75,
+    Torus_Regular_25,
+    Torus_Regular_50,
+    Torus_Regular_60,
+    Torus_SemiBold_15,
     Torus_SemiBold_20,
     Torus_SemiBold_25,
     Torus_SemiBold_30,
@@ -197,15 +201,23 @@ async def draw_score_pic(score_info: UnifiedScore, info: UnifiedUser, map_json,
     original_ss_pp_info = get_ss_pp(str(osu.absolute()), 0, is_lazer)
     if_pp, ss_pp = get_if_pp_ss_pp(score_info, str(osu.absolute()), is_lazer)
     # 新建图片
-    im = Image.new("RGBA", (1500, 720))
+    im = Image.new("RGBA", (1280, 720))
     draw = ImageDraw.Draw(im)
     # 获取cover并裁剪，高斯，降低亮度
     try:
         bg = await get_bg(mapinfo.id, mapinfo.beatmapset_id)
-        cover_crop = await crop_bg((1500, 720), bg)
-        cover_gb = cover_crop.filter(ImageFilter.GaussianBlur(3))
-        cover_img = ImageEnhance.Brightness(cover_gb).enhance(2 / 4.0)
-        im.alpha_composite(cover_img, (0, 0))
+        cover_crop_left = await crop_bg((1280, 720), bg)
+        cover_gb_left = cover_crop_left.filter(ImageFilter.GaussianBlur(10))
+        cover_gb_left = ImageEnhance.Brightness(cover_gb_left).enhance(1)
+        cover_img_left = ImageEnhance.Brightness(cover_gb_left).enhance(2 / 4.0)
+        im.alpha_composite(cover_img_left, (0, 0))
+        # 新小图 BG
+        cover_crop_right = await crop_bg((650, 270), bg)
+        cover_gb_right = cover_crop_right.filter(ImageFilter.GaussianBlur(1))
+        cover_gb_right = ImageEnhance.Brightness(cover_gb_right).enhance(0.9)
+        cover_img_right = ImageEnhance.Brightness(cover_gb_right).enhance(1)
+        cover_img_right = draw_fillet(cover_img_right, 15)
+        im.alpha_composite(cover_img_right, (0, 50))
     except NetworkError:
         ...
     # 获取成绩背景做底图
@@ -213,58 +225,65 @@ async def draw_score_pic(score_info: UnifiedScore, info: UnifiedUser, map_json,
     recent_bg = Image.open(bg).convert("RGBA")
     im.alpha_composite(recent_bg)
     # 模式
-    draw.text((75, 75), IconLs[score_info.ruleset_id], font=extra_30, anchor="lt")
+    draw_text_with_outline(
+        draw,
+        (30, 80),
+        IconLs[score_info.ruleset_id],
+        extra_30,
+        anchor="lm",
+        fill=(255, 255, 255, 255),
+    )
     # 难度星星
     stars_bg = stars_diff(pp_info.difficulty.stars)
     stars_img = stars_bg.resize((85, 37))
-    im.alpha_composite(stars_img, (122, 72))
+    im.alpha_composite(stars_img, (552, 67))
     if pp_info.difficulty.stars < 6.5:
         color = (0, 0, 0, 255)
     else:
         color = (255, 217, 102, 255)
     # 星级
     draw.text(
-        (128, 90),
+        (556, 85),
         f"★{pp_info.difficulty.stars:.2f}",
         font=Torus_SemiBold_20,
         anchor="lm",
         fill=color,
     )
     # mods
-    if any(i in score_info.mods for i in (Mod(acronym="HD"), Mod(acronym="FL"), Mod(acronym="FI"))):
-        ranking = ["XH", "SH", "A", "B", "C", "D", "F"]
-    else:
-        ranking = ["X", "S", "A", "B", "C", "D", "F"]
+    # if any(i in score_info.mods for i in (Mod(acronym="HD"), Mod(acronym="FL"), Mod(acronym="FI"))):
+    # ranking = ["XH", "SH", "A", "B", "C", "D", "F"]
+    # else:
+    # ranking = ["X", "S", "A", "B", "C", "D", "F"]
     if score_info.mods:
         for mods_num, s_mods in enumerate(score_info.mods):
             mods_bg = osufile / "mods" / f"{s_mods.acronym}.png"
             try:
                 mods_img = Image.open(mods_bg).convert("RGBA")
-                im.alpha_composite(mods_img, (500 + 50 * mods_num, 160))
+                im.alpha_composite(mods_img, (880 + 50 * mods_num, 100))
             except FileNotFoundError:
                 pass
     # 成绩S-F
-    rank_ok = False
-    for rank_num, i in enumerate(ranking):
-        rank_img = osufile / "ranking" / f"ranking-{i}.png"
-        if rank_ok:
-            rank_b = Image.open(rank_img).convert("RGBA").resize((48, 24))
-            rank_new = Image.new("RGBA", rank_b.size, (0, 0, 0, 0))
-            rank_bg = Image.blend(rank_new, rank_b, 0.5)
-        elif i != score_info.rank:
-            rank_b = Image.open(rank_img).convert("RGBA").resize((48, 24))
-            rank_new = Image.new("RGBA", rank_b.size, (0, 0, 0, 0))
-            rank_bg = Image.blend(rank_new, rank_b, 0.2)
-        else:
-            rank_bg = Image.open(rank_img).convert("RGBA").resize((48, 24))
-            rank_ok = True
-        im.alpha_composite(rank_bg, (75, 163 + 39 * rank_num))
+    # rank_ok = False
+    # for rank_num, i in enumerate(ranking):
+    # rank_img = osufile / "ranking" / f"ranking-{i}.png"
+    # if rank_ok:
+    # rank_b = Image.open(rank_img).convert("RGBA").resize((48, 24))
+    # rank_new = Image.new("RGBA", rank_b.size, (0, 0, 0, 0))
+    # rank_bg = Image.blend(rank_new, rank_b, 0.5)
+    # elif i != score_info.rank:
+    # rank_b = Image.open(rank_img).convert("RGBA").resize((48, 24))
+    # rank_new = Image.new("RGBA", rank_b.size, (0, 0, 0, 0))
+    # rank_bg = Image.blend(rank_new, rank_b, 0.2)
+    # else:
+    # rank_bg = Image.open(rank_img).convert("RGBA").resize((48, 24))
+    # rank_ok = True
+    # im.alpha_composite(rank_bg, (75, 163 + 39 * rank_num))
     # 成绩+acc
     im = draw_acc(im, score_info.accuracy, score_info.ruleset_id)
     # 地区
     country = osufile / "flags" / f"{info.country_code}.png"
     country_bg = Image.open(country).convert("RGBA").resize((66, 45))
-    im.alpha_composite(country_bg, (250, 577))
+    im.alpha_composite(country_bg, (208, 597))
     if info.team and info.team.flag_url:
         team_path = team_cache_path / f"{info.team.id}.png"
         if not team_path.exists():
@@ -273,11 +292,11 @@ async def draw_score_pic(score_info: UnifiedScore, info: UnifiedUser, map_json,
             team_img.save(team_path)
         try:
             team_img = Image.open(team_path).convert("RGBA").resize((80, 40))
-            im.alpha_composite(team_img, (250, 640))
+            im.alpha_composite(team_img, (208, 660))
         except UnidentifiedImageError:
             team_path.unlink()
             raise NetworkError("team 图片下载错误，请重试！")
-        draw.text((340, 660), info.team.name, font=Torus_Regular_20, anchor="lt")
+        draw.text((297, 675), info.team.name, font=Torus_Regular_20, anchor="lt")
     # supporter
     # if info.is_supporter:
     #     im.alpha_composite(SupporterBg.resize((40, 40)), (250, 640))
@@ -309,38 +328,38 @@ async def draw_score_pic(score_info: UnifiedScore, info: UnifiedUser, map_json,
     ]
 
     for num, (orig, new) in enumerate(zip(original_mapdiff, mapdiff)):
-        orig_difflen = int(250 * max(0, orig) / 10) if orig <= 10 else 250
-        new_difflen = int(250 * max(0, new) / 10) if new <= 10 else 250
+        orig_difflen = int(400 * max(0, orig) / 10) if orig <= 10 else 400
+        new_difflen = int(400 * max(0, new) / 10) if new <= 10 else 400
         if is_close(new, orig):
             color = (255, 255, 255, 255)
             diff_len = Image.new("RGBA", (orig_difflen, 8), color)
-            im.alpha_composite(diff_len, (1190, 306 + 35 * num))
+            im.alpha_composite(diff_len, (165, 352 + 35 * num))
         elif new > orig and not (score_info.ruleset_id == 3 and mapinfo.mode == "osu"):
             color = (198, 92, 102, 255)
             orig_color = (246, 136, 144, 255)
             new_diff_len = Image.new("RGBA", (new_difflen, 8), color)
-            im.alpha_composite(new_diff_len, (1190, 306 + 35 * num))
+            im.alpha_composite(new_diff_len, (165, 352 + 35 * num))
             orig_diff_len = Image.new("RGBA", (orig_difflen, 8), orig_color)
-            im.alpha_composite(orig_diff_len, (1190, 306 + 35 * num))
+            im.alpha_composite(orig_diff_len, (165, 352 + 35 * num))
         elif new < orig and not (score_info.ruleset_id == 3 and mapinfo.mode == "osu"):
             color = (161, 212, 238, 255)
             orig_color = (255, 255, 255, 255)
             orig_diff_len = Image.new("RGBA", (orig_difflen, 8), orig_color)
-            im.alpha_composite(orig_diff_len, (1190, 306 + 35 * num))
+            im.alpha_composite(orig_diff_len, (165, 352 + 35 * num))
             new_diff_len = Image.new("RGBA", (new_difflen, 8), color)
-            im.alpha_composite(new_diff_len, (1190, 306 + 35 * num))
+            im.alpha_composite(new_diff_len, (165, 352 + 35 * num))
         else:
             raise Exception("没有这种情况")
         if new == round(new):
             draw.text(
-                (1470, 310 + 35 * num),
+                (610, 355 + 35 * num),
                 f"{new:.0f}",
                 font=Torus_SemiBold_20,
                 anchor="mm",
             )
         else:
             draw.text(
-                (1470, 310 + 35 * num),
+                (610, 355 + 35 * num),
                 f"{new:.2f}" if new != round(new, 1) else f"{new:.1f}",
                 font=Torus_SemiBold_20,
                 anchor="mm",
@@ -351,253 +370,291 @@ async def draw_score_pic(score_info: UnifiedScore, info: UnifiedUser, map_json,
     if stars > original_stars:
         color = (198, 92, 102, 255)
         orig_color = (246, 111, 34, 255)
-        new_difflen = int(250 * max(0.0, stars) / 10) if stars <= 10 else 250
+        new_difflen = int(400 * max(0.0, stars) / 10) if stars <= 10 else 400
         new_diff_len = Image.new("RGBA", (new_difflen, 8), color)
-        im.alpha_composite(new_diff_len, (1190, 446))
-        orig_difflen = int(250 * max(0.0, original_stars) / 10) if original_stars <= 10 else 250
+        im.alpha_composite(new_diff_len, (165, 490))
+        orig_difflen = int(400 * max(0.0, original_stars) / 10) if original_stars <= 10 else 400
         orig_diff_len = Image.new("RGBA", (orig_difflen, 8), orig_color)
-        im.alpha_composite(orig_diff_len, (1190, 446))
+        im.alpha_composite(orig_diff_len, (165, 490))
     elif stars < original_stars:
         color = (161, 187, 127, 255)
         orig_color = (255, 204, 34, 255)
-        orig_difflen = int(250 * max(0.0, original_stars) / 10) if original_stars <= 10 else 250
+        orig_difflen = int(400 * max(0.0, original_stars) / 10) if original_stars <= 10 else 400
         orig_diff_len = Image.new("RGBA", (orig_difflen, 8), orig_color)
-        im.alpha_composite(orig_diff_len, (1190, 446))
-        new_difflen = int(250 * max(0.0, stars) / 10) if stars <= 10 else 250
+        im.alpha_composite(orig_diff_len, (165, 490))
+        new_difflen = int(400 * max(0.0, stars) / 10) if stars <= 10 else 400
         new_diff_len = Image.new("RGBA", (new_difflen, 8), color)
-        im.alpha_composite(new_diff_len, (1190, 446))
+        im.alpha_composite(new_diff_len, (165, 490))
     else:
         color = (255, 204, 34, 255)
-        difflen = int(250 * stars / 10) if stars <= 10 else 250
+        difflen = int(400 * stars / 10) if stars <= 10 else 400
         diff_len = Image.new("RGBA", (difflen, 8), color)
-        im.alpha_composite(diff_len, (1190, 446))
-    draw.text((1470, 450), f"{stars:.2f}", font=Torus_SemiBold_20, anchor="mm")
+        im.alpha_composite(diff_len, (165, 490))
+    draw.text((610, 493), f"{stars:.2f}", font=Torus_SemiBold_20, anchor="mm")
     # 时长 - 滑条
-    diff_info = (
+    diff_info = [
         calc_songlen(mapinfo.total_length),
         f"{mapinfo.bpm:.1f}",
         mapinfo.count_circles,
         mapinfo.count_sliders,
-    )
+    ] + ([mapinfo.count_spinners] if score_info.ruleset_id != 3 else [])
     for num, i in enumerate(diff_info):
-        draw.text(
-            (1070 + 120 * num, 245),
+        draw_text_with_outline(
+            draw,
+            (70 + 120 * num, 300),
             f"{i}",
             font=Torus_Regular_20,
             anchor="lm",
             fill=(255, 204, 34, 255),
         )
     # 状态
-    draw.text((1400, 184), mapinfo.status.capitalize(), font=Torus_SemiBold_20, anchor="mm")
+    draw_text_with_outline(
+        draw,
+        (595, 115),
+        mapinfo.status.capitalize(),
+        Torus_SemiBold_15,
+        anchor="mm",
+        fill=(255, 255, 255, 255),
+    )
+    # setid
+    draw.text((20, 25), f"Setid：{mapinfo.beatmapset_id}", font=Torus_SemiBold_20, anchor="lm")
     # mapid
-    draw.text((1485, 90), f"Mapid: {mapinfo.id}", font=Torus_SemiBold_20, anchor="rm")
+    draw.text((650, 25), f"Mapid: {mapinfo.id}", font=Torus_SemiBold_20, anchor="rm")
     # 曲名
-    draw.text(
-        (75, 38),
-        f"{mapinfo.beatmapset.title} | by {mapinfo.beatmapset.artist_unicode}",
-        font=Torus_SemiBold_30,
+    title = trim_text_with_ellipsis(mapinfo.beatmapset.title, 600, Torus_SemiBold_30)
+    draw_text_with_outline(
+        draw,
+        (30, 200),
+        title,
+        Torus_SemiBold_30,
         anchor="lm",
+        fill=(255, 255, 255, 255),
     )
-    # 谱面版本，mapper
+    # 艺术家
+    artist = trim_text_with_ellipsis(mapinfo.beatmapset.artist, 600, Torus_SemiBold_20)
+    draw_text_with_outline(
+        draw,
+        (30, 230),
+        artist,
+        Torus_SemiBold_20,
+        anchor="lm",
+        fill=(255, 255, 255, 255),
+    )
+    # mapper
     if mapinfo.owners:
         owner_names = [owner.username for owner in mapinfo.owners]
         owners_str = ", ".join(owner_names)
-        mapper = f"{mapinfo.version} | 谱师: {owners_str}"
+        mapper = f"谱师: {owners_str}"
 
     else:
-        mapper = f"{mapinfo.version} | 谱师: {mapinfo.beatmapset.creator}"
-    mapper = trim_text_with_ellipsis(mapper, 1000, Torus_SemiBold_20)
-
-    draw.text(
-        (225, 90),
+        mapper = f"谱师: {mapinfo.beatmapset.creator}"
+    mapper = trim_text_with_ellipsis(mapper, 600, Torus_SemiBold_15)
+    draw_text_with_outline(
+        draw,
+        (30, 265),
         mapper,
-        font=Torus_SemiBold_20,
+        Torus_SemiBold_15,
+        anchor="lm",
+        fill=(255, 255, 255, 255),
+    )
+    # 谱面版本
+    version = trim_text_with_ellipsis(mapinfo.version, 450, Torus_SemiBold_15)
+    draw_text_with_outline(
+        draw,
+        (65, 80),
+        version,
+        Torus_SemiBold_15,
         anchor="lm",
+        fill=(255, 255, 255, 255),
     )
     # 评价
-    draw.text((316, 307), score_info.rank, font=Venera_75, anchor="mm")
+    draw.text((772, 185), score_info.rank, font=Venera_60, anchor="mm")
     # 分数
     draw.text(
-        (498, 251),
+        (880, 165),
         f"{score_info.legacy_total_score or score_info.total_score:,}",
-        font=Torus_Regular_75,
+        font=Torus_Regular_60,
         anchor="lm",
     )
     # 时间
-    draw.text((498, 341), "达成时间:", font=Torus_SemiBold_20, anchor="lm")
-    draw.text((630, 341), score_info.ended_at.strftime("%Y-%m-%d %H:%M:%S"), font=Torus_SemiBold_20, anchor="lm")
+    draw.text((883, 260), "达成时间：", font=Torus_SemiBold_20, anchor="lm")
+    draw.text((985, 260), score_info.ended_at.strftime("%Y-%m-%d %H:%M:%S"), font=Torus_SemiBold_20, anchor="lm")
     # 全球排名
-    draw.text((583, 410), f"#{grank}" if grank else "", font=Torus_SemiBold_25, anchor="mm")
+    draw.text((715, 300), "全球排行：" if grank else "", font=Torus_SemiBold_20, anchor="lm")
+    draw.text((817, 300), f"#{grank}" if grank else "", font=Torus_SemiBold_25, anchor="lm")
     # 左下玩家名
-    draw.text((250, 530), info.username, font=Torus_SemiBold_30, anchor="lm")
+    draw.text((208, 550), info.username, font=Torus_SemiBold_30, anchor="lm")
     # 国内排名
     draw.text(
-        (325, 610),
+        (283, 630),
         f"#{info.statistics.country_rank}",
         font=Torus_SemiBold_25,
         anchor="lm",
     )
     if score_info.ruleset_id in {0, 4, 8}:
-        draw.text((720, 550), ss_pp, font=Torus_Regular_30, anchor="mm")
-        draw.text((840, 550), if_pp, font=Torus_Regular_30, anchor="mm")
-        draw.text((960, 550), f"{pp_info.pp:.0f}", font=Torus_Regular_30, anchor="mm")
-        draw.text((720, 645), f"{pp_info.pp_aim:.0f}", font=Torus_Regular_30, anchor="mm")
-        draw.text((840, 645), f"{pp_info.pp_speed:.0f}", font=Torus_Regular_30, anchor="mm")
-        draw.text((960, 645), f"{pp_info.pp_accuracy:.0f}", font=Torus_Regular_30, anchor="mm")
+        draw.text((1066, 393), ss_pp, font=Torus_Regular_25, anchor="mm")
+        draw.text((933, 393), if_pp, font=Torus_Regular_25, anchor="mm")
+        draw.text((768, 438), f"{pp_info.pp:.0f}", font=Torus_Regular_50, anchor="mm")
+        draw.text((933, 482), f"{pp_info.pp_aim:.0f}", font=Torus_Regular_25, anchor="mm")
+        draw.text((1066, 482), f"{pp_info.pp_speed:.0f}", font=Torus_Regular_25, anchor="mm")
+        draw.text((1200, 482), f"{pp_info.pp_accuracy:.0f}", font=Torus_Regular_25, anchor="mm")
         draw.text(
-            (1157, 550),
+            (768, 577),
             f"{score_info.accuracy:.2f}%",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1385, 550),
+            (768, 666),
             f"{score_info.max_combo:,}/{pp_info.difficulty.max_combo}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1100, 645),
+            (933, 577),
             f"{score_info.statistics.great or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1214, 645),
+            (1066, 577),
             f"{score_info.statistics.ok or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1328, 645),
+            (933, 666),
             f"{score_info.statistics.meh or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1442, 645),
+            (1066, 666),
             f"{score_info.statistics.miss or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
     elif score_info.ruleset_id in {1, 5}:
         draw.text(
-            (1118, 550),
+            (768, 577),
             f"{score_info.accuracy:.2f}%",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
-        draw.text((1270, 550), f"{score_info.max_combo:,}", font=Torus_Regular_30, anchor="mm")
-        draw.text((1420, 550), f"{pp_info.pp:.0f}/{ss_pp}", font=Torus_Regular_30, anchor="mm")
+        draw.text((768, 666), f"{score_info.max_combo:,}", font=Torus_Regular_25, anchor="mm")
+        draw.text((768, 438), f"{pp_info.pp:.0f}", font=Torus_Regular_50, anchor="mm")
+        draw.text((933, 393), f"{ss_pp}", font=Torus_Regular_25, anchor="mm")
         draw.text(
-            (1118, 645),
+            (933, 577),
             f"{score_info.statistics.great or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1270, 645),
+            (1066, 577),
             f"{score_info.statistics.ok or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1420, 645),
+            (933, 666),
             f"{score_info.statistics.miss or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
     elif score_info.ruleset_id in {2, 6}:
         draw.text(
-            (1083, 550),
+            (768, 577),
             f"{score_info.accuracy:.2f}%",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1247, 550),
+            (768, 666),
             f"{score_info.max_combo}/{pp_info.difficulty.max_combo}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
-        draw.text((1411, 550), f"{pp_info.pp:.0f}/{ss_pp}", font=Torus_Regular_30, anchor="mm")
+        draw.text((768, 438), f"{pp_info.pp:.0f}", font=Torus_Regular_50, anchor="mm")
+        draw.text((933, 393), f"{ss_pp}", font=Torus_Regular_25, anchor="mm")
         draw.text(
-            (1062, 645),
+            (933, 577),
             f"{score_info.statistics.great or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1185, 645),
+            (1066, 577),
             f"{score_info.statistics.large_tick_hit or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1309, 645),
+            (933, 666),
             f"{score_info.statistics.small_tick_miss or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1432, 645),
+            (1066, 666),
             f"{score_info.statistics.miss or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
     else:
         draw.text(
-            (1002, 580),
+            (933, 600),
             (
                 f"{score_info.statistics.perfect / score_info.statistics.great:.1f}:1"
                 if (score_info.statistics.great or 0) != 0
                 else "∞:1"
             ),
-            font=Torus_Regular_20,
+            font=Torus_Regular_15,
             anchor="mm",
         )
         draw.text(
-            (1002, 550),
+            (768, 577),
             f"{score_info.accuracy:.2f}%",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
-        draw.text((1197, 550), f"{score_info.max_combo}", font=Torus_Regular_30, anchor="mm")
-        draw.text((1395, 550), f"{pp_info.pp:.0f}/{ss_pp}", font=Torus_Regular_30, anchor="mm")
+        draw.text((768, 666), f"{score_info.max_combo}", font=Torus_Regular_25, anchor="mm")
+        draw.text((768, 438), f"{pp_info.pp:.0f}", font=Torus_Regular_50, anchor="mm")
+        draw.text((933, 393), f"{ss_pp}", font=Torus_Regular_25, anchor="mm")
         draw.text(
-            (953, 645),
+            (933, 577),
             f"{score_info.statistics.perfect or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1051, 645),
+            (1066, 577),
             f"{score_info.statistics.great or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1150, 645),
+            (1200, 577),
             f"{score_info.statistics.good or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1249, 645),
+            (933, 666),
             f"{score_info.statistics.ok or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1347, 645),
+            (1066, 666),
             f"{score_info.statistics.meh or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
         draw.text(
-            (1445, 645),
+            (1200, 666),
             f"{score_info.statistics.miss or 0}",
-            font=Torus_Regular_30,
+            font=Torus_Regular_25,
             anchor="mm",
         )
     user_icon = await open_user_icon(info, source)
@@ -607,7 +664,7 @@ async def draw_score_pic(score_info: UnifiedScore, info: UnifiedUser, map_json,
     if not getattr(user_icon, "is_animated", False):
         icon_bg = user_icon.convert("RGBA").resize((170, 170))
         icon_img = draw_fillet(icon_bg, 15)
-        im.alpha_composite(icon_img, (60, 510))
+        im.alpha_composite(icon_img, (27, 532))
         byt = BytesIO()
         im.convert("RGB").save(byt, "jpeg")
         im.close()
@@ -620,7 +677,7 @@ async def draw_score_pic(score_info: UnifiedScore, info: UnifiedUser, map_json,
         # 创建一个新的 RGBA 图片，将 PNG 图片作为背景，将当前帧添加到背景上
         rgba_frame = Image.new("RGBA", im.size, (0, 0, 0, 0))
         rgba_frame.paste(im, (0, 0), im)
-        rgba_frame.paste(gif_frame, (60, 510), gif_frame)
+        rgba_frame.paste(gif_frame, (27, 532), gif_frame)
         # 将 RGBA 图片转换为 RGB 模式，并添加到 GIF 图片中
         gif_frames.append(rgba_frame)
     gif_bytes = BytesIO()

nonebot_plugin_osubot/draw/static.py

@@ -15,14 +15,15 @@ Torus_Regular_35 = ImageFont.truetype(str(osufile / "fonts" / "Torus Regular.otf
 Torus_Regular_40 = ImageFont.truetype(str(osufile / "fonts" / "Torus Regular.otf"), 40)
 Torus_Regular_45 = ImageFont.truetype(str(osufile / "fonts" / "Torus Regular.otf"), 45)
 Torus_Regular_50 = ImageFont.truetype(str(osufile / "fonts" / "Torus Regular.otf"), 50)
-Torus_Regular_75 = ImageFont.truetype(str(osufile / "fonts" / "Torus Regular.otf"), 75)
+Torus_Regular_60 = ImageFont.truetype(str(osufile / "fonts" / "Torus Regular.otf"), 60)
+Torus_SemiBold_15 = ImageFont.truetype(str(osufile / "fonts" / "Torus SemiBold.otf"), 15)
 Torus_SemiBold_20 = ImageFont.truetype(str(osufile / "fonts" / "Torus SemiBold.otf"), 20)
 Torus_SemiBold_25 = ImageFont.truetype(str(osufile / "fonts" / "Torus SemiBold.otf"), 25)
 Torus_SemiBold_30 = ImageFont.truetype(str(osufile / "fonts" / "Torus SemiBold.otf"), 30)
 Torus_SemiBold_40 = ImageFont.truetype(str(osufile / "fonts" / "Torus SemiBold.otf"), 40)
 Torus_SemiBold_45 = ImageFont.truetype(str(osufile / "fonts" / "Torus SemiBold.otf"), 45)
 Torus_SemiBold_50 = ImageFont.truetype(str(osufile / "fonts" / "Torus SemiBold.otf"), 50)
-Venera_75 = ImageFont.truetype(str(osufile / "fonts" / "Venera.otf"), 75)
+Venera_60 = ImageFont.truetype(str(osufile / "fonts" / "Venera.otf"), 60)
 extra_30 = ImageFont.truetype(str(osufile / "fonts" / "Extra.otf"), 30)
 
 InfoImg = Image.open(osufile / "info.png").convert("RGBA")

nonebot_plugin_osubot/draw/utils.py

@@ -120,8 +120,8 @@ def draw_acc(img: Image, acc: float, mode: int):
     ax.clear()
     fig.clf()
     fig.clear()
-    score_acc_img = Image.open(acc_img).convert("RGBA").resize((576, 432))
-    img.alpha_composite(score_acc_img, (25, 83))
+    score_acc_img = Image.open(acc_img).convert("RGBA").resize((384, 288))
+    img.alpha_composite(score_acc_img, (580, 35))
     return img
 
 
@@ -438,3 +438,18 @@ def trim_text_with_ellipsis(text, max_width, font):
 
     # 返回截断后的字符串 + 省略号
     return truncated_text + ellipsis_symbol if truncated_text else ellipsis_symbol
+
+
+# 字体描边函数
+def draw_text_with_outline(draw, position, text, font, anchor, fill):
+    for dx in [-1, 0, 1]:
+        for dy in [-1, 0, 1]:
+            if dx != 0 or dy != 0:
+                draw.text(
+                    (position[0] + dx, position[1] + dy),
+                    text,
+                    font=font,
+                    anchor=anchor,
+                    fill=(0, 0, 0, 255),
+                )
+    draw.text(position, text, font=font, anchor=anchor, fill=fill)

nonebot_plugin_osubot/matcher/utils.py

@@ -33,7 +33,9 @@ def split_msg():
         state["query"] = []
         state["target"] = None
         state["is_lazer"] = True if not user_data else user_data.lazer_mode
-        arg = arg.extract_plain_text().strip()
+        arg = (
+            arg.extract_plain_text().strip().replace("＝", "=").replace("：", ":").replace("＆", "&").replace("＃", "#")
+        )
         matches = re.findall(pattern, arg)
         for match in matches:
             if match[0]:
@@ -85,9 +87,9 @@ def split_msg():
         if state["source"] == "ppysb" and not arg.strip():
             sb_user_data = await SbUserData.get_or_none(user_id=qq)
             if sb_user_data:
-                state["user"] = sb_user_data.osu_id if user_data else 0
-                state["username"] = sb_user_data.osu_name if user_data else ""
+                state["user"] = sb_user_data.osu_id
+                state["username"] = sb_user_data.osu_name
             else:
-                state["error"] = "该账号尚未绑定sb 服务器，请输入 /sbbind 用户名 绑定账号"
+                state["error"] = "该账号尚未绑定 sb 服务器，请输入 /sbbind 用户名 绑定账号"
 
     return Depends(dependency)

{nonebot_plugin_osubot-6.20.1.dist-info → nonebot_plugin_osubot-6.21.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-osubot
-Version: 6.20.1
+Version: 6.21.0
 Summary: OSUbot in NoneBot2
 License: AGPL-3.0
 Author-email: yaowan233 <572473053@qq.com>

{nonebot_plugin_osubot-6.20.1.dist-info → nonebot_plugin_osubot-6.21.0.dist-info}/RECORD

@@ -17,7 +17,7 @@ nonebot_plugin_osubot/draw/catch_preview_templates/js/beatmap/timingpoint.js,sha
 nonebot_plugin_osubot/draw/catch_preview_templates/js/catch/LegacyRandom.js,sha256=HDiks3FCVQBtVK5VzN7YV9Ekkk_WHYi0fPk3-XCQaj8,2155
 nonebot_plugin_osubot/draw/catch_preview_templates/js/catch/PalpableCatchHitObject.js,sha256=CnUBiIkAqFUaCrc5TXRtL_fuK20NeK1yMti1Sp4dJAE,5702
 nonebot_plugin_osubot/draw/catch_preview_templates/js/catch/bananashower.js,sha256=sPISMifUWVXK9nXuOD7JUPeXBNPBKquiDNKpYzbSJyg,988
-nonebot_plugin_osubot/draw/catch_preview_templates/js/catch/catch.js,sha256=MnYorETgLMjXJ8X0uPNyapD3m0KHHzHdoPnkUcBU374,34430
+nonebot_plugin_osubot/draw/catch_preview_templates/js/catch/catch.js,sha256=uLbMrZBZfvj1YxJVIeirFWVVJ2apLPfB1VY_KHq-hSE,34561
 nonebot_plugin_osubot/draw/catch_preview_templates/js/catch/fruit.js,sha256=ABvFMbmXP0t5wACUhSVbu8sVJ845mWJ9sWiQJtMV5co,437
 nonebot_plugin_osubot/draw/catch_preview_templates/js/catch/juicestream.js,sha256=kWjmPtT_UgnUlg5G-_8q-1AyNTv6GLRp0bOOfiMcojc,7347
 nonebot_plugin_osubot/draw/catch_preview_templates/js/fakeaudio.js,sha256=gJrdVwNrAVjWx80z_XkzybL9ldfV97nKl7k1v7NulBg,1211
@@ -42,14 +42,14 @@ nonebot_plugin_osubot/draw/info.py,sha256=i2YcJmSdTpwhZl_nDe7GJv4jQTB8_9oBfpq2Zw
 nonebot_plugin_osubot/draw/map.py,sha256=4M8xRd0dIbC5g1s8I4eTZ3vRglM6r_TSznFOZ62K2wk,8654
 nonebot_plugin_osubot/draw/match_history.py,sha256=GBJl6lAA27U7NSMC2isEzD_YsoIPAeG6ijDu7Oflcl0,997
 nonebot_plugin_osubot/draw/rating.py,sha256=pA7mGLI4IujmYB6kQf_tSkR7mZGpUAVLRLyaAsZhqTM,20397
-nonebot_plugin_osubot/draw/score.py,sha256=Y2-BUuKYgYoXk-Uq0PFNg3WaU_SUfSB6Ebo446xslUg,27553
-nonebot_plugin_osubot/draw/static.py,sha256=2rznsXZTcKggQ5JSpsJg4y6uWP4e-Y40U7v_QAwLT4Q,3969
+nonebot_plugin_osubot/draw/score.py,sha256=izYS28IovyFXACLkyQL9Qtp8fUrguoO63xKdawZv70Y,29414
+nonebot_plugin_osubot/draw/static.py,sha256=28_ta4ivORxdX_-P7OdOp1VzJK_Tw0-VudfJOY9kW8I,4059
 nonebot_plugin_osubot/draw/taiko_preview.py,sha256=tqhuHSdxUJEuXqKHMJDeSLdusuJhSnMMiaG5FbUnaJw,11441
 nonebot_plugin_osubot/draw/templates/bpa_chart.html,sha256=cnpM0qRvvyCMTRP-mIOABQlaaqxQwG5kLUxlo4h7F7w,7012
 nonebot_plugin_osubot/draw/templates/echarts.min.js,sha256=IF32ooP8NPIzQg_fs7lVHpwG92JcCPE1TZAEyFSgGZU,1022939
 nonebot_plugin_osubot/draw/templates/mod_chart.html,sha256=Iz71KM5v9z_Rt2vqJ5WIZumRIHgDfcGIUmWGvVGZ-nQ,1508
 nonebot_plugin_osubot/draw/templates/pp_rank_line_chart.html,sha256=Gyf-GR8ZBlWQTks0TlB3M8EWUBMVwiUaesFAmDISxLo,1417
-nonebot_plugin_osubot/draw/utils.py,sha256=LZVDmrQizVwVFX0kDJISYYO68jmZbn5Xz40gV5bj8bo,15276
+nonebot_plugin_osubot/draw/utils.py,sha256=r-It_mt4o3ckkjanAynJ28ICGxTYk3o2XMnAH__0rUQ,15764
 nonebot_plugin_osubot/exceptions.py,sha256=N_FsEk-9Eu2QnuznhdfWn6OoyA1HH73Q7bUaY89gVi0,40
 nonebot_plugin_osubot/file.py,sha256=GhG54EdVsxFf8_8GZOPh4YGvw9iw5bAX9JFz4Mg4kMg,4379
 nonebot_plugin_osubot/info/__init__.py,sha256=I7YlMQiuHExEeJWqyzZb2I-Vl2uql3Py2LdhSH2Z9N0,136
@@ -80,7 +80,7 @@ nonebot_plugin_osubot/matcher/score.py,sha256=Nk6dpDlszKJKdboTSQRBf-wMGioHIPqKSV
 nonebot_plugin_osubot/matcher/update.py,sha256=MHpxoJmU0hKW82XuM9YpyCxUUjjiNKwejnRgYwueR4Q,3168
 nonebot_plugin_osubot/matcher/update_mode.py,sha256=0Wy6Y1-rN7XcqBZyo37mYFdixq-4HxCwZftUaiYhZqE,1602
 nonebot_plugin_osubot/matcher/url_match.py,sha256=opx4DYSQ83tk0qlMOBirl4TC49WXHgMZ04lMr9NCHNs,746
-nonebot_plugin_osubot/matcher/utils.py,sha256=BUAorxXrWioiMzR0nZ8NUeaV48ZGUDe4FXLWxKT72g4,4240
+nonebot_plugin_osubot/matcher/utils.py,sha256=gWmNa31wUxcY_PNSNLy348x5_7sTY9ttMKH-5V5jkuE,4304
 nonebot_plugin_osubot/mods.py,sha256=vxIWYX0HwTxetPAHWZK5ojEMfqV9HFlWT0YC4Yncgb8,1402
 nonebot_plugin_osubot/network/__init__.py,sha256=WOijcd81yhnpGKYeiDIOxbBDVI12GHPRGoOFfxrUuQk,61
 nonebot_plugin_osubot/network/auto_retry.py,sha256=vDfYGbEVPF6WZLYXmRVkNvaxf6_6RyIqEAcA7TRwV_k,565
@@ -372,10 +372,10 @@ nonebot_plugin_osubot/osufile/mods/SD.png,sha256=JptCZkXv8kOpIksYimWdC7hRJXShL7N
 nonebot_plugin_osubot/osufile/mods/SO.png,sha256=qKPoP-LXNU3nSVn8e7z2d6LddFOG-v4gbBEUOb6BtXU,1493
 nonebot_plugin_osubot/osufile/mods/TD.png,sha256=ZAprUMXNcqs_tXPF0HU34qa_NUZo6U-NemMjVxBOk10,1309
 nonebot_plugin_osubot/osufile/mods/V2.png,sha256=Y3ju7KMECnGiECRM1MnZUuuwQqbflkdz6I7XjCCTw2E,1354
-nonebot_plugin_osubot/osufile/pfm_ctb.png,sha256=UYiDqal_wQHJxqOGYrXNs587FZg6qGALAA6OaQaqPws,44488
-nonebot_plugin_osubot/osufile/pfm_mania.png,sha256=YnLEs9SUivR8BfTZQDyGZXQJMYLIB_v8KuA9qbuysMQ,45512
-nonebot_plugin_osubot/osufile/pfm_std.png,sha256=_H7i_QKzwkDH70avZLvn7dqcldRpKBHH_Y8AkflmNTI,47809
-nonebot_plugin_osubot/osufile/pfm_taiko.png,sha256=ds3C71ZKGiXd6LgxuLfrKxDrfPbzrbMddmh9IwLW3tk,44271
+nonebot_plugin_osubot/osufile/pfm_ctb.png,sha256=9JJu8J1gR_nQhb1EWOuJUOjNitYK_gcH6MRGiYtvsGI,53451
+nonebot_plugin_osubot/osufile/pfm_mania.png,sha256=PKlAezcKALo0UMnrYvTCL3pd-oJNEU76qLVPhfDLFdk,52208
+nonebot_plugin_osubot/osufile/pfm_std.png,sha256=ts7e7IUeoalLuw0Pww0X3trXUpZwnWRsOqdQ1RzcdFM,57032
+nonebot_plugin_osubot/osufile/pfm_taiko.png,sha256=7OAhXVfL_j7pZ4MZAXexgSMNmUyVNsvvq1Ij2XzFEgc,55756
 nonebot_plugin_osubot/osufile/ranking/ranking-A.png,sha256=nA4kI67IbnC-gfu1pCnPupHC45Uoqa6LYmJKawzV_L0,4364
 nonebot_plugin_osubot/osufile/ranking/ranking-B.png,sha256=KJCEGr7OkQ12rqng6_JL9r6qLTAclPO_PtHHmLFQooY,4214
 nonebot_plugin_osubot/osufile/ranking/ranking-C.png,sha256=SsIWOTOymgMze521v4G_rdqL6QqpE64R1dhxpmhzBAc,3862
@@ -403,6 +403,6 @@ nonebot_plugin_osubot/schema/sayo_beatmap.py,sha256=lS1PQZ-HvHl0VhkzlI0-pNLeJrLY
 nonebot_plugin_osubot/schema/score.py,sha256=zHU-w2e7RzMDL8vdPkX5vggcqalBo83JTvu96abcflo,3124
 nonebot_plugin_osubot/schema/user.py,sha256=sxNmqymG_kIVuGuzfchSv9UML6NPG70cqo2_h5xDIpM,2250
 nonebot_plugin_osubot/utils/__init__.py,sha256=pyv8XxBcCOeQVDj1E4dgvktzcefgQXfKBlarsYGx1sg,815
-nonebot_plugin_osubot-6.20.1.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
-nonebot_plugin_osubot-6.20.1.dist-info/METADATA,sha256=cosRoPpyiqrB686g_vBWg7JhlUs9jQ7CGFVvGZonDzU,4476
-nonebot_plugin_osubot-6.20.1.dist-info/RECORD,,
+nonebot_plugin_osubot-6.21.0.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
+nonebot_plugin_osubot-6.21.0.dist-info/METADATA,sha256=uKS_5rmuhM8-4dD90UGo6kb-p5n90veBEKDQR6aDB5Y,4476
+nonebot_plugin_osubot-6.21.0.dist-info/RECORD,,