koishi-plugin-ggcevo-game 1.0.5 → 1.0.7

package/lib/index.js

@@ -193,15 +193,33 @@ function apply(ctx, config) {
   }
   __name(gachaWithPity, "gachaWithPity");
   async function gachaWithHiddenAward(handle) {
-    const [record] = await ctx.database.get("ggcevo_records", { handle });
-    const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 2 });
+    const backpackItems = await ctx.database.get("ggcevo_backpack", {
+      handle,
+      itemId: { $in: [1, 2, 3] }
+    });
+    const itemMap = new Map(backpackItems.map((item) => [item.itemId, item]));
     const isWin = HiddenAward();
     if (isWin) {
-      await ctx.database.upsert("ggcevo_backpack", [{
+      const updates = [
+        {
+          itemId: 1,
+          addAmount: 100
+        },
+        {
+          itemId: 2,
+          addAmount: 1
+        },
+        {
+          itemId: 3,
+          addAmount: 1
+        }
+      ].map(({ itemId, addAmount }) => ({
         handle,
-        itemId: 2,
-        quantity: (backpack?.quantity || 0) + 3
-      }]);
+        itemId,
+        quantity: (itemMap.get(itemId)?.quantity || 0) + addAmount
+      }));
+      await ctx.database.upsert("ggcevo_backpack", updates, ["handle", "itemId"]);
+      const [record] = await ctx.database.get("ggcevo_records", { handle });
       await ctx.database.upsert("ggcevo_records", [{
         handle,
         hiddenawards: (record?.hiddenawards || 0) + 1
@@ -275,7 +293,7 @@ function apply(ctx, config) {
       `🎰 您使用了 ${quantity} 枚咕咕币`,
       winCount > 0 ? `🎉 其中获得 ${winCount} 张兑换券！` : "💔 本次未获得任何兑换券",
       `📊 当前保底进度：${record.pityCounter}/90`,
-      ...hiddenWinCount > 0 ? [`🎉 恭喜你抽中隐藏奖励，额外获得 ${hiddenWinCount * 3} 张兑换券！`] : []
+      ...hiddenWinCount > 0 ? [`🎉 恭喜你抽中隐藏奖励，额外获得 ${hiddenWinCount * 100} 枚咕咕币， ${hiddenWinCount} 张兑换券，以及 ${hiddenWinCount} 枚扭蛋币！`] : []
     ].join("\n");
   });
   ctx.command("ggcevo/单抽").action(async (argv) => {
@@ -307,7 +325,7 @@ function apply(ctx, config) {
     const [record] = await ctx.database.get("ggcevo_records", { handle });
     return [
       `${result ? "🎉 获得兑换券！" : "❌ 未中奖"} 保底进度：${record.pityCounter}/90`,
-      ...HiddenAward2 ? [`🎉 恭喜你抽中隐藏奖励，额外获得 3 张兑换券！`] : []
+      ...HiddenAward2 ? [`🎉 恭喜你抽中隐藏奖励，额外获得 100 枚咕咕币， 1 张兑换券，以及 1 枚扭蛋币！`] : []
     ].join("\n");
   });
   ctx.command("ggcevo/十连抽").action(async (argv) => {
@@ -346,7 +364,7 @@ function apply(ctx, config) {
       "十连抽结果：",
       ...results.map((r) => r ? "⭐获得兑换券" : "❌未中奖"),
       `保底进度：${record.pityCounter}/90`,
-      ...hiddenWinCount > 0 ? [`🎉 恭喜你抽中隐藏奖励，额外获得 ${hiddenWinCount * 3} 张兑换券！`] : []
+      ...hiddenWinCount > 0 ? [`🎉 恭喜你抽中隐藏奖励，额外获得 ${hiddenWinCount * 100} 枚咕咕币， ${hiddenWinCount} 张兑换券，以及 ${hiddenWinCount} 枚扭蛋币！`] : []
     ].join("\n");
   });
   ctx.command("ggcevo/抽奖记录").action(async (argv) => {
@@ -863,16 +881,27 @@ ID：${activity.id}
         displayName: await checkSensitiveWord(item.name) ? item.name : (item.name[0] || "") + "***"
       }))
     );
+    const ggcmap = await ctx.database.get("sc2arcade_map", { guildId: config.ggcqun });
+    const lastdate = ggcmap[0].lastdate;
     const rankingText = processedRecords.map(
       (item, index) => `${offset + index + 1}. ${item.displayName} | 积分: ${item.rank} | 胜率: ${item.matches === 0 ? "0.00%" : (item.wins / item.matches * 100).toFixed(2) + "%"}`
     ).join("\n");
     return [
       `🏆 GGCEvo S1赛季胜点榜 🏆`,
-      `本赛季从4月1日至5月15日23点结算`,
-      `第 ${pageNum} 页 共 ${totalPages} 页`,
+      `本赛季从4月1日至5月15日23点`,
+      `数据同步时间: ${lastdate.toLocaleString("zh-CN", {
+        timeZone: "Asia/Shanghai",
+        year: "numeric",
+        month: "2-digit",
+        day: "2-digit",
+        hour: "2-digit",
+        minute: "2-digit",
+        hour12: false
+      })}`,
       "------------------------------",
       rankingText,
       "------------------------------",
+      `第 ${pageNum} 页 / 共 ${totalPages} 页`,
       pageNum < totalPages ? `输入 胜点榜 ${pageNum + 1} 查看下一页` : "已是最后一页"
     ].join("\n");
   });
@@ -1293,7 +1322,7 @@ ${achievementList.join("\n")}`;
 ──────────────`);
     const [sign] = await ctx.database.get("ggcevo_sign", { handle });
     if (sign) {
-      const chinaTime = sign.lastSign.toLocaleString("zh-CN", {
+      const chinaTime = new Date(sign.lastSign).toLocaleString("zh-CN", {
         timeZone: "Asia/Shanghai",
         year: "numeric",
         month: "2-digit",
@@ -1321,22 +1350,54 @@ ${achievementList.join("\n")}`;
         "──────────────"
       );
     }
-    const [achievements] = await ctx.database.get("ggcevo_achievements", { handle });
-    if (achievements) {
-      output.push(
-        "🏆 已获成就：",
-        `${achievements.achievementname} (${achievements.gaintime.toLocaleDateString("zh-CN", {
+    const achievements = await ctx.database.get("ggcevo_achievements", { handle });
+    if (achievements.length) {
+      output.push("🏆 最近成就：");
+      achievements.sort((a, b) => {
+        const aTime = new Date(a.gaintime).getTime();
+        const bTime = new Date(b.gaintime).getTime();
+        return bTime - aTime;
+      }).slice(0, 3).forEach((ach) => {
+        const time = new Date(ach.gaintime).toLocaleDateString("zh-CN", {
           timeZone: "Asia/Shanghai",
           year: "numeric",
           month: "2-digit",
           day: "2-digit"
-        })})`,
+        });
+        output.push(`├ ${ach.achievementname} (${time})`);
+      });
+      output.push(
+        `└ 共获得 ${achievements.length} 个成就`,
         "──────────────"
       );
     }
-    const sections = [sign, lottery, achievements].filter(Boolean).length;
-    output.push(`共查询到 ${sections} 项个人信息`);
-    return output.flat().join("\n");
+    const exchanges = await ctx.database.get("ggcevo_exchange", { handle });
+    if (exchanges.length) {
+      output.push("📜 兑换记录：");
+      exchanges.sort((a, b) => {
+        const aTime = new Date(a.date).getTime();
+        const bTime = new Date(b.date).getTime();
+        return bTime - aTime;
+      }).forEach((e, index) => {
+        const date = new Date(e.date).toLocaleString("zh-CN", {
+          timeZone: "Asia/Shanghai",
+          year: "numeric",
+          month: "2-digit",
+          day: "2-digit"
+        });
+        const symbol = index === exchanges.length - 1 ? "└" : "├";
+        output.push(`${symbol} [${e.type}] ${e.item} (${date})`);
+      });
+      output.push("──────────────");
+    }
+    const existModules = [
+      sign && "签到",
+      lottery && "抽奖",
+      achievements.length && "成就",
+      exchanges.length && "兑换"
+    ].filter(Boolean);
+    output.push(`📊 共查询到 ${existModules.length} 类信息`);
+    return output.join("\n");
   });
 }
 __name(apply, "apply");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ggcevo-game",
   "description": "星际争霸2游戏大厅咕咕虫-Evo地图专属插件",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [