diff --git a/adapter/index.js b/adapter/index.js index 4eccf9a..6f57ceb 100644 --- a/adapter/index.js +++ b/adapter/index.js @@ -40,7 +40,7 @@ export class atlas extends plugin { e.getMysApi = async function (cfg) { return await getMysApi(e, cfg) } - msg = '#' + msg.replace(/#|#/, '').trim() + msg = msg.replace(/#|#/, '#').trim() for (let fn in Atlas.rule) { let cfg = Atlas.rule[fn] if (Atlas[fn] && new RegExp(cfg.reg).test(msg)) { diff --git a/apps/index.js b/apps/index.js index dbe6d80..86f85ce 100644 --- a/apps/index.js +++ b/apps/index.js @@ -68,14 +68,15 @@ let rule = { reg: "^#*(体力|树脂|查询体力|便笺|便签)$", describe: "体力", }, - genShenMap:{ - reg: "^#*(.*)(在(哪|那)里)$", - describe: "地图资源查询 #**在哪里", - }, + Note_appoint: { reg: "^#体力模板(设置(.*)|列表(.*))$", describe: "体力模板设置", }, + genShenMap:{ + reg: "^#(.*)(在(哪|那)里)$", + describe: "地图资源查询 #**在哪里", + }, pokeNote: { reg: "#poke#", describe: "体力", diff --git a/apps/map.js b/apps/map.js index 124f585..b727b57 100644 --- a/apps/map.js +++ b/apps/map.js @@ -23,7 +23,7 @@ export async function genShenMap(e){ try{ res=await res.json() if(res.retcode==-1){ - await e.reply(`${msg}:${res.message}`) + await e.reply(`${res.message}`) return true; } }catch(ex){ diff --git a/resources/Atlas_alias/wuqi_tujian.json b/resources/Atlas_alias/wuqi_tujian.json index 587a7ed..55ce0cc 100644 --- a/resources/Atlas_alias/wuqi_tujian.json +++ b/resources/Atlas_alias/wuqi_tujian.json @@ -38,6 +38,8 @@ "不灭月华": ["月华","心海","珊瑚宫心海"], + "千夜浮梦":["千夜","纳西达","草神"], + "昭心": ["糟心"], "幽夜华尔兹": ["幽夜", "幽夜弓", "华尔兹", "皇女弓","皇女外观"], "流浪乐章": ["赌狗书", "赌狗乐章", "赌狗"],