🎨 优化, 并新增部分4.6资源

GenshinUID/genshinuid_guide/__init__.py

@@ -9,10 +9,10 @@ from gsuid_core.segment import MessageSegment
 
 from .get_guide import get_gs_guide
 from ..version import Genshin_version
-from .get_abyss_data import get_review
+
+# from .get_abyss_data import get_review
 from ..utils.image.convert import convert_img
 from .get_new_abyss_data import get_review_data
-from ..genshinuid_config.gs_config import gsconfig
 from ..utils.resource.RESOURCE_PATH import REF_PATH
 from ..utils.map.name_covert import alias_to_char_name
 
@@ -65,10 +65,8 @@ async def send_abyss_review(bot: Bot, ev: Event):
             floor = ev.text
             version = Genshin_version[:-2]
 
-    if gsconfig.get_config('PicWiki').data:
+    im = await get_review_data(version, floor)
-        im = await get_review_data(version, floor)
+    # im = await get_review(version)
-    else:
-        im = await get_review(version)
 
     if isinstance(im, bytes):
         c = Button('♾️深渊概览', '深渊概览')
@@ -82,7 +80,7 @@ async def send_abyss_review(bot: Bot, ev: Event):
         d = Button(f'♾️版本深渊{adv_version}', f'深渊概览{adv_version}')
         await bot.send_option(im, [c, d])
     elif isinstance(im, List):
-        mes = [MessageSegment.text(msg) for msg in im]
+        mes = [MessageSegment.text(str(msg)) for msg in im]
         await bot.send(MessageSegment.node(mes))
     elif isinstance(im, str):
         await bot.send(im)

GenshinUID/genshinuid_postdraw/daily_check_draw.py

@@ -95,9 +95,9 @@ async def single_get_draw(bot_id: str, uid: str, gid: str, qid: str):
 async def daily_get_draw():
     tasks = []
     for bot_id in gss.active_bot:
-        user_list = await GsUser.get_all_user()
+        user_list: List[GsUser] = await GsUser.get_all_user()
         for user in user_list:
-            if user.draw_switch != 'off':
+            if user.draw_switch != 'off' and user.uid:
                 tasks.append(
                     single_get_draw(
                         user.bot_id, user.uid, user.sign_switch, user.user_id

GenshinUID/genshinuid_resin/notice.py

@@ -1,4 +1,4 @@
-from typing import Dict
+from typing import Dict, List
 
 from gsuid_core.gss import gss
 from gsuid_core.logger import logger
@@ -21,7 +21,7 @@ NOTICE = {
 async def get_notice_list() -> Dict[str, Dict[str, Dict]]:
     msg_dict: Dict[str, Dict[str, Dict]] = {}
     for bot_id in gss.active_bot:
-        user_list = await GsUser.get_all_push_user_list()
+        user_list: List[GsUser] = await GsUser.get_all_push_user_list()
         for user in user_list:
             if user.uid is None:
                 continue

GenshinUID/genshinuid_roleinfo/draw_all_char.py

@@ -51,11 +51,7 @@ async def _draw_char_pic(uid: str, raw_data: IndexData):
 
     # 确定角色占用行数
     char_num = len(char_datas)
-    char_hang = (
+    char_hang = 1 + (char_num - 1) // 4
-        1 + (char_num - 1) // 4
-        if char_num > 8
-        else (char_num // 2) + (char_num % 2)
-    )
 
     # 获取背景图片各项参数
     target = (374, 195)

GenshinUID/tools/get_achievement_json.py

@@ -10,11 +10,11 @@ import_path = Path(__file__).parent / 'achievement_data' / '成就汇总.xlsx'
 export_path = Path(__file__).parents[1] / 'genshinuid_achievement'
 
 wb: Workbook = load_workbook(str(import_path))
-ws_daily: Worksheet = wb['成就相关每日委托']
+ws_daily: Worksheet = wb['成就相关每日委托']  # type: ignore
-ws_all: Worksheet = wb['正式服成就汇总']
+ws_all: Worksheet = wb['正式服成就汇总']  # type: ignore
-ws_32: Worksheet = wb['3.2 新增成就']
+ws_32: Worksheet = wb['3.2 新增成就']  # type: ignore
-ws_33: Worksheet = wb['3.3 新增成就']
+ws_33: Worksheet = wb['3.3 新增成就']  # type: ignore
-ws_34: Worksheet = wb['3.4 新增成就']
+ws_34: Worksheet = wb['3.4 新增成就']  # type: ignore
 
 result_achi = {}
 result_all = {}

GenshinUID/utils/map/data/ExtraMonster.json

@@ -306,12 +306,5 @@
     "type": "MONSTER_ORDINARY",
     "route": "Tainted Water-Spouting Phantasm",
 	"icon": "UI_MonsterIcon_Necalevia_Big"
-  },
-  "20511201": {
-    "id": 20511201,
-    "name": "历经百战的浊水喷吐幻灵",
-    "type": "MONSTER_ORDINARY",
-    "route": "Tainted Water-Spouting Phantasm",
-	"icon": "UI_MonsterIcon_Necalevia_Big"
   }
 }

GenshinUID/version.py

@@ -1,2 +1,2 @@
-GenshinUID_version = '4.4.0'
+GenshinUID_version = '4.6.1'
 Genshin_version = '4.6.0'

README.md

@@ -1,7 +1,7 @@
 <p align="center">
   <a href="https://github.com/KimigaiiWuyi/GenshinUID/"><img src="https://s2.loli.net/2023/03/25/bareSdYcsmRPOyZ.png" width="256" height="256" alt="GenshinUID"></a>
 </p>
-<h1 align = "center">GenshinUID 4.1</h1>
+<h1 align = "center">GenshinUID 4.6.1</h1>
 <h4 align = "center">✨支持OneBot(QQ)、QQ频道、微信、开黑啦、Telegram的全功能原神Bot插件✨</h4>
 <div align = "center">
         <a href="https://docs.sayu-bot.com/" target="_blank">安装文档</a> &nbsp; · &nbsp;
@@ -12,6 +12,7 @@
   <a><img src="https://s2.loli.net/2023/03/26/76oWuYJwg18aXL2.jpg"></a>
 </p>
 
+
 > [!WARNING]
 > 该分支并不是Nonebot2的插件，也不是任何一个其他Bot的插件，具体安装方法请参考[文档](https://docs.sayu-bot.com/)
 ## 丨感谢
@@ -28,6 +29,8 @@
 - [@音尘绝LiuSXwww](https://bbs.mihoyo.com/ys/accountCenter/postList?id=271681956) - 怪物数据表的**授权**使用
 - [@Asgater](https://www.miyoushe.com/ys/accountCenter/postList?id=79695828) - 原牌图鉴的**授权**使用
 - [虚空数据库](https://akashadata.com/) - 深渊出场数据的**授权**使用
+- [@祈鸢ya](https://www.miyoushe.com/ys/accountCenter/postList?id=137101761) - 「4.6~」原石预估数据图片的**授权**使用
+- [@七月的休](https://www.miyoushe.com/ys/accountCenter/postList?id=218945821) - 「~4.5」原石预估数据图片的**授权**使用
 - [玉衡杯深渊数据库](http://www.yuhengcup.top/abyss) - `版本深渊`功能数据提供
 - [@lgc233](https://github.com/lgc2333) - 众多优秀PR贡献
 - [@lulu666lulu](https://github.com/lulu666lulu) - DS算法提供和验证码方案提供