Merge branch 'master' of github.com:yoimiya-kokomi/Miao-Yunzai

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)
+    try {
-    name = info.card || info.nickname
+      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) {
+  try {
-    forwardMsg = await e.group.makeForwardMsg(forwardMsg)
+    if (e?.group?.makeForwardMsg) {
-  } else if (e?.friend?.makeForwardMsg) {
+      forwardMsg = await e.group.makeForwardMsg(forwardMsg)
-    forwardMsg = await e.friend.makeForwardMsg(forwardMsg)
+    } else if (e?.friend?.makeForwardMsg) {
-  } else {
+      forwardMsg = await e.friend.makeForwardMsg(forwardMsg)
-    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
+      return msg.join('\n')
-        .replace(/\n/g, '')
-        .replace(/<title color="#777777" size="26">(.+?)<\/title>/g, '___')
-        .replace(/___+/, `<title color="#777777" size="26">${dec}</title>`)
     }
+
+    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 color="#777777" size="26">(.+?)<\/title>/g, '___')
+          .replace(/___+/, `<title color="#777777" size="26">${dec}</title>`)
+      }
+    }
+  } catch (err) {
+    logger.error(err)
   }
 
   return forwardMsg

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'
         },
         {

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]++
 

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;

plugins/genshin/resources/html/weapon/weapon.html

@@ -19,7 +19,11 @@
           </div>
           <div class="lab-item">
             <div class="lab-item-4"></div>
-            <div class="lab-item-text">四星：{{count.five}}</div>
+            <div class="lab-item-text">四星：{{count.four}}</div>
+          </div>
+          <div class="lab-item">
+            <div class="lab-item-3"></div>
+            <div class="lab-item-text">三星：{{count.three}}</div>
           </div>
           <div class="lab-item">
             <div class="lab-item-weapon"><img src="{{pluResPath}}img/gacha/items/单手剑.png"></div>
@@ -74,4 +78,4 @@
 <script type="text/javascript">
 </script>
 
-</html>
+</html>

plugins/other/update.js

@@ -19,11 +19,11 @@ export class update extends plugin {
       priority: 4000,
       rule: [
         {
-          reg: '^#更新日志$',
+          reg: '^#更新日志',
           fnc: 'updateLog'
         },
         {
-          reg: '^#(强制)?更新$',
+          reg: '^#(强制)?更新',
           fnc: 'update'
         },
         {