poi-plugin-item-improvement2-beta 0.0.32021 → 0.0.32024

package/.idea/workspace.xml

@@ -51,7 +51,7 @@
     "SHARE_PROJECT_CONFIGURATION_FILES": "true",
     "git-widget-placeholder": "main",
     "javascript.preferred.runtime.type.id": "node",
-    "last_opened_file_path": "/Users/sakana/code/plugin-item-improvement/views",
+    "last_opened_file_path": "/Users/sakana/code/plugin-item-improvement/assets",
     "node.js.detected.package.eslint": "true",
     "node.js.detected.package.tslint": "true",
     "node.js.selected.package.eslint": "(autodetect)",
@@ -63,8 +63,8 @@
 }]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/views" />
       <recent name="$PROJECT_DIR$/assets" />
+      <recent name="$PROJECT_DIR$/views" />
     </key>
   </component>
   <component name="SharedIndexes">
@@ -90,7 +90,7 @@
       <workItem from="1767266330648" duration="5077000" />
       <workItem from="1767272485923" duration="3120000" />
       <workItem from="1767275985364" duration="4189000" />
-      <workItem from="1767280935871" duration="4396000" />
+      <workItem from="1767280935871" duration="5556000" />
     </task>
     <servers />
   </component>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poi-plugin-item-improvement2-beta",
-  "version": "0.0.32021",
+  "version": "0.0.32024",
   "description": "use new data source",
   "main": "index.es",
   "scripts": {

package/views/selectors.js

@@ -92,18 +92,18 @@ const baseImprovementDataSelector = (0, _reselect.createSelector)([_selectors.wc
 
   const arsenalAll = loadNedbAsMap(ARSENAL_NEDB_PATH, 'id');
   const itemsDb = loadNedbAsMap(ITEMS_NEDB_PATH, 'id');
-  const arsenalWeek = loadNedbAsMap(ARSENAL_WEEK_NEDB_PATH, 'id'); // <== 本地 week
+  const arsenalWeek = loadNedbAsMap(ARSENAL_WEEK_NEDB_PATH, 'id'); // ✅ 覆盖 wctf db，后续 _.get(db, 'arsenal_weekday') 就能拿到本地 week
+
+  const dbWithWeek = _extends({}, db, {
+    arsenal_weekday: arsenalWeek
+  });
 
   return (0, _lodash.default)(arsenalAll).keys().map(itemId => {
     const item = itemsDb[itemId] || {};
-    const weekData = arsenalWeek[itemId] || {}; // 取这个 item 的 week 数据
-
     const assistants = (0, _lodash.default)(_lodash.default.range(7).concat(-1)).map(day => [day, (0, _lodash.default)(item.improvement).flatMap(entry => (0, _lodash.default)(entry.req).flatMap(([days, ships]) => day === -1 || days[day] ? ships : []).groupBy(id => uniqMap[id]).mapValues(ids => (0, _lodash.default)(ids).sortBy(id => (chains[id] || []).indexOf(id)).take(1).value()).values().flatten().map(id => window.i18n['poi-plugin-item-improvement2-beta'].__(window.i18n.resources.__(_lodash.default.get($const, ['$ships', id, 'api_name'], 'None')))).value()).join('/')]).fromPairs().value();
     return _extends({}, _lodash.default.get($const, ['$equips', item.id], {}), item, {
       priority: 0,
-      assistants,
-      week: weekData // <== 注入 week
-
+      assistants
     });
   }).value();
 });
@@ -122,7 +122,13 @@ const improvementDataSelector = (0, _reselect.createSelector)([baseImprovementDa
   });
 }).value());
 exports.improvementDataSelector = improvementDataSelector;
-const improveItemIdsByDaySelector = (0, _reselect.createSelector)([_selectors.wctfSelector], db => (0, _lodash.default)(_lodash.default.get(db, 'arsenal_weekday')).mapValues(day => (0, _lodash.default)(day.improvements).map(([id]) => id).value()).value());
+
+const improveItemIdsByDaySelector = weekOverride => (0, _reselect.createSelector)([_selectors.wctfSelector], db => {
+  const weekData = weekOverride || _lodash.default.get(db, 'arsenal_weekday', {});
+
+  return (0, _lodash.default)(weekData).mapValues(day => (0, _lodash.default)(day.improvements).map(([id]) => id).value()).value();
+});
+
 exports.improveItemIdsByDaySelector = improveItemIdsByDaySelector;
 
 const arrayResultWrapper = selector => (0, _selectors.createDeepCompareArraySelector)(selector, result => result);