poi-plugin-koushu-rate 2.0.13 → 2.0.15

package/index.js

@@ -40,6 +40,7 @@ const WEEKDAY_KEYS = ["monday", "tuesday", "wednesday", "thursday", "friday", "s
 const WEEKDAY_LABELS = { monday: "周一", tuesday: "周二", wednesday: "周三", thursday: "周四", friday: "周五", saturday: "周六", sunday: "周日" };
 const ALL_DAYS_KEY = "all";
 
+
 function japanWeekdayKey() {
   const japanNow = new Date(Date.now() + 9 * 60 * 60 * 1000)
   return ["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"][japanNow.getUTCDay()]
@@ -505,6 +506,10 @@ const CSS = `
   border-color: #2d72d2;
   color: #fff;
 }
+.kr2-plan-target-btn:disabled {
+  opacity: 0.4;
+  cursor: not-allowed;
+}
 .kr2-level-max-blue {
   color: #4fc3f7;
   font-weight: 700;
@@ -858,6 +863,42 @@ const CSS = `
 .kr2-row:hover {
   background: #252a31;
 }
+.kr2-row-not-improveable {
+  color: #abb3bf;
+  cursor: default;
+}
+.kr2-row-not-improveable .kr2-name,
+.kr2-row-not-improveable .kr2-secretary,
+.kr2-row-not-improveable .kr2-meta {
+  color: #abb3bf;
+}
+.kr2-reco-empty {
+  min-height: 34px;
+}
+.kr2-not-improveable-group {
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+}
+.kr2-collapse-toggle {
+  width: 100%;
+  padding: 10px 14px;
+  border: 0;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.08);
+  background: #252a31;
+  color: #abb3bf;
+  text-align: center;
+  font-size: 14px;
+  cursor: pointer;
+}
+.kr2-collapse-toggle:hover {
+  background: #2f343c;
+}
+.kr2-improveable-group {
+  border-bottom: 1px solid rgba(255, 255, 255, 0.12);
+}
+.kr2-fav-btn:disabled {
+  opacity: 0.4;
+  cursor: default;
+}
 .kr2-fav-btn {
   width: 24px;
   height: 24px;
@@ -1077,6 +1118,7 @@ const CSS = `
   align-items: flex-end;
   gap: 6px;
 }
+
 .kr2-material-list {
   display: flex;
   flex-direction: column;
@@ -2280,6 +2322,33 @@ function buildRows(staticData, masterEquips, fallbackNames, akashi, recommendati
     if (ib >= 0) return 1
     return Number(a.id) - Number(b.id)
   })
+  const improveableKeys = new Set(Object.keys(stepsByEquip))
+  const nonImproveableIds = Object.keys(fallbackNames).filter((id) => !improveableKeys.has(id)).map(Number).sort((a, b) => a - b)
+  for (const id of nonImproveableIds) {
+    const key = String(id)
+    const fallback = fallbackNames[key] || {}
+    const master = masterEquips[key] || {}
+    const category = CATEGORY_ALIASES[translateTypeName(fallback.type || master.api_type_name)] || "其他"
+    const name = String(master.api_name || fallback.name || ("装备 " + id))
+    rows.push({
+      id: key,
+      name,
+      typeName: String(fallback.type || master.api_type_name || ""),
+      icon: master.api_type && master.api_type[3] != null ? Number(master.api_type[3]) : (fallback.icon != null ? Number(fallback.icon) : 0),
+      base: null,
+      days: [],
+      category,
+      reco: false,
+      akashiName: "",
+      recommend: null,
+      secretaries: null,
+      searchText: normalizeText([name, category, id].join(" ")),
+      phase0: null,
+      phase1: null,
+      upgrades: null,
+      improveable: false,
+    })
+  }
   return rows
 }
 
@@ -2732,8 +2801,8 @@ function PlanningPage({ rows, inventoryByEquip, useItemCounts, selection, onTogg
               React.createElement(
                 "div",
                 { className: "kr2-plan-target-group" },
-                React.createElement("button", { type: "button", className: "kr2-plan-target-btn" + (!p.evoUpgradeId && p.target !== "max" ? " kr2-plan-target-active" : ""), onClick: () => onTarget(p.row.id, "6") }, "+6"),
-              React.createElement("button", { type: "button", className: "kr2-plan-target-btn" + (!p.evoUpgradeId && p.target === "max" ? " kr2-plan-target-active" : ""), onClick: () => onTarget(p.row.id, "max") }, "max"),
+                React.createElement("button", { type: "button", disabled: p.row.improveable === false, className: "kr2-plan-target-btn" + (!p.evoUpgradeId && p.target !== "max" ? " kr2-plan-target-active" : ""), onClick: () => onTarget(p.row.id, "6") }, "+6"),
+              React.createElement("button", { type: "button", disabled: p.row.improveable === false, className: "kr2-plan-target-btn" + (!p.evoUpgradeId && p.target === "max" ? " kr2-plan-target-active" : ""), onClick: () => onTarget(p.row.id, "max") }, "max"),
                 React.createElement(EvolutionButton, { rowId: p.row.id, branches: p.row.upgrades || [], value: p.evoUpgradeId, onSelect: onEvo })
               )
             ),
@@ -2837,6 +2906,7 @@ class StrongPage extends React.Component {
       if (n >= 10) return "max"
       return "+" + String(n)
     }
+    const demandMap = {}
     for (const row of rows || []) {
       const sel = (selection || {})[row.id] || { selected: true, target: "max", qty: 1 }
       const qty = Math.max(1, Math.min(99, Math.round(Number(sel.qty) || 1)))
@@ -2845,32 +2915,49 @@ class StrongPage extends React.Component {
       const displayRow = evoUpgrade
         ? Object.assign({}, row, { id: row.id + ":evo:" + evoUpgrade.upgrade_id, name: evoUpgrade.targetName, category: evoUpgrade.targetCategory || row.category })
         : row
-      const invId = evoUpgrade ? String(evoUpgrade.upgrade_id) : row.id
-      const targetLevelValue = evoUpgrade ? 0 : (sel.target === "max" ? 10 : 6)
-      const targetLevel = levelText(targetLevelValue)
-      const inv = (inventoryByEquip || {})[invId]
-      const levels = []
+      const targetEquipId = evoUpgrade ? String(evoUpgrade.upgrade_id) : row.id
+      const targetLevelValue = evoUpgrade ? 0 : (row.improveable === false ? 0 : (sel.target === "max" ? 10 : 6))
+      const bucket = demandMap[targetEquipId] || (demandMap[targetEquipId] = { equipId: targetEquipId, displayRow, demands: {} })
+      bucket.demands[String(targetLevelValue)] = (bucket.demands[String(targetLevelValue)] || 0) + qty
+    }
+    for (const bucket of Object.values(demandMap)) {
+      const inv = (inventoryByEquip || {})[bucket.equipId]
+      const inventoryLevels = []
       if (inv && inv.levels) {
         for (const level of Object.keys(inv.levels)) {
           const count = Math.max(0, Math.round(Number(inv.levels[level]) || 0))
-          if (count > 0) levels.push({ level: Number(level), count })
+          if (count > 0) inventoryLevels.push({ level: Number(level), count })
         }
-        levels.sort((a, b) => b.level - a.level)
+        inventoryLevels.sort((a, b) => b.level - a.level)
       }
-      const rowEntries = []
-      if (levels.length === 0) {
-        rowEntries.push({ key: displayRow.id + ":none", row: displayRow, targetLevel, targetLevelValue, inventoryLevel: null, stock: inventoryLoaded ? 0 : null, notFound: true })
-      } else {
-        for (const lv of levels) rowEntries.push({ key: displayRow.id + ":" + String(lv.level), row: displayRow, targetLevel, targetLevelValue, inventoryLevel: lv.level, stock: lv.count })
+      const remaining = {}
+      for (const lv of inventoryLevels) remaining[String(lv.level)] = lv.count
+      const targetLevels = Object.keys(bucket.demands).map(Number).sort((a, b) => b - a)
+      const allocation = {}
+      const shortfall = {}
+      for (const tl of targetLevels) {
+        let need = bucket.demands[String(tl)] || 0
+        for (const lv of inventoryLevels) {
+          if (need <= 0) break
+          const avail = remaining[String(lv.level)] || 0
+          if (avail <= 0) continue
+          const take = Math.min(need, avail)
+          const key = String(tl) + "|" + String(lv.level)
+          const alloc = allocation[key] || (allocation[key] = { targetLevelValue: tl, inventoryLevel: lv.level, qty: 0, stock: 0 })
+          alloc.qty += take
+          alloc.stock += take
+          remaining[String(lv.level)] = avail - take
+          need -= take
+        }
+        if (need > 0) shortfall[String(tl)] = need
       }
-      const base = Math.floor(qty / rowEntries.length)
-      let remainder = qty % rowEntries.length
-      for (const item of rowEntries) {
-        item.qty = base + (remainder > 0 ? 1 : 0)
-        if (remainder > 0) remainder -= 1
+      for (const key of Object.keys(allocation)) {
+        const alloc = allocation[key]
+        entries.push({ key: bucket.equipId + ":" + key, row: bucket.displayRow, targetLevel: levelText(alloc.targetLevelValue), targetLevelValue: alloc.targetLevelValue, qty: alloc.qty, inventoryLevel: alloc.inventoryLevel, stock: alloc.stock })
       }
-      for (const item of rowEntries) {
-        if (item.qty > 0) entries.push(item)
+      for (const tl of Object.keys(shortfall)) {
+        const value = Number(tl)
+        entries.push({ key: bucket.equipId + ":short:" + tl, row: bucket.displayRow, targetLevel: levelText(value), targetLevelValue: value, qty: shortfall[tl], inventoryLevel: null, stock: inventoryLoaded ? 0 : null, notFound: true })
       }
     }
     for (const item of entries) {
@@ -2961,6 +3048,7 @@ class LevelOneTable extends React.Component {
 
   render() {
     const phase = this.props.phase
+    const kcDevData = this.props.kcDevData
     if (!phase) {
       return React.createElement(
         "div",
@@ -2971,6 +3059,7 @@ class LevelOneTable extends React.Component {
     const normal = phase.consume_improvement_min
     const materials = phase.materials || []
     const hasMaterials = materials.some((item) => item && (item.item_name || item.item_material_key || item.item_equipment_id != null))
+
     const rows = []
     LEVEL_ONE_ROWS.forEach((rate) => {
       const key = rate.range
@@ -2990,6 +3079,7 @@ class LevelOneTable extends React.Component {
                   "div",
                   { className: "kr2-material-cell" },
                   React.createElement(RateCell, { range: "素材详情", open: !!this.state.open[key], onToggle: () => this.toggle(key) }),
+
                   !!this.state.open[key]
                     ? React.createElement(MaterialDetail, { materials, onMaterialClick: this.props.onMaterialClick, inventoryByEquip: this.props.inventoryByEquip, useItemCounts: this.props.useItemCounts, onInventoryClick: this.props.onInventoryClick })
                     : null
@@ -3032,6 +3122,7 @@ class LevelTwoTable extends React.Component {
     const phase0 = this.props.phase0
     const phase1 = this.props.phase1
     const upgrades = this.props.upgrades || null
+    const kcDevData = this.props.kcDevData
     const rows = []
     const pushRateRow = (step, range, label, key, p, subText, evolTarget, maxBlue) => {
       const normal = step ? step.consume_improvement_min : null
@@ -3039,6 +3130,7 @@ class LevelTwoTable extends React.Component {
       const rec = buildRecommendation(normal, certain, p)
       const materials = step ? step.materials || [] : []
       const hasMaterials = materials.some((item) => item && (item.item_name || item.item_material_key || item.item_equipment_id != null))
+  
       const rangeNode = maxBlue
         ? React.createElement("span", null, "★9→", React.createElement("span", { className: "kr2-level-max-blue" }, "max"))
         : range
@@ -3075,6 +3167,7 @@ class LevelTwoTable extends React.Component {
                   "div",
                   { className: "kr2-material-cell" },
                   React.createElement(RateCell, { range: rec.text, open: !!this.state.open[key], onToggle: () => this.toggle(key), tone: rec.tone }),
+
                   !!this.state.open[key]
                     ? React.createElement(MaterialDetail, { materials, onMaterialClick: this.props.onMaterialClick, inventoryByEquip: this.props.inventoryByEquip, useItemCounts: this.props.useItemCounts, onInventoryClick: this.props.onInventoryClick })
                     : null
@@ -3153,13 +3246,13 @@ class LevelSection extends React.Component {
   }
 }
 
-function EquipmentRow({ row, expanded, onToggle, onMaterialClick, inventoryByEquip, useItemCounts, onInventoryClick, isFavorite, onFavoriteClick, secretaryText }) {
+function EquipmentRow({ row, expanded, onToggle, onMaterialClick, inventoryByEquip, useItemCounts, onInventoryClick, isFavorite, onFavoriteClick, secretaryText, kcDevData }) {
   return React.createElement(
     "div",
     null,
     React.createElement(
       "div",
-      { className: "kr2-row", onClick: onToggle },
+      { className: "kr2-row" + (row.improveable === false ? " kr2-row-not-improveable" : ""), onClick: row.improveable === false ? null : onToggle },
       React.createElement(
         "button",
         { className: "kr2-fav-btn" + (isFavorite ? " kr2-fav-active" : ""), onClick: (e) => { e.stopPropagation(); onFavoriteClick && onFavoriteClick(row.id) }, title: isFavorite ? "取消收藏" : "收藏" },
@@ -3169,33 +3262,35 @@ function EquipmentRow({ row, expanded, onToggle, onMaterialClick, inventoryByEqu
         "span",
         { className: "kr2-expand" },
         React.createElement(SlotitemIcon, { slotitemId: row.icon, className: "kr2-icon" }),
-        React.createElement("span", { className: "kr2-arrow" }, expanded ? "▼" : "▶")
+        React.createElement("span", { className: "kr2-arrow" }, row.improveable === false ? "" : expanded ? "▼" : "▶")
       ),
       React.createElement("span", { className: "kr2-name" }, row.name),
-      React.createElement("span", { className: "kr2-secretary" }, secretaryText || "-"),
+      React.createElement("span", { className: "kr2-secretary" }, row.improveable === false ? "" : (secretaryText || "-")),
       React.createElement(
         "span",
         { className: "kr2-meta" },
-        row.days && row.days.length >= 7 ? "每日可改修" : (row.days || []).map((d) => WEEKDAY_LABELS[d] || d).join("·")
+        row.improveable === false ? "改修未开放" : (row.days && row.days.length >= 7 ? "每日可改修" : (row.days || []).map((d) => WEEKDAY_LABELS[d] || d).join("·"))
       ),
-      React.createElement(
-        "span",
-        { className: "kr2-reco" },
-        React.createElement(
-          "span",
-          { className: "kr2-reco-line" },
-          React.createElement("span", { className: "kr2-reco-label" }, "推荐星级"),
-          React.createElement("span", { className: "kr2-stars kr2-stars-priority" }, row.recommend && Number(row.recommend.priority) > 0 ? starText(row.recommend.priority) : "")
-        ),
-        React.createElement(
-          "span",
-          { className: "kr2-reco-line" },
-          React.createElement("span", { className: "kr2-reco-label" }, "活动强度"),
-          React.createElement("span", { className: "kr2-stars kr2-stars-activity" }, row.recommend && Number(row.recommend.activity) > 0 ? starText(row.recommend.activity) : "")
-        )
-      )
+      row.improveable === false
+        ? React.createElement("div", { className: "kr2-reco kr2-reco-empty" }, "")
+        : React.createElement(
+            "span",
+            { className: "kr2-reco" },
+            React.createElement(
+              "span",
+              { className: "kr2-reco-line" },
+              React.createElement("span", { className: "kr2-reco-label" }, "推荐星级"),
+              React.createElement("span", { className: "kr2-stars kr2-stars-priority" }, row.recommend && Number(row.recommend.priority) > 0 ? starText(row.recommend.priority) : "")
+            ),
+            React.createElement(
+              "span",
+              { className: "kr2-reco-line" },
+              React.createElement("span", { className: "kr2-reco-label" }, "活动强度"),
+              React.createElement("span", { className: "kr2-stars kr2-stars-activity" }, row.recommend && Number(row.recommend.activity) > 0 ? starText(row.recommend.activity) : "")
+            )
+          )
     ),
-    expanded
+    row.improveable !== false && expanded
       ? React.createElement(
           "div",
           { className: "kr2-detail" },
@@ -3205,7 +3300,7 @@ function EquipmentRow({ row, expanded, onToggle, onMaterialClick, inventoryByEqu
             React.createElement(
               LevelSection,
               { title: "0→5", defaultOpen: false, resourceText: "成功率100% · 改修资材 " + (row.phase0 ? row.phase0.consume_improvement_min : "--") },
-              React.createElement(LevelOneTable, { phase: row.phase0, onMaterialClick, inventoryByEquip, useItemCounts, onInventoryClick })
+              React.createElement(LevelOneTable, { phase: row.phase0, onMaterialClick, inventoryByEquip, useItemCounts, onInventoryClick, kcDevData })
             )
           ),
           React.createElement(
@@ -3214,7 +3309,7 @@ function EquipmentRow({ row, expanded, onToggle, onMaterialClick, inventoryByEqu
             React.createElement(
               LevelSection,
               { title: "6→max", defaultOpen: true, resourceText: "成功率 95 / 90 / 82 / 77 / 67 / 62 %" },
-              React.createElement(LevelTwoTable, { phase0: row.phase0, phase1: row.phase1, upgrades: row.upgrades, onMaterialClick, inventoryByEquip, useItemCounts, onInventoryClick })
+              React.createElement(LevelTwoTable, { phase0: row.phase0, phase1: row.phase1, upgrades: row.upgrades, onMaterialClick, inventoryByEquip, useItemCounts, onInventoryClick, kcDevData })
             )
           )
         )
@@ -3463,6 +3558,8 @@ class KoushuRateApp extends React.Component {
     favoritesOnly: readFavoritesOnly(),
     starSort: readUiState().starSort || null,
     activeTab: "list",
+    improveableOpen: true,
+    nonImproveableOpen: false,
     planSelection: readPlanSelection(),
     includeDevExpected: readPlanIncludeDev(),
   }
@@ -3741,7 +3838,7 @@ class KoushuRateApp extends React.Component {
     const favoritesOnly = !!this.state.favoritesOnly
     let rows = this.state.rows.filter((row) => {
       if (favoritesOnly && !this.state.favorites[row.id]) return false
-      if (day !== ALL_DAYS_KEY && (row.days || []).indexOf(day) < 0) return false
+      if (row.improveable !== false && day !== ALL_DAYS_KEY && (row.days || []).indexOf(day) < 0) return false
       if (category !== "all" && row.category !== category) return false
       return true
     })
@@ -3764,6 +3861,23 @@ class KoushuRateApp extends React.Component {
         })
         .map((item) => item.row)
     }
+    const improveableRows = rows.filter((row) => row.improveable !== false)
+    const notImproveableRows = rows.filter((row) => row.improveable === false)
+    const renderEquipmentRow = (row) =>
+      React.createElement(EquipmentRow, {
+        key: row.id,
+        row,
+        expanded: !!this.state.expanded[row.id],
+        onToggle: () => this.toggle(row.id),
+        onMaterialClick: this.openKcDevPopup,
+        inventoryByEquip,
+        useItemCounts,
+        onInventoryClick: this.openInventoryPopup,
+        isFavorite: !!this.state.favorites[row.id],
+        onFavoriteClick: this.toggleFavorite,
+        secretaryText: secretaryText(row.secretaries, day),
+        kcDevData: this.state.kcDevData,
+      })
 
     return React.createElement(
       "div",
@@ -3913,21 +4027,36 @@ class KoushuRateApp extends React.Component {
         { className: "kr2-list", style: this.state.activeTab === "plan" || this.state.activeTab === "strong" ? { display: "none" } : null },
         rows.length === 0
           ? React.createElement("div", { className: "kr2-empty" }, favoritesOnly ? "还没有收藏装备" : "没有匹配的装备")
-          : rows.map((row) =>
-              React.createElement(EquipmentRow, {
-                key: row.id,
-                row,
-                expanded: !!this.state.expanded[row.id],
-                onToggle: () => this.toggle(row.id),
-                onMaterialClick: this.openKcDevPopup,
-                inventoryByEquip,
-                useItemCounts,
-                onInventoryClick: this.openInventoryPopup,
-                isFavorite: !!this.state.favorites[row.id],
-                onFavoriteClick: this.toggleFavorite,
-                secretaryText: secretaryText(row.secretaries, day),
-              })
-            )
+          : [
+              React.createElement(
+                "div",
+                { key: "improveable-group", className: "kr2-improveable-group" },
+                React.createElement(
+                  "button",
+                  { type: "button", className: "kr2-collapse-toggle", onClick: () => this.setState((prev) => ({ improveableOpen: !prev.improveableOpen })) },
+                  this.state.improveableOpen ? "▼ " : "▶ ",
+                  "可改修装备 (",
+                  String(improveableRows.length),
+                  ")"
+                ),
+                this.state.improveableOpen ? improveableRows.map((row) => renderEquipmentRow(row)) : null
+              ),
+              notImproveableRows.length > 0
+                ? React.createElement(
+                    "div",
+                    { key: "not-improveable-group", className: "kr2-not-improveable-group" },
+                    React.createElement(
+                      "button",
+                      { type: "button", className: "kr2-collapse-toggle", onClick: () => this.setState((prev) => ({ nonImproveableOpen: !prev.nonImproveableOpen })) },
+                      this.state.nonImproveableOpen ? "▼ " : "▶ ",
+                      "不可改修装备 (",
+                      String(notImproveableRows.length),
+                      ")"
+                    ),
+                    this.state.nonImproveableOpen ? notImproveableRows.map((row) => renderEquipmentRow(row)) : null
+                  )
+                : null,
+            ]
       ),
       this.state.activeTab === "plan"
         ? React.createElement(PlanningPage, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poi-plugin-koushu-rate",
-  "version": "2.0.13",
+  "version": "2.0.15",
   "description": "全装备改修资材计算与推荐",
   "main": "index.js",
   "files": [