diff --git a/__version__ b/__version__ index 9a8a4009..1d5e2a4a 100644 --- a/__version__ +++ b/__version__ @@ -1 +1 @@ -__version__: v0.1.4.1 +__version__: v0.1.4 \ No newline at end of file diff --git a/basic_plugins/hooks/other_hook.py b/basic_plugins/hooks/other_hook.py index 1fccfc50..9460331b 100755 --- a/basic_plugins/hooks/other_hook.py +++ b/basic_plugins/hooks/other_hook.py @@ -2,12 +2,15 @@ from nonebot.matcher import Matcher from nonebot.message import run_preprocessor, IgnoredException from nonebot.typing import T_State from ._utils import status_message_manager +from utils.image_utils import text2image +from typing import Dict, Any from nonebot.adapters.onebot.v11 import ( Bot, MessageEvent, PrivateMessageEvent, GroupMessageEvent, ) +import re # 为什么AI会自己和自己聊天 @@ -38,3 +41,11 @@ async def _(matcher: Matcher, bot: Bot, event: MessageEvent, state: T_State): status_message_manager.delete(event.user_id) raise IgnoredException("有命令就别说话了") +# @Bot.on_calling_api +# async def handle_api_call(bot: Bot, api: str, data: Dict[str, Any]): +# if api in ["send_msg", "send_group_msg", "send_private_msg"]: +# msg = str(data["message"]) +# if (r := re.search("\[\[To_Img\|?(.*?)]]", msg)) or (r := re.search("[[To_Img\|?(.*?)[[")): + + + diff --git a/basic_plugins/hooks/task_hook.py b/basic_plugins/hooks/task_hook.py index 7cd241e8..cfec90db 100644 --- a/basic_plugins/hooks/task_hook.py +++ b/basic_plugins/hooks/task_hook.py @@ -14,20 +14,10 @@ async def handle_api_call(bot: Bot, api: str, data: Dict[str, Any]): or api == "send_group_msg" ) and ( - ( - r := re.search( - "^\[\[_task\|(.*)]]", - data["message"].strip() - if isinstance(data["message"], str) - else str(data["message"]["text"]).strip(), - ) - ) + (r := re.search("^\[\[_task\|(.*)]]", str(data["message"]["text"]).strip())) or ( r := re.search( - "^[[_task\|(.*)]]", - data["message"].strip() - if isinstance(data["message"], str) - else str(data["message"]["text"]).strip(), + "^[[_task\|(.*)]]", str(data["message"]["text"]).strip() ) ) ) diff --git a/plugins/c_song/__init__.py b/plugins/c_song/__init__.py deleted file mode 100755 index 0f8df8a6..00000000 --- a/plugins/c_song/__init__.py +++ /dev/null @@ -1,58 +0,0 @@ -from .music_163 import get_song_id, get_song_info -from nonebot.adapters.onebot.v11 import Bot, Event, GroupMessageEvent, Message -from nonebot.params import CommandArg -from nonebot.typing import T_State -from services.log import logger -from nonebot import on_command - - -__zx_plugin_name__ = "点歌" -__plugin_usage__ = """ -usage： - 在线点歌 - 指令： - 点歌 [歌名] -""".strip() -__plugin_des__ = "为你点播了一首曾经的歌" -__plugin_cmd__ = ["点歌 [歌名]"] -__plugin_type__ = ("一些工具",) -__plugin_version__ = 0.1 -__plugin_author__ = "HibiKier" -__plugin_settings__ = { - "level": 5, - "default_status": True, - "limit_superuser": False, - "cmd": ["点歌"], -} - - -music = on_command("点歌", priority=5, block=True) - - -@music.handle() -async def handle_first_receive(state: T_State, arg: Message = CommandArg()): - args = arg.extract_plain_text().strip() - if args: - state["song_name"] = args - - -@music.got("song_name", prompt="歌名是？") -async def _(bot: Bot, event: Event, state: T_State): - song = state["song_name"] - song_id = await get_song_id(song) - if not song_id: - await music.finish("没有找到这首歌！", at_sender=True) - for _ in range(3): - song_content = [{"type": "music", "data": {"type": 163, "id": song_id}}] - logger.info( - f"(USER {event.user_id}, GROUP " - f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'})" - f" 点歌 :{song}" - ) - await music.finish(song_content) - else: - await music.finish("网易云繁忙...") - - - - diff --git a/plugins/draw_card/count_manager.py b/plugins/draw_card/count_manager.py index 58acbaf3..9a930879 100644 --- a/plugins/draw_card/count_manager.py +++ b/plugins/draw_card/count_manager.py @@ -160,7 +160,7 @@ class GenshinCountManager(DrawCountManager): # print(self._data) user: GenshinCountManager.UserCount = self._data[key] if user.count - user.five_index == 90: - user.five_index = user.count + user.five_index = 90 return 5 if user.count - user.four_index == 10: user.four_index = user.count diff --git a/plugins/draw_card/rule.py b/plugins/draw_card/rule.py new file mode 100644 index 00000000..e69de29b diff --git a/plugins/group_welcome_msg.py b/plugins/group_welcome_msg.py index 1b610e51..27c22c01 100755 --- a/plugins/group_welcome_msg.py +++ b/plugins/group_welcome_msg.py @@ -37,7 +37,7 @@ async def _(event: GroupMessageEvent): img = "" msg = "" if (DATA_PATH / "custom_welcome_msg" / f"{event.group_id}.jpg").exists(): - img = image(abspath=DATA_PATH / "custom_welcome_msg" / f"{event.group_id}.jpg") + img = image(DATA_PATH / "custom_welcome_msg" / f"{event.group_id}.jpg") custom_welcome_msg_json = ( DATA_PATH / "custom_welcome_msg" / "custom_welcome_msg.json" ) diff --git a/plugins/music/__init__.py b/plugins/music/__init__.py new file mode 100644 index 00000000..109b215c --- /dev/null +++ b/plugins/music/__init__.py @@ -0,0 +1,54 @@ +from .music_163 import get_song_id, get_song_info +from nonebot.adapters.onebot.v11 import Bot, MessageEvent, GroupMessageEvent, Message +from nonebot.params import CommandArg +from nonebot.typing import T_State +from services.log import logger +from nonebot import on_command +from utils.message_builder import music + + +__zx_plugin_name__ = "点歌" +__plugin_usage__ = """ +usage： + 在线点歌 + 指令： + 点歌 [歌名] +""".strip() +__plugin_des__ = "为你点播了一首曾经的歌" +__plugin_cmd__ = ["点歌 [歌名]"] +__plugin_type__ = ("一些工具",) +__plugin_version__ = 0.1 +__plugin_author__ = "HibiKier" +__plugin_settings__ = { + "level": 5, + "default_status": True, + "limit_superuser": False, + "cmd": ["点歌"], +} + + +music_handler = on_command("点歌", priority=5, block=True) + + +@music_handler.handle() +async def handle_first_receive(state: T_State, arg: Message = CommandArg()): + if args := arg.extract_plain_text().strip(): + state["song_name"] = args + + +@music_handler.got("song_name", prompt="歌名是？") +async def _(bot: Bot, event: MessageEvent, state: T_State): + song = state["song_name"] + song_id = await get_song_id(song) + if not song_id: + await music_handler.finish("没有找到这首歌！", at_sender=True) + await music_handler.send(music("163", song_id)) + logger.info( + f"(USER {event.user_id}, GROUP " + f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'})" + f" 点歌 :{song}" + ) + + + + diff --git a/plugins/c_song/music_163.py b/plugins/music/music_163.py old mode 100755 new mode 100644 similarity index 95% rename from plugins/c_song/music_163.py rename to plugins/music/music_163.py index 91fe774b..00f24df2 --- a/plugins/c_song/music_163.py +++ b/plugins/music/music_163.py @@ -1,41 +1,41 @@ -from utils.http_utils import AsyncHttpx -import json - - -headers = {"referer": "http://music.163.com"} -cookies = {"appver": "2.0.2"} - - -async def search_song(song_name: str): - """ - 搜索歌曲 - :param song_name: 歌名 - """ - r = await AsyncHttpx.post( - f"http://music.163.com/api/search/get/", - data={"s": song_name, "limit": 1, "type": 1, "offset": 0}, - ) - if r.status_code != 200: - return None - return json.loads(r.text) - - -async def get_song_id(song_name: str) -> int: - """ """ - r = await search_song(song_name) - try: - return r["result"]["songs"][0]["id"] - except KeyError: - return 0 - - -async def get_song_info(songId: int): - """ - 获取歌曲信息 - """ - r = await AsyncHttpx.post( - f"http://music.163.com/api/song/detail/?id={songId}&ids=%5B{songId}%5D", - ) - if r.status_code != 200: - return None - return json.loads(r.text) +from utils.http_utils import AsyncHttpx +import json + + +headers = {"referer": "http://music.163.com"} +cookies = {"appver": "2.0.2"} + + +async def search_song(song_name: str): + """ + 搜索歌曲 + :param song_name: 歌名 + """ + r = await AsyncHttpx.post( + f"http://music.163.com/api/search/get/", + data={"s": song_name, "limit": 1, "type": 1, "offset": 0}, + ) + if r.status_code != 200: + return None + return json.loads(r.text) + + +async def get_song_id(song_name: str) -> int: + """ """ + r = await search_song(song_name) + try: + return r["result"]["songs"][0]["id"] + except KeyError: + return 0 + + +async def get_song_info(songId: int): + """ + 获取歌曲信息 + """ + r = await AsyncHttpx.post( + f"http://music.163.com/api/song/detail/?id={songId}&ids=%5B{songId}%5D", + ) + if r.status_code != 200: + return None + return json.loads(r.text) diff --git a/plugins/one_friend/__init__.py b/plugins/one_friend/__init__.py index 93c42660..69b4d51c 100755 --- a/plugins/one_friend/__init__.py +++ b/plugins/one_friend/__init__.py @@ -1,9 +1,8 @@ from io import BytesIO from random import choice from nonebot import on_regex -from nonebot.typing import T_State -from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent -from utils.utils import get_message_at, get_user_avatar +from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, Message +from utils.utils import get_message_at, get_user_avatar, get_message_text from utils.message_builder import image from utils.image_utils import BuildImage from nonebot.params import RegexGroup @@ -28,14 +27,14 @@ __plugin_settings__ = { } one_friend = on_regex( - "^我.*?朋友.*?(想问问|说|让我问问|想问|让我问|想知道|让我帮他问问|让我帮他问|让我帮忙问|让我帮忙问问|问)(.*)", + "^我.*?朋友.*?[想问问|说|让我问问|想问|让我问|想知道|让我帮他问问|让我帮他问|让我帮忙问|让我帮忙问问|问](.*)", priority=4, block=True, ) @one_friend.handle() -async def _(bot: Bot, event: GroupMessageEvent, state: T_State, reg_group: Tuple[Any, ...] = RegexGroup()): +async def _(bot: Bot, event: GroupMessageEvent, reg_group: Tuple[Any, ...] = RegexGroup()): qq = get_message_at(event.json()) if not qq: qq = choice( @@ -51,7 +50,7 @@ async def _(bot: Bot, event: GroupMessageEvent, state: T_State, reg_group: Tuple qq = qq[0] at_user = await bot.get_group_member_info(group_id=event.group_id, user_id=qq) user_name = at_user["card"] or at_user["nickname"] - msg = reg_group[1] + msg = get_message_text(Message(reg_group[0])).strip() if not msg: msg = "都不知道问什么" msg = msg.replace("他", "我").replace("她", "我").replace("它", "我") diff --git a/plugins/pix_gallery/_data_source.py b/plugins/pix_gallery/_data_source.py index 05043005..5fb2faf1 100644 --- a/plugins/pix_gallery/_data_source.py +++ b/plugins/pix_gallery/_data_source.py @@ -235,10 +235,10 @@ async def get_image(img_url: str, user_id: int) -> Optional[str]: img_url = old_img_url continue async with aiofiles.open( - TEMP_PATH / f"pix_{user_id}_{img_url[-10:-4]}.jpg", "wb" + TEMP_PATH / f"pix_{user_id}_{img_url.split('/')[-1][:-4]}.jpg", "wb" ) as f: await f.write(response.content) - return TEMP_PATH / f"pix_{user_id}_{img_url[-10:-4]}.jpg" + return TEMP_PATH / f"pix_{user_id}_{img_url.split('/')[-1][:-4]}.jpg" except TimeoutError: logger.warning(f"PIX：{img_url} 图片下载超时...") pass diff --git a/plugins/pix_gallery/pix.py b/plugins/pix_gallery/pix.py index 721f4771..7c62c8bb 100755 --- a/plugins/pix_gallery/pix.py +++ b/plugins/pix_gallery/pix.py @@ -1,15 +1,10 @@ from utils.utils import is_number from configs.config import Config from ._model.omega_pixiv_illusts import OmegaPixivIllusts -from utils.message_builder import image +from utils.message_builder import image, custom_forward_msg from utils.manager import withdraw_message_manager from services.log import logger -from nonebot.adapters.onebot.v11 import ( - Bot, - MessageEvent, - GroupMessageEvent, - Message -) +from nonebot.adapters.onebot.v11 import Bot, MessageEvent, GroupMessageEvent, Message from nonebot.params import CommandArg from ._data_source import get_image from ._model.pixiv import Pixiv @@ -49,6 +44,13 @@ __plugin_settings__ = { "cmd": ["pix", "Pix", "PIX", "pIx"], } __plugin_block_limit__ = {"rst": "您有PIX图片正在处理，请稍等..."} +__plugin_configs__ = { + "MAX_ONCE_NUM2FORWARD": { + "value": None, + "help": "单次发送的图片数量达到指定值时转发为合并消息", + "default_value": None, + } +} pix = on_command("pix", aliases={"PIX", "Pix"}, priority=5, block=True) @@ -64,12 +66,12 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()): if PIX_RATIO is None: pix_omega_pixiv_ratio = Config.get_config("pix", "PIX_OMEGA_PIXIV_RATIO") PIX_RATIO = pix_omega_pixiv_ratio[0] / ( - pix_omega_pixiv_ratio[0] + pix_omega_pixiv_ratio[1] + pix_omega_pixiv_ratio[0] + pix_omega_pixiv_ratio[1] ) OMEGA_RATIO = 1 - PIX_RATIO num = 1 keyword = arg.extract_plain_text().strip() - x = keyword.split(" ") + x = keyword.split() if "-s" in x: x.remove("-s") nsfw_tag = 1 @@ -80,12 +82,15 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()): nsfw_tag = 0 if nsfw_tag != 0 and str(event.user_id) not in bot.config.superusers: await pix.finish("你不能看这些噢，这些都是是留给管理员看的...") - if len(x) > 1: + if n := len(x) == 1 and is_number(x[0]): + num = int(x[-1]) + keyword = "" + elif n > 1: if is_number(x[-1]): num = int(x[-1]) if num > 10: if str(event.user_id) not in bot.config.superusers or ( - str(event.user_id) in bot.config.superusers and num > 30 + str(event.user_id) in bot.config.superusers and num > 30 ): num = random.randint(1, 10) await pix.send(f"太贪心了，就给你发 {num}张 好了") @@ -125,11 +130,12 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()): tmp_.append(x.pid) if not all_image: await pix.finish(f"未在图库中找到与 {keyword} 相关Tag/UID/PID的图片...", at_sender=True) + msg_list = [] for _ in range(num): img_url = None author = None - if not all_image: - await pix.finish("坏了...发完了，没图了...") + # if not all_image: + # await pix.finish("坏了...发完了，没图了...") img = random.choice(all_image) all_image.remove(img) if isinstance(img, OmegaPixivIllusts): @@ -144,7 +150,7 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()): _img = await get_image(img_url, event.user_id) if _img: if Config.get_config("pix", "SHOW_INFO"): - msg_id = await pix.send( + msg_list.append( Message( f"title：{title}\n" f"author：{author}\n" @@ -153,16 +159,31 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()): ) ) else: - msg_id = await pix.send(image(_img)) + msg_list.append(image(_img)) logger.info( f"(USER {event.user_id}, GROUP {event.group_id if isinstance(event, GroupMessageEvent) else 'private'})" f" 查看PIX图库PID: {pid}" ) else: - msg_id = await pix.send(f"下载图片似乎出了一点问题，PID：{pid}") + msg_list.append("这张图似乎下载失败了") logger.info( f"(USER {event.user_id}, GROUP {event.group_id if isinstance(event, GroupMessageEvent) else 'private'})" f" 查看PIX图库PID: {pid}，下载图片出错" ) - withdraw_message_manager.withdraw_message(event, msg_id, Config.get_config("pix", "WITHDRAW_PIX_MESSAGE")) - + if ( + Config.get_config("pix", "MAX_ONCE_NUM2FORWARD") + and num >= Config.get_config("pix", "MAX_ONCE_NUM2FORWARD") + and isinstance(event, GroupMessageEvent) + ): + msg_id = await bot.send_group_forward_msg( + group_id=event.group_id, messages=custom_forward_msg(msg_list, bot.self_id) + ) + withdraw_message_manager.withdraw_message( + event, msg_id, Config.get_config("pix", "WITHDRAW_PIX_MESSAGE") + ) + else: + for msg in msg_list: + msg_id = await pix.send(msg) + withdraw_message_manager.withdraw_message( + event, msg_id, Config.get_config("pix", "WITHDRAW_PIX_MESSAGE") + ) diff --git a/resources/ttf/CJGaoDeGuo.otf b/resources/font/CJGaoDeGuo.otf similarity index 100% rename from resources/ttf/CJGaoDeGuo.otf rename to resources/font/CJGaoDeGuo.otf diff --git a/resources/ttf/HWXingKai.ttf b/resources/font/HWXingKai.ttf similarity index 100% rename from resources/ttf/HWXingKai.ttf rename to resources/font/HWXingKai.ttf diff --git a/resources/ttf/HWZhongSong.ttf b/resources/font/HWZhongSong.ttf similarity index 100% rename from resources/ttf/HWZhongSong.ttf rename to resources/font/HWZhongSong.ttf diff --git a/resources/ttf/HYWenHei-85W.ttf b/resources/font/HYWenHei-85W.ttf similarity index 100% rename from resources/ttf/HYWenHei-85W.ttf rename to resources/font/HYWenHei-85W.ttf diff --git a/resources/ttf/SweiSpringCJKtc-Bold.ttf b/resources/font/SweiSpringCJKtc-Bold.ttf similarity index 100% rename from resources/ttf/SweiSpringCJKtc-Bold.ttf rename to resources/font/SweiSpringCJKtc-Bold.ttf diff --git a/resources/ttf/SweiSpringSugarCJKtc-Regular.ttf b/resources/font/SweiSpringSugarCJKtc-Regular.ttf similarity index 100% rename from resources/ttf/SweiSpringSugarCJKtc-Regular.ttf rename to resources/font/SweiSpringSugarCJKtc-Regular.ttf diff --git a/resources/ttf/YSHaoShenTi-2.ttf b/resources/font/YSHaoShenTi-2.ttf similarity index 100% rename from resources/ttf/YSHaoShenTi-2.ttf rename to resources/font/YSHaoShenTi-2.ttf diff --git a/resources/ttf/gorga.otf b/resources/font/gorga.otf similarity index 100% rename from resources/ttf/gorga.otf rename to resources/font/gorga.otf diff --git a/resources/ttf/msyh.ttf b/resources/font/msyh.ttf similarity index 100% rename from resources/ttf/msyh.ttf rename to resources/font/msyh.ttf diff --git a/resources/ttf/sarasa-mono-sc-nerd-regular.ttf b/resources/font/sarasa-mono-sc-nerd-regular.ttf similarity index 100% rename from resources/ttf/sarasa-mono-sc-nerd-regular.ttf rename to resources/font/sarasa-mono-sc-nerd-regular.ttf diff --git a/resources/ttf/wq.ttf b/resources/font/wq.ttf similarity index 100% rename from resources/ttf/wq.ttf rename to resources/font/wq.ttf diff --git a/resources/ttf/yuanshen.ttf b/resources/font/yuanshen.ttf similarity index 100% rename from resources/ttf/yuanshen.ttf rename to resources/font/yuanshen.ttf diff --git a/resources/ttf/yz.ttf b/resources/font/yz.ttf similarity index 100% rename from resources/ttf/yz.ttf rename to resources/font/yz.ttf diff --git a/resources/ttf/yzz.ttc b/resources/font/yzz.ttc similarity index 100% rename from resources/ttf/yzz.ttc rename to resources/font/yzz.ttc diff --git a/resources/img/background/0.png b/resources/image/background/0.png similarity index 100% rename from resources/img/background/0.png rename to resources/image/background/0.png diff --git a/resources/img/background/1.png b/resources/image/background/1.png similarity index 100% rename from resources/img/background/1.png rename to resources/image/background/1.png diff --git a/resources/img/background/check/0.jpg b/resources/image/background/check/0.jpg similarity index 100% rename from resources/img/background/check/0.jpg rename to resources/image/background/check/0.jpg diff --git a/resources/img/background/create_mat/0.jpg b/resources/image/background/create_mat/0.jpg similarity index 100% rename from resources/img/background/create_mat/0.jpg rename to resources/image/background/create_mat/0.jpg diff --git a/resources/img/background/create_mat/1.jpg b/resources/image/background/create_mat/1.jpg similarity index 100% rename from resources/img/background/create_mat/1.jpg rename to resources/image/background/create_mat/1.jpg diff --git a/resources/img/background/create_mat/10.jpg b/resources/image/background/create_mat/10.jpg similarity index 100% rename from resources/img/background/create_mat/10.jpg rename to resources/image/background/create_mat/10.jpg diff --git a/resources/img/background/create_mat/11.jpg b/resources/image/background/create_mat/11.jpg similarity index 100% rename from resources/img/background/create_mat/11.jpg rename to resources/image/background/create_mat/11.jpg diff --git a/resources/img/background/create_mat/2.jpg b/resources/image/background/create_mat/2.jpg similarity index 100% rename from resources/img/background/create_mat/2.jpg rename to resources/image/background/create_mat/2.jpg diff --git a/resources/img/background/create_mat/3.jpg b/resources/image/background/create_mat/3.jpg similarity index 100% rename from resources/img/background/create_mat/3.jpg rename to resources/image/background/create_mat/3.jpg diff --git a/resources/img/background/create_mat/4.jpg b/resources/image/background/create_mat/4.jpg similarity index 100% rename from resources/img/background/create_mat/4.jpg rename to resources/image/background/create_mat/4.jpg diff --git a/resources/img/background/create_mat/5.jpg b/resources/image/background/create_mat/5.jpg similarity index 100% rename from resources/img/background/create_mat/5.jpg rename to resources/image/background/create_mat/5.jpg diff --git a/resources/img/background/create_mat/6.jpg b/resources/image/background/create_mat/6.jpg similarity index 100% rename from resources/img/background/create_mat/6.jpg rename to resources/image/background/create_mat/6.jpg diff --git a/resources/img/background/create_mat/7.jpg b/resources/image/background/create_mat/7.jpg similarity index 100% rename from resources/img/background/create_mat/7.jpg rename to resources/image/background/create_mat/7.jpg diff --git a/resources/img/background/create_mat/8.jpg b/resources/image/background/create_mat/8.jpg similarity index 100% rename from resources/img/background/create_mat/8.jpg rename to resources/image/background/create_mat/8.jpg diff --git a/resources/img/background/create_mat/9.jpg b/resources/image/background/create_mat/9.jpg similarity index 100% rename from resources/img/background/create_mat/9.jpg rename to resources/image/background/create_mat/9.jpg diff --git a/resources/img/background/help/simple_help/11.jpg b/resources/image/background/help/simple_help/11.jpg similarity index 100% rename from resources/img/background/help/simple_help/11.jpg rename to resources/image/background/help/simple_help/11.jpg diff --git a/resources/img/background/help/simple_help/3.jpg b/resources/image/background/help/simple_help/3.jpg similarity index 100% rename from resources/img/background/help/simple_help/3.jpg rename to resources/image/background/help/simple_help/3.jpg diff --git a/resources/img/background/help/simple_help/8.jpg b/resources/image/background/help/simple_help/8.jpg similarity index 100% rename from resources/img/background/help/simple_help/8.jpg rename to resources/image/background/help/simple_help/8.jpg diff --git a/resources/img/cases/guangpu/AK-47 - xuexingyundong.png b/resources/image/cases/guangpu/AK-47 - xuexingyundong.png similarity index 100% rename from resources/img/cases/guangpu/AK-47 - xuexingyundong.png rename to resources/image/cases/guangpu/AK-47 - xuexingyundong.png diff --git a/resources/img/cases/guangpu/AWP - fushengrumeng.png b/resources/image/cases/guangpu/AWP - fushengrumeng.png similarity index 100% rename from resources/img/cases/guangpu/AWP - fushengrumeng.png rename to resources/image/cases/guangpu/AWP - fushengrumeng.png diff --git a/resources/img/cases/guangpu/CZ75 - xiangliu.png b/resources/image/cases/guangpu/CZ75 - xiangliu.png similarity index 100% rename from resources/img/cases/guangpu/CZ75 - xiangliu.png rename to resources/image/cases/guangpu/CZ75 - xiangliu.png diff --git a/resources/img/cases/guangpu/FN57 - maoxixueguan.png b/resources/image/cases/guangpu/FN57 - maoxixueguan.png similarity index 100% rename from resources/img/cases/guangpu/FN57 - maoxixueguan.png rename to resources/image/cases/guangpu/FN57 - maoxixueguan.png diff --git a/resources/img/cases/guangpu/M249 - cuilvjianduwa.png b/resources/image/cases/guangpu/M249 - cuilvjianduwa.png similarity index 100% rename from resources/img/cases/guangpu/M249 - cuilvjianduwa.png rename to resources/image/cases/guangpu/M249 - cuilvjianduwa.png diff --git a/resources/img/cases/guangpu/M4A1 - huimiezhe 2000.png b/resources/image/cases/guangpu/M4A1 - huimiezhe 2000.png similarity index 100% rename from resources/img/cases/guangpu/M4A1 - huimiezhe 2000.png rename to resources/image/cases/guangpu/M4A1 - huimiezhe 2000.png diff --git a/resources/img/cases/guangpu/MAC-10 - juejiezhixing.png b/resources/image/cases/guangpu/MAC-10 - juejiezhixing.png similarity index 100% rename from resources/img/cases/guangpu/MAC-10 - juejiezhixing.png rename to resources/image/cases/guangpu/MAC-10 - juejiezhixing.png diff --git a/resources/img/cases/guangpu/MP7 - feizhoubuluo.png b/resources/image/cases/guangpu/MP7 - feizhoubuluo.png similarity index 100% rename from resources/img/cases/guangpu/MP7 - feizhoubuluo.png rename to resources/image/cases/guangpu/MP7 - feizhoubuluo.png diff --git a/resources/img/cases/guangpu/P250 - lianyi.png b/resources/image/cases/guangpu/P250 - lianyi.png similarity index 100% rename from resources/img/cases/guangpu/P250 - lianyi.png rename to resources/image/cases/guangpu/P250 - lianyi.png diff --git a/resources/img/cases/guangpu/PP-yeniu - conglinhualiu.png b/resources/image/cases/guangpu/PP-yeniu - conglinhualiu.png similarity index 100% rename from resources/img/cases/guangpu/PP-yeniu - conglinhualiu.png rename to resources/image/cases/guangpu/PP-yeniu - conglinhualiu.png diff --git a/resources/img/cases/guangpu/SCAR-20 - lantu.png b/resources/image/cases/guangpu/SCAR-20 - lantu.png similarity index 100% rename from resources/img/cases/guangpu/SCAR-20 - lantu.png rename to resources/image/cases/guangpu/SCAR-20 - lantu.png diff --git a/resources/img/cases/guangpu/UMP-45 - zhijia.png b/resources/image/cases/guangpu/UMP-45 - zhijia.png similarity index 100% rename from resources/img/cases/guangpu/UMP-45 - zhijia.png rename to resources/image/cases/guangpu/UMP-45 - zhijia.png diff --git a/resources/img/cases/guangpu/USP - heisemeiying.png b/resources/image/cases/guangpu/USP - heisemeiying.png similarity index 100% rename from resources/img/cases/guangpu/USP - heisemeiying.png rename to resources/image/cases/guangpu/USP - heisemeiying.png diff --git a/resources/img/cases/guangpu/XM1014 - siji.png b/resources/image/cases/guangpu/XM1014 - siji.png similarity index 100% rename from resources/img/cases/guangpu/XM1014 - siji.png rename to resources/image/cases/guangpu/XM1014 - siji.png diff --git a/resources/img/cases/guangpu/anyingshuangbi - damashigegang.png b/resources/image/cases/guangpu/anyingshuangbi - damashigegang.png similarity index 100% rename from resources/img/cases/guangpu/anyingshuangbi - damashigegang.png rename to resources/image/cases/guangpu/anyingshuangbi - damashigegang.png diff --git a/resources/img/cases/guangpu/anyingshuangbi - duopulei.png b/resources/image/cases/guangpu/anyingshuangbi - duopulei.png similarity index 100% rename from resources/img/cases/guangpu/anyingshuangbi - duopulei.png rename to resources/image/cases/guangpu/anyingshuangbi - duopulei.png diff --git a/resources/img/cases/guangpu/anyingshuangbi - huya.png b/resources/image/cases/guangpu/anyingshuangbi - huya.png similarity index 100% rename from resources/img/cases/guangpu/anyingshuangbi - huya.png rename to resources/image/cases/guangpu/anyingshuangbi - huya.png diff --git a/resources/img/cases/guangpu/anyingshuangbi - jianbiandalishi.png b/resources/image/cases/guangpu/anyingshuangbi - jianbiandalishi.png similarity index 100% rename from resources/img/cases/guangpu/anyingshuangbi - jianbiandalishi.png rename to resources/image/cases/guangpu/anyingshuangbi - jianbiandalishi.png diff --git a/resources/img/cases/guangpu/anyingshuangbi - waibiaoshengxiu.png b/resources/image/cases/guangpu/anyingshuangbi - waibiaoshengxiu.png similarity index 100% rename from resources/img/cases/guangpu/anyingshuangbi - waibiaoshengxiu.png rename to resources/image/cases/guangpu/anyingshuangbi - waibiaoshengxiu.png diff --git a/resources/img/cases/guangpu/anyingshuangbi - zhimingziluolan.png b/resources/image/cases/guangpu/anyingshuangbi - zhimingziluolan.png similarity index 100% rename from resources/img/cases/guangpu/anyingshuangbi - zhimingziluolan.png rename to resources/image/cases/guangpu/anyingshuangbi - zhimingziluolan.png diff --git a/resources/img/cases/guangpu/baoyiliedao - damashigegang.png b/resources/image/cases/guangpu/baoyiliedao - damashigegang.png similarity index 100% rename from resources/img/cases/guangpu/baoyiliedao - damashigegang.png rename to resources/image/cases/guangpu/baoyiliedao - damashigegang.png diff --git a/resources/img/cases/guangpu/baoyiliedao - duopulei.png b/resources/image/cases/guangpu/baoyiliedao - duopulei.png similarity index 100% rename from resources/img/cases/guangpu/baoyiliedao - duopulei.png rename to resources/image/cases/guangpu/baoyiliedao - duopulei.png diff --git a/resources/img/cases/guangpu/baoyiliedao - huya.png b/resources/image/cases/guangpu/baoyiliedao - huya.png similarity index 100% rename from resources/img/cases/guangpu/baoyiliedao - huya.png rename to resources/image/cases/guangpu/baoyiliedao - huya.png diff --git a/resources/img/cases/guangpu/baoyiliedao - jianbiandalishi.png b/resources/image/cases/guangpu/baoyiliedao - jianbiandalishi.png similarity index 100% rename from resources/img/cases/guangpu/baoyiliedao - jianbiandalishi.png rename to resources/image/cases/guangpu/baoyiliedao - jianbiandalishi.png diff --git a/resources/img/cases/guangpu/baoyiliedao - waibiaoshengxiu.png b/resources/image/cases/guangpu/baoyiliedao - waibiaoshengxiu.png similarity index 100% rename from resources/img/cases/guangpu/baoyiliedao - waibiaoshengxiu.png rename to resources/image/cases/guangpu/baoyiliedao - waibiaoshengxiu.png diff --git a/resources/img/cases/guangpu/baoyiliedao - zhimingziluolan.png b/resources/image/cases/guangpu/baoyiliedao - zhimingziluolan.png similarity index 100% rename from resources/img/cases/guangpu/baoyiliedao - zhimingziluolan.png rename to resources/image/cases/guangpu/baoyiliedao - zhimingziluolan.png diff --git a/resources/img/cases/guangpu/hudiedao - damashigegang.png b/resources/image/cases/guangpu/hudiedao - damashigegang.png similarity index 100% rename from resources/img/cases/guangpu/hudiedao - damashigegang.png rename to resources/image/cases/guangpu/hudiedao - damashigegang.png diff --git a/resources/img/cases/guangpu/hudiedao - duopulei.png b/resources/image/cases/guangpu/hudiedao - duopulei.png similarity index 100% rename from resources/img/cases/guangpu/hudiedao - duopulei.png rename to resources/image/cases/guangpu/hudiedao - duopulei.png diff --git a/resources/img/cases/guangpu/hudiedao - huya.png b/resources/image/cases/guangpu/hudiedao - huya.png similarity index 100% rename from resources/img/cases/guangpu/hudiedao - huya.png rename to resources/image/cases/guangpu/hudiedao - huya.png diff --git a/resources/img/cases/guangpu/hudiedao - jianbiandalishi.png b/resources/image/cases/guangpu/hudiedao - jianbiandalishi.png similarity index 100% rename from resources/img/cases/guangpu/hudiedao - jianbiandalishi.png rename to resources/image/cases/guangpu/hudiedao - jianbiandalishi.png diff --git a/resources/img/cases/guangpu/hudiedao - waibiaoshengxiu.png b/resources/image/cases/guangpu/hudiedao - waibiaoshengxiu.png similarity index 100% rename from resources/img/cases/guangpu/hudiedao - waibiaoshengxiu.png rename to resources/image/cases/guangpu/hudiedao - waibiaoshengxiu.png diff --git a/resources/img/cases/guangpu/hudiedao - zhimingziluolan.png b/resources/image/cases/guangpu/hudiedao - zhimingziluolan.png similarity index 100% rename from resources/img/cases/guangpu/hudiedao - zhimingziluolan.png rename to resources/image/cases/guangpu/hudiedao - zhimingziluolan.png diff --git a/resources/img/cases/guangpu/jialier AR - shenhonghaixiao.png b/resources/image/cases/guangpu/jialier AR - shenhonghaixiao.png similarity index 100% rename from resources/img/cases/guangpu/jialier AR - shenhonghaixiao.png rename to resources/image/cases/guangpu/jialier AR - shenhonghaixiao.png diff --git a/resources/img/cases/guangpu/jieduanxiandanqiang - suolu.png b/resources/image/cases/guangpu/jieduanxiandanqiang - suolu.png similarity index 100% rename from resources/img/cases/guangpu/jieduanxiandanqiang - suolu.png rename to resources/image/cases/guangpu/jieduanxiandanqiang - suolu.png diff --git a/resources/img/cases/guangpu/lieshazhebishou - damashigegang.png b/resources/image/cases/guangpu/lieshazhebishou - damashigegang.png similarity index 100% rename from resources/img/cases/guangpu/lieshazhebishou - damashigegang.png rename to resources/image/cases/guangpu/lieshazhebishou - damashigegang.png diff --git a/resources/img/cases/guangpu/lieshazhebishou - duopulei.png b/resources/image/cases/guangpu/lieshazhebishou - duopulei.png similarity index 100% rename from resources/img/cases/guangpu/lieshazhebishou - duopulei.png rename to resources/image/cases/guangpu/lieshazhebishou - duopulei.png diff --git a/resources/img/cases/guangpu/lieshazhebishou - huya.png b/resources/image/cases/guangpu/lieshazhebishou - huya.png similarity index 100% rename from resources/img/cases/guangpu/lieshazhebishou - huya.png rename to resources/image/cases/guangpu/lieshazhebishou - huya.png diff --git a/resources/img/cases/guangpu/lieshazhebishou - jianbiandalishi.png b/resources/image/cases/guangpu/lieshazhebishou - jianbiandalishi.png similarity index 100% rename from resources/img/cases/guangpu/lieshazhebishou - jianbiandalishi.png rename to resources/image/cases/guangpu/lieshazhebishou - jianbiandalishi.png diff --git a/resources/img/cases/guangpu/lieshazhebishou - waibiaoshengxiu.png b/resources/image/cases/guangpu/lieshazhebishou - waibiaoshengxiu.png similarity index 100% rename from resources/img/cases/guangpu/lieshazhebishou - waibiaoshengxiu.png rename to resources/image/cases/guangpu/lieshazhebishou - waibiaoshengxiu.png diff --git a/resources/img/cases/guangpu/lieshazhebishou - zhimingziluolan.png b/resources/image/cases/guangpu/lieshazhebishou - zhimingziluolan.png similarity index 100% rename from resources/img/cases/guangpu/lieshazhebishou - zhimingziluolan.png rename to resources/image/cases/guangpu/lieshazhebishou - zhimingziluolan.png diff --git a/resources/img/cases/guangpu/shamozhiying - xiushilieyan.png b/resources/image/cases/guangpu/shamozhiying - xiushilieyan.png similarity index 100% rename from resources/img/cases/guangpu/shamozhiying - xiushilieyan.png rename to resources/image/cases/guangpu/shamozhiying - xiushilieyan.png diff --git a/resources/img/cases/guangpu/wandao - damashigegang.png b/resources/image/cases/guangpu/wandao - damashigegang.png similarity index 100% rename from resources/img/cases/guangpu/wandao - damashigegang.png rename to resources/image/cases/guangpu/wandao - damashigegang.png diff --git a/resources/img/cases/guangpu/wandao - duopulei.png b/resources/image/cases/guangpu/wandao - duopulei.png similarity index 100% rename from resources/img/cases/guangpu/wandao - duopulei.png rename to resources/image/cases/guangpu/wandao - duopulei.png diff --git a/resources/img/cases/guangpu/wandao - huya.png b/resources/image/cases/guangpu/wandao - huya.png similarity index 100% rename from resources/img/cases/guangpu/wandao - huya.png rename to resources/image/cases/guangpu/wandao - huya.png diff --git a/resources/img/cases/guangpu/wandao - jianbiandalishi.png b/resources/image/cases/guangpu/wandao - jianbiandalishi.png similarity index 100% rename from resources/img/cases/guangpu/wandao - jianbiandalishi.png rename to resources/image/cases/guangpu/wandao - jianbiandalishi.png diff --git a/resources/img/cases/guangpu/wandao - waibiaoshengxiu.png b/resources/image/cases/guangpu/wandao - waibiaoshengxiu.png similarity index 100% rename from resources/img/cases/guangpu/wandao - waibiaoshengxiu.png rename to resources/image/cases/guangpu/wandao - waibiaoshengxiu.png diff --git a/resources/img/cases/guangpu/wandao - zhimingziluolan.png b/resources/image/cases/guangpu/wandao - zhimingziluolan.png similarity index 100% rename from resources/img/cases/guangpu/wandao - zhimingziluolan.png rename to resources/image/cases/guangpu/wandao - zhimingziluolan.png diff --git a/resources/img/cases/kuangyadaxingdong/AWP - wanglingzhizhu.png b/resources/image/cases/kuangyadaxingdong/AWP - wanglingzhizhu.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/AWP - wanglingzhizhu.png rename to resources/image/cases/kuangyadaxingdong/AWP - wanglingzhizhu.png diff --git a/resources/img/cases/kuangyadaxingdong/CZ75 - shichou.png b/resources/image/cases/kuangyadaxingdong/CZ75 - shichou.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/CZ75 - shichou.png rename to resources/image/cases/kuangyadaxingdong/CZ75 - shichou.png diff --git a/resources/img/cases/kuangyadaxingdong/FN57 - tonghuachengbao.png b/resources/image/cases/kuangyadaxingdong/FN57 - tonghuachengbao.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/FN57 - tonghuachengbao.png rename to resources/image/cases/kuangyadaxingdong/FN57 - tonghuachengbao.png diff --git a/resources/img/cases/kuangyadaxingdong/G3SG1 - xuexingmicai.png b/resources/image/cases/kuangyadaxingdong/G3SG1 - xuexingmicai.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/G3SG1 - xuexingmicai.png rename to resources/image/cases/kuangyadaxingdong/G3SG1 - xuexingmicai.png diff --git a/resources/img/cases/kuangyadaxingdong/M249 - denggaoxian.png b/resources/image/cases/kuangyadaxingdong/M249 - denggaoxian.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/M249 - denggaoxian.png rename to resources/image/cases/kuangyadaxingdong/M249 - denggaoxian.png diff --git a/resources/img/cases/kuangyadaxingdong/M4A1 - yinhuaji.png b/resources/image/cases/kuangyadaxingdong/M4A1 - yinhuaji.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/M4A1 - yinhuaji.png rename to resources/image/cases/kuangyadaxingdong/M4A1 - yinhuaji.png diff --git a/resources/img/cases/kuangyadaxingdong/M4A4 - saibo.png b/resources/image/cases/kuangyadaxingdong/M4A4 - saibo.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/M4A4 - saibo.png rename to resources/image/cases/kuangyadaxingdong/M4A4 - saibo.png diff --git a/resources/img/cases/kuangyadaxingdong/MP5-SD - lingdianxingdong.png b/resources/image/cases/kuangyadaxingdong/MP5-SD - lingdianxingdong.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/MP5-SD - lingdianxingdong.png rename to resources/image/cases/kuangyadaxingdong/MP5-SD - lingdianxingdong.png diff --git a/resources/img/cases/kuangyadaxingdong/P250 - wuranwu.png b/resources/image/cases/kuangyadaxingdong/P250 - wuranwu.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/P250 - wuranwu.png rename to resources/image/cases/kuangyadaxingdong/P250 - wuranwu.png diff --git a/resources/img/cases/kuangyadaxingdong/P90 - daguaishouRUSH.png b/resources/image/cases/kuangyadaxingdong/P90 - daguaishouRUSH.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/P90 - daguaishouRUSH.png rename to resources/image/cases/kuangyadaxingdong/P90 - daguaishouRUSH.png diff --git a/resources/img/cases/kuangyadaxingdong/SSG 08 - douqiang.png b/resources/image/cases/kuangyadaxingdong/SSG 08 - douqiang.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/SSG 08 - douqiang.png rename to resources/image/cases/kuangyadaxingdong/SSG 08 - douqiang.png diff --git a/resources/img/cases/kuangyadaxingdong/UMP-45 - jinbihuihuang.png b/resources/image/cases/kuangyadaxingdong/UMP-45 - jinbihuihuang.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/UMP-45 - jinbihuihuang.png rename to resources/image/cases/kuangyadaxingdong/UMP-45 - jinbihuihuang.png diff --git a/resources/img/cases/kuangyadaxingdong/USP - xiaolvguai.png b/resources/image/cases/kuangyadaxingdong/USP - xiaolvguai.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/USP - xiaolvguai.png rename to resources/image/cases/kuangyadaxingdong/USP - xiaolvguai.png diff --git a/resources/img/cases/kuangyadaxingdong/geluoke - heisemeiying.png b/resources/image/cases/kuangyadaxingdong/geluoke - heisemeiying.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/geluoke - heisemeiying.png rename to resources/image/cases/kuangyadaxingdong/geluoke - heisemeiying.png diff --git a/resources/img/cases/kuangyadaxingdong/guoshou - changjinglu.png b/resources/image/cases/kuangyadaxingdong/guoshou - changjinglu.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/guoshou - changjinglu.png rename to resources/image/cases/kuangyadaxingdong/guoshou - changjinglu.png diff --git a/resources/img/cases/kuangyadaxingdong/guoshou - jinggao！.png b/resources/image/cases/kuangyadaxingdong/guoshou - jinggao！.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/guoshou - jinggao！.png rename to resources/image/cases/kuangyadaxingdong/guoshou - jinggao！.png diff --git a/resources/img/cases/kuangyadaxingdong/guoshou - mangshe.png b/resources/image/cases/kuangyadaxingdong/guoshou - mangshe.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/guoshou - mangshe.png rename to resources/image/cases/kuangyadaxingdong/guoshou - mangshe.png diff --git a/resources/img/cases/kuangyadaxingdong/guoshou - shamotoujin.png b/resources/image/cases/kuangyadaxingdong/guoshou - shamotoujin.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/guoshou - shamotoujin.png rename to resources/image/cases/kuangyadaxingdong/guoshou - shamotoujin.png diff --git a/resources/img/cases/kuangyadaxingdong/jialier AR - pohuaizhe.png b/resources/image/cases/kuangyadaxingdong/jialier AR - pohuaizhe.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/jialier AR - pohuaizhe.png rename to resources/image/cases/kuangyadaxingdong/jialier AR - pohuaizhe.png diff --git a/resources/img/cases/kuangyadaxingdong/jiashishoutao - feihongliezan.png b/resources/image/cases/kuangyadaxingdong/jiashishoutao - feihongliezan.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/jiashishoutao - feihongliezan.png rename to resources/image/cases/kuangyadaxingdong/jiashishoutao - feihongliezan.png diff --git a/resources/img/cases/kuangyadaxingdong/jiashishoutao - meizhoubaonvwang.png b/resources/image/cases/kuangyadaxingdong/jiashishoutao - meizhoubaonvwang.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/jiashishoutao - meizhoubaonvwang.png rename to resources/image/cases/kuangyadaxingdong/jiashishoutao - meizhoubaonvwang.png diff --git a/resources/img/cases/kuangyadaxingdong/jiashishoutao - xizhuanggelv.png b/resources/image/cases/kuangyadaxingdong/jiashishoutao - xizhuanggelv.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/jiashishoutao - xizhuanggelv.png rename to resources/image/cases/kuangyadaxingdong/jiashishoutao - xizhuanggelv.png diff --git a/resources/img/cases/kuangyadaxingdong/jiashishoutao - xuebao.png b/resources/image/cases/kuangyadaxingdong/jiashishoutao - xuebao.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/jiashishoutao - xuebao.png rename to resources/image/cases/kuangyadaxingdong/jiashishoutao - xuebao.png diff --git a/resources/img/cases/kuangyadaxingdong/kuangyashoutao - feicui.png b/resources/image/cases/kuangyadaxingdong/kuangyashoutao - feicui.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/kuangyashoutao - feicui.png rename to resources/image/cases/kuangyadaxingdong/kuangyashoutao - feicui.png diff --git a/resources/img/cases/kuangyadaxingdong/kuangyashoutao - huangsebanwen.png b/resources/image/cases/kuangyadaxingdong/kuangyashoutao - huangsebanwen.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/kuangyashoutao - huangsebanwen.png rename to resources/image/cases/kuangyadaxingdong/kuangyashoutao - huangsebanwen.png diff --git a/resources/img/cases/kuangyadaxingdong/kuangyashoutao - jingshencuoluan.png b/resources/image/cases/kuangyadaxingdong/kuangyashoutao - jingshencuoluan.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/kuangyashoutao - jingshencuoluan.png rename to resources/image/cases/kuangyadaxingdong/kuangyashoutao - jingshencuoluan.png diff --git a/resources/img/cases/kuangyadaxingdong/kuangyashoutao - zhenjian.png b/resources/image/cases/kuangyadaxingdong/kuangyashoutao - zhenjian.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/kuangyashoutao - zhenjian.png rename to resources/image/cases/kuangyadaxingdong/kuangyashoutao - zhenjian.png diff --git a/resources/img/cases/kuangyadaxingdong/motuoshoutao - disantezhongbinglian.png b/resources/image/cases/kuangyadaxingdong/motuoshoutao - disantezhongbinglian.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/motuoshoutao - disantezhongbinglian.png rename to resources/image/cases/kuangyadaxingdong/motuoshoutao - disantezhongbinglian.png diff --git a/resources/img/cases/kuangyadaxingdong/motuoshoutao - xiaoxinyanmudan.png b/resources/image/cases/kuangyadaxingdong/motuoshoutao - xiaoxinyanmudan.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/motuoshoutao - xiaoxinyanmudan.png rename to resources/image/cases/kuangyadaxingdong/motuoshoutao - xiaoxinyanmudan.png diff --git a/resources/img/cases/kuangyadaxingdong/motuoshoutao - xueya.png b/resources/image/cases/kuangyadaxingdong/motuoshoutao - xueya.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/motuoshoutao - xueya.png rename to resources/image/cases/kuangyadaxingdong/motuoshoutao - xueya.png diff --git a/resources/img/cases/kuangyadaxingdong/motuoshoutao - zhongdianxian.png b/resources/image/cases/kuangyadaxingdong/motuoshoutao - zhongdianxian.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/motuoshoutao - zhongdianxian.png rename to resources/image/cases/kuangyadaxingdong/motuoshoutao - zhongdianxian.png diff --git a/resources/img/cases/kuangyadaxingdong/shuangchibeiruita - zainan.png b/resources/image/cases/kuangyadaxingdong/shuangchibeiruita - zainan.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/shuangchibeiruita - zainan.png rename to resources/image/cases/kuangyadaxingdong/shuangchibeiruita - zainan.png diff --git a/resources/img/cases/kuangyadaxingdong/xinxing - yijianqingxin.png b/resources/image/cases/kuangyadaxingdong/xinxing - yijianqingxin.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/xinxing - yijianqingxin.png rename to resources/image/cases/kuangyadaxingdong/xinxing - yijianqingxin.png diff --git a/resources/img/cases/kuangyadaxingdong/yundongshoutao - dangong.png b/resources/image/cases/kuangyadaxingdong/yundongshoutao - dangong.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/yundongshoutao - dangong.png rename to resources/image/cases/kuangyadaxingdong/yundongshoutao - dangong.png diff --git a/resources/img/cases/kuangyadaxingdong/yundongshoutao - daxingliewu.png b/resources/image/cases/kuangyadaxingdong/yundongshoutao - daxingliewu.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/yundongshoutao - daxingliewu.png rename to resources/image/cases/kuangyadaxingdong/yundongshoutao - daxingliewu.png diff --git a/resources/img/cases/kuangyadaxingdong/yundongshoutao - xinghongtoujin.png b/resources/image/cases/kuangyadaxingdong/yundongshoutao - xinghongtoujin.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/yundongshoutao - xinghongtoujin.png rename to resources/image/cases/kuangyadaxingdong/yundongshoutao - xinghongtoujin.png diff --git a/resources/img/cases/kuangyadaxingdong/yundongshoutao - yexingyi.png b/resources/image/cases/kuangyadaxingdong/yundongshoutao - yexingyi.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/yundongshoutao - yexingyi.png rename to resources/image/cases/kuangyadaxingdong/yundongshoutao - yexingyi.png diff --git a/resources/img/cases/kuangyadaxingdong/zhuanyeshoutao - jianbiandalishi.png b/resources/image/cases/kuangyadaxingdong/zhuanyeshoutao - jianbiandalishi.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/zhuanyeshoutao - jianbiandalishi.png rename to resources/image/cases/kuangyadaxingdong/zhuanyeshoutao - jianbiandalishi.png diff --git a/resources/img/cases/kuangyadaxingdong/zhuanyeshoutao - laohujingying.png b/resources/image/cases/kuangyadaxingdong/zhuanyeshoutao - laohujingying.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/zhuanyeshoutao - laohujingying.png rename to resources/image/cases/kuangyadaxingdong/zhuanyeshoutao - laohujingying.png diff --git a/resources/img/cases/kuangyadaxingdong/zhuanyeshoutao - lujunshaoweizhangguan.png b/resources/image/cases/kuangyadaxingdong/zhuanyeshoutao - lujunshaoweizhangguan.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/zhuanyeshoutao - lujunshaoweizhangguan.png rename to resources/image/cases/kuangyadaxingdong/zhuanyeshoutao - lujunshaoweizhangguan.png diff --git a/resources/img/cases/kuangyadaxingdong/zhuanyeshoutao - yixiantegong.png b/resources/image/cases/kuangyadaxingdong/zhuanyeshoutao - yixiantegong.png similarity index 100% rename from resources/img/cases/kuangyadaxingdong/zhuanyeshoutao - yixiantegong.png rename to resources/image/cases/kuangyadaxingdong/zhuanyeshoutao - yixiantegong.png diff --git a/resources/img/cases/liekong/AK-47 - anubisijuntuan.png b/resources/image/cases/liekong/AK-47 - anubisijuntuan.png similarity index 100% rename from resources/img/cases/liekong/AK-47 - anubisijuntuan.png rename to resources/image/cases/liekong/AK-47 - anubisijuntuan.png diff --git a/resources/img/cases/liekong/M4A4 - chixian.png b/resources/image/cases/liekong/M4A4 - chixian.png similarity index 100% rename from resources/img/cases/liekong/M4A4 - chixian.png rename to resources/image/cases/liekong/M4A4 - chixian.png diff --git a/resources/img/cases/liekong/MAC-10 - meihuo.png b/resources/image/cases/liekong/MAC-10 - meihuo.png similarity index 100% rename from resources/img/cases/liekong/MAC-10 - meihuo.png rename to resources/image/cases/liekong/MAC-10 - meihuo.png diff --git a/resources/img/cases/liekong/MAG-7 - beimingyouyu.png b/resources/image/cases/liekong/MAG-7 - beimingyouyu.png similarity index 100% rename from resources/img/cases/liekong/MAG-7 - beimingyouyu.png rename to resources/image/cases/liekong/MAG-7 - beimingyouyu.png diff --git a/resources/img/cases/liekong/MP5-SD - mengliechongfeng.png b/resources/image/cases/liekong/MP5-SD - mengliechongfeng.png similarity index 100% rename from resources/img/cases/liekong/MP5-SD - mengliechongfeng.png rename to resources/image/cases/liekong/MP5-SD - mengliechongfeng.png diff --git a/resources/img/cases/liekong/P2000 - pangencuojie.png b/resources/image/cases/liekong/P2000 - pangencuojie.png similarity index 100% rename from resources/img/cases/liekong/P2000 - pangencuojie.png rename to resources/image/cases/liekong/P2000 - pangencuojie.png diff --git a/resources/img/cases/liekong/P250 - kadai.png b/resources/image/cases/liekong/P250 - kadai.png similarity index 100% rename from resources/img/cases/liekong/P250 - kadai.png rename to resources/image/cases/liekong/P250 - kadai.png diff --git a/resources/img/cases/liekong/P90 - jizhuangxiang.png b/resources/image/cases/liekong/P90 - jizhuangxiang.png similarity index 100% rename from resources/img/cases/liekong/P90 - jizhuangxiang.png rename to resources/image/cases/liekong/P90 - jizhuangxiang.png diff --git a/resources/img/cases/liekong/PP-yeniu - shenmibeiwen.png b/resources/image/cases/liekong/PP-yeniu - shenmibeiwen.png similarity index 100% rename from resources/img/cases/liekong/PP-yeniu - shenmibeiwen.png rename to resources/image/cases/liekong/PP-yeniu - shenmibeiwen.png diff --git a/resources/img/cases/liekong/SG 553 - xiushizhiren.png b/resources/image/cases/liekong/SG 553 - xiushizhiren.png similarity index 100% rename from resources/img/cases/liekong/SG 553 - xiushizhiren.png rename to resources/image/cases/liekong/SG 553 - xiushizhiren.png diff --git a/resources/img/cases/liekong/SSG 08 - zhuji001.png b/resources/image/cases/liekong/SSG 08 - zhuji001.png similarity index 100% rename from resources/img/cases/liekong/SSG 08 - zhuji001.png rename to resources/image/cases/liekong/SSG 08 - zhuji001.png diff --git a/resources/img/cases/liekong/Tec-9 - xiongdilian.png b/resources/image/cases/liekong/Tec-9 - xiongdilian.png similarity index 100% rename from resources/img/cases/liekong/Tec-9 - xiongdilian.png rename to resources/image/cases/liekong/Tec-9 - xiongdilian.png diff --git a/resources/img/cases/liekong/XM1014 - maizangzhiying.png b/resources/image/cases/liekong/XM1014 - maizangzhiying.png similarity index 100% rename from resources/img/cases/liekong/XM1014 - maizangzhiying.png rename to resources/image/cases/liekong/XM1014 - maizangzhiying.png diff --git a/resources/img/cases/liekong/geluoke - modengshidai.png b/resources/image/cases/liekong/geluoke - modengshidai.png similarity index 100% rename from resources/img/cases/liekong/geluoke - modengshidai.png rename to resources/image/cases/liekong/geluoke - modengshidai.png diff --git a/resources/img/cases/liekong/jialier AR - fenghuangshanghao.png b/resources/image/cases/liekong/jialier AR - fenghuangshanghao.png similarity index 100% rename from resources/img/cases/liekong/jialier AR - fenghuangshanghao.png rename to resources/image/cases/liekong/jialier AR - fenghuangshanghao.png diff --git a/resources/img/cases/liekong/jishengbishou - beifangsenlin.png b/resources/image/cases/liekong/jishengbishou - beifangsenlin.png similarity index 100% rename from resources/img/cases/liekong/jishengbishou - beifangsenlin.png rename to resources/image/cases/liekong/jishengbishou - beifangsenlin.png diff --git a/resources/img/cases/liekong/jishengbishou - biaomiancuihuo.png b/resources/image/cases/liekong/jishengbishou - biaomiancuihuo.png similarity index 100% rename from resources/img/cases/liekong/jishengbishou - biaomiancuihuo.png rename to resources/image/cases/liekong/jishengbishou - biaomiancuihuo.png diff --git a/resources/img/cases/liekong/jishengbishou - dushiweizhuang.png b/resources/image/cases/liekong/jishengbishou - dushiweizhuang.png similarity index 100% rename from resources/img/cases/liekong/jishengbishou - dushiweizhuang.png rename to resources/image/cases/liekong/jishengbishou - dushiweizhuang.png diff --git a/resources/img/cases/liekong/jishengbishou - jianbianzhise.png b/resources/image/cases/liekong/jishengbishou - jianbianzhise.png similarity index 100% rename from resources/img/cases/liekong/jishengbishou - jianbianzhise.png rename to resources/image/cases/liekong/jishengbishou - jianbianzhise.png diff --git a/resources/img/cases/liekong/jishengbishou - kujiaozhise.png b/resources/image/cases/liekong/jishengbishou - kujiaozhise.png similarity index 100% rename from resources/img/cases/liekong/jishengbishou - kujiaozhise.png rename to resources/image/cases/liekong/jishengbishou - kujiaozhise.png diff --git a/resources/img/cases/liekong/jishengbishou - langang.png b/resources/image/cases/liekong/jishengbishou - langang.png similarity index 100% rename from resources/img/cases/liekong/jishengbishou - langang.png rename to resources/image/cases/liekong/jishengbishou - langang.png diff --git a/resources/img/cases/liekong/jishengbishou - rengongranse.png b/resources/image/cases/liekong/jishengbishou - rengongranse.png similarity index 100% rename from resources/img/cases/liekong/jishengbishou - rengongranse.png rename to resources/image/cases/liekong/jishengbishou - rengongranse.png diff --git a/resources/img/cases/liekong/jishengbishou - senlin DDPAT.png b/resources/image/cases/liekong/jishengbishou - senlin DDPAT.png similarity index 100% rename from resources/img/cases/liekong/jishengbishou - senlin DDPAT.png rename to resources/image/cases/liekong/jishengbishou - senlin DDPAT.png diff --git a/resources/img/cases/liekong/jishengbishou - shenhongzhiwang.png b/resources/image/cases/liekong/jishengbishou - shenhongzhiwang.png similarity index 100% rename from resources/img/cases/liekong/jishengbishou - shenhongzhiwang.png rename to resources/image/cases/liekong/jishengbishou - shenhongzhiwang.png diff --git a/resources/img/cases/liekong/jishengbishou - shouliewangge.png b/resources/image/cases/liekong/jishengbishou - shouliewangge.png similarity index 100% rename from resources/img/cases/liekong/jishengbishou - shouliewangge.png rename to resources/image/cases/liekong/jishengbishou - shouliewangge.png diff --git a/resources/img/cases/liekong/jishengbishou - tufu.png b/resources/image/cases/liekong/jishengbishou - tufu.png similarity index 100% rename from resources/img/cases/liekong/jishengbishou - tufu.png rename to resources/image/cases/liekong/jishengbishou - tufu.png diff --git a/resources/img/cases/liekong/jishengbishou - wutuzhuangg.png b/resources/image/cases/liekong/jishengbishou - wutuzhuangg.png similarity index 100% rename from resources/img/cases/liekong/jishengbishou - wutuzhuangg.png rename to resources/image/cases/liekong/jishengbishou - wutuzhuangg.png diff --git a/resources/img/cases/liekong/jishengbishou - yese.png b/resources/image/cases/liekong/jishengbishou - yese.png similarity index 100% rename from resources/img/cases/liekong/jishengbishou - yese.png rename to resources/image/cases/liekong/jishengbishou - yese.png diff --git a/resources/img/cases/liekong/kuloubishou - beifangsenlin.png b/resources/image/cases/liekong/kuloubishou - beifangsenlin.png similarity index 100% rename from resources/img/cases/liekong/kuloubishou - beifangsenlin.png rename to resources/image/cases/liekong/kuloubishou - beifangsenlin.png diff --git a/resources/img/cases/liekong/kuloubishou - biaomiancuihuo.png b/resources/image/cases/liekong/kuloubishou - biaomiancuihuo.png similarity index 100% rename from resources/img/cases/liekong/kuloubishou - biaomiancuihuo.png rename to resources/image/cases/liekong/kuloubishou - biaomiancuihuo.png diff --git a/resources/img/cases/liekong/kuloubishou - dushiweizhuang.png b/resources/image/cases/liekong/kuloubishou - dushiweizhuang.png similarity index 100% rename from resources/img/cases/liekong/kuloubishou - dushiweizhuang.png rename to resources/image/cases/liekong/kuloubishou - dushiweizhuang.png diff --git a/resources/img/cases/liekong/kuloubishou - jianbianzhise.png b/resources/image/cases/liekong/kuloubishou - jianbianzhise.png similarity index 100% rename from resources/img/cases/liekong/kuloubishou - jianbianzhise.png rename to resources/image/cases/liekong/kuloubishou - jianbianzhise.png diff --git a/resources/img/cases/liekong/kuloubishou - kujiaozhise.png b/resources/image/cases/liekong/kuloubishou - kujiaozhise.png similarity index 100% rename from resources/img/cases/liekong/kuloubishou - kujiaozhise.png rename to resources/image/cases/liekong/kuloubishou - kujiaozhise.png diff --git a/resources/img/cases/liekong/kuloubishou - langang.png b/resources/image/cases/liekong/kuloubishou - langang.png similarity index 100% rename from resources/img/cases/liekong/kuloubishou - langang.png rename to resources/image/cases/liekong/kuloubishou - langang.png diff --git a/resources/img/cases/liekong/kuloubishou - rengongranse.png b/resources/image/cases/liekong/kuloubishou - rengongranse.png similarity index 100% rename from resources/img/cases/liekong/kuloubishou - rengongranse.png rename to resources/image/cases/liekong/kuloubishou - rengongranse.png diff --git a/resources/img/cases/liekong/kuloubishou - senlin DDPAT.png b/resources/image/cases/liekong/kuloubishou - senlin DDPAT.png similarity index 100% rename from resources/img/cases/liekong/kuloubishou - senlin DDPAT.png rename to resources/image/cases/liekong/kuloubishou - senlin DDPAT.png diff --git a/resources/img/cases/liekong/kuloubishou - shenhongzhiwang.png b/resources/image/cases/liekong/kuloubishou - shenhongzhiwang.png similarity index 100% rename from resources/img/cases/liekong/kuloubishou - shenhongzhiwang.png rename to resources/image/cases/liekong/kuloubishou - shenhongzhiwang.png diff --git a/resources/img/cases/liekong/kuloubishou - shouliewangge.png b/resources/image/cases/liekong/kuloubishou - shouliewangge.png similarity index 100% rename from resources/img/cases/liekong/kuloubishou - shouliewangge.png rename to resources/image/cases/liekong/kuloubishou - shouliewangge.png diff --git a/resources/img/cases/liekong/kuloubishou - tufu.png b/resources/image/cases/liekong/kuloubishou - tufu.png similarity index 100% rename from resources/img/cases/liekong/kuloubishou - tufu.png rename to resources/image/cases/liekong/kuloubishou - tufu.png diff --git a/resources/img/cases/liekong/kuloubishou - wutuzhuang.png b/resources/image/cases/liekong/kuloubishou - wutuzhuang.png similarity index 100% rename from resources/img/cases/liekong/kuloubishou - wutuzhuang.png rename to resources/image/cases/liekong/kuloubishou - wutuzhuang.png diff --git a/resources/img/cases/liekong/kuloubishou - yese.png b/resources/image/cases/liekong/kuloubishou - yese.png similarity index 100% rename from resources/img/cases/liekong/kuloubishou - yese.png rename to resources/image/cases/liekong/kuloubishou - yese.png diff --git a/resources/img/cases/liekong/liulangzhebishou - beifangsenlin.png b/resources/image/cases/liekong/liulangzhebishou - beifangsenlin.png similarity index 100% rename from resources/img/cases/liekong/liulangzhebishou - beifangsenlin.png rename to resources/image/cases/liekong/liulangzhebishou - beifangsenlin.png diff --git a/resources/img/cases/liekong/liulangzhebishou - biaomiancuihuo.png b/resources/image/cases/liekong/liulangzhebishou - biaomiancuihuo.png similarity index 100% rename from resources/img/cases/liekong/liulangzhebishou - biaomiancuihuo.png rename to resources/image/cases/liekong/liulangzhebishou - biaomiancuihuo.png diff --git a/resources/img/cases/liekong/liulangzhebishou - dushiweizhuang.png b/resources/image/cases/liekong/liulangzhebishou - dushiweizhuang.png similarity index 100% rename from resources/img/cases/liekong/liulangzhebishou - dushiweizhuang.png rename to resources/image/cases/liekong/liulangzhebishou - dushiweizhuang.png diff --git a/resources/img/cases/liekong/liulangzhebishou - jianbianzhise.png b/resources/image/cases/liekong/liulangzhebishou - jianbianzhise.png similarity index 100% rename from resources/img/cases/liekong/liulangzhebishou - jianbianzhise.png rename to resources/image/cases/liekong/liulangzhebishou - jianbianzhise.png diff --git a/resources/img/cases/liekong/liulangzhebishou - kujiaozhise.png b/resources/image/cases/liekong/liulangzhebishou - kujiaozhise.png similarity index 100% rename from resources/img/cases/liekong/liulangzhebishou - kujiaozhise.png rename to resources/image/cases/liekong/liulangzhebishou - kujiaozhise.png diff --git a/resources/img/cases/liekong/liulangzhebishou - langang.png b/resources/image/cases/liekong/liulangzhebishou - langang.png similarity index 100% rename from resources/img/cases/liekong/liulangzhebishou - langang.png rename to resources/image/cases/liekong/liulangzhebishou - langang.png diff --git a/resources/img/cases/liekong/liulangzhebishou - rengongranse.png b/resources/image/cases/liekong/liulangzhebishou - rengongranse.png similarity index 100% rename from resources/img/cases/liekong/liulangzhebishou - rengongranse.png rename to resources/image/cases/liekong/liulangzhebishou - rengongranse.png diff --git a/resources/img/cases/liekong/liulangzhebishou - senlin DDPAT.png b/resources/image/cases/liekong/liulangzhebishou - senlin DDPAT.png similarity index 100% rename from resources/img/cases/liekong/liulangzhebishou - senlin DDPAT.png rename to resources/image/cases/liekong/liulangzhebishou - senlin DDPAT.png diff --git a/resources/img/cases/liekong/liulangzhebishou - shenhongzhiwang.png b/resources/image/cases/liekong/liulangzhebishou - shenhongzhiwang.png similarity index 100% rename from resources/img/cases/liekong/liulangzhebishou - shenhongzhiwang.png rename to resources/image/cases/liekong/liulangzhebishou - shenhongzhiwang.png diff --git a/resources/img/cases/liekong/liulangzhebishou - shouliewangge.png b/resources/image/cases/liekong/liulangzhebishou - shouliewangge.png similarity index 100% rename from resources/img/cases/liekong/liulangzhebishou - shouliewangge.png rename to resources/image/cases/liekong/liulangzhebishou - shouliewangge.png diff --git a/resources/img/cases/liekong/liulangzhebishou - tufu.png b/resources/image/cases/liekong/liulangzhebishou - tufu.png similarity index 100% rename from resources/img/cases/liekong/liulangzhebishou - tufu.png rename to resources/image/cases/liekong/liulangzhebishou - tufu.png diff --git a/resources/img/cases/liekong/liulangzhebishou - wutuzhuang.png b/resources/image/cases/liekong/liulangzhebishou - wutuzhuang.png similarity index 100% rename from resources/img/cases/liekong/liulangzhebishou - wutuzhuang.png rename to resources/image/cases/liekong/liulangzhebishou - wutuzhuang.png diff --git a/resources/img/cases/liekong/liulangzhebishou - yese.png b/resources/image/cases/liekong/liulangzhebishou - yese.png similarity index 100% rename from resources/img/cases/liekong/liulangzhebishou - yese.png rename to resources/image/cases/liekong/liulangzhebishou - yese.png diff --git a/resources/img/cases/liekong/neigefu - feiyu.png b/resources/image/cases/liekong/neigefu - feiyu.png similarity index 100% rename from resources/img/cases/liekong/neigefu - feiyu.png rename to resources/image/cases/liekong/neigefu - feiyu.png diff --git a/resources/img/cases/liekong/qiushengbishou - beifangsenlin.png b/resources/image/cases/liekong/qiushengbishou - beifangsenlin.png similarity index 100% rename from resources/img/cases/liekong/qiushengbishou - beifangsenlin.png rename to resources/image/cases/liekong/qiushengbishou - beifangsenlin.png diff --git a/resources/img/cases/liekong/qiushengbishou - biaomiancuihuo.png b/resources/image/cases/liekong/qiushengbishou - biaomiancuihuo.png similarity index 100% rename from resources/img/cases/liekong/qiushengbishou - biaomiancuihuo.png rename to resources/image/cases/liekong/qiushengbishou - biaomiancuihuo.png diff --git a/resources/img/cases/liekong/qiushengbishou - dushiweizhuang.png b/resources/image/cases/liekong/qiushengbishou - dushiweizhuang.png similarity index 100% rename from resources/img/cases/liekong/qiushengbishou - dushiweizhuang.png rename to resources/image/cases/liekong/qiushengbishou - dushiweizhuang.png diff --git a/resources/img/cases/liekong/qiushengbishou - jianbianzhise.png b/resources/image/cases/liekong/qiushengbishou - jianbianzhise.png similarity index 100% rename from resources/img/cases/liekong/qiushengbishou - jianbianzhise.png rename to resources/image/cases/liekong/qiushengbishou - jianbianzhise.png diff --git a/resources/img/cases/liekong/qiushengbishou - kujiaozhise.png b/resources/image/cases/liekong/qiushengbishou - kujiaozhise.png similarity index 100% rename from resources/img/cases/liekong/qiushengbishou - kujiaozhise.png rename to resources/image/cases/liekong/qiushengbishou - kujiaozhise.png diff --git a/resources/img/cases/liekong/qiushengbishou - langang.png b/resources/image/cases/liekong/qiushengbishou - langang.png similarity index 100% rename from resources/img/cases/liekong/qiushengbishou - langang.png rename to resources/image/cases/liekong/qiushengbishou - langang.png diff --git a/resources/img/cases/liekong/qiushengbishou - rengongranse.png b/resources/image/cases/liekong/qiushengbishou - rengongranse.png similarity index 100% rename from resources/img/cases/liekong/qiushengbishou - rengongranse.png rename to resources/image/cases/liekong/qiushengbishou - rengongranse.png diff --git a/resources/img/cases/liekong/qiushengbishou - senlin DDPAT.png b/resources/image/cases/liekong/qiushengbishou - senlin DDPAT.png similarity index 100% rename from resources/img/cases/liekong/qiushengbishou - senlin DDPAT.png rename to resources/image/cases/liekong/qiushengbishou - senlin DDPAT.png diff --git a/resources/img/cases/liekong/qiushengbishou - shenhongzhiwang.png b/resources/image/cases/liekong/qiushengbishou - shenhongzhiwang.png similarity index 100% rename from resources/img/cases/liekong/qiushengbishou - shenhongzhiwang.png rename to resources/image/cases/liekong/qiushengbishou - shenhongzhiwang.png diff --git a/resources/img/cases/liekong/qiushengbishou - shouliewangge.png b/resources/image/cases/liekong/qiushengbishou - shouliewangge.png similarity index 100% rename from resources/img/cases/liekong/qiushengbishou - shouliewangge.png rename to resources/image/cases/liekong/qiushengbishou - shouliewangge.png diff --git a/resources/img/cases/liekong/qiushengbishou - tufu.png b/resources/image/cases/liekong/qiushengbishou - tufu.png similarity index 100% rename from resources/img/cases/liekong/qiushengbishou - tufu.png rename to resources/image/cases/liekong/qiushengbishou - tufu.png diff --git a/resources/img/cases/liekong/qiushengbishou - wutuzhuang .png b/resources/image/cases/liekong/qiushengbishou - wutuzhuang .png similarity index 100% rename from resources/img/cases/liekong/qiushengbishou - wutuzhuang .png rename to resources/image/cases/liekong/qiushengbishou - wutuzhuang .png diff --git a/resources/img/cases/liekong/qiushengbishou - yese.png b/resources/image/cases/liekong/qiushengbishou - yese.png similarity index 100% rename from resources/img/cases/liekong/qiushengbishou - yese.png rename to resources/image/cases/liekong/qiushengbishou - yese.png diff --git a/resources/img/cases/liekong/shamozhiying - yinhuaji.png b/resources/image/cases/liekong/shamozhiying - yinhuaji.png similarity index 100% rename from resources/img/cases/liekong/shamozhiying - yinhuaji.png rename to resources/image/cases/liekong/shamozhiying - yinhuaji.png diff --git a/resources/img/cases/mingxuanyixian/AUG - huguainiao.png b/resources/image/cases/mingxuanyixian/AUG - huguainiao.png similarity index 100% rename from resources/img/cases/mingxuanyixian/AUG - huguainiao.png rename to resources/image/cases/mingxuanyixian/AUG - huguainiao.png diff --git a/resources/img/cases/mingxuanyixian/AWP - sishen.png b/resources/image/cases/mingxuanyixian/AWP - sishen.png similarity index 100% rename from resources/img/cases/mingxuanyixian/AWP - sishen.png rename to resources/image/cases/mingxuanyixian/AWP - sishen.png diff --git a/resources/img/cases/mingxuanyixian/FN57 - yansefanying.png b/resources/image/cases/mingxuanyixian/FN57 - yansefanying.png similarity index 100% rename from resources/img/cases/mingxuanyixian/FN57 - yansefanying.png rename to resources/image/cases/mingxuanyixian/FN57 - yansefanying.png diff --git a/resources/img/cases/mingxuanyixian/M4A4 - heisemeiying.png b/resources/image/cases/mingxuanyixian/M4A4 - heisemeiying.png similarity index 100% rename from resources/img/cases/mingxuanyixian/M4A4 - heisemeiying.png rename to resources/image/cases/mingxuanyixian/M4A4 - heisemeiying.png diff --git a/resources/img/cases/mingxuanyixian/MAG-7 - SWAG-7.png b/resources/image/cases/mingxuanyixian/MAG-7 - SWAG-7.png similarity index 100% rename from resources/img/cases/mingxuanyixian/MAG-7 - SWAG-7.png rename to resources/image/cases/mingxuanyixian/MAG-7 - SWAG-7.png diff --git a/resources/img/cases/mingxuanyixian/MP7 - xuexingyundong.png b/resources/image/cases/mingxuanyixian/MP7 - xuexingyundong.png similarity index 100% rename from resources/img/cases/mingxuanyixian/MP7 - xuexingyundong.png rename to resources/image/cases/mingxuanyixian/MP7 - xuexingyundong.png diff --git a/resources/img/cases/mingxuanyixian/MP9 - heisha.png b/resources/image/cases/mingxuanyixian/MP9 - heisha.png similarity index 100% rename from resources/img/cases/mingxuanyixian/MP9 - heisha.png rename to resources/image/cases/mingxuanyixian/MP9 - heisha.png diff --git a/resources/img/cases/mingxuanyixian/P2000 - dushiweiji.png b/resources/image/cases/mingxuanyixian/P2000 - dushiweiji.png similarity index 100% rename from resources/img/cases/mingxuanyixian/P2000 - dushiweiji.png rename to resources/image/cases/mingxuanyixian/P2000 - dushiweiji.png diff --git a/resources/img/cases/mingxuanyixian/PP-yeniu - heiyebaoluan.png b/resources/image/cases/mingxuanyixian/PP-yeniu - heiyebaoluan.png similarity index 100% rename from resources/img/cases/mingxuanyixian/PP-yeniu - heiyebaoluan.png rename to resources/image/cases/mingxuanyixian/PP-yeniu - heiyebaoluan.png diff --git a/resources/img/cases/mingxuanyixian/R8 zuolunshouqiang - wen.png b/resources/image/cases/mingxuanyixian/R8 zuolunshouqiang - wen.png similarity index 100% rename from resources/img/cases/mingxuanyixian/R8 zuolunshouqiang - wen.png rename to resources/image/cases/mingxuanyixian/R8 zuolunshouqiang - wen.png diff --git a/resources/img/cases/mingxuanyixian/SG 553 - aluoha.png b/resources/image/cases/mingxuanyixian/SG 553 - aluoha.png similarity index 100% rename from resources/img/cases/mingxuanyixian/SG 553 - aluoha.png rename to resources/image/cases/mingxuanyixian/SG 553 - aluoha.png diff --git a/resources/img/cases/mingxuanyixian/UMP-45 - bailang.png b/resources/image/cases/mingxuanyixian/UMP-45 - bailang.png similarity index 100% rename from resources/img/cases/mingxuanyixian/UMP-45 - bailang.png rename to resources/image/cases/mingxuanyixian/UMP-45 - bailang.png diff --git a/resources/img/cases/mingxuanyixian/USP - naodongdakai.png b/resources/image/cases/mingxuanyixian/USP - naodongdakai.png similarity index 100% rename from resources/img/cases/mingxuanyixian/USP - naodongdakai.png rename to resources/image/cases/mingxuanyixian/USP - naodongdakai.png diff --git a/resources/img/cases/mingxuanyixian/XM1014 - xiushilieyan.png b/resources/image/cases/mingxuanyixian/XM1014 - xiushilieyan.png similarity index 100% rename from resources/img/cases/mingxuanyixian/XM1014 - xiushilieyan.png rename to resources/image/cases/mingxuanyixian/XM1014 - xiushilieyan.png diff --git a/resources/img/cases/mingxuanyixian/geluoke - chenglideyueguang.png b/resources/image/cases/mingxuanyixian/geluoke - chenglideyueguang.png similarity index 100% rename from resources/img/cases/mingxuanyixian/geluoke - chenglideyueguang.png rename to resources/image/cases/mingxuanyixian/geluoke - chenglideyueguang.png diff --git a/resources/img/cases/mingxuanyixian/guoshou - fangshuibujiaodai.png b/resources/image/cases/mingxuanyixian/guoshou - fangshuibujiaodai.png similarity index 100% rename from resources/img/cases/mingxuanyixian/guoshou - fangshuibujiaodai.png rename to resources/image/cases/mingxuanyixian/guoshou - fangshuibujiaodai.png diff --git a/resources/img/cases/mingxuanyixian/guoshou - gulankulou.png b/resources/image/cases/mingxuanyixian/guoshou - gulankulou.png similarity index 100% rename from resources/img/cases/mingxuanyixian/guoshou - gulankulou.png rename to resources/image/cases/mingxuanyixian/guoshou - gulankulou.png diff --git a/resources/img/cases/mingxuanyixian/guoshou - senlinsediao.png b/resources/image/cases/mingxuanyixian/guoshou - senlinsediao.png similarity index 100% rename from resources/img/cases/mingxuanyixian/guoshou - senlinsediao.png rename to resources/image/cases/mingxuanyixian/guoshou - senlinsediao.png diff --git a/resources/img/cases/mingxuanyixian/guoshou - taoyin.png b/resources/image/cases/mingxuanyixian/guoshou - taoyin.png similarity index 100% rename from resources/img/cases/mingxuanyixian/guoshou - taoyin.png rename to resources/image/cases/mingxuanyixian/guoshou - taoyin.png diff --git a/resources/img/cases/mingxuanyixian/jiashishoutao - chaoyue.png b/resources/image/cases/mingxuanyixian/jiashishoutao - chaoyue.png similarity index 100% rename from resources/img/cases/mingxuanyixian/jiashishoutao - chaoyue.png rename to resources/image/cases/mingxuanyixian/jiashishoutao - chaoyue.png diff --git a/resources/img/cases/mingxuanyixian/jiashishoutao - lanzigezi.png b/resources/image/cases/mingxuanyixian/jiashishoutao - lanzigezi.png similarity index 100% rename from resources/img/cases/mingxuanyixian/jiashishoutao - lanzigezi.png rename to resources/image/cases/mingxuanyixian/jiashishoutao - lanzigezi.png diff --git a/resources/img/cases/mingxuanyixian/jiashishoutao - molvsediao.png b/resources/image/cases/mingxuanyixian/jiashishoutao - molvsediao.png similarity index 100% rename from resources/img/cases/mingxuanyixian/jiashishoutao - molvsediao.png rename to resources/image/cases/mingxuanyixian/jiashishoutao - molvsediao.png diff --git a/resources/img/cases/mingxuanyixian/jiashishoutao - wangshe.png b/resources/image/cases/mingxuanyixian/jiashishoutao - wangshe.png similarity index 100% rename from resources/img/cases/mingxuanyixian/jiashishoutao - wangshe.png rename to resources/image/cases/mingxuanyixian/jiashishoutao - wangshe.png diff --git a/resources/img/cases/mingxuanyixian/jiutousheshoutao - biaomiancuihuo.png b/resources/image/cases/mingxuanyixian/jiutousheshoutao - biaomiancuihuo.png similarity index 100% rename from resources/img/cases/mingxuanyixian/jiutousheshoutao - biaomiancuihuo.png rename to resources/image/cases/mingxuanyixian/jiutousheshoutao - biaomiancuihuo.png diff --git a/resources/img/cases/mingxuanyixian/jiutousheshoutao - feicuisediao.png b/resources/image/cases/mingxuanyixian/jiutousheshoutao - feicuisediao.png similarity index 100% rename from resources/img/cases/mingxuanyixian/jiutousheshoutao - feicuisediao.png rename to resources/image/cases/mingxuanyixian/jiutousheshoutao - feicuisediao.png diff --git a/resources/img/cases/mingxuanyixian/jiutousheshoutao - hongshulin.png b/resources/image/cases/mingxuanyixian/jiutousheshoutao - hongshulin.png similarity index 100% rename from resources/img/cases/mingxuanyixian/jiutousheshoutao - hongshulin.png rename to resources/image/cases/mingxuanyixian/jiutousheshoutao - hongshulin.png diff --git a/resources/img/cases/mingxuanyixian/jiutousheshoutao - xiangweishe.png b/resources/image/cases/mingxuanyixian/jiutousheshoutao - xiangweishe.png similarity index 100% rename from resources/img/cases/mingxuanyixian/jiutousheshoutao - xiangweishe.png rename to resources/image/cases/mingxuanyixian/jiutousheshoutao - xiangweishe.png diff --git a/resources/img/cases/mingxuanyixian/motuoshoutao - daimao.png b/resources/image/cases/mingxuanyixian/motuoshoutao - daimao.png similarity index 100% rename from resources/img/cases/mingxuanyixian/motuoshoutao - daimao.png rename to resources/image/cases/mingxuanyixian/motuoshoutao - daimao.png diff --git a/resources/img/cases/mingxuanyixian/motuoshoutao - duobianxing.png b/resources/image/cases/mingxuanyixian/motuoshoutao - duobianxing.png similarity index 100% rename from resources/img/cases/mingxuanyixian/motuoshoutao - duobianxing.png rename to resources/image/cases/mingxuanyixian/motuoshoutao - duobianxing.png diff --git a/resources/img/cases/mingxuanyixian/motuoshoutao - jiaoyun.png b/resources/image/cases/mingxuanyixian/motuoshoutao - jiaoyun.png similarity index 100% rename from resources/img/cases/mingxuanyixian/motuoshoutao - jiaoyun.png rename to resources/image/cases/mingxuanyixian/motuoshoutao - jiaoyun.png diff --git a/resources/img/cases/mingxuanyixian/motuoshoutao - peng！.png b/resources/image/cases/mingxuanyixian/motuoshoutao - peng！.png similarity index 100% rename from resources/img/cases/mingxuanyixian/motuoshoutao - peng！.png rename to resources/image/cases/mingxuanyixian/motuoshoutao - peng！.png diff --git a/resources/img/cases/mingxuanyixian/neigefu - shiziyu.png b/resources/image/cases/mingxuanyixian/neigefu - shiziyu.png similarity index 100% rename from resources/img/cases/mingxuanyixian/neigefu - shiziyu.png rename to resources/image/cases/mingxuanyixian/neigefu - shiziyu.png diff --git a/resources/img/cases/mingxuanyixian/xinxing - kuangyeliuhao.png b/resources/image/cases/mingxuanyixian/xinxing - kuangyeliuhao.png similarity index 100% rename from resources/img/cases/mingxuanyixian/xinxing - kuangyeliuhao.png rename to resources/image/cases/mingxuanyixian/xinxing - kuangyeliuhao.png diff --git a/resources/img/cases/mingxuanyixian/yundongshoutao - maiamifengyun.png b/resources/image/cases/mingxuanyixian/yundongshoutao - maiamifengyun.png similarity index 100% rename from resources/img/cases/mingxuanyixian/yundongshoutao - maiamifengyun.png rename to resources/image/cases/mingxuanyixian/yundongshoutao - maiamifengyun.png diff --git a/resources/img/cases/mingxuanyixian/yundongshoutao - oumiga.png b/resources/image/cases/mingxuanyixian/yundongshoutao - oumiga.png similarity index 100% rename from resources/img/cases/mingxuanyixian/yundongshoutao - oumiga.png rename to resources/image/cases/mingxuanyixian/yundongshoutao - oumiga.png diff --git a/resources/img/cases/mingxuanyixian/yundongshoutao - qingtongxingtai.png b/resources/image/cases/mingxuanyixian/yundongshoutao - qingtongxingtai.png similarity index 100% rename from resources/img/cases/mingxuanyixian/yundongshoutao - qingtongxingtai.png rename to resources/image/cases/mingxuanyixian/yundongshoutao - qingtongxingtai.png diff --git a/resources/img/cases/mingxuanyixian/yundongshoutao - shuangqi.png b/resources/image/cases/mingxuanyixian/yundongshoutao - shuangqi.png similarity index 100% rename from resources/img/cases/mingxuanyixian/yundongshoutao - shuangqi.png rename to resources/image/cases/mingxuanyixian/yundongshoutao - shuangqi.png diff --git a/resources/img/cases/mingxuanyixian/zhuanyeshoutao - dawan.png b/resources/image/cases/mingxuanyixian/zhuanyeshoutao - dawan.png similarity index 100% rename from resources/img/cases/mingxuanyixian/zhuanyeshoutao - dawan.png rename to resources/image/cases/mingxuanyixian/zhuanyeshoutao - dawan.png diff --git a/resources/img/cases/mingxuanyixian/zhuanyeshoutao - jianbianzhise.png b/resources/image/cases/mingxuanyixian/zhuanyeshoutao - jianbianzhise.png similarity index 100% rename from resources/img/cases/mingxuanyixian/zhuanyeshoutao - jianbianzhise.png rename to resources/image/cases/mingxuanyixian/zhuanyeshoutao - jianbianzhise.png diff --git a/resources/img/cases/mingxuanyixian/zhuanyeshoutao - shenhongzhiwang.png b/resources/image/cases/mingxuanyixian/zhuanyeshoutao - shenhongzhiwang.png similarity index 100% rename from resources/img/cases/mingxuanyixian/zhuanyeshoutao - shenhongzhiwang.png rename to resources/image/cases/mingxuanyixian/zhuanyeshoutao - shenhongzhiwang.png diff --git a/resources/img/cases/mingxuanyixian/zhuanyeshoutao - shoulu.png b/resources/image/cases/mingxuanyixian/zhuanyeshoutao - shoulu.png similarity index 100% rename from resources/img/cases/mingxuanyixian/zhuanyeshoutao - shoulu.png rename to resources/image/cases/mingxuanyixian/zhuanyeshoutao - shoulu.png diff --git a/resources/img/cases/tuweidaxingdong/CZ75 - menghu.png b/resources/image/cases/tuweidaxingdong/CZ75 - menghu.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/CZ75 - menghu.png rename to resources/image/cases/tuweidaxingdong/CZ75 - menghu.png diff --git a/resources/img/cases/tuweidaxingdong/FN57 - shoulieliqi.png b/resources/image/cases/tuweidaxingdong/FN57 - shoulieliqi.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/FN57 - shoulieliqi.png rename to resources/image/cases/tuweidaxingdong/FN57 - shoulieliqi.png diff --git a/resources/img/cases/tuweidaxingdong/M4A1 - cishidai.png b/resources/image/cases/tuweidaxingdong/M4A1 - cishidai.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/M4A1 - cishidai.png rename to resources/image/cases/tuweidaxingdong/M4A1 - cishidai.png diff --git a/resources/img/cases/tuweidaxingdong/MP7 - dushiweiji.png b/resources/image/cases/tuweidaxingdong/MP7 - dushiweiji.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/MP7 - dushiweiji.png rename to resources/image/cases/tuweidaxingdong/MP7 - dushiweiji.png diff --git a/resources/img/cases/tuweidaxingdong/P2000 - rubaixiangya.png b/resources/image/cases/tuweidaxingdong/P2000 - rubaixiangya.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/P2000 - rubaixiangya.png rename to resources/image/cases/tuweidaxingdong/P2000 - rubaixiangya.png diff --git a/resources/img/cases/tuweidaxingdong/P250 - chaoxinxing.png b/resources/image/cases/tuweidaxingdong/P250 - chaoxinxing.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/P250 - chaoxinxing.png rename to resources/image/cases/tuweidaxingdong/P250 - chaoxinxing.png diff --git a/resources/img/cases/tuweidaxingdong/P90 - erximofu.png b/resources/image/cases/tuweidaxingdong/P90 - erximofu.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/P90 - erximofu.png rename to resources/image/cases/tuweidaxingdong/P90 - erximofu.png diff --git a/resources/img/cases/tuweidaxingdong/PP-yeniu - siwangzhuzaizhe.png b/resources/image/cases/tuweidaxingdong/PP-yeniu - siwangzhuzaizhe.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/PP-yeniu - siwangzhuzaizhe.png rename to resources/image/cases/tuweidaxingdong/PP-yeniu - siwangzhuzaizhe.png diff --git a/resources/img/cases/tuweidaxingdong/SSG 08 - wujinshenhai.png b/resources/image/cases/tuweidaxingdong/SSG 08 - wujinshenhai.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/SSG 08 - wujinshenhai.png rename to resources/image/cases/tuweidaxingdong/SSG 08 - wujinshenhai.png diff --git a/resources/img/cases/tuweidaxingdong/UMP-45 - mizhigong.png b/resources/image/cases/tuweidaxingdong/UMP-45 - mizhigong.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/UMP-45 - mizhigong.png rename to resources/image/cases/tuweidaxingdong/UMP-45 - mizhigong.png diff --git a/resources/img/cases/tuweidaxingdong/geluoke - shuiling.png b/resources/image/cases/tuweidaxingdong/geluoke - shuiling.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/geluoke - shuiling.png rename to resources/image/cases/tuweidaxingdong/geluoke - shuiling.png diff --git a/resources/img/cases/tuweidaxingdong/hudiedao - beifangsenlin.png b/resources/image/cases/tuweidaxingdong/hudiedao - beifangsenlin.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/hudiedao - beifangsenlin.png rename to resources/image/cases/tuweidaxingdong/hudiedao - beifangsenlin.png diff --git a/resources/img/cases/tuweidaxingdong/hudiedao - biaomiancuihuo.png b/resources/image/cases/tuweidaxingdong/hudiedao - biaomiancuihuo.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/hudiedao - biaomiancuihuo.png rename to resources/image/cases/tuweidaxingdong/hudiedao - biaomiancuihuo.png diff --git a/resources/img/cases/tuweidaxingdong/hudiedao - dushiweizhuang.png b/resources/image/cases/tuweidaxingdong/hudiedao - dushiweizhuang.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/hudiedao - dushiweizhuang.png rename to resources/image/cases/tuweidaxingdong/hudiedao - dushiweizhuang.png diff --git a/resources/img/cases/tuweidaxingdong/hudiedao - emengzhiye.png b/resources/image/cases/tuweidaxingdong/hudiedao - emengzhiye.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/hudiedao - emengzhiye.png rename to resources/image/cases/tuweidaxingdong/hudiedao - emengzhiye.png diff --git a/resources/img/cases/tuweidaxingdong/hudiedao - jianbianzhise.png b/resources/image/cases/tuweidaxingdong/hudiedao - jianbianzhise.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/hudiedao - jianbianzhise.png rename to resources/image/cases/tuweidaxingdong/hudiedao - jianbianzhise.png diff --git a/resources/img/cases/tuweidaxingdong/hudiedao - kujiaozhise.png b/resources/image/cases/tuweidaxingdong/hudiedao - kujiaozhise.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/hudiedao - kujiaozhise.png rename to resources/image/cases/tuweidaxingdong/hudiedao - kujiaozhise.png diff --git a/resources/img/cases/tuweidaxingdong/hudiedao - langang.png b/resources/image/cases/tuweidaxingdong/hudiedao - langang.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/hudiedao - langang.png rename to resources/image/cases/tuweidaxingdong/hudiedao - langang.png diff --git a/resources/img/cases/tuweidaxingdong/hudiedao - rengongranse.png b/resources/image/cases/tuweidaxingdong/hudiedao - rengongranse.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/hudiedao - rengongranse.png rename to resources/image/cases/tuweidaxingdong/hudiedao - rengongranse.png diff --git a/resources/img/cases/tuweidaxingdong/hudiedao - senlin DDPAT.png b/resources/image/cases/tuweidaxingdong/hudiedao - senlin DDPAT.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/hudiedao - senlin DDPAT.png rename to resources/image/cases/tuweidaxingdong/hudiedao - senlin DDPAT.png diff --git a/resources/img/cases/tuweidaxingdong/hudiedao - shenhongzhiwang.png b/resources/image/cases/tuweidaxingdong/hudiedao - shenhongzhiwang.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/hudiedao - shenhongzhiwang.png rename to resources/image/cases/tuweidaxingdong/hudiedao - shenhongzhiwang.png diff --git a/resources/img/cases/tuweidaxingdong/hudiedao - shouliewangge.png b/resources/image/cases/tuweidaxingdong/hudiedao - shouliewangge.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/hudiedao - shouliewangge.png rename to resources/image/cases/tuweidaxingdong/hudiedao - shouliewangge.png diff --git a/resources/img/cases/tuweidaxingdong/hudiedao - tufu.png b/resources/image/cases/tuweidaxingdong/hudiedao - tufu.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/hudiedao - tufu.png rename to resources/image/cases/tuweidaxingdong/hudiedao - tufu.png diff --git a/resources/img/cases/tuweidaxingdong/hudiedao - wutuzhuang.png b/resources/image/cases/tuweidaxingdong/hudiedao - wutuzhuang.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/hudiedao - wutuzhuang.png rename to resources/image/cases/tuweidaxingdong/hudiedao - wutuzhuang.png diff --git a/resources/img/cases/tuweidaxingdong/neigefu - shamojingying.png b/resources/image/cases/tuweidaxingdong/neigefu - shamojingying.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/neigefu - shamojingying.png rename to resources/image/cases/tuweidaxingdong/neigefu - shamojingying.png diff --git a/resources/img/cases/tuweidaxingdong/shamozhiying - yinmouzhe.png b/resources/image/cases/tuweidaxingdong/shamozhiying - yinmouzhe.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/shamozhiying - yinmouzhe.png rename to resources/image/cases/tuweidaxingdong/shamozhiying - yinmouzhe.png diff --git a/resources/img/cases/tuweidaxingdong/xinxing - jinli.png b/resources/image/cases/tuweidaxingdong/xinxing - jinli.png similarity index 100% rename from resources/img/cases/tuweidaxingdong/xinxing - jinli.png rename to resources/image/cases/tuweidaxingdong/xinxing - jinli.png diff --git a/resources/img/dayouxi/0.jpg b/resources/image/dayouxi/0.jpg similarity index 100% rename from resources/img/dayouxi/0.jpg rename to resources/image/dayouxi/0.jpg diff --git a/resources/img/dayouxi/1.jpg b/resources/image/dayouxi/1.jpg similarity index 100% rename from resources/img/dayouxi/1.jpg rename to resources/image/dayouxi/1.jpg diff --git a/resources/img/dayouxi/2.jpg b/resources/image/dayouxi/2.jpg similarity index 100% rename from resources/img/dayouxi/2.jpg rename to resources/image/dayouxi/2.jpg diff --git a/resources/img/genshin/chars/10000003.png b/resources/image/genshin/chars/10000003.png similarity index 100% rename from resources/img/genshin/chars/10000003.png rename to resources/image/genshin/chars/10000003.png diff --git a/resources/img/genshin/chars/10000005.png b/resources/image/genshin/chars/10000005.png similarity index 100% rename from resources/img/genshin/chars/10000005.png rename to resources/image/genshin/chars/10000005.png diff --git a/resources/img/genshin/chars/10000006.png b/resources/image/genshin/chars/10000006.png similarity index 100% rename from resources/img/genshin/chars/10000006.png rename to resources/image/genshin/chars/10000006.png diff --git a/resources/img/genshin/chars/10000007.png b/resources/image/genshin/chars/10000007.png similarity index 100% rename from resources/img/genshin/chars/10000007.png rename to resources/image/genshin/chars/10000007.png diff --git a/resources/img/genshin/chars/10000014.png b/resources/image/genshin/chars/10000014.png similarity index 100% rename from resources/img/genshin/chars/10000014.png rename to resources/image/genshin/chars/10000014.png diff --git a/resources/img/genshin/chars/10000015.png b/resources/image/genshin/chars/10000015.png similarity index 100% rename from resources/img/genshin/chars/10000015.png rename to resources/image/genshin/chars/10000015.png diff --git a/resources/img/genshin/chars/10000016.png b/resources/image/genshin/chars/10000016.png similarity index 100% rename from resources/img/genshin/chars/10000016.png rename to resources/image/genshin/chars/10000016.png diff --git a/resources/img/genshin/chars/10000020.png b/resources/image/genshin/chars/10000020.png similarity index 100% rename from resources/img/genshin/chars/10000020.png rename to resources/image/genshin/chars/10000020.png diff --git a/resources/img/genshin/chars/10000021.png b/resources/image/genshin/chars/10000021.png similarity index 100% rename from resources/img/genshin/chars/10000021.png rename to resources/image/genshin/chars/10000021.png diff --git a/resources/img/genshin/chars/10000022.png b/resources/image/genshin/chars/10000022.png similarity index 100% rename from resources/img/genshin/chars/10000022.png rename to resources/image/genshin/chars/10000022.png diff --git a/resources/img/genshin/chars/10000023.png b/resources/image/genshin/chars/10000023.png similarity index 100% rename from resources/img/genshin/chars/10000023.png rename to resources/image/genshin/chars/10000023.png diff --git a/resources/img/genshin/chars/10000024.png b/resources/image/genshin/chars/10000024.png similarity index 100% rename from resources/img/genshin/chars/10000024.png rename to resources/image/genshin/chars/10000024.png diff --git a/resources/img/genshin/chars/10000025.png b/resources/image/genshin/chars/10000025.png similarity index 100% rename from resources/img/genshin/chars/10000025.png rename to resources/image/genshin/chars/10000025.png diff --git a/resources/img/genshin/chars/10000027.png b/resources/image/genshin/chars/10000027.png similarity index 100% rename from resources/img/genshin/chars/10000027.png rename to resources/image/genshin/chars/10000027.png diff --git a/resources/img/genshin/chars/10000029.png b/resources/image/genshin/chars/10000029.png similarity index 100% rename from resources/img/genshin/chars/10000029.png rename to resources/image/genshin/chars/10000029.png diff --git a/resources/img/genshin/chars/10000031.png b/resources/image/genshin/chars/10000031.png similarity index 100% rename from resources/img/genshin/chars/10000031.png rename to resources/image/genshin/chars/10000031.png diff --git a/resources/img/genshin/chars/10000032.png b/resources/image/genshin/chars/10000032.png similarity index 100% rename from resources/img/genshin/chars/10000032.png rename to resources/image/genshin/chars/10000032.png diff --git a/resources/img/genshin/chars/10000033.png b/resources/image/genshin/chars/10000033.png similarity index 100% rename from resources/img/genshin/chars/10000033.png rename to resources/image/genshin/chars/10000033.png diff --git a/resources/img/genshin/chars/10000034.png b/resources/image/genshin/chars/10000034.png similarity index 100% rename from resources/img/genshin/chars/10000034.png rename to resources/image/genshin/chars/10000034.png diff --git a/resources/img/genshin/chars/10000035.png b/resources/image/genshin/chars/10000035.png similarity index 100% rename from resources/img/genshin/chars/10000035.png rename to resources/image/genshin/chars/10000035.png diff --git a/resources/img/genshin/chars/10000036.png b/resources/image/genshin/chars/10000036.png similarity index 100% rename from resources/img/genshin/chars/10000036.png rename to resources/image/genshin/chars/10000036.png diff --git a/resources/img/genshin/chars/10000037.png b/resources/image/genshin/chars/10000037.png similarity index 100% rename from resources/img/genshin/chars/10000037.png rename to resources/image/genshin/chars/10000037.png diff --git a/resources/img/genshin/chars/10000039.png b/resources/image/genshin/chars/10000039.png similarity index 100% rename from resources/img/genshin/chars/10000039.png rename to resources/image/genshin/chars/10000039.png diff --git a/resources/img/genshin/chars/10000041.png b/resources/image/genshin/chars/10000041.png similarity index 100% rename from resources/img/genshin/chars/10000041.png rename to resources/image/genshin/chars/10000041.png diff --git a/resources/img/genshin/chars/10000042.png b/resources/image/genshin/chars/10000042.png similarity index 100% rename from resources/img/genshin/chars/10000042.png rename to resources/image/genshin/chars/10000042.png diff --git a/resources/img/genshin/chars/10000043.png b/resources/image/genshin/chars/10000043.png similarity index 100% rename from resources/img/genshin/chars/10000043.png rename to resources/image/genshin/chars/10000043.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000002.png b/resources/image/genshin/genshin_card/chars_ava/10000002.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000002.png rename to resources/image/genshin/genshin_card/chars_ava/10000002.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000003.png b/resources/image/genshin/genshin_card/chars_ava/10000003.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000003.png rename to resources/image/genshin/genshin_card/chars_ava/10000003.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000005.png b/resources/image/genshin/genshin_card/chars_ava/10000005.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000005.png rename to resources/image/genshin/genshin_card/chars_ava/10000005.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000006.png b/resources/image/genshin/genshin_card/chars_ava/10000006.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000006.png rename to resources/image/genshin/genshin_card/chars_ava/10000006.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000007.png b/resources/image/genshin/genshin_card/chars_ava/10000007.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000007.png rename to resources/image/genshin/genshin_card/chars_ava/10000007.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000014.png b/resources/image/genshin/genshin_card/chars_ava/10000014.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000014.png rename to resources/image/genshin/genshin_card/chars_ava/10000014.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000015.png b/resources/image/genshin/genshin_card/chars_ava/10000015.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000015.png rename to resources/image/genshin/genshin_card/chars_ava/10000015.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000016.png b/resources/image/genshin/genshin_card/chars_ava/10000016.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000016.png rename to resources/image/genshin/genshin_card/chars_ava/10000016.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000020.png b/resources/image/genshin/genshin_card/chars_ava/10000020.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000020.png rename to resources/image/genshin/genshin_card/chars_ava/10000020.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000021.png b/resources/image/genshin/genshin_card/chars_ava/10000021.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000021.png rename to resources/image/genshin/genshin_card/chars_ava/10000021.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000022.png b/resources/image/genshin/genshin_card/chars_ava/10000022.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000022.png rename to resources/image/genshin/genshin_card/chars_ava/10000022.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000023.png b/resources/image/genshin/genshin_card/chars_ava/10000023.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000023.png rename to resources/image/genshin/genshin_card/chars_ava/10000023.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000024.png b/resources/image/genshin/genshin_card/chars_ava/10000024.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000024.png rename to resources/image/genshin/genshin_card/chars_ava/10000024.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000025.png b/resources/image/genshin/genshin_card/chars_ava/10000025.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000025.png rename to resources/image/genshin/genshin_card/chars_ava/10000025.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000026.png b/resources/image/genshin/genshin_card/chars_ava/10000026.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000026.png rename to resources/image/genshin/genshin_card/chars_ava/10000026.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000027.png b/resources/image/genshin/genshin_card/chars_ava/10000027.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000027.png rename to resources/image/genshin/genshin_card/chars_ava/10000027.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000029.png b/resources/image/genshin/genshin_card/chars_ava/10000029.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000029.png rename to resources/image/genshin/genshin_card/chars_ava/10000029.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000030.png b/resources/image/genshin/genshin_card/chars_ava/10000030.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000030.png rename to resources/image/genshin/genshin_card/chars_ava/10000030.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000031.png b/resources/image/genshin/genshin_card/chars_ava/10000031.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000031.png rename to resources/image/genshin/genshin_card/chars_ava/10000031.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000032.png b/resources/image/genshin/genshin_card/chars_ava/10000032.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000032.png rename to resources/image/genshin/genshin_card/chars_ava/10000032.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000033.png b/resources/image/genshin/genshin_card/chars_ava/10000033.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000033.png rename to resources/image/genshin/genshin_card/chars_ava/10000033.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000034.png b/resources/image/genshin/genshin_card/chars_ava/10000034.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000034.png rename to resources/image/genshin/genshin_card/chars_ava/10000034.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000035.png b/resources/image/genshin/genshin_card/chars_ava/10000035.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000035.png rename to resources/image/genshin/genshin_card/chars_ava/10000035.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000036.png b/resources/image/genshin/genshin_card/chars_ava/10000036.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000036.png rename to resources/image/genshin/genshin_card/chars_ava/10000036.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000037.png b/resources/image/genshin/genshin_card/chars_ava/10000037.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000037.png rename to resources/image/genshin/genshin_card/chars_ava/10000037.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000038.png b/resources/image/genshin/genshin_card/chars_ava/10000038.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000038.png rename to resources/image/genshin/genshin_card/chars_ava/10000038.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000039.png b/resources/image/genshin/genshin_card/chars_ava/10000039.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000039.png rename to resources/image/genshin/genshin_card/chars_ava/10000039.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000041.png b/resources/image/genshin/genshin_card/chars_ava/10000041.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000041.png rename to resources/image/genshin/genshin_card/chars_ava/10000041.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000042.png b/resources/image/genshin/genshin_card/chars_ava/10000042.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000042.png rename to resources/image/genshin/genshin_card/chars_ava/10000042.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000043.png b/resources/image/genshin/genshin_card/chars_ava/10000043.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000043.png rename to resources/image/genshin/genshin_card/chars_ava/10000043.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000044.png b/resources/image/genshin/genshin_card/chars_ava/10000044.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000044.png rename to resources/image/genshin/genshin_card/chars_ava/10000044.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000045.png b/resources/image/genshin/genshin_card/chars_ava/10000045.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000045.png rename to resources/image/genshin/genshin_card/chars_ava/10000045.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000046.png b/resources/image/genshin/genshin_card/chars_ava/10000046.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000046.png rename to resources/image/genshin/genshin_card/chars_ava/10000046.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000047.png b/resources/image/genshin/genshin_card/chars_ava/10000047.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000047.png rename to resources/image/genshin/genshin_card/chars_ava/10000047.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000048.png b/resources/image/genshin/genshin_card/chars_ava/10000048.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000048.png rename to resources/image/genshin/genshin_card/chars_ava/10000048.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000049.png b/resources/image/genshin/genshin_card/chars_ava/10000049.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000049.png rename to resources/image/genshin/genshin_card/chars_ava/10000049.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000050.png b/resources/image/genshin/genshin_card/chars_ava/10000050.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000050.png rename to resources/image/genshin/genshin_card/chars_ava/10000050.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000051.png b/resources/image/genshin/genshin_card/chars_ava/10000051.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000051.png rename to resources/image/genshin/genshin_card/chars_ava/10000051.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000052.png b/resources/image/genshin/genshin_card/chars_ava/10000052.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000052.png rename to resources/image/genshin/genshin_card/chars_ava/10000052.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000053.png b/resources/image/genshin/genshin_card/chars_ava/10000053.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000053.png rename to resources/image/genshin/genshin_card/chars_ava/10000053.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000054.png b/resources/image/genshin/genshin_card/chars_ava/10000054.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000054.png rename to resources/image/genshin/genshin_card/chars_ava/10000054.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000056.png b/resources/image/genshin/genshin_card/chars_ava/10000056.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000056.png rename to resources/image/genshin/genshin_card/chars_ava/10000056.png diff --git a/resources/img/genshin/genshin_card/chars_ava/10000062.png b/resources/image/genshin/genshin_card/chars_ava/10000062.png similarity index 100% rename from resources/img/genshin/genshin_card/chars_ava/10000062.png rename to resources/image/genshin/genshin_card/chars_ava/10000062.png diff --git a/resources/img/genshin/genshin_card/cover.png b/resources/image/genshin/genshin_card/cover.png similarity index 100% rename from resources/img/genshin/genshin_card/cover.png rename to resources/image/genshin/genshin_card/cover.png diff --git a/resources/img/genshin/genshin_card/element.png b/resources/image/genshin/genshin_card/element.png similarity index 100% rename from resources/img/genshin/genshin_card/element.png rename to resources/image/genshin/genshin_card/element.png diff --git a/resources/img/genshin/genshin_card/head.png b/resources/image/genshin/genshin_card/head.png similarity index 100% rename from resources/img/genshin/genshin_card/head.png rename to resources/image/genshin/genshin_card/head.png diff --git a/resources/img/genshin/genshin_card/homes/lock.png b/resources/image/genshin/genshin_card/homes/lock.png similarity index 100% rename from resources/img/genshin/genshin_card/homes/lock.png rename to resources/image/genshin/genshin_card/homes/lock.png diff --git a/resources/img/genshin/genshin_card/logo/璃月.png b/resources/image/genshin/genshin_card/logo/璃月.png similarity index 100% rename from resources/img/genshin/genshin_card/logo/璃月.png rename to resources/image/genshin/genshin_card/logo/璃月.png diff --git a/resources/img/genshin/genshin_card/logo/稻妻.png b/resources/image/genshin/genshin_card/logo/稻妻.png similarity index 100% rename from resources/img/genshin/genshin_card/logo/稻妻.png rename to resources/image/genshin/genshin_card/logo/稻妻.png diff --git a/resources/img/genshin/genshin_card/logo/蒙德.png b/resources/image/genshin/genshin_card/logo/蒙德.png similarity index 100% rename from resources/img/genshin/genshin_card/logo/蒙德.png rename to resources/image/genshin/genshin_card/logo/蒙德.png diff --git a/resources/img/genshin/genshin_card/logo/龙脊雪山.png b/resources/image/genshin/genshin_card/logo/龙脊雪山.png similarity index 100% rename from resources/img/genshin/genshin_card/logo/龙脊雪山.png rename to resources/image/genshin/genshin_card/logo/龙脊雪山.png diff --git a/resources/img/genshin/genshin_card/middle.png b/resources/image/genshin/genshin_card/middle.png similarity index 100% rename from resources/img/genshin/genshin_card/middle.png rename to resources/image/genshin/genshin_card/middle.png diff --git a/resources/img/genshin/genshin_icon/box.png b/resources/image/genshin/genshin_icon/box.png similarity index 100% rename from resources/img/genshin/genshin_icon/box.png rename to resources/image/genshin/genshin_icon/box.png diff --git a/resources/img/genshin/genshin_icon/box_alpha.png b/resources/image/genshin/genshin_icon/box_alpha.png similarity index 100% rename from resources/img/genshin/genshin_icon/box_alpha.png rename to resources/image/genshin/genshin_icon/box_alpha.png diff --git a/resources/img/genshin/genshin_memo/resin.png b/resources/image/genshin/genshin_memo/resin.png similarity index 100% rename from resources/img/genshin/genshin_memo/resin.png rename to resources/image/genshin/genshin_memo/resin.png diff --git a/resources/img/genshin/genshin_memo/resin_discount.png b/resources/image/genshin/genshin_memo/resin_discount.png similarity index 100% rename from resources/img/genshin/genshin_memo/resin_discount.png rename to resources/image/genshin/genshin_memo/resin_discount.png diff --git a/resources/img/genshin/genshin_memo/task.png b/resources/image/genshin/genshin_memo/task.png similarity index 100% rename from resources/img/genshin/genshin_memo/task.png rename to resources/image/genshin/genshin_memo/task.png diff --git a/resources/img/genshin/texture2d/UI_EmotionIcon5.png b/resources/image/genshin/texture2d/UI_EmotionIcon5.png similarity index 100% rename from resources/img/genshin/texture2d/UI_EmotionIcon5.png rename to resources/image/genshin/texture2d/UI_EmotionIcon5.png diff --git a/resources/img/genshin/texture2d/ba.png b/resources/image/genshin/texture2d/ba.png similarity index 100% rename from resources/img/genshin/texture2d/ba.png rename to resources/image/genshin/texture2d/ba.png diff --git a/resources/img/genshin/texture2d/bar.png b/resources/image/genshin/texture2d/bar.png similarity index 100% rename from resources/img/genshin/texture2d/bar.png rename to resources/image/genshin/texture2d/bar.png diff --git a/resources/img/genshin/texture2d/bg_1.jpg b/resources/image/genshin/texture2d/bg_1.jpg similarity index 100% rename from resources/img/genshin/texture2d/bg_1.jpg rename to resources/image/genshin/texture2d/bg_1.jpg diff --git a/resources/img/genshin/texture2d/cover.png b/resources/image/genshin/texture2d/cover.png similarity index 100% rename from resources/img/genshin/texture2d/cover.png rename to resources/image/genshin/texture2d/cover.png diff --git a/resources/img/genshin/texture2d/default_ava.png b/resources/image/genshin/texture2d/default_ava.png similarity index 100% rename from resources/img/genshin/texture2d/default_ava.png rename to resources/image/genshin/texture2d/default_ava.png diff --git a/resources/img/genshin/texture2d/earth.png b/resources/image/genshin/texture2d/earth.png similarity index 100% rename from resources/img/genshin/texture2d/earth.png rename to resources/image/genshin/texture2d/earth.png diff --git a/resources/img/genshin/texture2d/h.png b/resources/image/genshin/texture2d/h.png similarity index 100% rename from resources/img/genshin/texture2d/h.png rename to resources/image/genshin/texture2d/h.png diff --git a/resources/img/genshin/texture2d/l.png b/resources/image/genshin/texture2d/l.png similarity index 100% rename from resources/img/genshin/texture2d/l.png rename to resources/image/genshin/texture2d/l.png diff --git a/resources/img/genshin/texture2d/level.png b/resources/image/genshin/texture2d/level.png similarity index 100% rename from resources/img/genshin/texture2d/level.png rename to resources/image/genshin/texture2d/level.png diff --git a/resources/img/genshin/texture2d/level2.png b/resources/image/genshin/texture2d/level2.png similarity index 100% rename from resources/img/genshin/texture2d/level2.png rename to resources/image/genshin/texture2d/level2.png diff --git a/resources/img/genshin/texture2d/luoxuan.png b/resources/image/genshin/texture2d/luoxuan.png similarity index 100% rename from resources/img/genshin/texture2d/luoxuan.png rename to resources/image/genshin/texture2d/luoxuan.png diff --git a/resources/img/genshin/texture2d/p1.png b/resources/image/genshin/texture2d/p1.png similarity index 100% rename from resources/img/genshin/texture2d/p1.png rename to resources/image/genshin/texture2d/p1.png diff --git a/resources/img/genshin/texture2d/staron.png b/resources/image/genshin/texture2d/staron.png similarity index 100% rename from resources/img/genshin/texture2d/staron.png rename to resources/image/genshin/texture2d/staron.png diff --git a/resources/img/genshin/texture2d/wind.png b/resources/image/genshin/texture2d/wind.png similarity index 100% rename from resources/img/genshin/texture2d/wind.png rename to resources/image/genshin/texture2d/wind.png diff --git a/resources/img/genshin/texture2d/wlevel.png b/resources/image/genshin/texture2d/wlevel.png similarity index 100% rename from resources/img/genshin/texture2d/wlevel.png rename to resources/image/genshin/texture2d/wlevel.png diff --git a/resources/img/luoxiang/0.jpg b/resources/image/luoxiang/0.jpg similarity index 100% rename from resources/img/luoxiang/0.jpg rename to resources/image/luoxiang/0.jpg diff --git a/resources/img/luoxiang/1.jpg b/resources/image/luoxiang/1.jpg similarity index 100% rename from resources/img/luoxiang/1.jpg rename to resources/image/luoxiang/1.jpg diff --git a/resources/img/luoxiang/2.jpg b/resources/image/luoxiang/2.jpg similarity index 100% rename from resources/img/luoxiang/2.jpg rename to resources/image/luoxiang/2.jpg diff --git a/resources/img/luoxiang/4.jpg b/resources/image/luoxiang/4.jpg similarity index 100% rename from resources/img/luoxiang/4.jpg rename to resources/image/luoxiang/4.jpg diff --git a/resources/img/luoxiang/5.jpg b/resources/image/luoxiang/5.jpg similarity index 100% rename from resources/img/luoxiang/5.jpg rename to resources/image/luoxiang/5.jpg diff --git a/resources/img/luoxiang/6.jpg b/resources/image/luoxiang/6.jpg similarity index 100% rename from resources/img/luoxiang/6.jpg rename to resources/image/luoxiang/6.jpg diff --git a/resources/img/luoxiang/7.jpg b/resources/image/luoxiang/7.jpg similarity index 100% rename from resources/img/luoxiang/7.jpg rename to resources/image/luoxiang/7.jpg diff --git a/resources/img/noresult/0.jpg b/resources/image/noresult/0.jpg similarity index 100% rename from resources/img/noresult/0.jpg rename to resources/image/noresult/0.jpg diff --git a/resources/img/noresult/1.jpg b/resources/image/noresult/1.jpg similarity index 100% rename from resources/img/noresult/1.jpg rename to resources/image/noresult/1.jpg diff --git a/resources/img/noresult/2.jpg b/resources/image/noresult/2.jpg similarity index 100% rename from resources/img/noresult/2.jpg rename to resources/image/noresult/2.jpg diff --git a/resources/img/noresult/3.jpg b/resources/image/noresult/3.jpg similarity index 100% rename from resources/img/noresult/3.jpg rename to resources/image/noresult/3.jpg diff --git a/resources/img/noresult/4.jpg b/resources/image/noresult/4.jpg similarity index 100% rename from resources/img/noresult/4.jpg rename to resources/image/noresult/4.jpg diff --git a/resources/img/noresult/5.jpg b/resources/image/noresult/5.jpg similarity index 100% rename from resources/img/noresult/5.jpg rename to resources/image/noresult/5.jpg diff --git a/resources/img/other/laopo.jpg b/resources/image/other/laopo.jpg similarity index 100% rename from resources/img/other/laopo.jpg rename to resources/image/other/laopo.jpg diff --git a/resources/img/other/luxun.jpg b/resources/image/other/luxun.jpg similarity index 100% rename from resources/img/other/luxun.jpg rename to resources/image/other/luxun.jpg diff --git a/resources/img/other/shop.png b/resources/image/other/shop.png similarity index 100% rename from resources/img/other/shop.png rename to resources/image/other/shop.png diff --git a/resources/img/other/shop_text.png b/resources/image/other/shop_text.png similarity index 100% rename from resources/img/other/shop_text.png rename to resources/image/other/shop_text.png diff --git a/resources/img/other/time.png b/resources/image/other/time.png similarity index 100% rename from resources/img/other/time.png rename to resources/image/other/time.png diff --git a/resources/img/other/webtop.png b/resources/image/other/webtop.png similarity index 100% rename from resources/img/other/webtop.png rename to resources/image/other/webtop.png diff --git a/resources/img/pa/0.jpg b/resources/image/pa/0.jpg similarity index 100% rename from resources/img/pa/0.jpg rename to resources/image/pa/0.jpg diff --git a/resources/img/pa/1.jpg b/resources/image/pa/1.jpg similarity index 100% rename from resources/img/pa/1.jpg rename to resources/image/pa/1.jpg diff --git a/resources/img/pa/10.jpg b/resources/image/pa/10.jpg similarity index 100% rename from resources/img/pa/10.jpg rename to resources/image/pa/10.jpg diff --git a/resources/img/pa/11.jpg b/resources/image/pa/11.jpg similarity index 100% rename from resources/img/pa/11.jpg rename to resources/image/pa/11.jpg diff --git a/resources/img/pa/12.jpg b/resources/image/pa/12.jpg similarity index 100% rename from resources/img/pa/12.jpg rename to resources/image/pa/12.jpg diff --git a/resources/img/pa/13.jpg b/resources/image/pa/13.jpg similarity index 100% rename from resources/img/pa/13.jpg rename to resources/image/pa/13.jpg diff --git a/resources/img/pa/14.jpg b/resources/image/pa/14.jpg similarity index 100% rename from resources/img/pa/14.jpg rename to resources/image/pa/14.jpg diff --git a/resources/img/pa/15.jpg b/resources/image/pa/15.jpg similarity index 100% rename from resources/img/pa/15.jpg rename to resources/image/pa/15.jpg diff --git a/resources/img/pa/16.jpg b/resources/image/pa/16.jpg similarity index 100% rename from resources/img/pa/16.jpg rename to resources/image/pa/16.jpg diff --git a/resources/img/pa/17.jpg b/resources/image/pa/17.jpg similarity index 100% rename from resources/img/pa/17.jpg rename to resources/image/pa/17.jpg diff --git a/resources/img/pa/18.jpg b/resources/image/pa/18.jpg similarity index 100% rename from resources/img/pa/18.jpg rename to resources/image/pa/18.jpg diff --git a/resources/img/pa/19.jpg b/resources/image/pa/19.jpg similarity index 100% rename from resources/img/pa/19.jpg rename to resources/image/pa/19.jpg diff --git a/resources/img/pa/2.jpg b/resources/image/pa/2.jpg similarity index 100% rename from resources/img/pa/2.jpg rename to resources/image/pa/2.jpg diff --git a/resources/img/pa/20.jpg b/resources/image/pa/20.jpg similarity index 100% rename from resources/img/pa/20.jpg rename to resources/image/pa/20.jpg diff --git a/resources/img/pa/21.jpg b/resources/image/pa/21.jpg similarity index 100% rename from resources/img/pa/21.jpg rename to resources/image/pa/21.jpg diff --git a/resources/img/pa/22.jpg b/resources/image/pa/22.jpg similarity index 100% rename from resources/img/pa/22.jpg rename to resources/image/pa/22.jpg diff --git a/resources/img/pa/23.jpg b/resources/image/pa/23.jpg similarity index 100% rename from resources/img/pa/23.jpg rename to resources/image/pa/23.jpg diff --git a/resources/img/pa/24.jpg b/resources/image/pa/24.jpg similarity index 100% rename from resources/img/pa/24.jpg rename to resources/image/pa/24.jpg diff --git a/resources/img/pa/25.jpg b/resources/image/pa/25.jpg similarity index 100% rename from resources/img/pa/25.jpg rename to resources/image/pa/25.jpg diff --git a/resources/img/pa/26.jpg b/resources/image/pa/26.jpg similarity index 100% rename from resources/img/pa/26.jpg rename to resources/image/pa/26.jpg diff --git a/resources/img/pa/27.jpg b/resources/image/pa/27.jpg similarity index 100% rename from resources/img/pa/27.jpg rename to resources/image/pa/27.jpg diff --git a/resources/img/pa/28.jpg b/resources/image/pa/28.jpg similarity index 100% rename from resources/img/pa/28.jpg rename to resources/image/pa/28.jpg diff --git a/resources/img/pa/29.jpg b/resources/image/pa/29.jpg similarity index 100% rename from resources/img/pa/29.jpg rename to resources/image/pa/29.jpg diff --git a/resources/img/pa/3.jpg b/resources/image/pa/3.jpg similarity index 100% rename from resources/img/pa/3.jpg rename to resources/image/pa/3.jpg diff --git a/resources/img/pa/30.jpg b/resources/image/pa/30.jpg similarity index 100% rename from resources/img/pa/30.jpg rename to resources/image/pa/30.jpg diff --git a/resources/img/pa/31.jpg b/resources/image/pa/31.jpg similarity index 100% rename from resources/img/pa/31.jpg rename to resources/image/pa/31.jpg diff --git a/resources/img/pa/32.jpg b/resources/image/pa/32.jpg similarity index 100% rename from resources/img/pa/32.jpg rename to resources/image/pa/32.jpg diff --git a/resources/img/pa/33.jpg b/resources/image/pa/33.jpg similarity index 100% rename from resources/img/pa/33.jpg rename to resources/image/pa/33.jpg diff --git a/resources/img/pa/34.jpg b/resources/image/pa/34.jpg similarity index 100% rename from resources/img/pa/34.jpg rename to resources/image/pa/34.jpg diff --git a/resources/img/pa/35.jpg b/resources/image/pa/35.jpg similarity index 100% rename from resources/img/pa/35.jpg rename to resources/image/pa/35.jpg diff --git a/resources/img/pa/36.jpg b/resources/image/pa/36.jpg similarity index 100% rename from resources/img/pa/36.jpg rename to resources/image/pa/36.jpg diff --git a/resources/img/pa/37.jpg b/resources/image/pa/37.jpg similarity index 100% rename from resources/img/pa/37.jpg rename to resources/image/pa/37.jpg diff --git a/resources/img/pa/38.jpg b/resources/image/pa/38.jpg similarity index 100% rename from resources/img/pa/38.jpg rename to resources/image/pa/38.jpg diff --git a/resources/img/pa/39.jpg b/resources/image/pa/39.jpg similarity index 100% rename from resources/img/pa/39.jpg rename to resources/image/pa/39.jpg diff --git a/resources/img/pa/4.jpg b/resources/image/pa/4.jpg similarity index 100% rename from resources/img/pa/4.jpg rename to resources/image/pa/4.jpg diff --git a/resources/img/pa/40.jpg b/resources/image/pa/40.jpg similarity index 100% rename from resources/img/pa/40.jpg rename to resources/image/pa/40.jpg diff --git a/resources/img/pa/41.jpg b/resources/image/pa/41.jpg similarity index 100% rename from resources/img/pa/41.jpg rename to resources/image/pa/41.jpg diff --git a/resources/img/pa/42.jpg b/resources/image/pa/42.jpg similarity index 100% rename from resources/img/pa/42.jpg rename to resources/image/pa/42.jpg diff --git a/resources/img/pa/43.jpg b/resources/image/pa/43.jpg similarity index 100% rename from resources/img/pa/43.jpg rename to resources/image/pa/43.jpg diff --git a/resources/img/pa/44.jpg b/resources/image/pa/44.jpg similarity index 100% rename from resources/img/pa/44.jpg rename to resources/image/pa/44.jpg diff --git a/resources/img/pa/45.jpg b/resources/image/pa/45.jpg similarity index 100% rename from resources/img/pa/45.jpg rename to resources/image/pa/45.jpg diff --git a/resources/img/pa/5.jpg b/resources/image/pa/5.jpg similarity index 100% rename from resources/img/pa/5.jpg rename to resources/image/pa/5.jpg diff --git a/resources/img/pa/6.jpg b/resources/image/pa/6.jpg similarity index 100% rename from resources/img/pa/6.jpg rename to resources/image/pa/6.jpg diff --git a/resources/img/pa/7.jpg b/resources/image/pa/7.jpg similarity index 100% rename from resources/img/pa/7.jpg rename to resources/image/pa/7.jpg diff --git a/resources/img/pa/8.jpg b/resources/image/pa/8.jpg similarity index 100% rename from resources/img/pa/8.jpg rename to resources/image/pa/8.jpg diff --git a/resources/img/pa/9.jpg b/resources/image/pa/9.jpg similarity index 100% rename from resources/img/pa/9.jpg rename to resources/image/pa/9.jpg diff --git a/resources/img/prts/redbag_12.png b/resources/image/prts/redbag_12.png similarity index 100% rename from resources/img/prts/redbag_12.png rename to resources/image/prts/redbag_12.png diff --git a/resources/img/prts/redbag_2/chen_00.png b/resources/image/prts/redbag_2/chen_00.png similarity index 100% rename from resources/img/prts/redbag_2/chen_00.png rename to resources/image/prts/redbag_2/chen_00.png diff --git a/resources/img/prts/redbag_2/dusk_00.png b/resources/image/prts/redbag_2/dusk_00.png similarity index 100% rename from resources/img/prts/redbag_2/dusk_00.png rename to resources/image/prts/redbag_2/dusk_00.png diff --git a/resources/img/prts/redbag_2/jessica_00.png b/resources/image/prts/redbag_2/jessica_00.png similarity index 100% rename from resources/img/prts/redbag_2/jessica_00.png rename to resources/image/prts/redbag_2/jessica_00.png diff --git a/resources/img/prts/redbag_2/nian_00.png b/resources/image/prts/redbag_2/nian_00.png similarity index 100% rename from resources/img/prts/redbag_2/nian_00.png rename to resources/image/prts/redbag_2/nian_00.png diff --git a/resources/img/prts/redbag_2/sikadi_00.png b/resources/image/prts/redbag_2/sikadi_00.png similarity index 100% rename from resources/img/prts/redbag_2/sikadi_00.png rename to resources/image/prts/redbag_2/sikadi_00.png diff --git a/resources/img/prts/redbag_2/tknogi_00.png b/resources/image/prts/redbag_2/tknogi_00.png similarity index 100% rename from resources/img/prts/redbag_2/tknogi_00.png rename to resources/image/prts/redbag_2/tknogi_00.png diff --git a/resources/img/qxz/0.jpg b/resources/image/qxz/0.jpg similarity index 100% rename from resources/img/qxz/0.jpg rename to resources/image/qxz/0.jpg diff --git a/resources/img/qxz/1.jpg b/resources/image/qxz/1.jpg similarity index 100% rename from resources/img/qxz/1.jpg rename to resources/image/qxz/1.jpg diff --git a/resources/img/sign/sign_res/background/background_01.jpg b/resources/image/sign/sign_res/background/background_01.jpg similarity index 100% rename from resources/img/sign/sign_res/background/background_01.jpg rename to resources/image/sign/sign_res/background/background_01.jpg diff --git a/resources/img/sign/sign_res/bar.png b/resources/image/sign/sign_res/bar.png similarity index 100% rename from resources/img/sign/sign_res/bar.png rename to resources/image/sign/sign_res/bar.png diff --git a/resources/img/sign/sign_res/bar_white.png b/resources/image/sign/sign_res/bar_white.png similarity index 100% rename from resources/img/sign/sign_res/bar_white.png rename to resources/image/sign/sign_res/bar_white.png diff --git a/resources/img/sign/sign_res/border/ava_border_01.png b/resources/image/sign/sign_res/border/ava_border_01.png similarity index 100% rename from resources/img/sign/sign_res/border/ava_border_01.png rename to resources/image/sign/sign_res/border/ava_border_01.png diff --git a/resources/img/sign/sign_res/border/gift_border_02.png b/resources/image/sign/sign_res/border/gift_border_02.png similarity index 100% rename from resources/img/sign/sign_res/border/gift_border_02.png rename to resources/image/sign/sign_res/border/gift_border_02.png diff --git a/resources/img/sign/sign_res/white.png b/resources/image/sign/sign_res/white.png similarity index 100% rename from resources/img/sign/sign_res/white.png rename to resources/image/sign/sign_res/white.png diff --git a/resources/img/zai/1.jpg b/resources/image/zai/1.jpg similarity index 100% rename from resources/img/zai/1.jpg rename to resources/image/zai/1.jpg diff --git a/resources/img/zai/2.gif b/resources/image/zai/2.gif similarity index 100% rename from resources/img/zai/2.gif rename to resources/image/zai/2.gif diff --git a/resources/img/zai/3.jpg b/resources/image/zai/3.jpg similarity index 100% rename from resources/img/zai/3.jpg rename to resources/image/zai/3.jpg diff --git a/resources/img/zai/4.jpg b/resources/image/zai/4.jpg similarity index 100% rename from resources/img/zai/4.jpg rename to resources/image/zai/4.jpg diff --git a/resources/img/zai/5.jpg b/resources/image/zai/5.jpg similarity index 100% rename from resources/img/zai/5.jpg rename to resources/image/zai/5.jpg diff --git a/resources/img/zhenxun.jpg b/resources/image/zhenxun.jpg similarity index 100% rename from resources/img/zhenxun.jpg rename to resources/image/zhenxun.jpg diff --git a/resources/img/zhenxun/bujiangli.jpg b/resources/image/zhenxun/bujiangli.jpg similarity index 100% rename from resources/img/zhenxun/bujiangli.jpg rename to resources/image/zhenxun/bujiangli.jpg diff --git a/resources/img/zhenxun/daojia.jpg b/resources/image/zhenxun/daojia.jpg similarity index 100% rename from resources/img/zhenxun/daojia.jpg rename to resources/image/zhenxun/daojia.jpg diff --git a/resources/img/zhenxun/dayouxi.png b/resources/image/zhenxun/dayouxi.png similarity index 100% rename from resources/img/zhenxun/dayouxi.png rename to resources/image/zhenxun/dayouxi.png diff --git a/resources/img/zhenxun/gezi.jpg b/resources/image/zhenxun/gezi.jpg similarity index 100% rename from resources/img/zhenxun/gezi.jpg rename to resources/image/zhenxun/gezi.jpg diff --git a/resources/img/zhenxun/haipa.jpg b/resources/image/zhenxun/haipa.jpg similarity index 100% rename from resources/img/zhenxun/haipa.jpg rename to resources/image/zhenxun/haipa.jpg diff --git a/resources/img/zhenxun/miao.jpg b/resources/image/zhenxun/miao.jpg similarity index 100% rename from resources/img/zhenxun/miao.jpg rename to resources/image/zhenxun/miao.jpg diff --git a/resources/img/zhenxun/o.png b/resources/image/zhenxun/o.png similarity index 100% rename from resources/img/zhenxun/o.png rename to resources/image/zhenxun/o.png diff --git a/resources/img/zhenxun/qiang.jpg b/resources/image/zhenxun/qiang.jpg similarity index 100% rename from resources/img/zhenxun/qiang.jpg rename to resources/image/zhenxun/qiang.jpg diff --git a/resources/img/zhenxun/shengqi.jpg b/resources/image/zhenxun/shengqi.jpg similarity index 100% rename from resources/img/zhenxun/shengqi.jpg rename to resources/image/zhenxun/shengqi.jpg diff --git a/resources/img/zhenxun/sleep.jpg b/resources/image/zhenxun/sleep.jpg similarity index 100% rename from resources/img/zhenxun/sleep.jpg rename to resources/image/zhenxun/sleep.jpg diff --git a/resources/img/zhenxun/sorry.jpg b/resources/image/zhenxun/sorry.jpg similarity index 100% rename from resources/img/zhenxun/sorry.jpg rename to resources/image/zhenxun/sorry.jpg diff --git a/resources/img/zhenxun/toukan.png b/resources/image/zhenxun/toukan.png similarity index 100% rename from resources/img/zhenxun/toukan.png rename to resources/image/zhenxun/toukan.png diff --git a/resources/img/zhenxun/toukan_2.png b/resources/image/zhenxun/toukan_2.png similarity index 100% rename from resources/img/zhenxun/toukan_2.png rename to resources/image/zhenxun/toukan_2.png diff --git a/resources/img/zhenxun/wa.jpg b/resources/image/zhenxun/wa.jpg similarity index 100% rename from resources/img/zhenxun/wa.jpg rename to resources/image/zhenxun/wa.jpg diff --git a/resources/img/zhenxun/wenhao.jpg b/resources/image/zhenxun/wenhao.jpg similarity index 100% rename from resources/img/zhenxun/wenhao.jpg rename to resources/image/zhenxun/wenhao.jpg diff --git a/resources/img/zhenxun/yiwen.jpg b/resources/image/zhenxun/yiwen.jpg similarity index 100% rename from resources/img/zhenxun/yiwen.jpg rename to resources/image/zhenxun/yiwen.jpg diff --git a/resources/img/zhenxun/yun.jpg b/resources/image/zhenxun/yun.jpg similarity index 100% rename from resources/img/zhenxun/yun.jpg rename to resources/image/zhenxun/yun.jpg diff --git a/resources/img/zhenxun/zao.jpg b/resources/image/zhenxun/zao.jpg similarity index 100% rename from resources/img/zhenxun/zao.jpg rename to resources/image/zhenxun/zao.jpg diff --git a/resources/voice/dinggong/01_你这家伙，找块豆腐一头撞死算了！_.mp3 b/resources/record/dinggong/01_你这家伙，找块豆腐一头撞死算了！_.mp3 similarity index 100% rename from resources/voice/dinggong/01_你这家伙，找块豆腐一头撞死算了！_.mp3 rename to resources/record/dinggong/01_你这家伙，找块豆腐一头撞死算了！_.mp3 diff --git a/resources/voice/dinggong/02_你还是老老实实定个闹钟起床啊！干吗每次都非要我来叫醒你嘛。_.mp3 b/resources/record/dinggong/02_你还是老老实实定个闹钟起床啊！干吗每次都非要我来叫醒你嘛。_.mp3 similarity index 100% rename from resources/voice/dinggong/02_你还是老老实实定个闹钟起床啊！干吗每次都非要我来叫醒你嘛。_.mp3 rename to resources/record/dinggong/02_你还是老老实实定个闹钟起床啊！干吗每次都非要我来叫醒你嘛。_.mp3 diff --git a/resources/voice/dinggong/03_吵死了吵死了吵死了！真是吵死了！_.mp3 b/resources/record/dinggong/03_吵死了吵死了吵死了！真是吵死了！_.mp3 similarity index 100% rename from resources/voice/dinggong/03_吵死了吵死了吵死了！真是吵死了！_.mp3 rename to resources/record/dinggong/03_吵死了吵死了吵死了！真是吵死了！_.mp3 diff --git a/resources/voice/dinggong/04_ 是我选的你，你可别以为是你给了我机会哦！_.mp3 b/resources/record/dinggong/04_ 是我选的你，你可别以为是你给了我机会哦！_.mp3 similarity index 100% rename from resources/voice/dinggong/04_ 是我选的你，你可别以为是你给了我机会哦！_.mp3 rename to resources/record/dinggong/04_ 是我选的你，你可别以为是你给了我机会哦！_.mp3 diff --git a/resources/voice/dinggong/05_什么“早安”，应该说“您早上好”才对！_.mp3 b/resources/record/dinggong/05_什么“早安”，应该说“您早上好”才对！_.mp3 similarity index 100% rename from resources/voice/dinggong/05_什么“早安”，应该说“您早上好”才对！_.mp3 rename to resources/record/dinggong/05_什么“早安”，应该说“您早上好”才对！_.mp3 diff --git a/resources/voice/dinggong/06_你可别胡思乱想_.mp3 b/resources/record/dinggong/06_你可别胡思乱想_.mp3 similarity index 100% rename from resources/voice/dinggong/06_你可别胡思乱想_.mp3 rename to resources/record/dinggong/06_你可别胡思乱想_.mp3 diff --git a/resources/voice/dinggong/07_我才不是特地为你做的。_.mp3 b/resources/record/dinggong/07_我才不是特地为你做的。_.mp3 similarity index 100% rename from resources/voice/dinggong/07_我才不是特地为你做的。_.mp3 rename to resources/record/dinggong/07_我才不是特地为你做的。_.mp3 diff --git a/resources/voice/dinggong/08_ 接、接吻什么的，你还早了100年呢！_.mp3 b/resources/record/dinggong/08_ 接、接吻什么的，你还早了100年呢！_.mp3 similarity index 100% rename from resources/voice/dinggong/08_ 接、接吻什么的，你还早了100年呢！_.mp3 rename to resources/record/dinggong/08_ 接、接吻什么的，你还早了100年呢！_.mp3 diff --git a/resources/voice/dinggong/09_… 哭…我的胸部…_.mp3 b/resources/record/dinggong/09_… 哭…我的胸部…_.mp3 similarity index 100% rename from resources/voice/dinggong/09_… 哭…我的胸部…_.mp3 rename to resources/record/dinggong/09_… 哭…我的胸部…_.mp3 diff --git a/resources/voice/dinggong/10_要是你受伤的话，岂不是会让我很头疼。_.mp3 b/resources/record/dinggong/10_要是你受伤的话，岂不是会让我很头疼。_.mp3 similarity index 100% rename from resources/voice/dinggong/10_要是你受伤的话，岂不是会让我很头疼。_.mp3 rename to resources/record/dinggong/10_要是你受伤的话，岂不是会让我很头疼。_.mp3 diff --git a/resources/voice/dinggong/11_你这个笨蛋！_.mp3 b/resources/record/dinggong/11_你这个笨蛋！_.mp3 similarity index 100% rename from resources/voice/dinggong/11_你这个笨蛋！_.mp3 rename to resources/record/dinggong/11_你这个笨蛋！_.mp3 diff --git a/resources/voice/dinggong/12_再见之类的话，我才懒得对你说…_.mp3 b/resources/record/dinggong/12_再见之类的话，我才懒得对你说…_.mp3 similarity index 100% rename from resources/voice/dinggong/12_再见之类的话，我才懒得对你说…_.mp3 rename to resources/record/dinggong/12_再见之类的话，我才懒得对你说…_.mp3 diff --git a/resources/voice/dinggong/13_我才没有为你担心！_.mp3 b/resources/record/dinggong/13_我才没有为你担心！_.mp3 similarity index 100% rename from resources/voice/dinggong/13_我才没有为你担心！_.mp3 rename to resources/record/dinggong/13_我才没有为你担心！_.mp3 diff --git a/resources/voice/dinggong/14_我、我可不是因为自己喜欢才打扮成这样…只有在你面前罢了…_.mp3 b/resources/record/dinggong/14_我、我可不是因为自己喜欢才打扮成这样…只有在你面前罢了…_.mp3 similarity index 100% rename from resources/voice/dinggong/14_我、我可不是因为自己喜欢才打扮成这样…只有在你面前罢了…_.mp3 rename to resources/record/dinggong/14_我、我可不是因为自己喜欢才打扮成这样…只有在你面前罢了…_.mp3 diff --git a/resources/voice/dinggong/15_真是的…笨蛋…_.mp3 b/resources/record/dinggong/15_真是的…笨蛋…_.mp3 similarity index 100% rename from resources/voice/dinggong/15_真是的…笨蛋…_.mp3 rename to resources/record/dinggong/15_真是的…笨蛋…_.mp3 diff --git a/resources/voice/dinggong/16_尽管放马过来吧！让我打你个落花流水！_.mp3 b/resources/record/dinggong/16_尽管放马过来吧！让我打你个落花流水！_.mp3 similarity index 100% rename from resources/voice/dinggong/16_尽管放马过来吧！让我打你个落花流水！_.mp3 rename to resources/record/dinggong/16_尽管放马过来吧！让我打你个落花流水！_.mp3 diff --git a/resources/voice/dinggong/17_留在我身边！一辈子！没异议吧！_.mp3 b/resources/record/dinggong/17_留在我身边！一辈子！没异议吧！_.mp3 similarity index 100% rename from resources/voice/dinggong/17_留在我身边！一辈子！没异议吧！_.mp3 rename to resources/record/dinggong/17_留在我身边！一辈子！没异议吧！_.mp3 diff --git a/resources/voice/dinggong/18_生日礼物这种东西，我想没有其他人会送给你了吧…_.mp3 b/resources/record/dinggong/18_生日礼物这种东西，我想没有其他人会送给你了吧…_.mp3 similarity index 100% rename from resources/voice/dinggong/18_生日礼物这种东西，我想没有其他人会送给你了吧…_.mp3 rename to resources/record/dinggong/18_生日礼物这种东西，我想没有其他人会送给你了吧…_.mp3 diff --git a/resources/voice/dinggong/19_ hi~_.mp3 b/resources/record/dinggong/19_ hi~_.mp3 similarity index 100% rename from resources/voice/dinggong/19_ hi~_.mp3 rename to resources/record/dinggong/19_ hi~_.mp3 diff --git a/resources/voice/dinggong/20_这个送给你……_.mp3 b/resources/record/dinggong/20_这个送给你……_.mp3 similarity index 100% rename from resources/voice/dinggong/20_这个送给你……_.mp3 rename to resources/record/dinggong/20_这个送给你……_.mp3 diff --git a/resources/voice/dinggong/21_给我等一下！你这个木头人！_.mp3 b/resources/record/dinggong/21_给我等一下！你这个木头人！_.mp3 similarity index 100% rename from resources/voice/dinggong/21_给我等一下！你这个木头人！_.mp3 rename to resources/record/dinggong/21_给我等一下！你这个木头人！_.mp3 diff --git a/resources/voice/dinggong/22_为什么…_.mp3 b/resources/record/dinggong/22_为什么…_.mp3 similarity index 100% rename from resources/voice/dinggong/22_为什么…_.mp3 rename to resources/record/dinggong/22_为什么…_.mp3 diff --git a/resources/voice/dinggong/23_为什么你就是注意不到嘛！_.mp3 b/resources/record/dinggong/23_为什么你就是注意不到嘛！_.mp3 similarity index 100% rename from resources/voice/dinggong/23_为什么你就是注意不到嘛！_.mp3 rename to resources/record/dinggong/23_为什么你就是注意不到嘛！_.mp3 diff --git a/resources/voice/dinggong/24_正好顺便，我也邀请一下你吧。_.mp3 b/resources/record/dinggong/24_正好顺便，我也邀请一下你吧。_.mp3 similarity index 100% rename from resources/voice/dinggong/24_正好顺便，我也邀请一下你吧。_.mp3 rename to resources/record/dinggong/24_正好顺便，我也邀请一下你吧。_.mp3 diff --git a/resources/voice/dinggong/25_就算你不打电话给我，我也没什么寂寞的…_.mp3 b/resources/record/dinggong/25_就算你不打电话给我，我也没什么寂寞的…_.mp3 similarity index 100% rename from resources/voice/dinggong/25_就算你不打电话给我，我也没什么寂寞的…_.mp3 rename to resources/record/dinggong/25_就算你不打电话给我，我也没什么寂寞的…_.mp3 diff --git a/resources/voice/dinggong/26_别离我这么近…丢死人了…_.mp3 b/resources/record/dinggong/26_别离我这么近…丢死人了…_.mp3 similarity index 100% rename from resources/voice/dinggong/26_别离我这么近…丢死人了…_.mp3 rename to resources/record/dinggong/26_别离我这么近…丢死人了…_.mp3 diff --git a/resources/voice/dinggong/27_那、那家伙干什么嘛！_.mp3 b/resources/record/dinggong/27_那、那家伙干什么嘛！_.mp3 similarity index 100% rename from resources/voice/dinggong/27_那、那家伙干什么嘛！_.mp3 rename to resources/record/dinggong/27_那、那家伙干什么嘛！_.mp3 diff --git a/resources/voice/dinggong/28_明明已经有我了的说！呜呜…_.mp3 b/resources/record/dinggong/28_明明已经有我了的说！呜呜…_.mp3 similarity index 100% rename from resources/voice/dinggong/28_明明已经有我了的说！呜呜…_.mp3 rename to resources/record/dinggong/28_明明已经有我了的说！呜呜…_.mp3 diff --git a/resources/voice/dinggong/29_别逃，至少听我把话说完！_.mp3 b/resources/record/dinggong/29_别逃，至少听我把话说完！_.mp3 similarity index 100% rename from resources/voice/dinggong/29_别逃，至少听我把话说完！_.mp3 rename to resources/record/dinggong/29_别逃，至少听我把话说完！_.mp3 diff --git a/resources/voice/dinggong/30_ 真是的，不管啦笨蛋！！你让人家怎么说嘛！！_.mp3 b/resources/record/dinggong/30_ 真是的，不管啦笨蛋！！你让人家怎么说嘛！！_.mp3 similarity index 100% rename from resources/voice/dinggong/30_ 真是的，不管啦笨蛋！！你让人家怎么说嘛！！_.mp3 rename to resources/record/dinggong/30_ 真是的，不管啦笨蛋！！你让人家怎么说嘛！！_.mp3 diff --git a/resources/voice/dinggong/31_你睡糊涂了吧，干什么呐！_.mp3 b/resources/record/dinggong/31_你睡糊涂了吧，干什么呐！_.mp3 similarity index 100% rename from resources/voice/dinggong/31_你睡糊涂了吧，干什么呐！_.mp3 rename to resources/record/dinggong/31_你睡糊涂了吧，干什么呐！_.mp3 diff --git a/resources/voice/dinggong/32_你可不许对我说“No”哦_.mp3 b/resources/record/dinggong/32_你可不许对我说“No”哦_.mp3 similarity index 100% rename from resources/voice/dinggong/32_你可不许对我说“No”哦_.mp3 rename to resources/record/dinggong/32_你可不许对我说“No”哦_.mp3 diff --git a/resources/voice/dinggong/33_虽然很丢人，让、让、让你牵牵手还是可以容忍…来吧…_.mp3 b/resources/record/dinggong/33_虽然很丢人，让、让、让你牵牵手还是可以容忍…来吧…_.mp3 similarity index 100% rename from resources/voice/dinggong/33_虽然很丢人，让、让、让你牵牵手还是可以容忍…来吧…_.mp3 rename to resources/record/dinggong/33_虽然很丢人，让、让、让你牵牵手还是可以容忍…来吧…_.mp3 diff --git a/resources/voice/dinggong/34_睡、睡…睡在我的腿上！？只、只能睡1分钟哦！_.mp3 b/resources/record/dinggong/34_睡、睡…睡在我的腿上！？只、只能睡1分钟哦！_.mp3 similarity index 100% rename from resources/voice/dinggong/34_睡、睡…睡在我的腿上！？只、只能睡1分钟哦！_.mp3 rename to resources/record/dinggong/34_睡、睡…睡在我的腿上！？只、只能睡1分钟哦！_.mp3 diff --git a/resources/voice/dinggong/35_唔，今天只有我们两个人的话…_.mp3 b/resources/record/dinggong/35_唔，今天只有我们两个人的话…_.mp3 similarity index 100% rename from resources/voice/dinggong/35_唔，今天只有我们两个人的话…_.mp3 rename to resources/record/dinggong/35_唔，今天只有我们两个人的话…_.mp3 diff --git a/resources/voice/dinggong/36_真是拿你没办法呢…_.mp3 b/resources/record/dinggong/36_真是拿你没办法呢…_.mp3 similarity index 100% rename from resources/voice/dinggong/36_真是拿你没办法呢…_.mp3 rename to resources/record/dinggong/36_真是拿你没办法呢…_.mp3 diff --git a/resources/voice/dinggong/37_变态、变态、变态、变态、变态笨蛋大变态！！！_.mp3 b/resources/record/dinggong/37_变态、变态、变态、变态、变态笨蛋大变态！！！_.mp3 similarity index 100% rename from resources/voice/dinggong/37_变态、变态、变态、变态、变态笨蛋大变态！！！_.mp3 rename to resources/record/dinggong/37_变态、变态、变态、变态、变态笨蛋大变态！！！_.mp3 diff --git a/resources/voice/dinggong/38_真是的，不管了啦…_.mp3 b/resources/record/dinggong/38_真是的，不管了啦…_.mp3 similarity index 100% rename from resources/voice/dinggong/38_真是的，不管了啦…_.mp3 rename to resources/record/dinggong/38_真是的，不管了啦…_.mp3 diff --git a/resources/voice/dinggong/39_别在那装傻了啦！！真是的_.mp3 b/resources/record/dinggong/39_别在那装傻了啦！！真是的_.mp3 similarity index 100% rename from resources/voice/dinggong/39_别在那装傻了啦！！真是的_.mp3 rename to resources/record/dinggong/39_别在那装傻了啦！！真是的_.mp3 diff --git a/resources/voice/dinggong/40_小心我一脚踢飞你！_.mp3 b/resources/record/dinggong/40_小心我一脚踢飞你！_.mp3 similarity index 100% rename from resources/voice/dinggong/40_小心我一脚踢飞你！_.mp3 rename to resources/record/dinggong/40_小心我一脚踢飞你！_.mp3 diff --git a/resources/voice/dinggong/41_啊…也好，既然你坚持要带着…_.mp3 b/resources/record/dinggong/41_啊…也好，既然你坚持要带着…_.mp3 similarity index 100% rename from resources/voice/dinggong/41_啊…也好，既然你坚持要带着…_.mp3 rename to resources/record/dinggong/41_啊…也好，既然你坚持要带着…_.mp3 diff --git a/resources/voice/dinggong/42_我也没办法了呢…_.mp3 b/resources/record/dinggong/42_我也没办法了呢…_.mp3 similarity index 100% rename from resources/voice/dinggong/42_我也没办法了呢…_.mp3 rename to resources/record/dinggong/42_我也没办法了呢…_.mp3 diff --git a/resources/voice/dinggong/43_所以说我不想给别人看到啊！_.mp3 b/resources/record/dinggong/43_所以说我不想给别人看到啊！_.mp3 similarity index 100% rename from resources/voice/dinggong/43_所以说我不想给别人看到啊！_.mp3 rename to resources/record/dinggong/43_所以说我不想给别人看到啊！_.mp3 diff --git a/resources/voice/dinggong/44_只想给你一个人…_.mp3 b/resources/record/dinggong/44_只想给你一个人…_.mp3 similarity index 100% rename from resources/voice/dinggong/44_只想给你一个人…_.mp3 rename to resources/record/dinggong/44_只想给你一个人…_.mp3 diff --git a/resources/voice/dinggong/45_不准无视我！快给我道歉！_.mp3 b/resources/record/dinggong/45_不准无视我！快给我道歉！_.mp3 similarity index 100% rename from resources/voice/dinggong/45_不准无视我！快给我道歉！_.mp3 rename to resources/record/dinggong/45_不准无视我！快给我道歉！_.mp3 diff --git a/resources/voice/dinggong/46_所以说只是从眼睛里流出来的汗啦！_.mp3 b/resources/record/dinggong/46_所以说只是从眼睛里流出来的汗啦！_.mp3 similarity index 100% rename from resources/voice/dinggong/46_所以说只是从眼睛里流出来的汗啦！_.mp3 rename to resources/record/dinggong/46_所以说只是从眼睛里流出来的汗啦！_.mp3 diff --git a/resources/voice/dinggong/47_才~不~是眼泪呢！_.mp3 b/resources/record/dinggong/47_才~不~是眼泪呢！_.mp3 similarity index 100% rename from resources/voice/dinggong/47_才~不~是眼泪呢！_.mp3 rename to resources/record/dinggong/47_才~不~是眼泪呢！_.mp3 diff --git a/resources/voice/dinggong/48_真是的~笨蛋、笨蛋、笨蛋！！_.mp3 b/resources/record/dinggong/48_真是的~笨蛋、笨蛋、笨蛋！！_.mp3 similarity index 100% rename from resources/voice/dinggong/48_真是的~笨蛋、笨蛋、笨蛋！！_.mp3 rename to resources/record/dinggong/48_真是的~笨蛋、笨蛋、笨蛋！！_.mp3 diff --git a/resources/voice/dinggong/49_不知道、不知道、不知道！_.mp3 b/resources/record/dinggong/49_不知道、不知道、不知道！_.mp3 similarity index 100% rename from resources/voice/dinggong/49_不知道、不知道、不知道！_.mp3 rename to resources/record/dinggong/49_不知道、不知道、不知道！_.mp3 diff --git a/resources/voice/dinggong/50_才没有吃醋呢，你在说什么傻话啊！_.mp3 b/resources/record/dinggong/50_才没有吃醋呢，你在说什么傻话啊！_.mp3 similarity index 100% rename from resources/voice/dinggong/50_才没有吃醋呢，你在说什么傻话啊！_.mp3 rename to resources/record/dinggong/50_才没有吃醋呢，你在说什么傻话啊！_.mp3 diff --git a/resources/voice/dinggong/51_所以说我最讨厌优柔寡断的家伙了！_.mp3 b/resources/record/dinggong/51_所以说我最讨厌优柔寡断的家伙了！_.mp3 similarity index 100% rename from resources/voice/dinggong/51_所以说我最讨厌优柔寡断的家伙了！_.mp3 rename to resources/record/dinggong/51_所以说我最讨厌优柔寡断的家伙了！_.mp3 diff --git a/resources/voice/dinggong/52_才不好呢。_.mp3 b/resources/record/dinggong/52_才不好呢。_.mp3 similarity index 100% rename from resources/voice/dinggong/52_才不好呢。_.mp3 rename to resources/record/dinggong/52_才不好呢。_.mp3 diff --git a/resources/voice/dinggong/53_只、只准你看着我哦！_.mp3 b/resources/record/dinggong/53_只、只准你看着我哦！_.mp3 similarity index 100% rename from resources/voice/dinggong/53_只、只准你看着我哦！_.mp3 rename to resources/record/dinggong/53_只、只准你看着我哦！_.mp3 diff --git a/resources/voice/dinggong/54_所以说别做些不正经的事了…对好不容易才和你在一起的我…_.mp3 b/resources/record/dinggong/54_所以说别做些不正经的事了…对好不容易才和你在一起的我…_.mp3 similarity index 100% rename from resources/voice/dinggong/54_所以说别做些不正经的事了…对好不容易才和你在一起的我…_.mp3 rename to resources/record/dinggong/54_所以说别做些不正经的事了…对好不容易才和你在一起的我…_.mp3 diff --git a/resources/voice/dinggong/55_对你说我喜欢你还是不讨厌你什么的_.mp3 b/resources/record/dinggong/55_对你说我喜欢你还是不讨厌你什么的_.mp3 similarity index 100% rename from resources/voice/dinggong/55_对你说我喜欢你还是不讨厌你什么的_.mp3 rename to resources/record/dinggong/55_对你说我喜欢你还是不讨厌你什么的_.mp3 diff --git a/resources/voice/dinggong/56_拉面都泡糟了啦！快点吃掉啦！_.mp3 b/resources/record/dinggong/56_拉面都泡糟了啦！快点吃掉啦！_.mp3 similarity index 100% rename from resources/voice/dinggong/56_拉面都泡糟了啦！快点吃掉啦！_.mp3 rename to resources/record/dinggong/56_拉面都泡糟了啦！快点吃掉啦！_.mp3 diff --git a/resources/voice/dinggong/57_诶，让我帮你吹吹？笨蛋啊你~_.mp3 b/resources/record/dinggong/57_诶，让我帮你吹吹？笨蛋啊你~_.mp3 similarity index 100% rename from resources/voice/dinggong/57_诶，让我帮你吹吹？笨蛋啊你~_.mp3 rename to resources/record/dinggong/57_诶，让我帮你吹吹？笨蛋啊你~_.mp3 diff --git a/resources/voice/dinggong/58_我才没有觉得你很有用呢…_.mp3 b/resources/record/dinggong/58_我才没有觉得你很有用呢…_.mp3 similarity index 100% rename from resources/voice/dinggong/58_我才没有觉得你很有用呢…_.mp3 rename to resources/record/dinggong/58_我才没有觉得你很有用呢…_.mp3 diff --git a/resources/voice/dinggong/59_我才没有很开心呢！_.mp3 b/resources/record/dinggong/59_我才没有很开心呢！_.mp3 similarity index 100% rename from resources/voice/dinggong/59_我才没有很开心呢！_.mp3 rename to resources/record/dinggong/59_我才没有很开心呢！_.mp3 diff --git a/resources/voice/dinggong/60_要多多的和我联系！不然我会担心你的…_.mp3 b/resources/record/dinggong/60_要多多的和我联系！不然我会担心你的…_.mp3 similarity index 100% rename from resources/voice/dinggong/60_要多多的和我联系！不然我会担心你的…_.mp3 rename to resources/record/dinggong/60_要多多的和我联系！不然我会担心你的…_.mp3 diff --git a/resources/voice/temp/bd_yysb.wav b/resources/record/temp/bd_yysb.wav similarity index 100% rename from resources/voice/temp/bd_yysb.wav rename to resources/record/temp/bd_yysb.wav diff --git a/resources/txt/cookie/buff.txt b/resources/text/cookie/buff.txt similarity index 100% rename from resources/txt/cookie/buff.txt rename to resources/text/cookie/buff.txt diff --git a/update_info.json b/update_info.json index 84cf81af..a1d8a124 100644 --- a/update_info.json +++ b/update_info.json @@ -7,9 +7,9 @@ "basic_plugins", "configs/path_config.py", "configs/utils", - "bot.py", "poetry.lock", - "pyproject.toml" + "pyproject.toml", + "resources/font" ], "add_file": [], "delete_file": [] diff --git a/utils/image_utils.py b/utils/image_utils.py index 74fe0a17..c1c5f525 100755 --- a/utils/image_utils.py +++ b/utils/image_utils.py @@ -367,7 +367,7 @@ class BuildImage: async def atext( self, - pos: Tuple[int, int], + pos: Union[Tuple[int, int], Tuple[float, float]], text: str, fill: Union[str, Tuple[int, int, int]] = (0, 0, 0), center_type: Optional[Literal["center", "by_height", "by_width"]] = None, @@ -385,7 +385,7 @@ class BuildImage: def text( self, - pos: Tuple[int, int], + pos: Union[Tuple[int, int], Tuple[float, float]], text: str, fill: Union[str, Tuple[int, int, int]] = (0, 0, 0), center_type: Optional[Literal["center", "by_height", "by_width"]] = None, diff --git a/utils/manager/__init__.py b/utils/manager/__init__.py index 01fc1266..b2f1b158 100755 --- a/utils/manager/__init__.py +++ b/utils/manager/__init__.py @@ -62,6 +62,5 @@ requests_manager: Optional[RequestManager] = RequestManager( DATA_PATH / "manager" / "requests_manager.json" ) - # 管理员命令管理器 admin_manager = AdminManager() diff --git a/utils/manager/plugins2settings_manager.py b/utils/manager/plugins2settings_manager.py index 7761bb7f..c68520be 100755 --- a/utils/manager/plugins2settings_manager.py +++ b/utils/manager/plugins2settings_manager.py @@ -17,13 +17,14 @@ class Plugins2settingsManager(StaticData): if file.exists(): with open(file, "r", encoding="utf8") as f: self._data = yaml.load(f) - if "PluginSettings" in self._data.keys(): - self._data = ( - self._data["PluginSettings"] if self._data["PluginSettings"] else {} - ) - for x in self._data.keys(): - if self._data[x].get("cost_gold") is None: - self._data[x]["cost_gold"] = 0 + if self._data: + if "PluginSettings" in self._data.keys(): + self._data = ( + self._data["PluginSettings"] if self._data["PluginSettings"] else {} + ) + for x in self._data.keys(): + if self._data[x].get("cost_gold") is None: + self._data[x]["cost_gold"] = 0 def add_plugin_settings( self, diff --git a/utils/message_builder.py b/utils/message_builder.py index 8b8a2104..5a1b3780 100755 --- a/utils/message_builder.py +++ b/utils/message_builder.py @@ -150,6 +150,10 @@ def poke(qq: int) -> MessageSegment: return MessageSegment("poke", {"qq": qq}) +def music(type_: str, id_: int) -> MessageSegment: + return MessageSegment.music(type_, id_) + + def custom_forward_msg( msg_list: List[str], uin: Union[int, str], name: str = f"这里是{NICKNAME}" ) -> List[dict]: