poi-plugin-milk 1.0.7 → 1.0.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.idea/workspace.xml +13 -13
- package/index.js +5 -4
- package/package.json +1 -1
package/.idea/workspace.xml
CHANGED
|
@@ -31,11 +31,11 @@
|
|
|
31
31
|
</provider>
|
|
32
32
|
</entry>
|
|
33
33
|
</file>
|
|
34
|
-
<file leaf-file-name="index.js" pinned="false" current-in-tab="
|
|
34
|
+
<file leaf-file-name="index.js" pinned="false" current-in-tab="false">
|
|
35
35
|
<entry file="file://$PROJECT_DIR$/index.js">
|
|
36
36
|
<provider selected="true" editor-type-id="text-editor">
|
|
37
|
-
<state relative-caret-position="
|
|
38
|
-
<caret line="
|
|
37
|
+
<state relative-caret-position="588">
|
|
38
|
+
<caret line="233" column="6" lean-forward="false" selection-start-line="233" selection-start-column="6" selection-end-line="233" selection-end-column="6" />
|
|
39
39
|
<folding />
|
|
40
40
|
</state>
|
|
41
41
|
</provider>
|
|
@@ -84,7 +84,7 @@
|
|
|
84
84
|
</provider>
|
|
85
85
|
</entry>
|
|
86
86
|
</file>
|
|
87
|
-
<file leaf-file-name="package.json" pinned="false" current-in-tab="
|
|
87
|
+
<file leaf-file-name="package.json" pinned="false" current-in-tab="true">
|
|
88
88
|
<entry file="file://$PROJECT_DIR$/package.json">
|
|
89
89
|
<provider selected="true" editor-type-id="text-editor">
|
|
90
90
|
<state relative-caret-position="82">
|
|
@@ -151,8 +151,8 @@
|
|
|
151
151
|
<option value="$PROJECT_DIR$/parts/fleet-list.js" />
|
|
152
152
|
<option value="$PROJECT_DIR$/parts/ship-row.js" />
|
|
153
153
|
<option value="$PROJECT_DIR$/i18n/zh-CN.json" />
|
|
154
|
-
<option value="$PROJECT_DIR$/package.json" />
|
|
155
154
|
<option value="$PROJECT_DIR$/index.js" />
|
|
155
|
+
<option value="$PROJECT_DIR$/package.json" />
|
|
156
156
|
</list>
|
|
157
157
|
</option>
|
|
158
158
|
</component>
|
|
@@ -277,12 +277,12 @@
|
|
|
277
277
|
<updated>1764751942683</updated>
|
|
278
278
|
<workItem from="1764751943836" duration="336000" />
|
|
279
279
|
<workItem from="1764814660477" duration="9930000" />
|
|
280
|
-
<workItem from="1764899367749" duration="
|
|
280
|
+
<workItem from="1764899367749" duration="3630000" />
|
|
281
281
|
</task>
|
|
282
282
|
<servers />
|
|
283
283
|
</component>
|
|
284
284
|
<component name="TimeTrackingManager">
|
|
285
|
-
<option name="totallyTimeSpent" value="
|
|
285
|
+
<option name="totallyTimeSpent" value="13896000" />
|
|
286
286
|
</component>
|
|
287
287
|
<component name="ToolWindowManager">
|
|
288
288
|
<frame x="140" y="22" width="3700" height="2138" extended-state="0" />
|
|
@@ -500,18 +500,18 @@
|
|
|
500
500
|
</state>
|
|
501
501
|
</provider>
|
|
502
502
|
</entry>
|
|
503
|
-
<entry file="file://$PROJECT_DIR$/
|
|
503
|
+
<entry file="file://$PROJECT_DIR$/index.js">
|
|
504
504
|
<provider selected="true" editor-type-id="text-editor">
|
|
505
|
-
<state relative-caret-position="
|
|
506
|
-
<caret line="
|
|
505
|
+
<state relative-caret-position="588">
|
|
506
|
+
<caret line="233" column="6" lean-forward="false" selection-start-line="233" selection-start-column="6" selection-end-line="233" selection-end-column="6" />
|
|
507
507
|
<folding />
|
|
508
508
|
</state>
|
|
509
509
|
</provider>
|
|
510
510
|
</entry>
|
|
511
|
-
<entry file="file://$PROJECT_DIR$/
|
|
511
|
+
<entry file="file://$PROJECT_DIR$/package.json">
|
|
512
512
|
<provider selected="true" editor-type-id="text-editor">
|
|
513
|
-
<state relative-caret-position="
|
|
514
|
-
<caret line="
|
|
513
|
+
<state relative-caret-position="82">
|
|
514
|
+
<caret line="2" column="19" lean-forward="false" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" />
|
|
515
515
|
<folding />
|
|
516
516
|
</state>
|
|
517
517
|
</provider>
|
package/index.js
CHANGED
|
@@ -92,7 +92,7 @@ const fleetAkashiConv = (fleet, $ships, ships, equips, repairId) => {
|
|
|
92
92
|
if(canRepair){
|
|
93
93
|
repairStatus = 1;
|
|
94
94
|
if(secondshipid==996
|
|
95
|
-
|
|
95
|
+
//||secondshipid==357 //没有野崎，用初月改测试
|
|
96
96
|
){
|
|
97
97
|
repairStatus = 4;
|
|
98
98
|
}
|
|
@@ -102,7 +102,7 @@ const fleetAkashiConv = (fleet, $ships, ships, equips, repairId) => {
|
|
|
102
102
|
}
|
|
103
103
|
}else{
|
|
104
104
|
if(flagshipid==996||secondshipid==996
|
|
105
|
-
|
|
105
|
+
//||flagshipid==357||secondshipid==357 //没有野崎，用初月改测试
|
|
106
106
|
){
|
|
107
107
|
repairStatus = 2;
|
|
108
108
|
}
|
|
@@ -231,9 +231,10 @@ const switchPluginPath = exports.switchPluginPath = [{
|
|
|
231
231
|
const repairId = repairs.map(dock => dock.api_ship_id);
|
|
232
232
|
|
|
233
233
|
const result = fleets.map(fleet => fleetAkashiConv(fleet, $ships, ships, equips, repairId));
|
|
234
|
+
//console.log(result)
|
|
234
235
|
return result.some(fleet =>
|
|
235
|
-
((fleet.canRepair ==1 )&& fleet.repairDetail.some(ship => ship.estimate > 0))
|
|
236
|
-
((fleet.canRepair ==2 || fleet.canRepair ==3 )&& fleet.repairDetail.some(ship => ship.cond < 54))
|
|
236
|
+
((fleet.canRepair ==1 )&& fleet.repairDetail.some(ship => ship.estimate > 0)) ||
|
|
237
|
+
((fleet.canRepair ==2 || fleet.canRepair ==3 )&& fleet.repairDetail.some(ship => ship.cond < 54)) ||
|
|
237
238
|
((fleet.canRepair ==4 || fleet.canRepair ==5 )&&
|
|
238
239
|
(fleet.repairDetail.some(ship => ship.cond < 54) || fleet.repairDetail.some(ship => ship.estimate > 0))
|
|
239
240
|
)
|