koishi-plugin-dwrgbwiki 1.3.1 → 1.3.3

package/gacha.js

@@ -212,10 +212,11 @@ function itemKey(item) {
   return [item.name, item.type, item.rarity, item.img || ''].join('|')
 }
 
-// 记录已抽到物品（存储名称/稀有度/数量/图片，兼容旧版 true 数据）
+// 记录已抽到物品（存储名称/稀有度/数量/图片，兼容旧版 true 数据），返回是否为重复
 function markOwned(user, item) {
   const key = itemKey(item)
   const prev = user.owned[key]
+  const isRepeat = !!prev
   user.owned[key] = {
     name: item.name,
     type: item.type,
@@ -223,7 +224,7 @@ function markOwned(user, item) {
     img: item.img || item.icon || '',
     count: (prev && typeof prev === 'object' ? prev.count || 0 : 0) + 1,
   }
-  return key
+  return isRepeat
 }
 
 // 通用状态字段
@@ -309,8 +310,7 @@ function v1Draw(pool, prob, state, user) {
   else if (r === 'A') state.pityPurple = 0
   else if (r === 'B') state.pityBlue = 0
 
-  const key = markOwned(user, item)
-  const isRepeat = !!user.owned[key]
+  const isRepeat = markOwned(user, item)
   return { item, isRepeat, fragments: isRepeat ? (item.repeat || 0) : 0 }
 }
 
@@ -364,8 +364,7 @@ function v2Draw(pool, prob, state, user) {
   else if (r === 'B') state.pityBlue = 0
   else if (r === 'F') state.pityFrame = 0
 
-  const key = markOwned(user, item)
-  const isRepeat = !!user.owned[key]
+  const isRepeat = markOwned(user, item)
   return { item, isRepeat, fragments: isRepeat ? (item.repeat || 0) : 0 }
 }
 
@@ -411,8 +410,7 @@ function xingyunDraw(pool, prob, state, user) {
       if (name && pool.items[name]) {
         const it = pool.items[name]
         const final = { ...it, name, rarity: it.rarity }
-        const key = markOwned(user, final)
-        const isRepeat = !!user.owned[key]
+        const isRepeat = markOwned(user, final)
         return { item: final, isRepeat, fragments: isRepeat ? (it.repeat || 0) : 0 }
       }
     }
@@ -423,8 +421,7 @@ function xingyunDraw(pool, prob, state, user) {
   const name = names[Math.floor(Math.random() * names.length)]
   const it = pool.items[name] || { type: '未知', rarity: 'D' }
   const final = { ...it, name, rarity: it.rarity }
-  const key = markOwned(user, final)
-  const isRepeat = !!user.owned[key]
+  const isRepeat = markOwned(user, final)
   return { item: final, isRepeat, fragments: isRepeat ? (it.repeat || 0) : 0 }
 }
 
@@ -452,8 +449,7 @@ function jyxbDraw(pool, prob, state, user, isOld) {
   const items = pool.items[r] || []
   const item = items.length > 0 ? items[Math.floor(Math.random() * items.length)] : { name: '未知' + r + '级', type: '奖励', rarity: r }
   const final = { ...item, rarity: r }
-  const key = markOwned(user, final)
-  const isRepeat = !!user.owned[key]
+  const isRepeat = markOwned(user, final)
 
   let fragments = 0, clue = 0
   const match = String(item.name || '').match(/\*(\d+)/)
@@ -497,8 +493,7 @@ function hxmtDraw(pool, prob, state, user) {
   if (r === 'discount') {
     // 折扣不参与重复
   } else {
-    const key = markOwned(user, final)
-    const isRepeat = !!user.owned[key]
+    const isRepeat = markOwned(user, final)
     final.isRepeat = isRepeat
     if (isRepeat) {
       const reward = (pool.repeatRewards && pool.repeatRewards[r]) || 0
@@ -802,7 +797,7 @@ body { font-family:-apple-system,BlinkMacSystemFont,'Segoe UI','Microsoft YaHei'
 .card-img { width:100%; aspect-ratio:1/1; background:#111318; border-radius:10px; display:flex; align-items:center; justify-content:center; overflow:hidden; margin-bottom:10px; }
 .card-img img { max-width:100%; max-height:100%; object-fit:contain; filter:drop-shadow(0 0 10px var(--c)) drop-shadow(0 0 20px var(--c)); }
 .noimg { width:100%; height:100%; display:flex; align-items:center; justify-content:center; font-size:34px; font-weight:800; color:var(--c); }
-.card-name { font-size:14px; font-weight:700; color:#fff; margin-bottom:4px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; }
+.card-name { font-size:20px; font-weight:700; color:#fff; margin-bottom:4px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; }
 .card-type { font-size:12px; }
 .empty { text-align:center; color:#8b949e; font-size:15px; padding:40px 0; }
 .foot { text-align:center; color:#8b949e; font-size:12px; margin-top:18px; opacity:.75; }
@@ -890,14 +885,14 @@ body { font-family:-apple-system,BlinkMacSystemFont,'Segoe UI','Microsoft YaHei'
   text-align:center; overflow:hidden; }
 .card-img { width:100%; aspect-ratio:1/1; background:#111318; border-radius:10px; display:flex; align-items:center; justify-content:center; overflow:hidden; margin-bottom:10px; }
 .card-img img { max-width:100%; max-height:100%; object-fit:contain; filter:drop-shadow(0 0 10px var(--c)) drop-shadow(0 0 20px var(--c)); }
-.card-name { font-size:14px; font-weight:700; color:#fff; margin-bottom:4px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; }
+.card-name { font-size:20px; font-weight:700; color:#fff; margin-bottom:4px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; }
 .card-type { font-size:12px; }
-.repeat { margin-top:6px; font-size:11.5px; color:#f85149; background:rgba(248,81,73,.08); border:1px solid rgba(248,81,73,.2); border-radius:6px; padding:3px 6px; }
+.repeat { margin-top:6px; font-size:15px; color:#f85149; background:rgba(248,81,73,.08); border:1px solid rgba(248,81,73,.2); border-radius:6px; padding:3px 6px; }
 .gains { display:flex; flex-wrap:wrap; gap:8px; justify-content:center; margin-top:20px; }
 .gains span { font-size:13px; font-weight:700; color:#3fb950; background:rgba(63,185,80,.08); border:1px solid rgba(63,185,80,.25); border-radius:8px; padding:5px 14px; }
 .foot { text-align:center; color:#8b949e; font-size:12px; margin-top:18px; opacity:.75; }
 .pity { text-align:center; color:#8b949e; font-size:12px; margin-top:8px; }
-.daily { display:inline-block; font-size:12.5px; color:#8b949e; background:rgba(139,148,158,.08); border:1px solid rgba(139,148,158,.25);
+.daily { display:inline-block; font-size:25px; color:#8b949e; background:rgba(139,148,158,.08); border:1px solid rgba(139,148,158,.25);
   border-radius:8px; padding:4px 12px; margin-top:10px; }
 </style>
 </head>
@@ -1435,7 +1430,7 @@ body { font-family:-apple-system,BlinkMacSystemFont,'Segoe UI','Microsoft YaHei'
 .status { display:inline-block; font-size:14px; font-weight:700; border-radius:8px; padding:5px 16px; margin-top:10px; }
 .status.good { color:#3fb950; background:rgba(63,185,80,.1); border:1px solid rgba(63,185,80,.3); }
 .status.bad { color:#f85149; background:rgba(248,81,73,.1); border:1px solid rgba(248,81,73,.3); }
-.daily { display:inline-block; font-size:12.5px; color:#8b949e; background:rgba(139,148,158,.08); border:1px solid rgba(139,148,158,.25);
+.daily { display:inline-block; font-size:25px; color:#8b949e; background:rgba(139,148,158,.08); border:1px solid rgba(139,148,158,.25);
   border-radius:8px; padding:4px 12px; margin-left:8px; }
 .log { background:rgba(22,27,34,.75); border:1px solid rgba(255,255,255,.09); border-radius:14px; padding:18px 20px; }
 .line { font-size:13px; line-height:1.9; color:#c9d1d9; }

package/index.js

@@ -242,7 +242,11 @@ module.exports = {
         if (t === '加页探索' || t === '加页手记探索') {
           try {
             const result = await gacha.gachaExplore(config, gachaStore, uid, poolId)
-            if (!result.ok) return errorImage(ctx, config, result.error, GACHA_HERO_SUB)
+            if (!result.ok) {
+              // 达到每日上限：纯文字提示
+              if (result.error && result.error.includes('上限')) return result.error
+              return errorImage(ctx, config, result.error, GACHA_HERO_SUB)
+            }
             const width = (config.gachaWidth && config.gachaWidth > 0) ? config.gachaWidth : config.width
             const html = gacha.buildExploreHtml(result, { ...config, width })
             const image = await capture(ctx, html, { ...config, width })
@@ -259,7 +263,11 @@ module.exports = {
         }
         try {
           const result = await gacha.gachaPull(config, gachaStore, uid, t, poolId, count)
-          if (!result.ok) return errorImage(ctx, config, result.error, GACHA_HERO_SUB)
+          if (!result.ok) {
+            // 达到每日上限：纯文字提示
+            if (result.error && result.error.includes('上限')) return result.error
+            return errorImage(ctx, config, result.error, GACHA_HERO_SUB)
+          }
           const width = (config.gachaWidth && config.gachaWidth > 0) ? config.gachaWidth : config.width
           const html = gacha.buildGachaHtml(result, { ...config, width })
           const image = await capture(ctx, html, { ...config, width })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-dwrgbwiki",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "第五人格BWIKI编辑组测试用插件，所有代码由DeepSeek V4 Flash编写",
   "main": "index.js",
   "files": [