koishi-plugin-dwrgbwiki 1.3.1 → 1.3.2

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
@@ -648,7 +643,7 @@ async function gachaPull(config, store, userId, poolType, poolQuery, count) {
   const daily = user.daily[type] || { date: todayStr, count: 0 }
   if (daily.date !== todayStr) { daily.date = todayStr; daily.count = 0 }
   if (daily.count >= limit) {
-    return { ok: false, error: '今日' + (POOL_TYPES[type].label || type) + '抽卡次数已达上限（每种每天限 ' + limit + ' 次），明天再来吧' }
+    return { ok: false, limit: true, error: '今日' + (POOL_TYPES[type].label || type) + '抽卡次数已达上限（每种每天限 ' + limit + ' 次），明天再来吧' }
   }
 
   const results = []
@@ -772,7 +767,7 @@ function buildResourcesHtml(data, config) {
     return '<div class="card" style="--c:' + color + '">' +
       '<div class="card-img">' + imgHtml + '</div>' +
       '<div class="card-name">' + esc(it.name) + '</div>' +
-      '<div class="card-type" style="color:' + color + '">' + esc(label) + (it.count > 1 ? ' · ×' + it.count : '') + '</div>' +
+      '<div class="card-type" style="color:' + color + '">' + esc(label) + (it.count > 1 ? ' ×' + it.count : '') + '</div>' +
       '</div>'
   }).join('')
 
@@ -797,13 +792,13 @@ body { font-family:-apple-system,BlinkMacSystemFont,'Segoe UI','Microsoft YaHei'
 .res { font-size:13px; color:#8b949e; background:rgba(139,148,158,.08); border:1px solid rgba(139,148,158,.25); border-radius:8px; padding:5px 14px; }
 .res b { color:#e6edf3; margin-left:4px; }
 .grid { display:grid; grid-template-columns:repeat(${colNum}, 1fr); gap:14px; }
-.card { background:rgba(22,27,34,.75); border:1px solid rgba(255,255,255,.09); border-radius:14px; padding:14px 12px;
+.card { background:rgba(22,27,34,.75); border:1px solid rgba(255,255,255,.09); border-radius:14px; padding:12px 8px;
   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 { width:54px; height:54px; margin:0 auto 8px; background:#111318; border-radius:10px; display:flex; align-items:center; justify-content:center; overflow:hidden; }
 .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-type { font-size:12px; }
+.noimg { width:100%; height:100%; display:flex; align-items:center; justify-content:center; font-size:22px; font-weight:800; color:var(--c); }
+.card-name { font-size:14.5px; font-weight:700; color:#fff; margin-bottom:3px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; }
+.card-type { font-size:13px; }
 .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; }
 </style>
@@ -850,7 +845,7 @@ function buildGachaHtml(data, config) {
     senior: '稀世', intermediate: '奇珍', junior: '罕见', basic: '普通', discount: '折扣',
   }
 
-  const colNum = data.items.length === 1 ? 1 : (data.items.length <= 3 ? data.items.length : 5)
+  const colNum = data.items.length === 1 ? 1 : (data.items.length <= 3 ? data.items.length : 6)
   const cardHtml = data.items.map((it, idx) => {
     const color = colors[it.rarity] || '#9ca3af'
     const label = labels[it.rarity] || it.rarityLabel || it.rarity
@@ -859,9 +854,11 @@ function buildGachaHtml(data, config) {
       : ''
     return '<div class="card" style="--c:' + color + '">' +
       '<div class="card-img"><img src="' + esc(it.img || it.icon || '') + '" onerror="this.style.visibility=\'hidden\'"></div>' +
+      '<div class="card-body">' +
       '<div class="card-name">' + esc(it.name) + '</div>' +
       '<div class="card-type" style="color:' + color + '">' + esc(label) + (it.type ? ' · ' + esc(it.type) : '') + '</div>' +
       repeatHtml +
+      '</div>' +
       '</div>'
   }).join('')
 
@@ -886,13 +883,14 @@ body { font-family:-apple-system,BlinkMacSystemFont,'Segoe UI','Microsoft YaHei'
   background:linear-gradient(90deg, #79c0ff, #ffd76d); -webkit-background-clip:text; background-clip:text; -webkit-text-fill-color:transparent; }
 .pool-sub { font-size:13px; color:#8b949e; margin-top:6px; }
 .grid { display:grid; grid-template-columns:repeat(${colNum}, 1fr); gap:14px; }
-.card { background:rgba(22,27,34,.75); border:1px solid rgba(255,255,255,.09); border-radius:14px; padding:14px 12px;
-  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 { background:rgba(22,27,34,.75); border:1px solid rgba(255,255,255,.09); border-radius:14px; padding:12px 14px;
+  display:flex; align-items:center; gap:14px; overflow:hidden; }
+.card-img { width:62px; height:62px; flex-shrink:0; background:#111318; border-radius:10px; display:flex; align-items:center; justify-content:center; overflow:hidden; }
 .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-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; }
+.card-body { min-width:0; }
+.card-name { font-size:17px; font-weight:700; color:#fff; margin-bottom:3px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; }
+.card-type { font-size:14px; }
+.repeat { margin-top:6px; font-size:12.5px; color:#f85149; background:rgba(248,81,73,.08); border:1px solid rgba(248,81,73,.2); border-radius:6px; padding:3px 8px; display:inline-block; }
 .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; }
@@ -1370,7 +1368,7 @@ async function gachaExplore(config, store, userId, diffArg) {
   const daily = user.daily['explore'] || { date: todayStr, count: 0 }
   if (daily.date !== todayStr) { daily.date = todayStr; daily.count = 0 }
   if (daily.count >= limit) {
-    return { ok: false, error: '今日探索次数已达上限（每天限 ' + limit + ' 次），明天再来吧' }
+    return { ok: false, limit: true, error: '今日探索次数已达上限（每天限 ' + limit + ' 次），明天再来吧' }
   }
 
   const src = await resolveSource(config)

package/index.js

@@ -242,7 +242,7 @@ 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) return result.limit ? result.error : 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 +259,7 @@ 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) return result.limit ? result.error : 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.2",
   "description": "第五人格BWIKI编辑组测试用插件，所有代码由DeepSeek V4 Flash编写",
   "main": "index.js",
   "files": [