poi-plugin-koushu-rate 2.0.8 → 2.0.10

package/index.js

@@ -341,13 +341,22 @@ const CSS = `
 }
 .kr2-plan-bar-left {
   display: flex;
-  align-items: center;
+  align-items: flex-end;
   gap: 10px;
 }
 .kr2-plan-total-label {
   font-size: 12px;
   color: #abb3bf;
 }
+.kr2-plan-dev-toggle {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  font-size: 14px;
+  color: #ffd54f;
+  cursor: pointer;
+  white-space: nowrap;
+}
 .kr2-plan-table td.kr2-plan-mat-col,
 .kr2-plan-table td.kr2-plan-consumed {
   text-align: left;
@@ -1590,12 +1599,30 @@ function kcDevRecipes(data, equipId) {
   }
   out.sort((a, b) => {
     if (a.rate !== b.rate) return b.rate - a.rate
+    if (a.failRate !== b.failRate) return b.failRate - a.failRate
     if (Math.abs(a.total - b.total) > 1) return a.total - b.total
-    return b.failRate - a.failRate
+    return 0
   })
   return out
 }
 
+let kcDevBestCache = {}
+let kcDevBestCacheKey = ""
+function kcDevBestFormula(data, equipId) {
+  if (!data) return null
+  const dataKey = String(data.updatedAt || data.generatedAt || "bundled")
+  if (kcDevBestCacheKey !== dataKey) {
+    kcDevBestCache = {}
+    kcDevBestCacheKey = dataKey
+  }
+  const key = String(equipId)
+  if (Object.prototype.hasOwnProperty.call(kcDevBestCache, key)) return kcDevBestCache[key]
+  const bestList = kcDevRecipes(data, key).slice().sort((a, b) => b.rate - a.rate || a.failRate - b.failRate || (Math.abs(a.total - b.total) > 1 ? a.total - b.total : 0))
+  const best = bestList.length ? bestList[0] : null
+  kcDevBestCache[key] = best
+  return best
+}
+
 function openExternalUrl(url) {
   try {
     let remote = null
@@ -2198,17 +2225,38 @@ function planFormatScrews(n) {
   return v.toFixed(1)
 }
 
-function PlanningPage({ rows, inventoryByEquip, useItemCounts, selection, onToggle, onTarget, onQty, onSelectAll, onMaterialClick }) {
+function planDevExpectedValue(item, count, kcDevData) {
+  if (!item || item.item_equipment_id == null || !kcDevData) return 0
+  const best = kcDevBestFormula(kcDevData, item.item_equipment_id)
+  if (!best || !Number.isFinite(best.rate) || best.rate <= 0) return 0
+  const qty = Number(count) > 0 ? Number(count) : 1
+  return qty * (100 / best.rate)
+}
+
+function planDevExpectedText(item, count, kcDevData) {
+  const v = planDevExpectedValue(item, count, kcDevData)
+  return v > 0 ? planFormatScrews(v) : "--"
+}
+
+function planMaterialDevExpected(costs, kcDevData) {
+  let total = 0
+  for (const m of costs.materials || []) total += planDevExpectedValue(m.item, m.count, kcDevData)
+  return total
+}
+
+function PlanningPage({ rows, inventoryByEquip, useItemCounts, selection, onToggle, onTarget, onQty, onSelectAll, onMaterialClick, kcDevData, includeDevExpected, onToggleIncludeDevExpected }) {
   const planRows = rows.map((row) => {
     const sel = (selection || {})[row.id] || { selected: true, target: "max", qty: 1 }
-    return { row, sel, costs: planRowCosts(row, sel.target, sel.qty, inventoryByEquip), display: planCurrentDisplay(row, sel, inventoryByEquip) }
+    const costs = planRowCosts(row, sel.target, sel.qty, inventoryByEquip)
+    return { row, sel, costs, matDev: planMaterialDevExpected(costs, kcDevData), display: planCurrentDisplay(row, sel, inventoryByEquip) }
   })
   const selected = planRows.filter((p) => p.sel.selected)
   const totals = { screws: 0, dev: 0, fuel: 0, ammo: 0, steel: 0, bauxite: 0 }
   const materialMap = {}
+  const includeDev = !!includeDevExpected
   for (const p of selected) {
     totals.screws += p.costs.screws
-    totals.dev += p.costs.dev
+    totals.dev += p.costs.dev + (includeDev ? p.matDev : 0)
     totals.fuel += p.costs.fuel
     totals.ammo += p.costs.ammo
     totals.steel += p.costs.steel
@@ -2241,7 +2289,8 @@ function PlanningPage({ rows, inventoryByEquip, useItemCounts, selection, onTogg
         "div",
         { className: "kr2-plan-bar-left" },
         React.createElement("span", { className: "kr2-plan-total-label" }, "总资源消耗"),
-        React.createElement("span", { className: "kr2-status" }, "已选 " + selected.length + " / " + planRows.length + " 件收藏装备")
+        React.createElement("span", { className: "kr2-status" }, "已选 " + selected.length + " / " + planRows.length + " 件收藏装备"),
+        React.createElement("label", { className: "kr2-plan-dev-toggle" }, React.createElement("input", { type: "checkbox", checked: !!includeDevExpected, onChange: onToggleIncludeDevExpected }), "统计素材开发的紫菜消耗期望")
       ),
       React.createElement(
         "div",
@@ -2276,7 +2325,7 @@ function PlanningPage({ rows, inventoryByEquip, useItemCounts, selection, onTogg
           React.createElement("th", null, "当前"),
           React.createElement("th", null, "目标"),
           React.createElement("th", null, "目标数量"),
-          React.createElement("th", null, "资材"),
+          React.createElement("th", null, "开发资材"),
           React.createElement("th", null, "螺丝"),
           React.createElement("th", null, "素材")
         )
@@ -2319,7 +2368,7 @@ function PlanningPage({ rows, inventoryByEquip, useItemCounts, selection, onTogg
                 React.createElement("button", { type: "button", className: "kr2-plan-qty-btn", onClick: () => onQty(p.row.id, Number(p.sel.qty || 1) + 1) }, "+")
               )
             ),
-            React.createElement("td", null, planFormatNumber(p.costs.dev)),
+            React.createElement("td", null, planFormatNumber(p.costs.dev + (includeDev ? p.matDev : 0))),
             React.createElement("td", null, planFormatScrews(p.costs.screws)),
             React.createElement("td", { className: "kr2-plan-mat-col" }, matText)
           )
@@ -2336,13 +2385,13 @@ function PlanningPage({ rows, inventoryByEquip, useItemCounts, selection, onTogg
         React.createElement(
           "thead",
           null,
-          React.createElement("tr", null, React.createElement("th", { className: "kr2-plan-mat-th" }, "素材名称"), React.createElement("th", null, "需求"), React.createElement("th", null, "库存"), React.createElement("th", { className: "kr2-plan-mat-th" }, "消耗于装备"))
+          React.createElement("tr", null, React.createElement("th", { className: "kr2-plan-mat-th" }, "素材名称"), React.createElement("th", null, "需求"), React.createElement("th", null, "库存"), React.createElement("th", null, "紫菜开发期望"), React.createElement("th", { className: "kr2-plan-mat-th" }, "消耗于装备"))
         ),
         React.createElement(
           "tbody",
           null,
           materialList.length === 0
-            ? React.createElement("tr", null, React.createElement("td", { colSpan: 4 }, "暂无素材需求"))
+            ? React.createElement("tr", null, React.createElement("td", { colSpan: 5 }, "暂无素材需求"))
             : materialList.map((m) =>
                 React.createElement(
                   "tr",
@@ -2350,6 +2399,7 @@ function PlanningPage({ rows, inventoryByEquip, useItemCounts, selection, onTogg
                   React.createElement("td", { className: "kr2-plan-name" }, React.createElement("button", { className: "kr2-plan-mat-btn", onClick: () => onMaterialClick && onMaterialClick(m.item) }, m.name)),
                   React.createElement("td", null, String(m.required)),
                   React.createElement("td", { className: stockClass(m.stock, m.required) }, m.stock == null ? "--" : String(m.stock)),
+                  React.createElement("td", null, planDevExpectedText(m.item, m.required, kcDevData)),
                   React.createElement("td", { className: "kr2-plan-consumed" }, m.equips.join("、"))
                 )
               )
@@ -2628,6 +2678,47 @@ function saveFavorites(favorites) {
   } catch (_) {}
 }
 
+const PLAN_SELECTION_STORAGE_KEY = "poi-plugin-koushu-rate:plan-selection";
+
+function readPlanSelection() {
+  try {
+    const storage = typeof localStorage !== "undefined" ? localStorage : (typeof window !== "undefined" ? window.localStorage : null)
+    if (!storage) return {}
+    const raw = storage.getItem(PLAN_SELECTION_STORAGE_KEY)
+    if (!raw) return {}
+    const parsed = JSON.parse(raw)
+    return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {}
+  } catch (_) {
+    return {}
+  }
+}
+
+function savePlanSelection(selection) {
+  try {
+    const storage = typeof localStorage !== "undefined" ? localStorage : (typeof window !== "undefined" ? window.localStorage : null)
+    if (storage) storage.setItem(PLAN_SELECTION_STORAGE_KEY, JSON.stringify(selection || {}))
+  } catch (_) {}
+}
+
+const PLAN_INCLUDE_DEV_STORAGE_KEY = "poi-plugin-koushu-rate:plan-include-dev";
+
+function readPlanIncludeDev() {
+  try {
+    const storage = typeof localStorage !== "undefined" ? localStorage : (typeof window !== "undefined" ? window.localStorage : null)
+    if (!storage) return false
+    return storage.getItem(PLAN_INCLUDE_DEV_STORAGE_KEY) === "1"
+  } catch (_) {
+    return false
+  }
+}
+
+function savePlanIncludeDev(value) {
+  try {
+    const storage = typeof localStorage !== "undefined" ? localStorage : (typeof window !== "undefined" ? window.localStorage : null)
+    if (storage) storage.setItem(PLAN_INCLUDE_DEV_STORAGE_KEY, value ? "1" : "0")
+  } catch (_) {}
+}
+
 class KoushuRateApp extends React.Component {
   state = {
     query: "",
@@ -2646,17 +2737,20 @@ class KoushuRateApp extends React.Component {
     inventoryPopup: null,
     inventoryByEquip: {},
     useItemCounts: {},
+    kcDevData: null,
     favorites: readFavorites(),
     favoritesOnly: false,
     starSort: null,
     activeTab: "list",
-    planSelection: {},
+    planSelection: readPlanSelection(),
+    includeDevExpected: readPlanIncludeDev(),
   }
 
   componentDidMount() {
     this.refresh()
     this.checkAkashiUpdate(false)
     refreshKcDevData().catch(() => {})
+    this.loadKcDevExpectations()
     this.refreshInventory()
     this.inventoryTimer = setInterval(() => this.refreshInventory(), 1000)
   }
@@ -2665,6 +2759,12 @@ class KoushuRateApp extends React.Component {
     if (this.inventoryTimer) clearInterval(this.inventoryTimer)
   }
 
+  loadKcDevExpectations = () => {
+    loadKcDevData(false)
+      .then((data) => this.setState({ kcDevData: data }))
+      .catch(() => {})
+  }
+
   refreshInventory = () => {
     const nextEquips = getEquipInventory(getInventoryEquips(this.props.envWindow))
     const nextUseItems = getUseItemCounts(this.props.envWindow)
@@ -2817,14 +2917,18 @@ class KoushuRateApp extends React.Component {
   togglePlanRow = (id) => {
     this.setState((prev) => {
       const cur = prev.planSelection[id] || this.planDefaultSel(id)
-      return { planSelection: Object.assign({}, prev.planSelection, { [id]: Object.assign({}, cur, { selected: !cur.selected }) }) }
+      const planSelection = Object.assign({}, prev.planSelection, { [id]: Object.assign({}, cur, { selected: !cur.selected }) })
+      savePlanSelection(planSelection)
+      return { planSelection }
     })
   }
 
   setPlanTarget = (id, target) => {
     this.setState((prev) => {
       const cur = prev.planSelection[id] || this.planDefaultSel(id)
-      return { planSelection: Object.assign({}, prev.planSelection, { [id]: Object.assign({}, cur, { target }) }) }
+      const planSelection = Object.assign({}, prev.planSelection, { [id]: Object.assign({}, cur, { target }) })
+      savePlanSelection(planSelection)
+      return { planSelection }
     })
   }
 
@@ -2832,7 +2936,9 @@ class KoushuRateApp extends React.Component {
     const n = Math.max(1, Math.min(99, Math.round(Number(qty) || 1)))
     this.setState((prev) => {
       const cur = prev.planSelection[id] || this.planDefaultSel(id)
-      return { planSelection: Object.assign({}, prev.planSelection, { [id]: Object.assign({}, cur, { qty: n }) }) }
+      const planSelection = Object.assign({}, prev.planSelection, { [id]: Object.assign({}, cur, { qty: n }) })
+      savePlanSelection(planSelection)
+      return { planSelection }
     })
   }
 
@@ -2844,10 +2950,19 @@ class KoushuRateApp extends React.Component {
         const cur = planSelection[row.id] || this.planDefaultSel(row.id)
         planSelection[row.id] = Object.assign({}, cur, { selected })
       }
+      savePlanSelection(planSelection)
       return { planSelection }
     })
   }
 
+  toggleIncludeDevExpected = () => {
+    this.setState((prev) => {
+      const includeDevExpected = !prev.includeDevExpected
+      savePlanIncludeDev(includeDevExpected)
+      return { includeDevExpected }
+    })
+  }
+
   setKcDevSort = (key) => {
     this.setState((prev) => {
       const popup = prev.kcDevPopup
@@ -3084,6 +3199,9 @@ class KoushuRateApp extends React.Component {
             onQty: this.setPlanQty,
             onSelectAll: this.selectAllPlan,
             onMaterialClick: this.openKcDevPopup,
+            kcDevData: this.state.kcDevData,
+            includeDevExpected: !!this.state.includeDevExpected,
+            onToggleIncludeDevExpected: this.toggleIncludeDevExpected,
           })
         : null,
       kcDevPopup

package/package.json

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