koishi-plugin-ggcevo-game 2.0.9 → 2.0.10

package/lib/index.js

@@ -13397,32 +13397,51 @@ ID: ${group.id}
       if (rouletteIds.length === 0) {
         return "该轮盘组没有可抽奖的轮盘";
       }
-      const randomRouletteId = rouletteIds[Math.floor(Math.random() * rouletteIds.length)];
-      const roulette = await ctx.model.get("roulettes", { id: randomRouletteId });
-      if (!roulette || roulette.length === 0) {
-        return "轮盘组中的某个轮盘已不存在";
-      }
-      const items = roulette[0].items;
-      if (items.length === 0) {
-        return "选中的轮盘没有可抽奖的选项";
+      const roulettes = await Promise.all(
+        rouletteIds.map(async (id) => {
+          const roulette = await ctx.model.get("roulettes", { id });
+          return roulette && roulette.length > 0 ? roulette[0] : null;
+        })
+      );
+      const validRoulettes = roulettes.filter((roulette) => roulette !== null);
+      if (validRoulettes.length === 0) {
+        return "轮盘组中的轮盘已不存在";
       }
-      const results = [];
-      for (let i = 0; i < count; i++) {
-        const randomIndex = Math.floor(Math.random() * items.length);
-        results.push(items[randomIndex]);
+      const results = validRoulettes.map((roulette) => {
+        if (roulette.items.length === 0) {
+          return { id: roulette.id, result: "（无选项）" };
+        }
+        const randomIndex = Math.floor(Math.random() * roulette.items.length);
+        return { id: roulette.id, result: roulette.items[randomIndex] };
+      });
+      let finalResults;
+      if (count <= validRoulettes.length) {
+        finalResults = results.slice(0, count);
+      } else {
+        finalResults = [...results];
+        for (let i = validRoulettes.length; i < count; i++) {
+          const randomRouletteIndex = Math.floor(Math.random() * validRoulettes.length);
+          const roulette = validRoulettes[randomRouletteIndex];
+          if (roulette.items.length > 0) {
+            const randomIndex = Math.floor(Math.random() * roulette.items.length);
+            finalResults.push({
+              id: roulette.id,
+              result: roulette.items[randomIndex],
+              isAdditional: true
+            });
+          }
+        }
       }
       let message = `轮盘组: ${target}
-（从轮盘 ID: ${randomRouletteId} 中抽取）
-抽奖结果：
 `;
-      if (count === 1) {
-        message += `🎉 ${results[0]} 🎉`;
-      } else {
-        results.forEach((result, index) => {
-          message += `${index + 1}. ${result}
+      message += `抽奖结果（从${finalResults.length}个轮盘中各抽取1个）：
+
 `;
-        });
-      }
+      finalResults.forEach((item, index) => {
+        const prefix = item.isAdditional ? `附加${index - validRoulettes.length + 1}.` : `${index + 1}.`;
+        message += `${prefix} [轮盘ID: ${item.id}] ${item.result}
+`;
+      });
       return message;
     }
   });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ggcevo-game",
   "description": "星际争霸2咕咕虫-evolved地图的专属游戏助手插件，集成天梯排行、抽奖系统、签到福利、兑换商城等丰富功能。",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [