diff --git a/configs/config.py b/configs/config.py index bae52d7f..7cfa5bd7 100644 --- a/configs/config.py +++ b/configs/config.py @@ -84,10 +84,10 @@ MUTE_LEVEL: int = 5 # 更改禁言设置权限 # 需要为哪些群更新最新版gocq吗？（上传最新版gocq） # 示例：[434995955, 239483248] -UPDATE_GOCQ_GROUP: List[int] = [774261838] +UPDATE_GOCQ_GROUP: List[int] = [] # 代理 -system_proxy: str = 'http://127.0.0.1:7890' +system_proxy: str = '' buff_proxy: str = '' # 是否存储色图 diff --git a/plugins/admin_bot_manage/__init__.py b/plugins/admin_bot_manage/__init__.py index 816decca..30db6692 100644 --- a/plugins/admin_bot_manage/__init__.py +++ b/plugins/admin_bot_manage/__init__.py @@ -58,6 +58,8 @@ async def _(bot: Bot, event: GroupMessageEvent, state: T_State): async def _(bot: Bot, event: GroupMessageEvent, state: T_State): msg = get_message_text(event.json()) imgs = get_message_imgs(event.json()) + if not msg and not imgs: + await custom_welcome.finish('格式：自定义群欢迎消息 [文本] [图片]\n\t示例：自定义群欢迎消息 我们都是萝莉控，你呢？ [图片]') await custom_welcome.finish(await custom_group_welcome(msg, imgs, event.user_id, event.group_id), at_sender=True) diff --git a/plugins/admin_config.py b/plugins/admin_config.py index de0a0a79..858fb53d 100644 --- a/plugins/admin_config.py +++ b/plugins/admin_config.py @@ -24,7 +24,7 @@ async def _(bot: Bot, event: GroupAdminNoticeEvent, state: T_State): if event.sub_type == 'set': await LevelUser.set_level(event.user_id, event.group_id, ADMIN_DEFAULT_AUTH) logger.info(f'为新晋管理员 {nickname}({event.user_id}) 添加权限等级：{ADMIN_DEFAULT_AUTH}') - if event.sub_type == 'unset': + elif event.sub_type == 'unset': await LevelUser.delete_level(event.user_id, event.group_id) logger.info(f'将非管理员 {nickname}({event.user_id}) 取消权限等级') diff --git a/plugins/bt/__init__.py b/plugins/bt/__init__.py index 429bc71c..18cca9ed 100644 --- a/plugins/bt/__init__.py +++ b/plugins/bt/__init__.py @@ -8,6 +8,7 @@ from util.utils import get_message_text from nonebot.adapters.cqhttp.permission import PRIVATE from util.utils import UserExistLimiter from asyncio.exceptions import TimeoutError +from aiohttp.client_exceptions import ServerDisconnectedError __plugin_name__ = '磁力搜索' __plugin_usage__ = r""" @@ -67,9 +68,17 @@ async def _(bot: Bot, event: PrivateMessageEvent, state: T_State): f'种子：{link}') send_flag = True except TimeoutError: - pass + _ulmt.set_False(event.user_id) + await bt.finish(f'搜索 {keyword} 超时...') + except ServerDisconnectedError: + _ulmt.set_False(event.user_id) + await bt.finish(f'搜索 {keyword} 连接失败') + except Exception as e: + _ulmt.set_False(event.user_id) + await bt.finish(f'bt 其他未知错误..') + logger.error(f'bt 错误 e：{e}') if not send_flag: - await bt.send(f'{keyword} 超时或未搜索到...') + await bt.send(f'{keyword} 未搜索到...') logger.info(f'USER {event.user_id} BT搜索 {keyword} 第 {page} 页') _ulmt.set_False(event.user_id) diff --git a/plugins/draw_card/__init__.py b/plugins/draw_card/__init__.py index 2fe78c25..b87fb502 100644 --- a/plugins/draw_card/__init__.py +++ b/plugins/draw_card/__init__.py @@ -120,7 +120,7 @@ async def _(bot: Bot, event: MessageEvent, state: T_State): if msg.find('1井') != -1 or msg.find('一井') != -1: num = 200 if msg.find("卡") == -1: - pool_name = 'horse' + pool_name = 'char' else: pool_name = 'card' else: @@ -131,7 +131,7 @@ async def _(bot: Bot, event: MessageEvent, state: T_State): num = num[1:] pool_name = 'card' else: - pool_name = 'horse' + pool_name = 'char' num, flag = check_num(num, 200) if not flag: await pretty.finish(num, at_sender=True) diff --git a/plugins/draw_card/announcement.py b/plugins/draw_card/announcement.py index 85e2857b..4a55c579 100644 --- a/plugins/draw_card/announcement.py +++ b/plugins/draw_card/announcement.py @@ -36,12 +36,15 @@ def is_expired(data: dict): # 检查写入 def check_write(data: dict, up_char_file, game_name: str = ''): tmp = data - if game_name == 'genshin': + if game_name in ['genshin', 'pretty']: tmp = data['char'] if not is_expired(tmp): - if game_name == 'genshin': + if game_name in ['genshin']: data['char']['title'] = '' data['arms']['title'] = '' + elif game_name in ['pretty']: + data['char']['title'] = '' + data['card']['title'] = '' else: data['title'] = '' else: @@ -54,7 +57,7 @@ def check_write(data: dict, up_char_file, game_name: str = ''): with open(up_char_file, 'r', encoding='utf8') as f: old_data = json.load(f) tmp = old_data - if game_name == 'genshin': + if game_name in ['genshin', 'pretty']: tmp = old_data['char'] if is_expired(tmp): return old_data diff --git a/plugins/draw_card/async_update_game_info.py b/plugins/draw_card/async_update_game_info.py index 949c5331..efb9e92d 100644 --- a/plugins/draw_card/async_update_game_info.py +++ b/plugins/draw_card/async_update_game_info.py @@ -1,6 +1,7 @@ import asyncio import nonebot import os +from services.log import logger from .pcr_handle import update_pcr_info, init_pcr_data from .azur_handle import update_azur_info, init_azur_data from .prts_handle import update_prts_info, init_prts_data @@ -55,9 +56,13 @@ async def async_update_game(): tasks.append(asyncio.ensure_future(update_onmyoji_info())) init_lst.remove(init_onmyoji_data) - await asyncio.gather(*tasks) - for func in init_lst: - await func() + try: + await asyncio.gather(*tasks) + for func in init_lst: + await func() + except asyncio.exceptions.CancelledError: + logger.info('更新异常：CancelledError，再次更新...') + await async_update_game() diff --git a/plugins/draw_card/pretty_handle.py b/plugins/draw_card/pretty_handle.py index 5811baaf..316d4bd9 100644 --- a/plugins/draw_card/pretty_handle.py +++ b/plugins/draw_card/pretty_handle.py @@ -10,6 +10,7 @@ from dataclasses import dataclass from .init_card_pool import init_game_pool from util.init_result import image from configs.path_config import IMAGE_PATH +from services.log import logger try: import ujson as json @@ -89,6 +90,7 @@ async def update_pretty_info(): data, code = await update_info(url, 'pretty_card') if code == 200: ALL_CARD = init_game_pool('pretty_card', data, PrettyChar) + await _init_up_char() async def init_pretty_data(): @@ -100,6 +102,7 @@ async def init_pretty_data(): pretty_card_dict = json.load(f) ALL_CHAR = init_game_pool('pretty', pretty_char_dict, PrettyChar) ALL_CARD = init_game_pool('pretty_card', pretty_card_dict, PrettyChar) + await _init_up_char() # 抽取卡池 @@ -149,7 +152,7 @@ async def _init_up_char(): os.remove(IMAGE_PATH + '/draw_card/pretty/up_char_pool_img.png') if os.path.exists(IMAGE_PATH + '/draw_card/genshin/up_arms_pool_img.png'): os.remove(IMAGE_PATH + '/draw_card/pretty/up_card_pool_img.png') - print(f'成功获取赛马娘当前up信息...当前up池: {_CURRENT_CHAR_POOL_TITLE} & {_CURRENT_CARD_POOL_TITLE}') + logger.info(f'成功获取赛马娘当前up信息...当前up池: {_CURRENT_CHAR_POOL_TITLE} & {_CURRENT_CARD_POOL_TITLE}') for key in up_char_dict.keys(): for star in up_char_dict[key]['up_char'].keys(): up_lst = [] diff --git a/plugins/genshin/query_resource_points/__init__.py b/plugins/genshin/query_resource_points/__init__.py index c318c2fc..e9893b7a 100644 --- a/plugins/genshin/query_resource_points/__init__.py +++ b/plugins/genshin/query_resource_points/__init__.py @@ -36,7 +36,7 @@ async def _(bot: Bot, event: MessageEvent, state: T_State): if resource_name == "" or resource_name not in in_list: return - await qr.send(get_resource_map_mes(resource_name), at_sender=True) + await qr.send(await get_resource_map_mes(resource_name), at_sender=True) logger.info( f"(USER {event.user_id}, GROUP {event.group_id if event.message_type != 'private' else 'private'})" f" 查询原神材料:" + resource_name) @@ -52,7 +52,7 @@ async def _(bot: Bot, event: MessageEvent, state: T_State): rs = re.search('.*?(哪有|哪里有)(.*)', msg) resource_name = rs.group(2) if rs else '' if resource_name: - msg = get_resource_map_mes(resource_name) + msg = await get_resource_map_mes(resource_name) if msg == '发送 原神资源列表 查看所有资源名称': return await rex_qr.send(msg, at_sender=True) @@ -100,7 +100,7 @@ async def _(bot: Bot, event: MessageEvent, state: T_State): ) async def _(): try: - up_label_and_point_list() + await up_label_and_point_list() logger.info(f'每日更新原神材料信息成功！') except Exception as e: logger.error(f'每日更新原神材料信息错误：{e}') diff --git a/plugins/genshin/query_resource_points/icon/0.png b/plugins/genshin/query_resource_points/icon/0.png deleted file mode 100644 index bdf2090b..00000000 Binary files a/plugins/genshin/query_resource_points/icon/0.png and /dev/null differ diff --git a/plugins/genshin/query_resource_points/icon/111.png b/plugins/genshin/query_resource_points/icon/111.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/112.png b/plugins/genshin/query_resource_points/icon/112.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/114.png b/plugins/genshin/query_resource_points/icon/114.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/115.png b/plugins/genshin/query_resource_points/icon/115.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/116.png b/plugins/genshin/query_resource_points/icon/116.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/121.png b/plugins/genshin/query_resource_points/icon/121.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/122.png b/plugins/genshin/query_resource_points/icon/122.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/123.png b/plugins/genshin/query_resource_points/icon/123.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/124.png b/plugins/genshin/query_resource_points/icon/124.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/125.png b/plugins/genshin/query_resource_points/icon/125.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/126.png b/plugins/genshin/query_resource_points/icon/126.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/127.png b/plugins/genshin/query_resource_points/icon/127.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/128.png b/plugins/genshin/query_resource_points/icon/128.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/129.png b/plugins/genshin/query_resource_points/icon/129.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/130.png b/plugins/genshin/query_resource_points/icon/130.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/132.png b/plugins/genshin/query_resource_points/icon/132.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/133.png b/plugins/genshin/query_resource_points/icon/133.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/134.png b/plugins/genshin/query_resource_points/icon/134.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/135.png b/plugins/genshin/query_resource_points/icon/135.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/136.png b/plugins/genshin/query_resource_points/icon/136.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/137.png b/plugins/genshin/query_resource_points/icon/137.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/138.png b/plugins/genshin/query_resource_points/icon/138.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/139.png b/plugins/genshin/query_resource_points/icon/139.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/140.png b/plugins/genshin/query_resource_points/icon/140.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/141.png b/plugins/genshin/query_resource_points/icon/141.png deleted file mode 100644 index 1f08de30..00000000 Binary files a/plugins/genshin/query_resource_points/icon/141.png and /dev/null differ diff --git a/plugins/genshin/query_resource_points/icon/142.png b/plugins/genshin/query_resource_points/icon/142.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/144.png b/plugins/genshin/query_resource_points/icon/144.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/145.png b/plugins/genshin/query_resource_points/icon/145.png deleted file mode 100644 index 7dbb019e..00000000 Binary files a/plugins/genshin/query_resource_points/icon/145.png and /dev/null differ diff --git a/plugins/genshin/query_resource_points/icon/146.png b/plugins/genshin/query_resource_points/icon/146.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/147.png b/plugins/genshin/query_resource_points/icon/147.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/148.png b/plugins/genshin/query_resource_points/icon/148.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/149.png b/plugins/genshin/query_resource_points/icon/149.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/15.png b/plugins/genshin/query_resource_points/icon/15.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/150.png b/plugins/genshin/query_resource_points/icon/150.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/151.png b/plugins/genshin/query_resource_points/icon/151.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/152.png b/plugins/genshin/query_resource_points/icon/152.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/153.png b/plugins/genshin/query_resource_points/icon/153.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/154.png b/plugins/genshin/query_resource_points/icon/154.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/155.png b/plugins/genshin/query_resource_points/icon/155.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/156.png b/plugins/genshin/query_resource_points/icon/156.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/157.png b/plugins/genshin/query_resource_points/icon/157.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/158.png b/plugins/genshin/query_resource_points/icon/158.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/159.png b/plugins/genshin/query_resource_points/icon/159.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/16.png b/plugins/genshin/query_resource_points/icon/16.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/160.png b/plugins/genshin/query_resource_points/icon/160.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/161.png b/plugins/genshin/query_resource_points/icon/161.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/162.png b/plugins/genshin/query_resource_points/icon/162.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/163.png b/plugins/genshin/query_resource_points/icon/163.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/164.png b/plugins/genshin/query_resource_points/icon/164.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/165.png b/plugins/genshin/query_resource_points/icon/165.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/166.png b/plugins/genshin/query_resource_points/icon/166.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/167.png b/plugins/genshin/query_resource_points/icon/167.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/168.png b/plugins/genshin/query_resource_points/icon/168.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/169.png b/plugins/genshin/query_resource_points/icon/169.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/17.png b/plugins/genshin/query_resource_points/icon/17.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/171.png b/plugins/genshin/query_resource_points/icon/171.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/172.png b/plugins/genshin/query_resource_points/icon/172.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/174.png b/plugins/genshin/query_resource_points/icon/174.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/175.png b/plugins/genshin/query_resource_points/icon/175.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/176.png b/plugins/genshin/query_resource_points/icon/176.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/177.png b/plugins/genshin/query_resource_points/icon/177.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/178.png b/plugins/genshin/query_resource_points/icon/178.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/179.png b/plugins/genshin/query_resource_points/icon/179.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/18.png b/plugins/genshin/query_resource_points/icon/18.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/180.png b/plugins/genshin/query_resource_points/icon/180.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/181.png b/plugins/genshin/query_resource_points/icon/181.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/182.png b/plugins/genshin/query_resource_points/icon/182.png deleted file mode 100644 index 233d0451..00000000 Binary files a/plugins/genshin/query_resource_points/icon/182.png and /dev/null differ diff --git a/plugins/genshin/query_resource_points/icon/185.png b/plugins/genshin/query_resource_points/icon/185.png deleted file mode 100644 index 090da066..00000000 Binary files a/plugins/genshin/query_resource_points/icon/185.png and /dev/null differ diff --git a/plugins/genshin/query_resource_points/icon/187.png b/plugins/genshin/query_resource_points/icon/187.png deleted file mode 100644 index e76468b8..00000000 Binary files a/plugins/genshin/query_resource_points/icon/187.png and /dev/null differ diff --git a/plugins/genshin/query_resource_points/icon/188.png b/plugins/genshin/query_resource_points/icon/188.png deleted file mode 100644 index f18f1668..00000000 Binary files a/plugins/genshin/query_resource_points/icon/188.png and /dev/null differ diff --git a/plugins/genshin/query_resource_points/icon/19.png b/plugins/genshin/query_resource_points/icon/19.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/190.png b/plugins/genshin/query_resource_points/icon/190.png deleted file mode 100644 index b8ac291e..00000000 Binary files a/plugins/genshin/query_resource_points/icon/190.png and /dev/null differ diff --git a/plugins/genshin/query_resource_points/icon/191.png b/plugins/genshin/query_resource_points/icon/191.png deleted file mode 100644 index 361c184b..00000000 Binary files a/plugins/genshin/query_resource_points/icon/191.png and /dev/null differ diff --git a/plugins/genshin/query_resource_points/icon/192.png b/plugins/genshin/query_resource_points/icon/192.png deleted file mode 100644 index c4a86cfa..00000000 Binary files a/plugins/genshin/query_resource_points/icon/192.png and /dev/null differ diff --git a/plugins/genshin/query_resource_points/icon/193.png b/plugins/genshin/query_resource_points/icon/193.png deleted file mode 100644 index 8852383a..00000000 Binary files a/plugins/genshin/query_resource_points/icon/193.png and /dev/null differ diff --git a/plugins/genshin/query_resource_points/icon/195.png b/plugins/genshin/query_resource_points/icon/195.png deleted file mode 100644 index fea049f2..00000000 Binary files a/plugins/genshin/query_resource_points/icon/195.png and /dev/null differ diff --git a/plugins/genshin/query_resource_points/icon/2.png b/plugins/genshin/query_resource_points/icon/2.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/20.png b/plugins/genshin/query_resource_points/icon/20.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/21.png b/plugins/genshin/query_resource_points/icon/21.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/22.png b/plugins/genshin/query_resource_points/icon/22.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/23.png b/plugins/genshin/query_resource_points/icon/23.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/24.png b/plugins/genshin/query_resource_points/icon/24.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/25.png b/plugins/genshin/query_resource_points/icon/25.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/26.png b/plugins/genshin/query_resource_points/icon/26.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/27.png b/plugins/genshin/query_resource_points/icon/27.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/28.png b/plugins/genshin/query_resource_points/icon/28.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/29.png b/plugins/genshin/query_resource_points/icon/29.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/3.png b/plugins/genshin/query_resource_points/icon/3.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/30.png b/plugins/genshin/query_resource_points/icon/30.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/31.png b/plugins/genshin/query_resource_points/icon/31.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/32.png b/plugins/genshin/query_resource_points/icon/32.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/33.png b/plugins/genshin/query_resource_points/icon/33.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/34.png b/plugins/genshin/query_resource_points/icon/34.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/35.png b/plugins/genshin/query_resource_points/icon/35.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/36.png b/plugins/genshin/query_resource_points/icon/36.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/37.png b/plugins/genshin/query_resource_points/icon/37.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/38.png b/plugins/genshin/query_resource_points/icon/38.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/39.png b/plugins/genshin/query_resource_points/icon/39.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/40.png b/plugins/genshin/query_resource_points/icon/40.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/41.png b/plugins/genshin/query_resource_points/icon/41.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/42.png b/plugins/genshin/query_resource_points/icon/42.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/43.png b/plugins/genshin/query_resource_points/icon/43.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/44.png b/plugins/genshin/query_resource_points/icon/44.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/45.png b/plugins/genshin/query_resource_points/icon/45.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/46.png b/plugins/genshin/query_resource_points/icon/46.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/47.png b/plugins/genshin/query_resource_points/icon/47.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/48.png b/plugins/genshin/query_resource_points/icon/48.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/49.png b/plugins/genshin/query_resource_points/icon/49.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/5.png b/plugins/genshin/query_resource_points/icon/5.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/52.png b/plugins/genshin/query_resource_points/icon/52.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/53.png b/plugins/genshin/query_resource_points/icon/53.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/54.png b/plugins/genshin/query_resource_points/icon/54.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/55.png b/plugins/genshin/query_resource_points/icon/55.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/56.png b/plugins/genshin/query_resource_points/icon/56.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/57.png b/plugins/genshin/query_resource_points/icon/57.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/58.png b/plugins/genshin/query_resource_points/icon/58.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/59.png b/plugins/genshin/query_resource_points/icon/59.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/6.png b/plugins/genshin/query_resource_points/icon/6.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/61.png b/plugins/genshin/query_resource_points/icon/61.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/62.png b/plugins/genshin/query_resource_points/icon/62.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/63.png b/plugins/genshin/query_resource_points/icon/63.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/64.png b/plugins/genshin/query_resource_points/icon/64.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/65.png b/plugins/genshin/query_resource_points/icon/65.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/66.png b/plugins/genshin/query_resource_points/icon/66.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/67.png b/plugins/genshin/query_resource_points/icon/67.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/68.png b/plugins/genshin/query_resource_points/icon/68.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/69.png b/plugins/genshin/query_resource_points/icon/69.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/70.png b/plugins/genshin/query_resource_points/icon/70.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/71.png b/plugins/genshin/query_resource_points/icon/71.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/72.png b/plugins/genshin/query_resource_points/icon/72.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/73.png b/plugins/genshin/query_resource_points/icon/73.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/74.png b/plugins/genshin/query_resource_points/icon/74.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/75.png b/plugins/genshin/query_resource_points/icon/75.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/76.png b/plugins/genshin/query_resource_points/icon/76.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/77.png b/plugins/genshin/query_resource_points/icon/77.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/78.png b/plugins/genshin/query_resource_points/icon/78.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/79.png b/plugins/genshin/query_resource_points/icon/79.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/8.png b/plugins/genshin/query_resource_points/icon/8.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/80.png b/plugins/genshin/query_resource_points/icon/80.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/81.png b/plugins/genshin/query_resource_points/icon/81.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/82.png b/plugins/genshin/query_resource_points/icon/82.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/83.png b/plugins/genshin/query_resource_points/icon/83.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/85.png b/plugins/genshin/query_resource_points/icon/85.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/87.png b/plugins/genshin/query_resource_points/icon/87.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/9.png b/plugins/genshin/query_resource_points/icon/9.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/90.png b/plugins/genshin/query_resource_points/icon/90.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/91.png b/plugins/genshin/query_resource_points/icon/91.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/92.png b/plugins/genshin/query_resource_points/icon/92.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/93.png b/plugins/genshin/query_resource_points/icon/93.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/icon/94.png b/plugins/genshin/query_resource_points/icon/94.png deleted file mode 100644 index e69de29b..00000000 diff --git a/plugins/genshin/query_resource_points/query_resource.py b/plugins/genshin/query_resource_points/query_resource.py index 4ffee4ab..2c4451ed 100644 --- a/plugins/genshin/query_resource_points/query_resource.py +++ b/plugins/genshin/query_resource_points/query_resource.py @@ -7,6 +7,7 @@ import time import base64 from configs.path_config import IMAGE_PATH from util.init_result import image +from services.log import logger import asyncio import nonebot @@ -18,7 +19,9 @@ POINT_LIST_URL = 'https://api-static.mihoyo.com/common/blackboard/ys_obc/v1/map/ header = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) ' \ 'Chrome/84.0.4147.105 Safari/537.36' -FILE_PATH = os.path.dirname(__file__) +FILE_PATH = IMAGE_PATH + 'genshin/' +if not os.path.exists(IMAGE_PATH + 'genshin/genshin_icon/'): + os.mkdir(IMAGE_PATH + 'genshin/genshin_icon/') MAP_PATH = None MAP_IMAGE = None @@ -37,7 +40,7 @@ async def init(): MAP_PATH = os.path.join(IMAGE_PATH, "genshin", "seek_god_eye", "icon", "map_icon.jpg") MAP_IMAGE = await asyncio.get_event_loop().run_in_executor(None, Image.open, MAP_PATH) MAP_SIZE = MAP_IMAGE.size - await asyncio.get_event_loop().run_in_executor(None, up_label_and_point_list) + await up_label_and_point_list() data = { @@ -84,7 +87,7 @@ def up_icon_image(sublist): id = sublist["id"] icon_url = sublist["icon"] - icon_path = os.path.join(FILE_PATH, "icon", f"{id}.png") + icon_path = os.path.join(FILE_PATH, "genshin_icon", f"{id}.png") if not os.path.exists(icon_path): schedule = request.Request(icon_url) @@ -93,8 +96,9 @@ def up_icon_image(sublist): icon = Image.open(f) icon = icon.resize((150, 150)) - box_alpha = Image.open(os.path.join(FILE_PATH, "icon", "box_alpha.png")).getchannel("A") - box = Image.open(os.path.join(FILE_PATH, "icon", "box.png")) + box_alpha = Image.open(os.path.join(FILE_PATH, "genshin_icon", "box_alpha.png")).getchannel("A") + box = Image.open(os.path.join(FILE_PATH, "genshin_icon", "box.png")) + logger.info(f'原神资源更新 --> {sublist}') try: icon_alpha = icon.getchannel("A") @@ -114,8 +118,18 @@ def up_icon_image(sublist): bg.save(icon_file) -def up_label_and_point_list(): +async def up_label_and_point_list(): # 更新label列表和资源点列表 + try: + if os.path.exists(os.path.dirname(__file__) + '/icon/box_alpha.png'): + os.rename(os.path.dirname(__file__) + '/icon/box_alpha.png', IMAGE_PATH + 'genshin/genshin_icon/box_alpha.png') + except: + pass + try: + if os.path.exists(os.path.dirname(__file__) + '/icon/box.png'): + os.rename(os.path.dirname(__file__) + '/icon/box.png', IMAGE_PATH + 'genshin/genshin_icon/box.png') + except: + pass schedule = request.Request(LABEL_URL) schedule.add_header('User-Agent', header) @@ -123,16 +137,18 @@ def up_label_and_point_list(): if f.code != 200: # 检查返回的状态码是否是200 raise ValueError(f"资源标签列表初始化失败，错误代码{f.code}") label_data = json.loads(f.read().decode('utf-8')) - + tasks = [] for label in label_data["data"]["tree"]: data["all_resource_type"][str(label["id"])] = label for sublist in label["children"]: data["all_resource_type"][str(sublist["id"])] = sublist data["can_query_type_list"][sublist["name"]] = str(sublist["id"]) - up_icon_image(sublist) + tasks.append(asyncio.get_event_loop().run_in_executor(None, up_icon_image, sublist)) + # logger.info(f'原神资源更新 --> {sublist}') label["children"] = [] + await asyncio.gather(*tasks) schedule = request.Request(POINT_LIST_URL) schedule.add_header('User-Agent', header) @@ -179,12 +195,12 @@ class Resource_map(object): def get_icon_path(self): # 检查有没有图标，有返回正确图标，没有返回默认图标 - icon_path = os.path.join(FILE_PATH, "icon", f"{self.resource_id}.png") + icon_path = os.path.join(FILE_PATH, "genshin_icon", f"{self.resource_id}.png") if os.path.exists(icon_path): return icon_path else: - return os.path.join(FILE_PATH, "icon", "0.png") + return os.path.join(FILE_PATH, "genshin_icon", "0.png") def get_resource_point_list(self): temp_list = [] @@ -247,9 +263,9 @@ class Resource_map(object): return len(self.resource_xy_list) -def get_resource_map_mes(name): +async def get_resource_map_mes(name): if data["date"] != time.strftime("%d"): - up_label_and_point_list() + await up_label_and_point_list() if not (name in data["can_query_type_list"]): return f"没有 {name} 这种资源。\n发送 原神资源列表 查看所有资源名称" diff --git a/plugins/group_handle/__init__.py b/plugins/group_handle/__init__.py index c6e1981f..4bd25779 100644 --- a/plugins/group_handle/__init__.py +++ b/plugins/group_handle/__init__.py @@ -25,17 +25,18 @@ __usage__ = '用法：无' export = require("admin_bot_manage") # 群员增加处理 -group_increase_handle = on_notice(priority=5) +group_increase_handle = on_notice(priority=1, block=False) # 群员减少处理 -group_decrease_handle = on_notice(priority=5) +group_decrease_handle = on_notice(priority=1, block=False) # （群管理）加群同意请求 -add_group = on_request(priority=5) +add_group = on_request(priority=1, block=False) @group_increase_handle.handle() async def _(bot: Bot, event: GroupIncreaseNoticeEvent, state: dict): if event.user_id == int(bot.self_id): await export.update_member_info(event.group_id) + logger.info('被邀请入群，自动更新群成员列表...') else: join_time = datetime.now() user_info = await bot.get_group_member_info(group_id=event.group_id, user_id=event.user_id) diff --git a/plugins/help/__init__.py b/plugins/help/__init__.py index b5e551de..a25142b1 100644 --- a/plugins/help/__init__.py +++ b/plugins/help/__init__.py @@ -39,7 +39,7 @@ async def _(bot: Bot, event: GroupMessageEvent, state: T_State): async def _(bot: Bot, event: PrivateMessageEvent, state: T_State): msg = get_message_text(event.json()) if not msg: - await _help.finish(image('help.png')) + await _help.finish(image(abspath='')) else: await _help.finish(get_plugin_help(msg)) diff --git a/plugins/help/config.py b/plugins/help/config.py index 76add431..4e1ddfc3 100644 --- a/plugins/help/config.py +++ b/plugins/help/config.py @@ -49,7 +49,6 @@ entertainment_help = { } # 其他 other_help = [ - '群内csgo服务器（指定群） --> 指令:服务器/ip(其他群请私聊)', '查看当前的群欢迎消息 --> 指令:群欢迎消息', '这是一份正经的自我介绍 --> 指令:自我介绍', '不得看看自己权力多大？ --> 指令:我的权限', diff --git a/plugins/pixiv/data_source.py b/plugins/pixiv/data_source.py index 017e07be..7ed8f086 100644 --- a/plugins/pixiv/data_source.py +++ b/plugins/pixiv/data_source.py @@ -47,7 +47,7 @@ async def download_pixiv_imgs(urls: list, user_id: int) -> str: async def search_pixiv_urls(keyword: str, num: int, order: str, r18: int) -> 'list, list': - url = 'https://rsshub.app/pixiv/search/{}/{}/{}'.format(keyword, order, r18) + url = f'{RSSHUBAPP}pixiv/search/{keyword}/{order}/{r18}' return await parser_data(url, num) diff --git a/plugins/russian/__init__.py b/plugins/russian/__init__.py index 7243290e..16b34562 100644 --- a/plugins/russian/__init__.py +++ b/plugins/russian/__init__.py @@ -288,8 +288,11 @@ async def end_game(bot: Bot, event: GroupMessageEvent): lose_name = player2_name rand = random.randint(0, 5) money = rs_player[event.group_id]['money'] - fee = int(money * float(rand) / 100) - fee = 1 if fee < 1 and rand != 0 else fee + if money > 10: + fee = int(money * float(rand) / 100) + fee = 1 if fee < 1 and rand != 0 else fee + else: + fee = 0 await RussianUser.add_count(win_user_id, event.group_id, 'win') await RussianUser.add_count(lose_user_id, event.group_id, 'lose') await RussianUser.money(win_user_id, event.group_id, 'win', money - fee) diff --git a/plugins/send_img/__init__.py b/plugins/send_img/__init__.py index 4348cf39..17df799a 100644 --- a/plugins/send_img/__init__.py +++ b/plugins/send_img/__init__.py @@ -28,8 +28,6 @@ send_img = on_command("img", aliases=cmd, priority=5, block=True) @send_img.handle() async def _(bot: Bot, event: Event, state: T_State): img_id = str(event.get_message()) - if img_id in ['帮助']: - await send_img.finish(__plugin_usage__) path = cn2py(state["_prefix"]["raw_command"]) + '/' if not os.path.exists(IMAGE_PATH + path): logger.warning(f'未找到 {path} 文件夹，调用取消!') diff --git a/plugins/server_ip.py b/plugins/server_ip.py deleted file mode 100644 index 5725771f..00000000 --- a/plugins/server_ip.py +++ /dev/null @@ -1,37 +0,0 @@ -from nonebot import on_command -from nonebot.adapters.cqhttp import Bot, PrivateMessageEvent, GroupMessageEvent -from nonebot.typing import T_State -from nonebot.rule import to_me - -__plugin_name__ = '服务器' -__plugin_usage__ = '用法： 无' - - -server_ip = on_command("服务器", aliases={'ip'}, rule=to_me(), priority=5, block=True) - - -@server_ip.handle() -async def _(bot: Bot, event: PrivateMessageEvent, state: T_State): - await server_ip.finish("|* 请不要发给其他人！ *|\n" - "\t121.40.195.22\n" - "|* 请不要发给其他人！ *|\n" - "csgo ~号键控制台输入 connect 121.40.195.22 进入服务器\n" - "然后再公屏输入 !diy 来使用皮肤（英文感叹号，注意）\n" - "【说不定可以凑到内战噢，欢迎~{娱乐为主}】", at_sender=True) - - -@server_ip.handle() -async def _(bot: Bot, event: GroupMessageEvent, state: T_State): - if event.group_id == 698279647: - await server_ip.finish("嗨呀！当前服务器地址是:" - "\ncsgo:\n\tay: 121.40.195.22\n\t" - "wzt: 101.200.199.143\n\t夜之北枭: 101.132.170.254\n我的世界:\n\t47.111.1.220：25565") - elif event.group_id == 1046451860: - await server_ip.finish("嗨呀！当前服务器地址是:\n121.40.195.22\n !diy") - else: - await server_ip.finish("不好意思呀，小真寻不能为你使用此功能，因为服务器IP是真寻的小秘密呀！", at_sender=True) - - - - - diff --git a/plugins/shop/gold_redbag/__init__.py b/plugins/shop/gold_redbag/__init__.py index d368dd3e..379c1114 100644 --- a/plugins/shop/gold_redbag/__init__.py +++ b/plugins/shop/gold_redbag/__init__.py @@ -64,17 +64,6 @@ async def _(matcher: Matcher, bot: Bot, event: PokeNotifyEvent, state: T_State): else: if matcher.module == 'gold_redbag': raise IgnoredException('目前没有红包...') - # for data in [festive_redbag_data, redbag_data]: - # if data.get(event.group_id): - # if data[event.group_id].get('user_id') != 0: - # if event.user_id not in data[event.group_id]['open_user']: - # if matcher.module == 'poke': - # raise IgnoredException('目前正在抢红包...') - # else: - # open_flag = True - # if open_flag: - # if matcher.module == 'gold_redbag': - # raise IgnoredException('目前没有红包...') except AttributeError: pass @@ -122,6 +111,11 @@ async def _(bot: Bot, event: GroupMessageEvent, state: T_State): @open_.handle() async def _(bot: Bot, event: GroupMessageEvent, state: T_State): global redbag_data, festive_redbag_data + msg = get_message_text(event.json()) + msg = msg.replace('!', '').replace('！', '').replace(',', '').replace('，', '').replace('.', '').replace('。', '') + if msg: + if msg.find('红包') == -1: + return flag1 = True flag2 = True open_flag1 = True diff --git a/plugins/super_cmd/__init__.py b/plugins/super_cmd/__init__.py index b057aaaf..6effccd9 100644 --- a/plugins/super_cmd/__init__.py +++ b/plugins/super_cmd/__init__.py @@ -2,13 +2,14 @@ from nonebot import on_command from nonebot.permission import SUPERUSER from models.level_user import LevelUser from nonebot.typing import T_State -from nonebot.adapters import Bot, Event +from nonebot.adapters.cqhttp import Bot, Event, MessageEvent, Message from nonebot.rule import to_me from util.utils import get_message_at, get_message_text, is_number, get_bot from services.log import logger from .data_source import open_remind, close_remind from models.group_info import GroupInfo from models.friend_user import FriendUser +from util.init_result import at __plugin_name__ = '超级用户指令 [Hidden]' @@ -26,13 +27,33 @@ update_friend_info = on_command('更新好友信息', rule=to_me(), permission=S @super_cmd.handle() -async def _(bot: Bot, event: Event, state: T_State): +async def _(bot: Bot, event: MessageEvent, state: T_State): try: args = get_message_text(event.json()).strip().split(" ") - qq = int(get_message_at(event.json())[0]) + qq = get_message_at(event.json()) + flag = -1 + if not qq: + if len(args) > 2: + if is_number(args[0]) and is_number(args[1]) and is_number(args[2]): + qq = int(args[0]) + group_id = int(args[1]) + level = int(args[2]) + flag = 1 + else: + await super_cmd.finish('所有参数必须是数字！', at_sender=True) + else: + await super_cmd.finish('权限参数不完全\n\t格式：添加/删除权限 [at] [level]' + '\n\t格式：添加/删除权限 [qq] [group] [level]', at_sender=True) + else: + qq = int(qq[0]) + group_id = event.group_id + flag = 2 + if is_number(args[0]): + level = int(args[0]) + else: + await super_cmd.finish('权限等级必须是数字！', at_sender=True) if state["_prefix"]["raw_command"][:2] == "添加": - level = int(args[0]) - if await LevelUser.set_level(qq, event.group_id, level, 1): + if await LevelUser.set_level(qq, group_id, level, 1): result = "添加管理成功, 权限: " + str(level) else: result = "管理已存在, 更新权限: " + str(level) @@ -41,7 +62,11 @@ async def _(bot: Bot, event: Event, state: T_State): result = "删除管理成功!" else: result = "该账号无管理权限!" - await super_cmd.send(result) + if flag == 2: + await super_cmd.send(result) + elif flag == 1: + await bot.send_group_msg(group_id=group_id, message=Message(f'{at(qq)}管理员已为你修改' + f'权限\n--------\n你当前的权限等级：{level}')) except Exception as e: await super_cmd.send("执行指令失败!") logger.error(f'执行指令失败 e{e}') diff --git a/plugins/upload_img/__init__.py b/plugins/upload_img/__init__.py index e9ae2169..647805ca 100644 --- a/plugins/upload_img/__init__.py +++ b/plugins/upload_img/__init__.py @@ -14,7 +14,7 @@ from configs.config import IMAGE_DIR_LIST __plugin_name__ = '上传图片' __plugin_usage__ = '上传图片帮助：\n\t' \ '1.查看列表 --> 指令: 上传图片 列表/目录\n\t' \ - '2.上传图片 序号 图片(在文字后跟图片即可), 即在相应目录下添加图片\n\t\t示例: 上传图片 1 图片(在文字后跟图片即可)' + '2.上传图片 [序号] [图片], 即在相应目录下添加图片\n\t\t示例: 上传图片 1 [图片]' upload_img = on_command("上传图片", rule=to_me(), priority=5, block=True) diff --git a/resources/img/cases/guangpu/AK-47 - xuexingyundong.png b/resources/img/cases/guangpu/AK-47 - xuexingyundong.png deleted file mode 100644 index 03679673..00000000 Binary files a/resources/img/cases/guangpu/AK-47 - xuexingyundong.png and /dev/null differ diff --git a/resources/img/cases/guangpu/AWP - fushengrumeng.png b/resources/img/cases/guangpu/AWP - fushengrumeng.png deleted file mode 100644 index dfa897e1..00000000 Binary files a/resources/img/cases/guangpu/AWP - fushengrumeng.png and /dev/null differ diff --git a/resources/img/cases/guangpu/CZ75 - xiangliu.png b/resources/img/cases/guangpu/CZ75 - xiangliu.png deleted file mode 100644 index 762b046d..00000000 Binary files a/resources/img/cases/guangpu/CZ75 - xiangliu.png and /dev/null differ diff --git a/resources/img/cases/guangpu/FN57 - maoxixueguan.png b/resources/img/cases/guangpu/FN57 - maoxixueguan.png deleted file mode 100644 index 55b3b3cf..00000000 Binary files a/resources/img/cases/guangpu/FN57 - maoxixueguan.png and /dev/null differ diff --git a/resources/img/cases/guangpu/M249 - cuilvjianduwa.png b/resources/img/cases/guangpu/M249 - cuilvjianduwa.png deleted file mode 100644 index 9189ae27..00000000 Binary files a/resources/img/cases/guangpu/M249 - cuilvjianduwa.png and /dev/null differ diff --git a/resources/img/cases/guangpu/M4A1 - huimiezhe 2000.png b/resources/img/cases/guangpu/M4A1 - huimiezhe 2000.png deleted file mode 100644 index a96c295f..00000000 Binary files a/resources/img/cases/guangpu/M4A1 - huimiezhe 2000.png and /dev/null differ diff --git a/resources/img/cases/guangpu/MAC-10 - juejiezhixing.png b/resources/img/cases/guangpu/MAC-10 - juejiezhixing.png deleted file mode 100644 index 5215e106..00000000 Binary files a/resources/img/cases/guangpu/MAC-10 - juejiezhixing.png and /dev/null differ diff --git a/resources/img/cases/guangpu/MP7 - feizhoubuluo.png b/resources/img/cases/guangpu/MP7 - feizhoubuluo.png deleted file mode 100644 index f4df11f0..00000000 Binary files a/resources/img/cases/guangpu/MP7 - feizhoubuluo.png and /dev/null differ diff --git a/resources/img/cases/guangpu/P250 - lianyi.png b/resources/img/cases/guangpu/P250 - lianyi.png deleted file mode 100644 index d25a8673..00000000 Binary files a/resources/img/cases/guangpu/P250 - lianyi.png and /dev/null differ diff --git a/resources/img/cases/guangpu/PP-yeniu - conglinhualiu.png b/resources/img/cases/guangpu/PP-yeniu - conglinhualiu.png deleted file mode 100644 index 9da72469..00000000 Binary files a/resources/img/cases/guangpu/PP-yeniu - conglinhualiu.png and /dev/null differ diff --git a/resources/img/cases/guangpu/SCAR-20 - lantu.png b/resources/img/cases/guangpu/SCAR-20 - lantu.png deleted file mode 100644 index 0fef06db..00000000 Binary files a/resources/img/cases/guangpu/SCAR-20 - lantu.png and /dev/null differ diff --git a/resources/img/cases/guangpu/UMP-45 - zhijia.png b/resources/img/cases/guangpu/UMP-45 - zhijia.png deleted file mode 100644 index 8b71a062..00000000 Binary files a/resources/img/cases/guangpu/UMP-45 - zhijia.png and /dev/null differ diff --git a/resources/img/cases/guangpu/USP - heisemeiying.png b/resources/img/cases/guangpu/USP - heisemeiying.png deleted file mode 100644 index 169ce1c4..00000000 Binary files a/resources/img/cases/guangpu/USP - heisemeiying.png and /dev/null differ diff --git a/resources/img/cases/guangpu/XM1014 - siji.png b/resources/img/cases/guangpu/XM1014 - siji.png deleted file mode 100644 index caad273c..00000000 Binary files a/resources/img/cases/guangpu/XM1014 - siji.png and /dev/null differ diff --git a/resources/img/cases/guangpu/anyingshuangbi - damashigegang.png b/resources/img/cases/guangpu/anyingshuangbi - damashigegang.png deleted file mode 100644 index 4f3fb07e..00000000 Binary files a/resources/img/cases/guangpu/anyingshuangbi - damashigegang.png and /dev/null differ diff --git a/resources/img/cases/guangpu/anyingshuangbi - duopulei.png b/resources/img/cases/guangpu/anyingshuangbi - duopulei.png deleted file mode 100644 index 85173f28..00000000 Binary files a/resources/img/cases/guangpu/anyingshuangbi - duopulei.png and /dev/null differ diff --git a/resources/img/cases/guangpu/anyingshuangbi - huya.png b/resources/img/cases/guangpu/anyingshuangbi - huya.png deleted file mode 100644 index 1d847cea..00000000 Binary files a/resources/img/cases/guangpu/anyingshuangbi - huya.png and /dev/null differ diff --git a/resources/img/cases/guangpu/anyingshuangbi - jianbiandalishi.png b/resources/img/cases/guangpu/anyingshuangbi - jianbiandalishi.png deleted file mode 100644 index da77c554..00000000 Binary files a/resources/img/cases/guangpu/anyingshuangbi - jianbiandalishi.png and /dev/null differ diff --git a/resources/img/cases/guangpu/anyingshuangbi - waibiaoshengxiu.png b/resources/img/cases/guangpu/anyingshuangbi - waibiaoshengxiu.png deleted file mode 100644 index 7b8c2e64..00000000 Binary files a/resources/img/cases/guangpu/anyingshuangbi - waibiaoshengxiu.png and /dev/null differ diff --git a/resources/img/cases/guangpu/anyingshuangbi - zhimingziluolan.png b/resources/img/cases/guangpu/anyingshuangbi - zhimingziluolan.png deleted file mode 100644 index 74894a10..00000000 Binary files a/resources/img/cases/guangpu/anyingshuangbi - zhimingziluolan.png and /dev/null differ diff --git a/resources/img/cases/guangpu/baoyiliedao - damashigegang.png b/resources/img/cases/guangpu/baoyiliedao - damashigegang.png deleted file mode 100644 index 8a6862e9..00000000 Binary files a/resources/img/cases/guangpu/baoyiliedao - damashigegang.png and /dev/null differ diff --git a/resources/img/cases/guangpu/baoyiliedao - duopulei.png b/resources/img/cases/guangpu/baoyiliedao - duopulei.png deleted file mode 100644 index 39091a44..00000000 Binary files a/resources/img/cases/guangpu/baoyiliedao - duopulei.png and /dev/null differ diff --git a/resources/img/cases/guangpu/baoyiliedao - huya.png b/resources/img/cases/guangpu/baoyiliedao - huya.png deleted file mode 100644 index 7c4e1981..00000000 Binary files a/resources/img/cases/guangpu/baoyiliedao - huya.png and /dev/null differ diff --git a/resources/img/cases/guangpu/baoyiliedao - jianbiandalishi.png b/resources/img/cases/guangpu/baoyiliedao - jianbiandalishi.png deleted file mode 100644 index ae7d4ed5..00000000 Binary files a/resources/img/cases/guangpu/baoyiliedao - jianbiandalishi.png and /dev/null differ diff --git a/resources/img/cases/guangpu/baoyiliedao - waibiaoshengxiu.png b/resources/img/cases/guangpu/baoyiliedao - waibiaoshengxiu.png deleted file mode 100644 index d02a4010..00000000 Binary files a/resources/img/cases/guangpu/baoyiliedao - waibiaoshengxiu.png and /dev/null differ diff --git a/resources/img/cases/guangpu/baoyiliedao - zhimingziluolan.png b/resources/img/cases/guangpu/baoyiliedao - zhimingziluolan.png deleted file mode 100644 index 53b759d6..00000000 Binary files a/resources/img/cases/guangpu/baoyiliedao - zhimingziluolan.png and /dev/null differ diff --git a/resources/img/cases/guangpu/hudiedao - damashigegang.png b/resources/img/cases/guangpu/hudiedao - damashigegang.png deleted file mode 100644 index 464408e4..00000000 Binary files a/resources/img/cases/guangpu/hudiedao - damashigegang.png and /dev/null differ diff --git a/resources/img/cases/guangpu/hudiedao - duopulei.png b/resources/img/cases/guangpu/hudiedao - duopulei.png deleted file mode 100644 index 9bba8f34..00000000 Binary files a/resources/img/cases/guangpu/hudiedao - duopulei.png and /dev/null differ diff --git a/resources/img/cases/guangpu/hudiedao - huya.png b/resources/img/cases/guangpu/hudiedao - huya.png deleted file mode 100644 index c46b83c4..00000000 Binary files a/resources/img/cases/guangpu/hudiedao - huya.png and /dev/null differ diff --git a/resources/img/cases/guangpu/hudiedao - jianbiandalishi.png b/resources/img/cases/guangpu/hudiedao - jianbiandalishi.png deleted file mode 100644 index e7a22b33..00000000 Binary files a/resources/img/cases/guangpu/hudiedao - jianbiandalishi.png and /dev/null differ diff --git a/resources/img/cases/guangpu/hudiedao - waibiaoshengxiu.png b/resources/img/cases/guangpu/hudiedao - waibiaoshengxiu.png deleted file mode 100644 index 1c5541b8..00000000 Binary files a/resources/img/cases/guangpu/hudiedao - waibiaoshengxiu.png and /dev/null differ diff --git a/resources/img/cases/guangpu/hudiedao - zhimingziluolan.png b/resources/img/cases/guangpu/hudiedao - zhimingziluolan.png deleted file mode 100644 index dd703adc..00000000 Binary files a/resources/img/cases/guangpu/hudiedao - zhimingziluolan.png and /dev/null differ diff --git a/resources/img/cases/guangpu/jialier AR - shenhonghaixiao.png b/resources/img/cases/guangpu/jialier AR - shenhonghaixiao.png deleted file mode 100644 index e6e58be5..00000000 Binary files a/resources/img/cases/guangpu/jialier AR - shenhonghaixiao.png and /dev/null differ diff --git a/resources/img/cases/guangpu/jieduanxiandanqiang - suolu.png b/resources/img/cases/guangpu/jieduanxiandanqiang - suolu.png deleted file mode 100644 index c4e425ed..00000000 Binary files a/resources/img/cases/guangpu/jieduanxiandanqiang - suolu.png and /dev/null differ diff --git a/resources/img/cases/guangpu/lieshazhebishou - damashigegang.png b/resources/img/cases/guangpu/lieshazhebishou - damashigegang.png deleted file mode 100644 index 432bcb67..00000000 Binary files a/resources/img/cases/guangpu/lieshazhebishou - damashigegang.png and /dev/null differ diff --git a/resources/img/cases/guangpu/lieshazhebishou - duopulei.png b/resources/img/cases/guangpu/lieshazhebishou - duopulei.png deleted file mode 100644 index 08cb33c5..00000000 Binary files a/resources/img/cases/guangpu/lieshazhebishou - duopulei.png and /dev/null differ diff --git a/resources/img/cases/guangpu/lieshazhebishou - huya.png b/resources/img/cases/guangpu/lieshazhebishou - huya.png deleted file mode 100644 index f47a840b..00000000 Binary files a/resources/img/cases/guangpu/lieshazhebishou - huya.png and /dev/null differ diff --git a/resources/img/cases/guangpu/lieshazhebishou - jianbiandalishi.png b/resources/img/cases/guangpu/lieshazhebishou - jianbiandalishi.png deleted file mode 100644 index ed91a161..00000000 Binary files a/resources/img/cases/guangpu/lieshazhebishou - jianbiandalishi.png and /dev/null differ diff --git a/resources/img/cases/guangpu/lieshazhebishou - waibiaoshengxiu.png b/resources/img/cases/guangpu/lieshazhebishou - waibiaoshengxiu.png deleted file mode 100644 index 65688380..00000000 Binary files a/resources/img/cases/guangpu/lieshazhebishou - waibiaoshengxiu.png and /dev/null differ diff --git a/resources/img/cases/guangpu/lieshazhebishou - zhimingziluolan.png b/resources/img/cases/guangpu/lieshazhebishou - zhimingziluolan.png deleted file mode 100644 index 0b290ddb..00000000 Binary files a/resources/img/cases/guangpu/lieshazhebishou - zhimingziluolan.png and /dev/null differ diff --git a/resources/img/cases/guangpu/shamozhiying - xiushilieyan.png b/resources/img/cases/guangpu/shamozhiying - xiushilieyan.png deleted file mode 100644 index 685c58db..00000000 Binary files a/resources/img/cases/guangpu/shamozhiying - xiushilieyan.png and /dev/null differ diff --git a/resources/img/cases/guangpu/wandao - damashigegang.png b/resources/img/cases/guangpu/wandao - damashigegang.png deleted file mode 100644 index 0f29cfbf..00000000 Binary files a/resources/img/cases/guangpu/wandao - damashigegang.png and /dev/null differ diff --git a/resources/img/cases/guangpu/wandao - duopulei.png b/resources/img/cases/guangpu/wandao - duopulei.png deleted file mode 100644 index 6d661dae..00000000 Binary files a/resources/img/cases/guangpu/wandao - duopulei.png and /dev/null differ diff --git a/resources/img/cases/guangpu/wandao - huya.png b/resources/img/cases/guangpu/wandao - huya.png deleted file mode 100644 index 7b56e548..00000000 Binary files a/resources/img/cases/guangpu/wandao - huya.png and /dev/null differ diff --git a/resources/img/cases/guangpu/wandao - jianbiandalishi.png b/resources/img/cases/guangpu/wandao - jianbiandalishi.png deleted file mode 100644 index ae0ceaa0..00000000 Binary files a/resources/img/cases/guangpu/wandao - jianbiandalishi.png and /dev/null differ diff --git a/resources/img/cases/guangpu/wandao - waibiaoshengxiu.png b/resources/img/cases/guangpu/wandao - waibiaoshengxiu.png deleted file mode 100644 index 24c9209f..00000000 Binary files a/resources/img/cases/guangpu/wandao - waibiaoshengxiu.png and /dev/null differ diff --git a/resources/img/cases/guangpu/wandao - zhimingziluolan.png b/resources/img/cases/guangpu/wandao - zhimingziluolan.png deleted file mode 100644 index eb9d1e68..00000000 Binary files a/resources/img/cases/guangpu/wandao - zhimingziluolan.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/AWP - wanglingzhizhu.png b/resources/img/cases/kuangyadaxingdong/AWP - wanglingzhizhu.png deleted file mode 100644 index 2a90e22e..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/AWP - wanglingzhizhu.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/CZ75 - shichou.png b/resources/img/cases/kuangyadaxingdong/CZ75 - shichou.png deleted file mode 100644 index 40f46b81..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/CZ75 - shichou.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/FN57 - tonghuachengbao.png b/resources/img/cases/kuangyadaxingdong/FN57 - tonghuachengbao.png deleted file mode 100644 index 3e0926d0..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/FN57 - tonghuachengbao.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/G3SG1 - xuexingmicai.png b/resources/img/cases/kuangyadaxingdong/G3SG1 - xuexingmicai.png deleted file mode 100644 index dd75718b..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/G3SG1 - xuexingmicai.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/M249 - denggaoxian.png b/resources/img/cases/kuangyadaxingdong/M249 - denggaoxian.png deleted file mode 100644 index 4e20683e..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/M249 - denggaoxian.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/M4A1 - yinhuaji.png b/resources/img/cases/kuangyadaxingdong/M4A1 - yinhuaji.png deleted file mode 100644 index 2681ed4e..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/M4A1 - yinhuaji.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/M4A4 - saibo.png b/resources/img/cases/kuangyadaxingdong/M4A4 - saibo.png deleted file mode 100644 index 5a227b26..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/M4A4 - saibo.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/MP5-SD - lingdianxingdong.png b/resources/img/cases/kuangyadaxingdong/MP5-SD - lingdianxingdong.png deleted file mode 100644 index 1936a136..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/MP5-SD - lingdianxingdong.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/P250 - wuranwu.png b/resources/img/cases/kuangyadaxingdong/P250 - wuranwu.png deleted file mode 100644 index 0aab3c4e..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/P250 - wuranwu.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/P90 - daguaishouRUSH.png b/resources/img/cases/kuangyadaxingdong/P90 - daguaishouRUSH.png deleted file mode 100644 index c7942d6e..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/P90 - daguaishouRUSH.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/SSG 08 - douqiang.png b/resources/img/cases/kuangyadaxingdong/SSG 08 - douqiang.png deleted file mode 100644 index 9fd88095..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/SSG 08 - douqiang.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/UMP-45 - jinbihuihuang.png b/resources/img/cases/kuangyadaxingdong/UMP-45 - jinbihuihuang.png deleted file mode 100644 index ed153db7..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/UMP-45 - jinbihuihuang.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/USP - xiaolvguai.png b/resources/img/cases/kuangyadaxingdong/USP - xiaolvguai.png deleted file mode 100644 index 5acf33d7..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/USP - xiaolvguai.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/geluoke - heisemeiying.png b/resources/img/cases/kuangyadaxingdong/geluoke - heisemeiying.png deleted file mode 100644 index 7d13767b..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/geluoke - heisemeiying.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/guoshou - changjinglu.png b/resources/img/cases/kuangyadaxingdong/guoshou - changjinglu.png deleted file mode 100644 index df040fbc..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/guoshou - changjinglu.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/guoshou - jinggao！.png b/resources/img/cases/kuangyadaxingdong/guoshou - jinggao！.png deleted file mode 100644 index ff2cc8fb..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/guoshou - jinggao！.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/guoshou - mangshe.png b/resources/img/cases/kuangyadaxingdong/guoshou - mangshe.png deleted file mode 100644 index d825947a..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/guoshou - mangshe.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/guoshou - shamotoujin.png b/resources/img/cases/kuangyadaxingdong/guoshou - shamotoujin.png deleted file mode 100644 index 6539e1c0..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/guoshou - shamotoujin.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/jialier AR - pohuaizhe.png b/resources/img/cases/kuangyadaxingdong/jialier AR - pohuaizhe.png deleted file mode 100644 index 01d6233e..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/jialier AR - pohuaizhe.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/jiashishoutao - feihongliezan.png b/resources/img/cases/kuangyadaxingdong/jiashishoutao - feihongliezan.png deleted file mode 100644 index a64f2961..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/jiashishoutao - feihongliezan.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/jiashishoutao - meizhoubaonvwang.png b/resources/img/cases/kuangyadaxingdong/jiashishoutao - meizhoubaonvwang.png deleted file mode 100644 index 7f25b98c..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/jiashishoutao - meizhoubaonvwang.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/jiashishoutao - xizhuanggelv.png b/resources/img/cases/kuangyadaxingdong/jiashishoutao - xizhuanggelv.png deleted file mode 100644 index f16f4f7d..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/jiashishoutao - xizhuanggelv.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/jiashishoutao - xuebao.png b/resources/img/cases/kuangyadaxingdong/jiashishoutao - xuebao.png deleted file mode 100644 index 40a37619..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/jiashishoutao - xuebao.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/kuangyashoutao - feicui.png b/resources/img/cases/kuangyadaxingdong/kuangyashoutao - feicui.png deleted file mode 100644 index dd5d6c7f..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/kuangyashoutao - feicui.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/kuangyashoutao - huangsebanwen.png b/resources/img/cases/kuangyadaxingdong/kuangyashoutao - huangsebanwen.png deleted file mode 100644 index d308e951..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/kuangyashoutao - huangsebanwen.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/kuangyashoutao - jingshencuoluan.png b/resources/img/cases/kuangyadaxingdong/kuangyashoutao - jingshencuoluan.png deleted file mode 100644 index 834577b2..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/kuangyashoutao - jingshencuoluan.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/kuangyashoutao - zhenjian.png b/resources/img/cases/kuangyadaxingdong/kuangyashoutao - zhenjian.png deleted file mode 100644 index 627728c0..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/kuangyashoutao - zhenjian.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/motuoshoutao - disantezhongbinglian.png b/resources/img/cases/kuangyadaxingdong/motuoshoutao - disantezhongbinglian.png deleted file mode 100644 index 7f574dc6..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/motuoshoutao - disantezhongbinglian.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/motuoshoutao - xiaoxinyanmudan.png b/resources/img/cases/kuangyadaxingdong/motuoshoutao - xiaoxinyanmudan.png deleted file mode 100644 index 0b5de0f4..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/motuoshoutao - xiaoxinyanmudan.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/motuoshoutao - xueya.png b/resources/img/cases/kuangyadaxingdong/motuoshoutao - xueya.png deleted file mode 100644 index 7a63a4aa..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/motuoshoutao - xueya.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/motuoshoutao - zhongdianxian.png b/resources/img/cases/kuangyadaxingdong/motuoshoutao - zhongdianxian.png deleted file mode 100644 index 7188c831..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/motuoshoutao - zhongdianxian.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/shuangchibeiruita - zainan.png b/resources/img/cases/kuangyadaxingdong/shuangchibeiruita - zainan.png deleted file mode 100644 index 7d180c42..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/shuangchibeiruita - zainan.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/xinxing - yijianqingxin.png b/resources/img/cases/kuangyadaxingdong/xinxing - yijianqingxin.png deleted file mode 100644 index cf9ac585..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/xinxing - yijianqingxin.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/yundongshoutao - dangong.png b/resources/img/cases/kuangyadaxingdong/yundongshoutao - dangong.png deleted file mode 100644 index 873ea237..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/yundongshoutao - dangong.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/yundongshoutao - daxingliewu.png b/resources/img/cases/kuangyadaxingdong/yundongshoutao - daxingliewu.png deleted file mode 100644 index cf43276e..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/yundongshoutao - daxingliewu.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/yundongshoutao - xinghongtoujin.png b/resources/img/cases/kuangyadaxingdong/yundongshoutao - xinghongtoujin.png deleted file mode 100644 index e4438d8c..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/yundongshoutao - xinghongtoujin.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/yundongshoutao - yexingyi.png b/resources/img/cases/kuangyadaxingdong/yundongshoutao - yexingyi.png deleted file mode 100644 index 33981bca..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/yundongshoutao - yexingyi.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/zhuanyeshoutao - jianbiandalishi.png b/resources/img/cases/kuangyadaxingdong/zhuanyeshoutao - jianbiandalishi.png deleted file mode 100644 index 66d00374..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/zhuanyeshoutao - jianbiandalishi.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/zhuanyeshoutao - laohujingying.png b/resources/img/cases/kuangyadaxingdong/zhuanyeshoutao - laohujingying.png deleted file mode 100644 index f40f3b2e..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/zhuanyeshoutao - laohujingying.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/zhuanyeshoutao - lujunshaoweizhangguan.png b/resources/img/cases/kuangyadaxingdong/zhuanyeshoutao - lujunshaoweizhangguan.png deleted file mode 100644 index 517d85d8..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/zhuanyeshoutao - lujunshaoweizhangguan.png and /dev/null differ diff --git a/resources/img/cases/kuangyadaxingdong/zhuanyeshoutao - yixiantegong.png b/resources/img/cases/kuangyadaxingdong/zhuanyeshoutao - yixiantegong.png deleted file mode 100644 index 6dcd26c2..00000000 Binary files a/resources/img/cases/kuangyadaxingdong/zhuanyeshoutao - yixiantegong.png and /dev/null differ diff --git a/resources/img/cases/liekong/AK-47 - anubisijuntuan.png b/resources/img/cases/liekong/AK-47 - anubisijuntuan.png deleted file mode 100644 index e3e6684c..00000000 Binary files a/resources/img/cases/liekong/AK-47 - anubisijuntuan.png and /dev/null differ diff --git a/resources/img/cases/liekong/M4A4 - chixian.png b/resources/img/cases/liekong/M4A4 - chixian.png deleted file mode 100644 index e36fb694..00000000 Binary files a/resources/img/cases/liekong/M4A4 - chixian.png and /dev/null differ diff --git a/resources/img/cases/liekong/MAC-10 - meihuo.png b/resources/img/cases/liekong/MAC-10 - meihuo.png deleted file mode 100644 index fbe2bcc4..00000000 Binary files a/resources/img/cases/liekong/MAC-10 - meihuo.png and /dev/null differ diff --git a/resources/img/cases/liekong/MAG-7 - beimingyouyu.png b/resources/img/cases/liekong/MAG-7 - beimingyouyu.png deleted file mode 100644 index a52c0380..00000000 Binary files a/resources/img/cases/liekong/MAG-7 - beimingyouyu.png and /dev/null differ diff --git a/resources/img/cases/liekong/MP5-SD - mengliechongfeng.png b/resources/img/cases/liekong/MP5-SD - mengliechongfeng.png deleted file mode 100644 index 43621867..00000000 Binary files a/resources/img/cases/liekong/MP5-SD - mengliechongfeng.png and /dev/null differ diff --git a/resources/img/cases/liekong/P2000 - pangencuojie.png b/resources/img/cases/liekong/P2000 - pangencuojie.png deleted file mode 100644 index d54c53c9..00000000 Binary files a/resources/img/cases/liekong/P2000 - pangencuojie.png and /dev/null differ diff --git a/resources/img/cases/liekong/P250 - kadai.png b/resources/img/cases/liekong/P250 - kadai.png deleted file mode 100644 index 44204a2b..00000000 Binary files a/resources/img/cases/liekong/P250 - kadai.png and /dev/null differ diff --git a/resources/img/cases/liekong/P90 - jizhuangxiang.png b/resources/img/cases/liekong/P90 - jizhuangxiang.png deleted file mode 100644 index d146c120..00000000 Binary files a/resources/img/cases/liekong/P90 - jizhuangxiang.png and /dev/null differ diff --git a/resources/img/cases/liekong/PP-yeniu - shenmibeiwen.png b/resources/img/cases/liekong/PP-yeniu - shenmibeiwen.png deleted file mode 100644 index 22e3a21b..00000000 Binary files a/resources/img/cases/liekong/PP-yeniu - shenmibeiwen.png and /dev/null differ diff --git a/resources/img/cases/liekong/SG 553 - xiushizhiren.png b/resources/img/cases/liekong/SG 553 - xiushizhiren.png deleted file mode 100644 index 4b2d4c67..00000000 Binary files a/resources/img/cases/liekong/SG 553 - xiushizhiren.png and /dev/null differ diff --git a/resources/img/cases/liekong/SSG 08 - zhuji001.png b/resources/img/cases/liekong/SSG 08 - zhuji001.png deleted file mode 100644 index d5a72b8a..00000000 Binary files a/resources/img/cases/liekong/SSG 08 - zhuji001.png and /dev/null differ diff --git a/resources/img/cases/liekong/Tec-9 - xiongdilian.png b/resources/img/cases/liekong/Tec-9 - xiongdilian.png deleted file mode 100644 index b15b5730..00000000 Binary files a/resources/img/cases/liekong/Tec-9 - xiongdilian.png and /dev/null differ diff --git a/resources/img/cases/liekong/XM1014 - maizangzhiying.png b/resources/img/cases/liekong/XM1014 - maizangzhiying.png deleted file mode 100644 index 4d04d211..00000000 Binary files a/resources/img/cases/liekong/XM1014 - maizangzhiying.png and /dev/null differ diff --git a/resources/img/cases/liekong/geluoke - modengshidai.png b/resources/img/cases/liekong/geluoke - modengshidai.png deleted file mode 100644 index 30fdcc9d..00000000 Binary files a/resources/img/cases/liekong/geluoke - modengshidai.png and /dev/null differ diff --git a/resources/img/cases/liekong/jialier AR - fenghuangshanghao.png b/resources/img/cases/liekong/jialier AR - fenghuangshanghao.png deleted file mode 100644 index ca9e64da..00000000 Binary files a/resources/img/cases/liekong/jialier AR - fenghuangshanghao.png and /dev/null differ diff --git a/resources/img/cases/liekong/jishengbishou - beifangsenlin.png b/resources/img/cases/liekong/jishengbishou - beifangsenlin.png deleted file mode 100644 index 1f7aba45..00000000 Binary files a/resources/img/cases/liekong/jishengbishou - beifangsenlin.png and /dev/null differ diff --git a/resources/img/cases/liekong/jishengbishou - biaomiancuihuo.png b/resources/img/cases/liekong/jishengbishou - biaomiancuihuo.png deleted file mode 100644 index b6dbda8f..00000000 Binary files a/resources/img/cases/liekong/jishengbishou - biaomiancuihuo.png and /dev/null differ diff --git a/resources/img/cases/liekong/jishengbishou - dushiweizhuang.png b/resources/img/cases/liekong/jishengbishou - dushiweizhuang.png deleted file mode 100644 index 69aee80f..00000000 Binary files a/resources/img/cases/liekong/jishengbishou - dushiweizhuang.png and /dev/null differ diff --git a/resources/img/cases/liekong/jishengbishou - jianbianzhise.png b/resources/img/cases/liekong/jishengbishou - jianbianzhise.png deleted file mode 100644 index c3cc49e3..00000000 Binary files a/resources/img/cases/liekong/jishengbishou - jianbianzhise.png and /dev/null differ diff --git a/resources/img/cases/liekong/jishengbishou - kujiaozhise.png b/resources/img/cases/liekong/jishengbishou - kujiaozhise.png deleted file mode 100644 index e1822df3..00000000 Binary files a/resources/img/cases/liekong/jishengbishou - kujiaozhise.png and /dev/null differ diff --git a/resources/img/cases/liekong/jishengbishou - langang.png b/resources/img/cases/liekong/jishengbishou - langang.png deleted file mode 100644 index 7b0538e6..00000000 Binary files a/resources/img/cases/liekong/jishengbishou - langang.png and /dev/null differ diff --git a/resources/img/cases/liekong/jishengbishou - rengongranse.png b/resources/img/cases/liekong/jishengbishou - rengongranse.png deleted file mode 100644 index 562e358d..00000000 Binary files a/resources/img/cases/liekong/jishengbishou - rengongranse.png and /dev/null differ diff --git a/resources/img/cases/liekong/jishengbishou - senlin DDPAT.png b/resources/img/cases/liekong/jishengbishou - senlin DDPAT.png deleted file mode 100644 index f67b8c28..00000000 Binary files a/resources/img/cases/liekong/jishengbishou - senlin DDPAT.png and /dev/null differ diff --git a/resources/img/cases/liekong/jishengbishou - shenhongzhiwang.png b/resources/img/cases/liekong/jishengbishou - shenhongzhiwang.png deleted file mode 100644 index b889b22e..00000000 Binary files a/resources/img/cases/liekong/jishengbishou - shenhongzhiwang.png and /dev/null differ diff --git a/resources/img/cases/liekong/jishengbishou - shouliewangge.png b/resources/img/cases/liekong/jishengbishou - shouliewangge.png deleted file mode 100644 index 05523002..00000000 Binary files a/resources/img/cases/liekong/jishengbishou - shouliewangge.png and /dev/null differ diff --git a/resources/img/cases/liekong/jishengbishou - tufu.png b/resources/img/cases/liekong/jishengbishou - tufu.png deleted file mode 100644 index 63522214..00000000 Binary files a/resources/img/cases/liekong/jishengbishou - tufu.png and /dev/null differ diff --git a/resources/img/cases/liekong/jishengbishou - wutuzhuangg.png b/resources/img/cases/liekong/jishengbishou - wutuzhuangg.png deleted file mode 100644 index f49e0d42..00000000 Binary files a/resources/img/cases/liekong/jishengbishou - wutuzhuangg.png and /dev/null differ diff --git a/resources/img/cases/liekong/jishengbishou - yese.png b/resources/img/cases/liekong/jishengbishou - yese.png deleted file mode 100644 index e36bda86..00000000 Binary files a/resources/img/cases/liekong/jishengbishou - yese.png and /dev/null differ diff --git a/resources/img/cases/liekong/kuloubishou - beifangsenlin.png b/resources/img/cases/liekong/kuloubishou - beifangsenlin.png deleted file mode 100644 index dfbf7bf5..00000000 Binary files a/resources/img/cases/liekong/kuloubishou - beifangsenlin.png and /dev/null differ diff --git a/resources/img/cases/liekong/kuloubishou - biaomiancuihuo.png b/resources/img/cases/liekong/kuloubishou - biaomiancuihuo.png deleted file mode 100644 index e09dc1a0..00000000 Binary files a/resources/img/cases/liekong/kuloubishou - biaomiancuihuo.png and /dev/null differ diff --git a/resources/img/cases/liekong/kuloubishou - dushiweizhuang.png b/resources/img/cases/liekong/kuloubishou - dushiweizhuang.png deleted file mode 100644 index 55e11a2d..00000000 Binary files a/resources/img/cases/liekong/kuloubishou - dushiweizhuang.png and /dev/null differ diff --git a/resources/img/cases/liekong/kuloubishou - jianbianzhise.png b/resources/img/cases/liekong/kuloubishou - jianbianzhise.png deleted file mode 100644 index 36ac2127..00000000 Binary files a/resources/img/cases/liekong/kuloubishou - jianbianzhise.png and /dev/null differ diff --git a/resources/img/cases/liekong/kuloubishou - kujiaozhise.png b/resources/img/cases/liekong/kuloubishou - kujiaozhise.png deleted file mode 100644 index df25e854..00000000 Binary files a/resources/img/cases/liekong/kuloubishou - kujiaozhise.png and /dev/null differ diff --git a/resources/img/cases/liekong/kuloubishou - langang.png b/resources/img/cases/liekong/kuloubishou - langang.png deleted file mode 100644 index 63df47cb..00000000 Binary files a/resources/img/cases/liekong/kuloubishou - langang.png and /dev/null differ diff --git a/resources/img/cases/liekong/kuloubishou - rengongranse.png b/resources/img/cases/liekong/kuloubishou - rengongranse.png deleted file mode 100644 index 82f1f4eb..00000000 Binary files a/resources/img/cases/liekong/kuloubishou - rengongranse.png and /dev/null differ diff --git a/resources/img/cases/liekong/kuloubishou - senlin DDPAT.png b/resources/img/cases/liekong/kuloubishou - senlin DDPAT.png deleted file mode 100644 index 9a951926..00000000 Binary files a/resources/img/cases/liekong/kuloubishou - senlin DDPAT.png and /dev/null differ diff --git a/resources/img/cases/liekong/kuloubishou - shenhongzhiwang.png b/resources/img/cases/liekong/kuloubishou - shenhongzhiwang.png deleted file mode 100644 index c2eb477c..00000000 Binary files a/resources/img/cases/liekong/kuloubishou - shenhongzhiwang.png and /dev/null differ diff --git a/resources/img/cases/liekong/kuloubishou - shouliewangge.png b/resources/img/cases/liekong/kuloubishou - shouliewangge.png deleted file mode 100644 index 88a1a5d2..00000000 Binary files a/resources/img/cases/liekong/kuloubishou - shouliewangge.png and /dev/null differ diff --git a/resources/img/cases/liekong/kuloubishou - tufu.png b/resources/img/cases/liekong/kuloubishou - tufu.png deleted file mode 100644 index d26aca9e..00000000 Binary files a/resources/img/cases/liekong/kuloubishou - tufu.png and /dev/null differ diff --git a/resources/img/cases/liekong/kuloubishou - wutuzhuang.png b/resources/img/cases/liekong/kuloubishou - wutuzhuang.png deleted file mode 100644 index c3f1a49b..00000000 Binary files a/resources/img/cases/liekong/kuloubishou - wutuzhuang.png and /dev/null differ diff --git a/resources/img/cases/liekong/kuloubishou - yese.png b/resources/img/cases/liekong/kuloubishou - yese.png deleted file mode 100644 index b9f0558a..00000000 Binary files a/resources/img/cases/liekong/kuloubishou - yese.png and /dev/null differ diff --git a/resources/img/cases/liekong/liulangzhebishou - beifangsenlin.png b/resources/img/cases/liekong/liulangzhebishou - beifangsenlin.png deleted file mode 100644 index 5e3a4ae2..00000000 Binary files a/resources/img/cases/liekong/liulangzhebishou - beifangsenlin.png and /dev/null differ diff --git a/resources/img/cases/liekong/liulangzhebishou - biaomiancuihuo.png b/resources/img/cases/liekong/liulangzhebishou - biaomiancuihuo.png deleted file mode 100644 index ff30c8b7..00000000 Binary files a/resources/img/cases/liekong/liulangzhebishou - biaomiancuihuo.png and /dev/null differ diff --git a/resources/img/cases/liekong/liulangzhebishou - dushiweizhuang.png b/resources/img/cases/liekong/liulangzhebishou - dushiweizhuang.png deleted file mode 100644 index 9cfe64d4..00000000 Binary files a/resources/img/cases/liekong/liulangzhebishou - dushiweizhuang.png and /dev/null differ diff --git a/resources/img/cases/liekong/liulangzhebishou - jianbianzhise.png b/resources/img/cases/liekong/liulangzhebishou - jianbianzhise.png deleted file mode 100644 index a3ddb5af..00000000 Binary files a/resources/img/cases/liekong/liulangzhebishou - jianbianzhise.png and /dev/null differ diff --git a/resources/img/cases/liekong/liulangzhebishou - kujiaozhise.png b/resources/img/cases/liekong/liulangzhebishou - kujiaozhise.png deleted file mode 100644 index 839fb423..00000000 Binary files a/resources/img/cases/liekong/liulangzhebishou - kujiaozhise.png and /dev/null differ diff --git a/resources/img/cases/liekong/liulangzhebishou - langang.png b/resources/img/cases/liekong/liulangzhebishou - langang.png deleted file mode 100644 index 2c521b09..00000000 Binary files a/resources/img/cases/liekong/liulangzhebishou - langang.png and /dev/null differ diff --git a/resources/img/cases/liekong/liulangzhebishou - rengongranse.png b/resources/img/cases/liekong/liulangzhebishou - rengongranse.png deleted file mode 100644 index 6036cbc2..00000000 Binary files a/resources/img/cases/liekong/liulangzhebishou - rengongranse.png and /dev/null differ diff --git a/resources/img/cases/liekong/liulangzhebishou - senlin DDPAT.png b/resources/img/cases/liekong/liulangzhebishou - senlin DDPAT.png deleted file mode 100644 index 75a29ff9..00000000 Binary files a/resources/img/cases/liekong/liulangzhebishou - senlin DDPAT.png and /dev/null differ diff --git a/resources/img/cases/liekong/liulangzhebishou - shenhongzhiwang.png b/resources/img/cases/liekong/liulangzhebishou - shenhongzhiwang.png deleted file mode 100644 index 20fd2aa7..00000000 Binary files a/resources/img/cases/liekong/liulangzhebishou - shenhongzhiwang.png and /dev/null differ diff --git a/resources/img/cases/liekong/liulangzhebishou - shouliewangge.png b/resources/img/cases/liekong/liulangzhebishou - shouliewangge.png deleted file mode 100644 index 9e49b676..00000000 Binary files a/resources/img/cases/liekong/liulangzhebishou - shouliewangge.png and /dev/null differ diff --git a/resources/img/cases/liekong/liulangzhebishou - tufu.png b/resources/img/cases/liekong/liulangzhebishou - tufu.png deleted file mode 100644 index eb6c59ba..00000000 Binary files a/resources/img/cases/liekong/liulangzhebishou - tufu.png and /dev/null differ diff --git a/resources/img/cases/liekong/liulangzhebishou - wutuzhuang.png b/resources/img/cases/liekong/liulangzhebishou - wutuzhuang.png deleted file mode 100644 index cbabde8d..00000000 Binary files a/resources/img/cases/liekong/liulangzhebishou - wutuzhuang.png and /dev/null differ diff --git a/resources/img/cases/liekong/liulangzhebishou - yese.png b/resources/img/cases/liekong/liulangzhebishou - yese.png deleted file mode 100644 index 241fc848..00000000 Binary files a/resources/img/cases/liekong/liulangzhebishou - yese.png and /dev/null differ diff --git a/resources/img/cases/liekong/neigefu - feiyu.png b/resources/img/cases/liekong/neigefu - feiyu.png deleted file mode 100644 index 04655408..00000000 Binary files a/resources/img/cases/liekong/neigefu - feiyu.png and /dev/null differ diff --git a/resources/img/cases/liekong/qiushengbishou - beifangsenlin.png b/resources/img/cases/liekong/qiushengbishou - beifangsenlin.png deleted file mode 100644 index 062d354a..00000000 Binary files a/resources/img/cases/liekong/qiushengbishou - beifangsenlin.png and /dev/null differ diff --git a/resources/img/cases/liekong/qiushengbishou - biaomiancuihuo.png b/resources/img/cases/liekong/qiushengbishou - biaomiancuihuo.png deleted file mode 100644 index e9242bb9..00000000 Binary files a/resources/img/cases/liekong/qiushengbishou - biaomiancuihuo.png and /dev/null differ diff --git a/resources/img/cases/liekong/qiushengbishou - dushiweizhuang.png b/resources/img/cases/liekong/qiushengbishou - dushiweizhuang.png deleted file mode 100644 index c97d1b93..00000000 Binary files a/resources/img/cases/liekong/qiushengbishou - dushiweizhuang.png and /dev/null differ diff --git a/resources/img/cases/liekong/qiushengbishou - jianbianzhise.png b/resources/img/cases/liekong/qiushengbishou - jianbianzhise.png deleted file mode 100644 index 4a1358fd..00000000 Binary files a/resources/img/cases/liekong/qiushengbishou - jianbianzhise.png and /dev/null differ diff --git a/resources/img/cases/liekong/qiushengbishou - kujiaozhise.png b/resources/img/cases/liekong/qiushengbishou - kujiaozhise.png deleted file mode 100644 index abf86a82..00000000 Binary files a/resources/img/cases/liekong/qiushengbishou - kujiaozhise.png and /dev/null differ diff --git a/resources/img/cases/liekong/qiushengbishou - langang.png b/resources/img/cases/liekong/qiushengbishou - langang.png deleted file mode 100644 index 5581b86f..00000000 Binary files a/resources/img/cases/liekong/qiushengbishou - langang.png and /dev/null differ diff --git a/resources/img/cases/liekong/qiushengbishou - rengongranse.png b/resources/img/cases/liekong/qiushengbishou - rengongranse.png deleted file mode 100644 index 15e8bd40..00000000 Binary files a/resources/img/cases/liekong/qiushengbishou - rengongranse.png and /dev/null differ diff --git a/resources/img/cases/liekong/qiushengbishou - senlin DDPAT.png b/resources/img/cases/liekong/qiushengbishou - senlin DDPAT.png deleted file mode 100644 index f269caab..00000000 Binary files a/resources/img/cases/liekong/qiushengbishou - senlin DDPAT.png and /dev/null differ diff --git a/resources/img/cases/liekong/qiushengbishou - shenhongzhiwang.png b/resources/img/cases/liekong/qiushengbishou - shenhongzhiwang.png deleted file mode 100644 index 3f3cd200..00000000 Binary files a/resources/img/cases/liekong/qiushengbishou - shenhongzhiwang.png and /dev/null differ diff --git a/resources/img/cases/liekong/qiushengbishou - shouliewangge.png b/resources/img/cases/liekong/qiushengbishou - shouliewangge.png deleted file mode 100644 index 3c99172a..00000000 Binary files a/resources/img/cases/liekong/qiushengbishou - shouliewangge.png and /dev/null differ diff --git a/resources/img/cases/liekong/qiushengbishou - tufu.png b/resources/img/cases/liekong/qiushengbishou - tufu.png deleted file mode 100644 index cc3417b5..00000000 Binary files a/resources/img/cases/liekong/qiushengbishou - tufu.png and /dev/null differ diff --git a/resources/img/cases/liekong/qiushengbishou - wutuzhuang .png b/resources/img/cases/liekong/qiushengbishou - wutuzhuang .png deleted file mode 100644 index e8e75585..00000000 Binary files a/resources/img/cases/liekong/qiushengbishou - wutuzhuang .png and /dev/null differ diff --git a/resources/img/cases/liekong/qiushengbishou - yese.png b/resources/img/cases/liekong/qiushengbishou - yese.png deleted file mode 100644 index 4ea75ece..00000000 Binary files a/resources/img/cases/liekong/qiushengbishou - yese.png and /dev/null differ diff --git a/resources/img/cases/liekong/shamozhiying - yinhuaji.png b/resources/img/cases/liekong/shamozhiying - yinhuaji.png deleted file mode 100644 index fca25535..00000000 Binary files a/resources/img/cases/liekong/shamozhiying - yinhuaji.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/AUG - huguainiao.png b/resources/img/cases/mingxuanyixian/AUG - huguainiao.png deleted file mode 100644 index 2e5a3d93..00000000 Binary files a/resources/img/cases/mingxuanyixian/AUG - huguainiao.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/AWP - sishen.png b/resources/img/cases/mingxuanyixian/AWP - sishen.png deleted file mode 100644 index d90fa3cb..00000000 Binary files a/resources/img/cases/mingxuanyixian/AWP - sishen.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/FN57 - yansefanying.png b/resources/img/cases/mingxuanyixian/FN57 - yansefanying.png deleted file mode 100644 index ab176b80..00000000 Binary files a/resources/img/cases/mingxuanyixian/FN57 - yansefanying.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/M4A4 - heisemeiying.png b/resources/img/cases/mingxuanyixian/M4A4 - heisemeiying.png deleted file mode 100644 index fb3ebc91..00000000 Binary files a/resources/img/cases/mingxuanyixian/M4A4 - heisemeiying.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/MAG-7 - SWAG-7.png b/resources/img/cases/mingxuanyixian/MAG-7 - SWAG-7.png deleted file mode 100644 index f5cefdb4..00000000 Binary files a/resources/img/cases/mingxuanyixian/MAG-7 - SWAG-7.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/MP7 - xuexingyundong.png b/resources/img/cases/mingxuanyixian/MP7 - xuexingyundong.png deleted file mode 100644 index 8bb420bb..00000000 Binary files a/resources/img/cases/mingxuanyixian/MP7 - xuexingyundong.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/MP9 - heisha.png b/resources/img/cases/mingxuanyixian/MP9 - heisha.png deleted file mode 100644 index 98c85b51..00000000 Binary files a/resources/img/cases/mingxuanyixian/MP9 - heisha.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/P2000 - dushiweiji.png b/resources/img/cases/mingxuanyixian/P2000 - dushiweiji.png deleted file mode 100644 index 25df76ba..00000000 Binary files a/resources/img/cases/mingxuanyixian/P2000 - dushiweiji.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/PP-yeniu - heiyebaoluan.png b/resources/img/cases/mingxuanyixian/PP-yeniu - heiyebaoluan.png deleted file mode 100644 index ff68bbcc..00000000 Binary files a/resources/img/cases/mingxuanyixian/PP-yeniu - heiyebaoluan.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/R8 zuolunshouqiang - wen.png b/resources/img/cases/mingxuanyixian/R8 zuolunshouqiang - wen.png deleted file mode 100644 index 6a0cd6db..00000000 Binary files a/resources/img/cases/mingxuanyixian/R8 zuolunshouqiang - wen.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/SG 553 - aluoha.png b/resources/img/cases/mingxuanyixian/SG 553 - aluoha.png deleted file mode 100644 index 46f22650..00000000 Binary files a/resources/img/cases/mingxuanyixian/SG 553 - aluoha.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/UMP-45 - bailang.png b/resources/img/cases/mingxuanyixian/UMP-45 - bailang.png deleted file mode 100644 index fb55230c..00000000 Binary files a/resources/img/cases/mingxuanyixian/UMP-45 - bailang.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/USP - naodongdakai.png b/resources/img/cases/mingxuanyixian/USP - naodongdakai.png deleted file mode 100644 index bd94143c..00000000 Binary files a/resources/img/cases/mingxuanyixian/USP - naodongdakai.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/XM1014 - xiushilieyan.png b/resources/img/cases/mingxuanyixian/XM1014 - xiushilieyan.png deleted file mode 100644 index ef0ed3f9..00000000 Binary files a/resources/img/cases/mingxuanyixian/XM1014 - xiushilieyan.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/geluoke - chenglideyueguang.png b/resources/img/cases/mingxuanyixian/geluoke - chenglideyueguang.png deleted file mode 100644 index 29fc57c7..00000000 Binary files a/resources/img/cases/mingxuanyixian/geluoke - chenglideyueguang.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/guoshou - fangshuibujiaodai.png b/resources/img/cases/mingxuanyixian/guoshou - fangshuibujiaodai.png deleted file mode 100644 index 57caa1d4..00000000 Binary files a/resources/img/cases/mingxuanyixian/guoshou - fangshuibujiaodai.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/guoshou - gulankulou.png b/resources/img/cases/mingxuanyixian/guoshou - gulankulou.png deleted file mode 100644 index a5f9959c..00000000 Binary files a/resources/img/cases/mingxuanyixian/guoshou - gulankulou.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/guoshou - senlinsediao.png b/resources/img/cases/mingxuanyixian/guoshou - senlinsediao.png deleted file mode 100644 index ede6725e..00000000 Binary files a/resources/img/cases/mingxuanyixian/guoshou - senlinsediao.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/guoshou - taoyin.png b/resources/img/cases/mingxuanyixian/guoshou - taoyin.png deleted file mode 100644 index 09959a61..00000000 Binary files a/resources/img/cases/mingxuanyixian/guoshou - taoyin.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/jiashishoutao - chaoyue.png b/resources/img/cases/mingxuanyixian/jiashishoutao - chaoyue.png deleted file mode 100644 index 28f91cfe..00000000 Binary files a/resources/img/cases/mingxuanyixian/jiashishoutao - chaoyue.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/jiashishoutao - lanzigezi.png b/resources/img/cases/mingxuanyixian/jiashishoutao - lanzigezi.png deleted file mode 100644 index 29ef3a70..00000000 Binary files a/resources/img/cases/mingxuanyixian/jiashishoutao - lanzigezi.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/jiashishoutao - molvsediao.png b/resources/img/cases/mingxuanyixian/jiashishoutao - molvsediao.png deleted file mode 100644 index dbe60e1c..00000000 Binary files a/resources/img/cases/mingxuanyixian/jiashishoutao - molvsediao.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/jiashishoutao - wangshe.png b/resources/img/cases/mingxuanyixian/jiashishoutao - wangshe.png deleted file mode 100644 index 44131378..00000000 Binary files a/resources/img/cases/mingxuanyixian/jiashishoutao - wangshe.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/jiutousheshoutao - biaomiancuihuo.png b/resources/img/cases/mingxuanyixian/jiutousheshoutao - biaomiancuihuo.png deleted file mode 100644 index aed17723..00000000 Binary files a/resources/img/cases/mingxuanyixian/jiutousheshoutao - biaomiancuihuo.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/jiutousheshoutao - feicuisediao.png b/resources/img/cases/mingxuanyixian/jiutousheshoutao - feicuisediao.png deleted file mode 100644 index e9d0e079..00000000 Binary files a/resources/img/cases/mingxuanyixian/jiutousheshoutao - feicuisediao.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/jiutousheshoutao - hongshulin.png b/resources/img/cases/mingxuanyixian/jiutousheshoutao - hongshulin.png deleted file mode 100644 index 396668fe..00000000 Binary files a/resources/img/cases/mingxuanyixian/jiutousheshoutao - hongshulin.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/jiutousheshoutao - xiangweishe.png b/resources/img/cases/mingxuanyixian/jiutousheshoutao - xiangweishe.png deleted file mode 100644 index 797cb7b7..00000000 Binary files a/resources/img/cases/mingxuanyixian/jiutousheshoutao - xiangweishe.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/motuoshoutao - daimao.png b/resources/img/cases/mingxuanyixian/motuoshoutao - daimao.png deleted file mode 100644 index 53861561..00000000 Binary files a/resources/img/cases/mingxuanyixian/motuoshoutao - daimao.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/motuoshoutao - duobianxing.png b/resources/img/cases/mingxuanyixian/motuoshoutao - duobianxing.png deleted file mode 100644 index ccf1804c..00000000 Binary files a/resources/img/cases/mingxuanyixian/motuoshoutao - duobianxing.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/motuoshoutao - jiaoyun.png b/resources/img/cases/mingxuanyixian/motuoshoutao - jiaoyun.png deleted file mode 100644 index 960a4957..00000000 Binary files a/resources/img/cases/mingxuanyixian/motuoshoutao - jiaoyun.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/motuoshoutao - peng！.png b/resources/img/cases/mingxuanyixian/motuoshoutao - peng！.png deleted file mode 100644 index 2b1bf522..00000000 Binary files a/resources/img/cases/mingxuanyixian/motuoshoutao - peng！.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/neigefu - shiziyu.png b/resources/img/cases/mingxuanyixian/neigefu - shiziyu.png deleted file mode 100644 index 3cfc6240..00000000 Binary files a/resources/img/cases/mingxuanyixian/neigefu - shiziyu.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/xinxing - kuangyeliuhao.png b/resources/img/cases/mingxuanyixian/xinxing - kuangyeliuhao.png deleted file mode 100644 index c109130e..00000000 Binary files a/resources/img/cases/mingxuanyixian/xinxing - kuangyeliuhao.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/yundongshoutao - maiamifengyun.png b/resources/img/cases/mingxuanyixian/yundongshoutao - maiamifengyun.png deleted file mode 100644 index c54a235b..00000000 Binary files a/resources/img/cases/mingxuanyixian/yundongshoutao - maiamifengyun.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/yundongshoutao - oumiga.png b/resources/img/cases/mingxuanyixian/yundongshoutao - oumiga.png deleted file mode 100644 index 6080c369..00000000 Binary files a/resources/img/cases/mingxuanyixian/yundongshoutao - oumiga.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/yundongshoutao - qingtongxingtai.png b/resources/img/cases/mingxuanyixian/yundongshoutao - qingtongxingtai.png deleted file mode 100644 index 8ebdaf4f..00000000 Binary files a/resources/img/cases/mingxuanyixian/yundongshoutao - qingtongxingtai.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/yundongshoutao - shuangqi.png b/resources/img/cases/mingxuanyixian/yundongshoutao - shuangqi.png deleted file mode 100644 index 6f8cefcc..00000000 Binary files a/resources/img/cases/mingxuanyixian/yundongshoutao - shuangqi.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/zhuanyeshoutao - dawan.png b/resources/img/cases/mingxuanyixian/zhuanyeshoutao - dawan.png deleted file mode 100644 index 06ecf370..00000000 Binary files a/resources/img/cases/mingxuanyixian/zhuanyeshoutao - dawan.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/zhuanyeshoutao - jianbianzhise.png b/resources/img/cases/mingxuanyixian/zhuanyeshoutao - jianbianzhise.png deleted file mode 100644 index 865c2613..00000000 Binary files a/resources/img/cases/mingxuanyixian/zhuanyeshoutao - jianbianzhise.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/zhuanyeshoutao - shenhongzhiwang.png b/resources/img/cases/mingxuanyixian/zhuanyeshoutao - shenhongzhiwang.png deleted file mode 100644 index 87ac08b4..00000000 Binary files a/resources/img/cases/mingxuanyixian/zhuanyeshoutao - shenhongzhiwang.png and /dev/null differ diff --git a/resources/img/cases/mingxuanyixian/zhuanyeshoutao - shoulu.png b/resources/img/cases/mingxuanyixian/zhuanyeshoutao - shoulu.png deleted file mode 100644 index 7b705fd4..00000000 Binary files a/resources/img/cases/mingxuanyixian/zhuanyeshoutao - shoulu.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/CZ75 - menghu.png b/resources/img/cases/tuweidaxingdong/CZ75 - menghu.png deleted file mode 100644 index 7bd05cec..00000000 Binary files a/resources/img/cases/tuweidaxingdong/CZ75 - menghu.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/FN57 - shoulieliqi.png b/resources/img/cases/tuweidaxingdong/FN57 - shoulieliqi.png deleted file mode 100644 index d6610c73..00000000 Binary files a/resources/img/cases/tuweidaxingdong/FN57 - shoulieliqi.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/M4A1 - cishidai.png b/resources/img/cases/tuweidaxingdong/M4A1 - cishidai.png deleted file mode 100644 index b8f9fd41..00000000 Binary files a/resources/img/cases/tuweidaxingdong/M4A1 - cishidai.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/MP7 - dushiweiji.png b/resources/img/cases/tuweidaxingdong/MP7 - dushiweiji.png deleted file mode 100644 index 5b952d73..00000000 Binary files a/resources/img/cases/tuweidaxingdong/MP7 - dushiweiji.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/P2000 - rubaixiangya.png b/resources/img/cases/tuweidaxingdong/P2000 - rubaixiangya.png deleted file mode 100644 index 66baa3ee..00000000 Binary files a/resources/img/cases/tuweidaxingdong/P2000 - rubaixiangya.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/P250 - chaoxinxing.png b/resources/img/cases/tuweidaxingdong/P250 - chaoxinxing.png deleted file mode 100644 index 11a34001..00000000 Binary files a/resources/img/cases/tuweidaxingdong/P250 - chaoxinxing.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/P90 - erximofu.png b/resources/img/cases/tuweidaxingdong/P90 - erximofu.png deleted file mode 100644 index a0abdff9..00000000 Binary files a/resources/img/cases/tuweidaxingdong/P90 - erximofu.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/PP-yeniu - siwangzhuzaizhe.png b/resources/img/cases/tuweidaxingdong/PP-yeniu - siwangzhuzaizhe.png deleted file mode 100644 index 38083ee5..00000000 Binary files a/resources/img/cases/tuweidaxingdong/PP-yeniu - siwangzhuzaizhe.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/SSG 08 - wujinshenhai.png b/resources/img/cases/tuweidaxingdong/SSG 08 - wujinshenhai.png deleted file mode 100644 index db9f8017..00000000 Binary files a/resources/img/cases/tuweidaxingdong/SSG 08 - wujinshenhai.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/UMP-45 - mizhigong.png b/resources/img/cases/tuweidaxingdong/UMP-45 - mizhigong.png deleted file mode 100644 index 237a2ac6..00000000 Binary files a/resources/img/cases/tuweidaxingdong/UMP-45 - mizhigong.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/geluoke - shuiling.png b/resources/img/cases/tuweidaxingdong/geluoke - shuiling.png deleted file mode 100644 index 8392989c..00000000 Binary files a/resources/img/cases/tuweidaxingdong/geluoke - shuiling.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/hudiedao - beifangsenlin.png b/resources/img/cases/tuweidaxingdong/hudiedao - beifangsenlin.png deleted file mode 100644 index a45a3326..00000000 Binary files a/resources/img/cases/tuweidaxingdong/hudiedao - beifangsenlin.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/hudiedao - biaomiancuihuo.png b/resources/img/cases/tuweidaxingdong/hudiedao - biaomiancuihuo.png deleted file mode 100644 index d708952f..00000000 Binary files a/resources/img/cases/tuweidaxingdong/hudiedao - biaomiancuihuo.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/hudiedao - dushiweizhuang.png b/resources/img/cases/tuweidaxingdong/hudiedao - dushiweizhuang.png deleted file mode 100644 index 92b69917..00000000 Binary files a/resources/img/cases/tuweidaxingdong/hudiedao - dushiweizhuang.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/hudiedao - emengzhiye.png b/resources/img/cases/tuweidaxingdong/hudiedao - emengzhiye.png deleted file mode 100644 index 94709824..00000000 Binary files a/resources/img/cases/tuweidaxingdong/hudiedao - emengzhiye.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/hudiedao - jianbianzhise.png b/resources/img/cases/tuweidaxingdong/hudiedao - jianbianzhise.png deleted file mode 100644 index 1f1bc2b7..00000000 Binary files a/resources/img/cases/tuweidaxingdong/hudiedao - jianbianzhise.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/hudiedao - kujiaozhise.png b/resources/img/cases/tuweidaxingdong/hudiedao - kujiaozhise.png deleted file mode 100644 index b91a210a..00000000 Binary files a/resources/img/cases/tuweidaxingdong/hudiedao - kujiaozhise.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/hudiedao - langang.png b/resources/img/cases/tuweidaxingdong/hudiedao - langang.png deleted file mode 100644 index ec571671..00000000 Binary files a/resources/img/cases/tuweidaxingdong/hudiedao - langang.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/hudiedao - rengongranse.png b/resources/img/cases/tuweidaxingdong/hudiedao - rengongranse.png deleted file mode 100644 index 4cf7e0e8..00000000 Binary files a/resources/img/cases/tuweidaxingdong/hudiedao - rengongranse.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/hudiedao - senlin DDPAT.png b/resources/img/cases/tuweidaxingdong/hudiedao - senlin DDPAT.png deleted file mode 100644 index 5bd59f24..00000000 Binary files a/resources/img/cases/tuweidaxingdong/hudiedao - senlin DDPAT.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/hudiedao - shenhongzhiwang.png b/resources/img/cases/tuweidaxingdong/hudiedao - shenhongzhiwang.png deleted file mode 100644 index ff3ba092..00000000 Binary files a/resources/img/cases/tuweidaxingdong/hudiedao - shenhongzhiwang.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/hudiedao - shouliewangge.png b/resources/img/cases/tuweidaxingdong/hudiedao - shouliewangge.png deleted file mode 100644 index 91c718d6..00000000 Binary files a/resources/img/cases/tuweidaxingdong/hudiedao - shouliewangge.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/hudiedao - tufu.png b/resources/img/cases/tuweidaxingdong/hudiedao - tufu.png deleted file mode 100644 index da75bb84..00000000 Binary files a/resources/img/cases/tuweidaxingdong/hudiedao - tufu.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/hudiedao - wutuzhuang.png b/resources/img/cases/tuweidaxingdong/hudiedao - wutuzhuang.png deleted file mode 100644 index 1ffec5a8..00000000 Binary files a/resources/img/cases/tuweidaxingdong/hudiedao - wutuzhuang.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/neigefu - shamojingying.png b/resources/img/cases/tuweidaxingdong/neigefu - shamojingying.png deleted file mode 100644 index ce4cffd3..00000000 Binary files a/resources/img/cases/tuweidaxingdong/neigefu - shamojingying.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/shamozhiying - yinmouzhe.png b/resources/img/cases/tuweidaxingdong/shamozhiying - yinmouzhe.png deleted file mode 100644 index 00f3c391..00000000 Binary files a/resources/img/cases/tuweidaxingdong/shamozhiying - yinmouzhe.png and /dev/null differ diff --git a/resources/img/cases/tuweidaxingdong/xinxing - jinli.png b/resources/img/cases/tuweidaxingdong/xinxing - jinli.png deleted file mode 100644 index 047b7279..00000000 Binary files a/resources/img/cases/tuweidaxingdong/xinxing - jinli.png and /dev/null differ diff --git a/plugins/genshin/query_resource_points/icon/box.png b/resources/img/genshin/genshin_icon/box.png similarity index 100% rename from plugins/genshin/query_resource_points/icon/box.png rename to resources/img/genshin/genshin_icon/box.png diff --git a/plugins/genshin/query_resource_points/icon/box_alpha.png b/resources/img/genshin/genshin_icon/box_alpha.png similarity index 100% rename from plugins/genshin/query_resource_points/icon/box_alpha.png rename to resources/img/genshin/genshin_icon/box_alpha.png diff --git a/services/db_context.py b/services/db_context.py index 3cf46b2e..0ddb3c0e 100644 --- a/services/db_context.py +++ b/services/db_context.py @@ -3,6 +3,7 @@ from gino import Gino from .log import logger from configs.config import bind, sql_name, user, password, address, port, database +from .service_config import DATABASE_URI # 全局数据库连接对象 @@ -10,7 +11,7 @@ db = Gino() async def init(): - i_bind = bind + i_bind = DATABASE_URI if DATABASE_URI else bind if not bind: i_bind = f"{sql_name}://{user}:{password}@{address}:{port}/{database}" # print(i_bind) diff --git a/services/service_config.py b/services/service_config.py new file mode 100644 index 00000000..befc7bdb --- /dev/null +++ b/services/service_config.py @@ -0,0 +1,13 @@ +import os + + +try: + DATABASE_URI = os.environ['DATABASE_URI'] +except KeyError: + DATABASE_URI = '' + +try: + TL_M_KEY = os.environ['TL_KEY'] +except KeyError: + TL_M_KEY = [] + diff --git a/util/data_utils.py b/util/data_utils.py index fe9987b8..903c2d6e 100644 --- a/util/data_utils.py +++ b/util/data_utils.py @@ -6,15 +6,15 @@ async def init_rank(users: list, all_user_data: list, group_id: int): all_user_id = [user.user_qq for user in users] rst = '' for i in range(len(all_user_id) if len(all_user_id) < 10 else 10): - max_gold = max(all_user_data) - max_user_id = all_user_id[all_user_data.index(max_gold)] + _max = max(all_user_data) + max_user_id = all_user_id[all_user_data.index(_max)] all_user_id.remove(max_user_id) - all_user_data.remove(max_gold) + all_user_data.remove(_max) try: user_name = (await GroupInfoUser.select_member_info(max_user_id, group_id)).user_name except AttributeError: user_name = f'{max_user_id}' - rst += f'{user_name}: {max_gold}\n' + rst += f'{user_name}: {_max}\n' return rst[:-1] diff --git a/util/get_bilibili_img.py b/util/get_bilibili_img.py deleted file mode 100644 index 19348e0b..00000000 --- a/util/get_bilibili_img.py +++ /dev/null @@ -1,140 +0,0 @@ -import requests -from util.user_agent import get_user_agent -from bs4 import BeautifulSoup -from time import sleep -import threading -import os -from configs.path_config import IMAGE_PATH - -lock = threading.Lock() - -url = "https://search.bilibili.com/article" -# path = IMAGE_PATH + "setu/" - -index = 1 -THREAD_SUM_REMAINDER = 2 # 越小线程越多 - - -class bilibiliThread (threading.Thread): - def __init__(self, threadId, url_list, path, nolist): - threading.Thread.__init__(self) - self.threadId = threadId - self.url_list = url_list - self.path = path - self.nolist = nolist - def run(self): - print("开始线程<><><><><><><><><> " + self.threadId) - thread_get_url(self.threadId, self.url_list, self.path, self.nolist) - - -def get_bilibili_img(name, path, nolist=None): - global index - index = get_dirfile_len(path) - print("index===", index) - threadId = 1 - params = { - 'keyword': name, - 'page': '1' - } - res = requests.get(url, headers=get_user_agent(), params=params) - sleep(8) - soup = BeautifulSoup(res.text, 'html.parser') - # print(soup.text) - try: - total_page = soup.find_all('button', {'class': 'pagination-btn'})[-1].text.strip() - print("1 try") - except: - try: - total_page = soup.find_all('button', {'class': 'pagination-btn num-btn'})[-1].text.strip() - print("2 try") - except: - total_page = 1 - print("3 except") - print(total_page) - url_list = [] - for page in range(1, int(total_page)+1): - url_r = "https://search.bilibili.com/article?keyword=" + name + "&page=" + str(page) - url_list.append(url_r) - if page % THREAD_SUM_REMAINDER == 0: - print('-----> ' + str(page) + " =======>", url_list) - # _thread.start_new_thread(thread_get_url, (url_list, path,)) - bilibiliThread(str(threadId), url_list, path, nolist).start() - threadId += 1 - sleep(0.5) - url_list = [] - if url_list: - print("=========================最后一个线程启动========================= url数量: ", len(url_list)) - bilibiliThread(str(threadId), url_list, path, nolist).start() - - -def thread_get_url(threadId, url_list, path, nolist): - for url in url_list: - res = requests.get(url, headers=get_user_agent()) - sleep(2) - soup = BeautifulSoup(res.text, 'lxml') - alist = soup.find_all('a', {'class': 'poster'}) - img_content_page = [] - # print(alist) - for a in alist: - if nolist != None: - if a.get('href') not in nolist: - img_content_page.append("https://" + a.get('href')[2:]) - else: - img_content_page.append("https://" + a.get('href')[2:]) - pic_url = [] - for img_content in img_content_page: - print("开始获取---------->", img_content) - res = requests.get(img_content, headers=get_user_agent()) - sleep(2) - soup = BeautifulSoup(res.text, 'lxml') - figure_ls = soup.body.find_all('figure') - # print(figure_ls) - for figure in figure_ls: - try: - _ = figure.img.attrs['class'] - except: - data_src = figure.img.attrs['data-src'] - pic_url.append('https:' + data_src) - print("线程 " + threadId + " 获取完毕------> 开始存储") - for url in pic_url: - print("线程 " + threadId + "正在存储---------------->", url) - res = requests.get(url, headers=get_user_agent()) - save_img(res.content, path, threadId) - pic_url = [] - print("线程 " + threadId + " ---------------->执行完毕") - - -def save_img(img, path, threadId): - global index - try: - lock.acquire() - img_index = index - finally: - lock.release() - try: - with open(path + str(img_index) + ".jpg", 'wb') as f: - f.write(img) - lock.acquire() - index += 1 - except: - print("线程 " + threadId + "存储失败-------->" + str(img_index) + ".jpg") - finally: - lock.release() - - -def get_dirfile_len(path): - return len(os.listdir(path)) - - -if __name__ == '__main__': - # url = "https://search.bilibili.com" \ - # "/article?keyword=%23%E4%BB%8A%E6%97%A5%E4%BB%BD%E7%9A%84%E5%8F%AF%E7%88%B1%" \ - # "E5%B0%8F%E8%90%9D%E8%8E%89%EF%BC%8C%E8%BF%9B%E6%9D%A5%E7%9C%8B%E7%9C%8B%EF%BC%8C%E" \ - # "6%8F%90%E7%A5%9E%E9%86%92%E8%84%91%EF%BC%81" - # res = requests.get(url, headers=get_user_agent()) - # sleep(2) - # soup = BeautifulSoup(res.text, 'lxml') - # alist = soup.find_all('button', {'class': 'pagination-btn num-btn'}) - # total_page = soup.find_all('button', {'class': 'pagination-btn num-btn'})[-1].text.strip() - # print(total_page) - get_bilibili_img("精选动漫壁纸手机电脑壁纸&动漫游戏专题", IMAGE_PATH + "bizhi/") \ No newline at end of file diff --git a/util/img_utils.py b/util/img_utils.py index b2c0859a..d1491408 100644 --- a/util/img_utils.py +++ b/util/img_utils.py @@ -304,6 +304,10 @@ class CreateImg: pimb[i - (r - r3), j - (r - r3)] = pima[i, j] self.markImg = imb + # + def getchannel(self, itype): + self.markImg = self.markImg.getchannel(itype) + if __name__ == '__main__':