From d8ea18a9d589217d65ad185958092340edc9f11f Mon Sep 17 00:00:00 2001
From: bietiaop <1527109126@qq.com>
Date: Thu, 11 Jul 2024 15:05:24 +0800
Subject: [PATCH] fix:gachalog

---
 apps/card.js                  |  2 +-
 apps/gachalog.js              |  2 +-
 apps/note.js                  |  2 +-
 lib/gacha.js                  | 26 ++++++++++++++++++--------
 model/gacha.js                |  1 +
 resources/gachalog/index.html |  5 ++++-
 utils/network.js              |  2 +-
 7 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/apps/card.js b/apps/card.js
index 77d871c..496e0ab 100644
--- a/apps/card.js
+++ b/apps/card.js
@@ -13,7 +13,7 @@ export class Card extends ZZZPlugin {
       priority: 100,
       rule: [
         {
-          reg: `${rulePrefix}card$`,
+          reg: `${rulePrefix}(card|卡片|个人信息)$`,
           fnc: 'card',
         },
       ],
diff --git a/apps/gachalog.js b/apps/gachalog.js
index 97bc096..4d176d6 100644
--- a/apps/gachalog.js
+++ b/apps/gachalog.js
@@ -23,7 +23,7 @@ export class GachaLog extends ZZZPlugin {
           fnc: 'startGachaLog',
         },
         {
-          reg: `${rulePrefix}刷新抽卡链接$`,
+          reg: `${rulePrefix}刷新抽卡(链接|记录)$`,
           fnc: 'refreshGachaLog',
         },
         {
diff --git a/apps/note.js b/apps/note.js
index 3eb0b30..677129f 100644
--- a/apps/note.js
+++ b/apps/note.js
@@ -13,7 +13,7 @@ export class Note extends ZZZPlugin {
       priority: 100,
       rule: [
         {
-          reg: `${rulePrefix}note$`,
+          reg: `${rulePrefix}(note|每日|体力|便笺|便签)$`,
           fnc: 'note',
         },
       ],
diff --git a/lib/gacha.js b/lib/gacha.js
index 97a74e1..3cbdb2a 100644
--- a/lib/gacha.js
+++ b/lib/gacha.js
@@ -136,6 +136,13 @@ const RANK_MAP = {
   2: 'B',
 };
 const HOMO_TAG = ['非到极致', '运气不好', '平稳保底', '小欧一把', '欧狗在此'];
+const EMOJI = [
+  [4, 8, 13],
+  [1, 10, 5],
+  [16, 15, 2],
+  [12, 3, 9],
+  [6, 14, 7],
+];
 const NORMAL_LIST = [
   '「11号」',
   '猫又',
@@ -194,7 +201,6 @@ export async function anaylizeGachaLog(uid) {
     const list = [];
     let lastFive = null;
     let preIndex = 0;
-    let luck = 0;
     let i = 0;
     for (const item of data) {
       let isUp = true;
@@ -218,7 +224,7 @@ export async function anaylizeGachaLog(uid) {
         preIndex = i;
       }
       if (i === data.length - 1 && list.length > 0) {
-        list[list.length - 1]['totalCount'] = i - preIndex;
+        list[list.length - 1]['totalCount'] = i - preIndex + 1;
       }
       i++;
     }
@@ -239,18 +245,21 @@ export async function anaylizeGachaLog(uid) {
       if (totalCount > 0) lastFive = totalCount;
       else lastFive = '-';
     }
-    if (avgUp !== "-") {
-      if ("音擎频段" === name) {
+    if (avgUp !== '-') {
+      if ('音擎频段' === name) {
         level = getLevelFromList(avgUp, [62, 75, 88, 99, 111]);
-      } else if ("邦布频段" === name) {
+      } else if ('邦布频段' === name) {
         level = getLevelFromList(avgUp, [51, 55, 61, 68, 70]);
-      } else if ("独家频段" === name) {
+      } else if ('独家频段' === name) {
         level = getLevelFromList(avgUp, [74, 87, 99, 105, 120]);
-      } else if ("常驻频段" === name) {
+      } else if ('常驻频段' === name) {
         level = getLevelFromList(avgUp, [53, 60, 68, 73, 75]);
       }
     }
-    let tag = HOMO_TAG[level];
+    const tag = HOMO_TAG[level];
+    const emojis = EMOJI[level];
+    // 随机选取一个
+    const emoji = emojis[Math.floor(Math.random() * emojis.length)];
     result.push({
       name,
       timeRange,
@@ -263,6 +272,7 @@ export async function anaylizeGachaLog(uid) {
       avgUp,
       level,
       tag,
+      emoji,
     });
   }
   return result;
diff --git a/model/gacha.js b/model/gacha.js
index 73900c9..4811ebd 100644
--- a/model/gacha.js
+++ b/model/gacha.js
@@ -64,6 +64,7 @@ export class SingleGachaLog {
   async get_assets() {
     if (this.item_type === '音擎') {
       const result = await getWeaponImage(this.item_id);
+      logger.debug('音擎result', result);
       this.square_icon = result;
     } else if (this.item_type === '邦布') {
       const result = await getSquareBangboo(this.item_id);
diff --git a/resources/gachalog/index.html b/resources/gachalog/index.html
index 7c68bfd..566c26d 100644
--- a/resources/gachalog/index.html
+++ b/resources/gachalog/index.html
@@ -30,11 +30,14 @@
         </div>
       </div>
     </div>
-    <div class="comment e1">
+    <div class="comment e{{item.emoji}}">
       <div class="icon"></div>
       <div class="label">{{item.tag}}</div>
     </div>
   </div>
+  {{if item.list.length === 0}}
+  <div style="margin: 1em auto; text-align: center;">暂无数据</div>
+  {{/if}}
   <div class="list">
     {{each item.list inv j}}
     <div class="item rankS {{inv.isUp && 'up'}}">
diff --git a/utils/network.js b/utils/network.js
index 721d5bf..447a1bd 100644
--- a/utils/network.js
+++ b/utils/network.js
@@ -16,7 +16,7 @@ export async function checkLatency(url) {
         });
       })
       .on('error', err => {
-        logger.mark(`Error checking ${url}:`, err.message);
+        logger.debug(`下载节点 ${url} 连接失败:`, err.message);
         resolve({ url, latency: Infinity });
       });
   });