From b20f748b4ff04b964259b9c63f656941e807f416 Mon Sep 17 00:00:00 2001
From: HibiKier <775757368@qq.com>
Date: Mon, 5 Aug 2024 19:57:01 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20=E4=BC=98=E5=8C=96pix?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=B8=8E=E8=BD=AE=E7=9B=98=E6=A6=82=E7=8E=87?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zhenxun/plugins/pix_gallery/pix.py     | 6 +++---
 zhenxun/plugins/russian/data_source.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/zhenxun/plugins/pix_gallery/pix.py b/zhenxun/plugins/pix_gallery/pix.py
index 0502f8c2..d67e5ada 100644
--- a/zhenxun/plugins/pix_gallery/pix.py
+++ b/zhenxun/plugins/pix_gallery/pix.py
@@ -79,7 +79,7 @@ __plugin_meta__ = PluginMetadata(
 _matcher = on_alconna(
     Alconna(
         "pix",
-        Args["tags?", list[str]],
+        Args["tags?", str] / "\n",
         Option("-s", action=store_true, help_text="色图"),
         Option("-r", action=store_true, help_text="r18"),
     ),
@@ -92,7 +92,7 @@ OMEGA_RATIO = None
 
 
 @_matcher.handle()
-async def _(bot: Bot, session: EventSession, arparma: Arparma, tags: Match[list[str]]):
+async def _(bot: Bot, session: EventSession, arparma: Arparma, tags: Match[str]):
     global PIX_RATIO, OMEGA_RATIO
     gid = session.id3 or session.id2
     if not session.id1:
@@ -106,7 +106,7 @@ async def _(bot: Bot, session: EventSession, arparma: Arparma, tags: Match[list[
     num = 1
     # keyword = arg.extract_plain_text().strip()
     keyword = ""
-    spt = tags.result if tags.available else []
+    spt = tags.result.split() if tags.available else []
     if arparma.find("s"):
         nsfw_tag = 1
     elif arparma.find("r"):
diff --git a/zhenxun/plugins/russian/data_source.py b/zhenxun/plugins/russian/data_source.py
index e7b5aed2..b25b72cf 100644
--- a/zhenxun/plugins/russian/data_source.py
+++ b/zhenxun/plugins/russian/data_source.py
@@ -293,7 +293,7 @@ class RussianManage:
                 return result, settle
             else:
                 """存活"""
-                p = (russian.bullet_index + 1) / len(russian.bullet_arr) * 100
+                p = (russian.bullet_index + russian.bullet_num + 1) / len(russian.bullet_arr) * 100
                 result = (
                     random.choice(
                         [