From ed736015312291396052741021a025ac787fddea Mon Sep 17 00:00:00 2001 From: Ctrlcvs <1509167646@qq.com> Date: Tue, 16 Aug 2022 22:07:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=AD=A6=E5=99=A8=E5=88=AB?= =?UTF-8?q?=E5=90=8D=E5=A2=9E=E5=8A=A0=E4=B8=93=E6=AD=A6=E8=AF=86=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/xiaoyao_image.js | 8 +++++--- resources/Atlas_alias/wuqi_tujian.json | 28 +++++++++++++------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/apps/xiaoyao_image.js b/apps/xiaoyao_image.js index db40ad9..d94638b 100644 --- a/apps/xiaoyao_image.js +++ b/apps/xiaoyao_image.js @@ -16,6 +16,7 @@ const _path = process.cwd(); const __dirname = path.resolve(); const list = ["wuqi_tujian", "shiwu_tujian", "yuanmo_tujian", "mijin_tujian", "shengyiwu_tujian", "daoju_tujian"] +const reglist=["(#|专武|武器|图鉴|突破)","(#|食物|特殊料理|特色|料理|食材)","(#|原魔|怪物|图鉴|信息)","(#|秘境|信息|图鉴)","(#|圣遗物|图鉴)","(#|图鉴|道具)"] export async function AtlasAlias(e) { if (!Cfg.get("Atlas.all")) { return false; @@ -29,8 +30,8 @@ export async function AtlasAlias(e) { } if (await Atlas_list(e)) return true; if (await roleInfo(e)) return true; - var name = e.msg.replace(/#|＃|信息|图鉴|圣遗物|食物|食材|特殊|特色|料理/g, ""); - return send_Msg(e, "all", name); + // var name = e.msg.replace(/#|＃|信息|图鉴|圣遗物|食物|食材|特殊|特色|料理/g, ""); + return send_Msg(e, "all", ""); } @@ -64,7 +65,8 @@ export async function roleInfo(e) { const send_Msg = function(e, type, name) { let path; if (type == "all") { - for (let val of list) { + for (let [index,val] of list.entries()) { + name=e.msg.replace(new RegExp(reglist[index],"g"),""); path = `${_path}/plugins/xiaoyao-cvs-plugin/resources/xiaoyao-plus/${val}/${name}.png` if (fs.existsSync(path)) { e.reply(segment.image(`file:///${path}`)); diff --git a/resources/Atlas_alias/wuqi_tujian.json b/resources/Atlas_alias/wuqi_tujian.json index 3a2c41c..80aa9bf 100644 --- a/resources/Atlas_alias/wuqi_tujian.json +++ b/resources/Atlas_alias/wuqi_tujian.json @@ -2,13 +2,13 @@ "磐岩结绿": ["绿箭", "绿剑"], "斫峰之刃": ["斫峰", "盾剑"], "无工之剑": ["蜈蚣", "蜈蚣大剑", "无工大剑", "盾大剑", "无工"], - "贯虹之槊": ["贯虹", "岩枪", "盾枪"], + "贯虹之槊": ["贯虹", "岩枪", "盾枪","钟离"], "赤角石溃杵": ["赤角", "石溃杵"], "尘世之锁": ["尘世锁", "尘世", "盾书", "锁"], - "终末嗟叹之诗": ["终末", "终末弓", "叹气弓", "乐团弓"], - "松籁响起之时": ["松籁", "乐团大剑", "松剑"], - "苍古自由之誓": ["苍古", "乐团剑"], + "终末嗟叹之诗": ["终末", "终末弓", "叹气弓", "乐团弓","温迪"], + "松籁响起之时": ["松籁", "乐团大剑", "松剑","尤拉"], + "苍古自由之誓": ["苍古", "乐团剑","万叶"], "渔获": ["鱼叉"], "衔珠海皇": ["海皇", "咸鱼剑", "咸鱼大剑"], @@ -37,18 +37,18 @@ "暗巷猎手": ["暗巷弓"], "阿莫斯之弓": ["阿莫斯", "ams", "痛苦弓"], - "雾切之回光": ["雾切"], - "飞雷之弦振": ["飞雷", "飞雷弓"], - "薙草之稻光": ["薙草", "稻光", "薙草稻光", "马尾枪", "马尾", "薙刀"], - "神乐之真意": ["神乐", "真意"], + "雾切之回光": ["雾切","神里"], + "飞雷之弦振": ["飞雷", "飞雷弓","宵宫"], + "薙草之稻光": ["薙草", "稻光", "薙草稻光", "马尾枪", "马尾", "薙刀","雷神"], + "神乐之真意": ["神乐", "真意","神子"], "狼的末路": ["狼末"], - "护摩之杖": ["护摩", "护摩枪", "护膜"], - "和璞鸢": ["鸟枪", "绿枪"], + "护摩之杖": ["护摩", "护摩枪", "护膜","胡桃"], + "和璞鸢": ["鸟枪", "绿枪","魈"], "风鹰剑": ["风鹰"], - "冬极白星": ["冬极"], - "不灭月华": ["月华"], - "波乱月白经津": ["波乱", "月白", "波乱月白", "经津", "波波津"], - "若水": ["麒麟弓", "Aqua", "aqua"], + "冬极白星": ["冬极","公子"], + "不灭月华": ["月华","心海"], + "波乱月白经津": ["波乱", "月白", "波乱月白", "经津", "波波津","凌人"], + "若水": ["麒麟弓", "Aqua", "aqua","夜兰"], "笼钓瓶一心":["妖刀", "红刀", "笼钓瓶", "一心传名刀"], "昭心": ["糟心"], "幽夜华尔兹": ["幽夜", "幽夜弓", "华尔兹", "皇女弓"],