diff --git a/lib/common/common.js b/lib/common/common.js
index cf82dd7..f0e500e 100644
--- a/lib/common/common.js
+++ b/lib/common/common.js
@@ -77,8 +77,12 @@ async function makeForwardMsg (e, msg = [], dec = '', msgsscr = false) {
let id = msgsscr ? e.user_id : Bot.uin
if (e.isGroup) {
- let info = await e.bot.getGroupMemberInfo(e.group_id, id)
- name = info.card || info.nickname
+ try {
+ let info = await e.bot.getGroupMemberInfo(e.group_id, id)
+ name = info.card || info.nickname
+ } catch (err) {
+ logger.error(err)
+ }
}
let userInfo = {
@@ -98,27 +102,31 @@ async function makeForwardMsg (e, msg = [], dec = '', msgsscr = false) {
}
/** 制作转发内容 */
- if (e?.group?.makeForwardMsg) {
- forwardMsg = await e.group.makeForwardMsg(forwardMsg)
- } else if (e?.friend?.makeForwardMsg) {
- forwardMsg = await e.friend.makeForwardMsg(forwardMsg)
- } else {
- return msg.join('\n')
- }
-
- if (dec) {
- /** 处理描述 */
- if (typeof (forwardMsg.data) === 'object') {
- let detail = forwardMsg.data?.meta?.detail
- if (detail) {
- detail.news = [{ text: dec }]
- }
+ try {
+ if (e?.group?.makeForwardMsg) {
+ forwardMsg = await e.group.makeForwardMsg(forwardMsg)
+ } else if (e?.friend?.makeForwardMsg) {
+ forwardMsg = await e.friend.makeForwardMsg(forwardMsg)
} else {
- forwardMsg.data = forwardMsg.data
- .replace(/\n/g, '')
- .replace(/
(.+?)<\/title>/g, '___')
- .replace(/___+/, `${dec}`)
+ return msg.join('\n')
}
+
+ if (dec) {
+ /** 处理描述 */
+ if (typeof (forwardMsg.data) === 'object') {
+ let detail = forwardMsg.data?.meta?.detail
+ if (detail) {
+ detail.news = [{ text: dec }]
+ }
+ } else {
+ forwardMsg.data = forwardMsg.data
+ .replace(/\n/g, '')
+ .replace(/(.+?)<\/title>/g, '___')
+ .replace(/___+/, `${dec}`)
+ }
+ }
+ } catch (err) {
+ logger.error(err)
}
return forwardMsg
diff --git a/plugins/genshin/apps/gcLog.js b/plugins/genshin/apps/gcLog.js
index 3c7b1d1..27038a5 100644
--- a/plugins/genshin/apps/gcLog.js
+++ b/plugins/genshin/apps/gcLog.js
@@ -20,15 +20,15 @@ export class gcLog extends plugin {
fnc: 'logUrl'
},
{
- reg: '#txt(日志)?(文件)?导入记录',
+ reg: '^#txt(日志)?(文件)?导入记录$',
fnc: 'logFile'
},
{
- reg: '#*(原神|星铁)?(xlsx|excel)(文件)?导入记录',
+ reg: '^#*(原神|星铁)?(xlsx|excel)(文件)?导入记录$',
fnc: 'logXlsx'
},
{
- reg: '#*(原神|星铁)?json(文件)?导入记录',
+ reg: '^#*(原神|星铁)?json(文件)?导入记录$',
fnc: 'logJson'
},
{
diff --git a/plugins/genshin/model/weapon.js b/plugins/genshin/model/weapon.js
index 6437728..fa5e61b 100644
--- a/plugins/genshin/model/weapon.js
+++ b/plugins/genshin/model/weapon.js
@@ -45,6 +45,7 @@ export default class Weapon extends base {
let count = {
five: 0,
four: 0,
+ three: 0,
单手剑: 0,
双手剑: 0,
长柄武器: 0,
@@ -64,6 +65,7 @@ export default class Weapon extends base {
if (val.weapon.rarity == 5) count.five++
if (val.weapon.rarity == 4) count.four++
+ if (val.weapon.rarity == 3) count.three++
count[val.weapon.type_name]++
diff --git a/plugins/genshin/resources/html/weapon/weapon.css b/plugins/genshin/resources/html/weapon/weapon.css
index e6903ef..e07c5d3 100644
--- a/plugins/genshin/resources/html/weapon/weapon.css
+++ b/plugins/genshin/resources/html/weapon/weapon.css
@@ -87,6 +87,13 @@ body {
border-radius: 100%;
margin-right: 4px;
}
+.lab-item-3{
+ background: #4c99b9;
+ width: 6px;
+ height: 6px;
+ border-radius: 100%;
+ margin-right: 4px;
+}
.lab-item-weapon{
width: 16px;
height: 16px;
diff --git a/plugins/genshin/resources/html/weapon/weapon.html b/plugins/genshin/resources/html/weapon/weapon.html
index 767f29a..e9864a8 100644
--- a/plugins/genshin/resources/html/weapon/weapon.html
+++ b/plugins/genshin/resources/html/weapon/weapon.html
@@ -19,7 +19,11 @@
-
四星:{{count.five}}
+
四星:{{count.four}}
+
+