diff --git a/apps/character.js b/apps/character.js index 774aa8d0..657697ff 100644 --- a/apps/character.js +++ b/apps/character.js @@ -9,7 +9,6 @@ import Calc from "../components/Calc.js"; import fs from "fs"; - //角色昵称 let nameID = ""; let genshin = {}; @@ -43,7 +42,7 @@ const relationMap = { } const relation = lodash.flatMap(relationMap, (d) => d.keyword); -export const wifeReg = `^#\\s*(${relation.join("|")})\\s*(设置|选择|指定|列表|查询|列表|是|是谁|照片|相片|写真|图像)?\\s*([^\\d]*)\\s*(\\d*)$`; +export const wifeReg = `^#?\\s*(${relation.join("|")})\\s*(设置|选择|指定|列表|查询|列表|是|是谁|照片|相片|图片|写真|图像)?\\s*([^\\d]*)\\s*(\\d*)$`; export async function init(isUpdate = false) { let _path = "file://" + process.cwd(); @@ -111,6 +110,10 @@ export async function wife(e, { render, User }) { action = msgRet[2] || "卡片", actionParam = msgRet[3] || ""; + if (!"设置,选择,挑选,指定".split(",").includes(action) && actionParam) { + return false; + } + let targetCfg = lodash.find(relationMap, (cfg, key) => { cfg.key = key; return cfg.keyword.includes(target); diff --git a/index.js b/index.js index 79f4ba43..1bed082a 100644 --- a/index.js +++ b/index.js @@ -27,7 +27,7 @@ let rule = { describe: "【#统计】 #深渊出场率 #深渊12层出场率", }, wiki: { - reg: "^#(喵喵)?.*(天赋|技能|命座|命之座|资料|照片|写真|图片|插画)$", + reg: "^(#|喵喵)?.*(天赋|技能|命座|命之座|资料|照片|写真|图片|插画)$", describe: "【#资料】 #神里天赋 #夜兰命座", }, help: { diff --git a/resources/character/detail.css b/resources/character/detail.css index 426a0ac4..c9384edb 100644 --- a/resources/character/detail.css +++ b/resources/character/detail.css @@ -76,7 +76,6 @@ body { font-family: YS; height: 32px; line-height: 32px; - font-weight: 400; text-shadow: 0 0 1px rgba(0, 0, 0, .5); } @@ -436,6 +435,7 @@ body { display: block; white-space: nowrap; overflow: hidden; + font-font: YS; } .artis .head span { @@ -571,6 +571,8 @@ body { .artis .weapon .head strong { font-size: 18px; margin-bottom: 3px; + font-weight: normal; + font-family: YS; } .artis .weapon .head > span {