diff --git a/apps/profile.js b/apps/profile.js index 54970d74..93ea7151 100644 --- a/apps/profile.js +++ b/apps/profile.js @@ -60,7 +60,7 @@ app.reg('profile-list', profileList, { }) app.reg('profile-stat', profileStat, { - rule: /^#面板练度统计$/, + rule: /^#(面板|喵喵)?练度统计$/, name: '面板练度统计$' }) diff --git a/apps/profile/ProfileStat.js b/apps/profile/ProfileStat.js index 2ec4735f..8a37a035 100644 --- a/apps/profile/ProfileStat.js +++ b/apps/profile/ProfileStat.js @@ -1,8 +1,12 @@ import lodash from 'lodash' -import { Common, Data } from '../../components/index.js' +import {Cfg, Common, Data } from '../../components/index.js' import { AvatarList, ProfileRank } from '../../models/index.js' export async function profileStat (e) { + let isMatch = /^#(喵喵|面板)练度统计?$/.test(e.original_msg || e.msg || '') + if (!Cfg.get('profileStat', false) && !isMatch) { + return false +} // 缓存时间,单位小时 let msg = e.msg.replace('#', '').trim() diff --git a/config/cfg_default.js b/config/cfg_default.js index c0b78c71..edfb7258 100644 --- a/config/cfg_default.js +++ b/config/cfg_default.js @@ -8,9 +8,12 @@ export const avatarProfile = true // 群面板排名 export const groupRank = false -// 使用【#上传深渊】功能取代【#深渊功能】,默认关闭 +// 使用【#上传深渊】功能取代【#深渊】功能,默认关闭 export const uploadAbyssData = false +// 使用【#面板练度统计】功能取代【#练度统计】功能,默认关闭 +export const profileStat = false + // 老婆查询 export const avatarWife = true diff --git a/config/system/cfg_system.js b/config/system/cfg_system.js index 9b7a7bb3..e9b516f5 100644 --- a/config/system/cfg_system.js +++ b/config/system/cfg_system.js @@ -40,7 +40,14 @@ export const cfgSchema = { key: '深渊', def: false, oldCfgKey: 'wiki.abyss', - desc: '使用【#上传深渊】功能取代【#深渊功能】,默认关闭' + desc: '使用【#上传深渊】功能取代【#深渊】功能,默认关闭' + }, + profileStat: { + title: '面板练度统计', + key: '练度统计', + def: false, + oldCfgKey: 'profile.stat', + desc: '使用【#面板练度统计】功能取代【#练度统计】功能,默认关闭' }, avatarWife: { title: '老婆查询', diff --git a/config/system/character_system.js b/config/system/character_system.js index 005ea78d..74171c7a 100644 --- a/config/system/character_system.js +++ b/config/system/character_system.js @@ -92,7 +92,8 @@ export const characters = { gongji: ['普契涅拉', '公鸡', '鸽子'], duizhang: ['卡皮塔诺', '队长'], daiyin: ['戴因斯雷布', '戴因', '男派蒙', '大派蒙', '末光之剑', '拾枝者'], - tianli: ['天理', '天理维系者', '维系者'] + tianli: ['天理', '天理维系者', '维系者'], + kawei: ['卡维', '艾尔海森室友'] } export const wifeData = { @@ -100,7 +101,7 @@ export const wifeData = { 烟绯, 优菈, 神里绫华, 宵宫, 雷电将军, 珊瑚宫心海, 九条裟罗, 八重神子, 埃洛伊, 申鹤, 云堇, 夜兰, 久岐忍, 柯莱, 多莉, 伐难, 女士, 萍姥姥, 柯莱, 多莉, 仆人, 少女, 妮露, 坎蒂丝, 天理,迪希雅,莱依拉,珐露珊`, boyfriend: `空, 凯亚, 迪卢克, 雷泽, 温迪, 行秋, 魈, 钟离, 班尼特, 达达利亚, 重云, 阿贝多, 枫原万叶, 托马, 五郎, 荒泷一斗, - 鹿野院平藏, 神里绫人, 提纳里, 流浪者, 白术, 提纳里, 富人, 博士, 丑角, 公鸡, 队长, 赛诺, 戴因`, + 鹿野院平藏, 神里绫人, 提纳里, 流浪者, 白术, 提纳里, 富人, 博士, 丑角, 公鸡, 队长, 赛诺, 戴因, 卡维`, daughter: '可莉, 七七, 迪奥娜, 早柚, 派蒙, 瑶瑶, 纳西妲', son: '' } diff --git a/resources/character-img/卡维/01.jpg b/resources/character-img/卡维/01.jpg new file mode 100644 index 00000000..7a8a3cdc Binary files /dev/null and b/resources/character-img/卡维/01.jpg differ diff --git a/resources/character-img/卡维/02.jpg b/resources/character-img/卡维/02.jpg new file mode 100644 index 00000000..a96a2125 Binary files /dev/null and b/resources/character-img/卡维/02.jpg differ diff --git a/resources/character-img/卡维/03.jpg b/resources/character-img/卡维/03.jpg new file mode 100644 index 00000000..053d2876 Binary files /dev/null and b/resources/character-img/卡维/03.jpg differ