From 625758ef40dcc8e58f8d3baf1d6b5fa79cd2a968 Mon Sep 17 00:00:00 2001
From: CMHopeSunshine <277073121@qq.com>
Date: Thu, 24 Mar 2022 19:25:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E4=B8=80=E9=94=AE=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E7=9A=84=E7=AB=AF=E5=8F=A3=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=89=98=E9=A9=AC=E6=94=BB=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LittlePaimon-install.ps1                               | 8 ++++----
 hoshino/modules/Genshin_Paimon/game_guild/blue.py      | 3 ++-
 hoshino/modules/Genshin_Paimon/player_card/__init__.py | 3 +++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/LittlePaimon-install.ps1 b/LittlePaimon-install.ps1
index 10e6fd4..24f826f 100644
--- a/LittlePaimon-install.ps1
+++ b/LittlePaimon-install.ps1
@@ -228,11 +228,11 @@ servers:
   - ws-reverse:
       # 反向WS Universal 地址
       # 注意 设置了此项地址后下面两项将会被忽略
-      universal: ws://127.0.0.1:80/ws/
+      universal: ws://127.0.0.1:6660/ws/
       # 反向WS API 地址
-      api: ws://127.0.0.1:80/api/
+      api: ws://127.0.0.1:6660/api/
       # 反向WS Event 地址
-      event: ws://127.0.0.1:80/event/
+      event: ws://127.0.0.1:6660/event/
       # 重连间隔 单位毫秒
       reconnect-interval: 3000
       middlewares:
@@ -244,7 +244,7 @@ servers:
 Set-Content .\LittlePaimon\hoshino\config\__bot__.py -Value @"
 # coding=gbk
 # hoshino监听的端口与ip
-PORT = 80
+PORT = 6660
 HOST = '127.0.0.1'      # 本地部署使用此条配置（QQ客户端和bot端运行在同一台计算机）
 # HOST = '0.0.0.0'      # 开放公网访问使用此条配置（不安全）
 
diff --git a/hoshino/modules/Genshin_Paimon/game_guild/blue.py b/hoshino/modules/Genshin_Paimon/game_guild/blue.py
index e8c9fc3..1a63077 100644
--- a/hoshino/modules/Genshin_Paimon/game_guild/blue.py
+++ b/hoshino/modules/Genshin_Paimon/game_guild/blue.py
@@ -1,5 +1,6 @@
 blue={
-    '胡桃': ['火', (0, 2420)],
+    '胡桃': ['火', (0, 1886)],
+    '托马': ['火', (1886, 2420)],
     '宵宫': ['火', (2420, 2955)],
     '烟绯': ['火', (2955, 3492)],
     '可莉': ['火', (3492, 4029)],
diff --git a/hoshino/modules/Genshin_Paimon/player_card/__init__.py b/hoshino/modules/Genshin_Paimon/player_card/__init__.py
index 17050ac..eadeb00 100644
--- a/hoshino/modules/Genshin_Paimon/player_card/__init__.py
+++ b/hoshino/modules/Genshin_Paimon/player_card/__init__.py
@@ -110,6 +110,9 @@ async def my_characters(bot,ev):
         if not uid:
             await bot.send(ev,'请把uid给派蒙哦，比如ysc100000001 钟离',at_sender=True)
             return
+    if len(uid) != 9 or not uid.isdigit():
+        await bot.send(ev,f'uid {uid} 不合规,是不是打错了呀',at_sender=True)
+        return
     cookie = await get_cookie(qq, uid)
     update_last_query_to_qq(qq, uid)
     if not cookie: