poi-plugin-milk 1.0.1 → 1.0.4
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 +34 -33
- package/index.js +15 -7
- package/package.json +1 -1
- package/parts/fleet-list.js +2 -0
- package/parts/ship-row.js +8 -9
package/.idea/workspace.xml
CHANGED
|
@@ -24,18 +24,18 @@
|
|
|
24
24
|
<file leaf-file-name="fleet-list.js" pinned="false" current-in-tab="false">
|
|
25
25
|
<entry file="file://$PROJECT_DIR$/parts/fleet-list.js">
|
|
26
26
|
<provider selected="true" editor-type-id="text-editor">
|
|
27
|
-
<state relative-caret-position="
|
|
28
|
-
<caret line="
|
|
27
|
+
<state relative-caret-position="-5995">
|
|
28
|
+
<caret line="124" column="51" lean-forward="false" selection-start-line="124" selection-start-column="51" selection-end-line="124" selection-end-column="51" />
|
|
29
29
|
<folding />
|
|
30
30
|
</state>
|
|
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="true">
|
|
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="1016">
|
|
38
|
+
<caret line="102" column="6" lean-forward="false" selection-start-line="102" selection-start-column="6" selection-end-line="102" 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="false">
|
|
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">
|
|
@@ -97,8 +97,8 @@
|
|
|
97
97
|
<file leaf-file-name="ship-row.js" pinned="false" current-in-tab="false">
|
|
98
98
|
<entry file="file://$PROJECT_DIR$/parts/ship-row.js">
|
|
99
99
|
<provider selected="true" editor-type-id="text-editor">
|
|
100
|
-
<state relative-caret-position="
|
|
101
|
-
<caret line="
|
|
100
|
+
<state relative-caret-position="893">
|
|
101
|
+
<caret line="65" column="42" lean-forward="false" selection-start-line="65" selection-start-column="42" selection-end-line="65" selection-end-column="42" />
|
|
102
102
|
<folding />
|
|
103
103
|
</state>
|
|
104
104
|
</provider>
|
|
@@ -107,8 +107,8 @@
|
|
|
107
107
|
<file leaf-file-name="functions.js" pinned="false" current-in-tab="false">
|
|
108
108
|
<entry file="file://$PROJECT_DIR$/parts/functions.js">
|
|
109
109
|
<provider selected="true" editor-type-id="text-editor">
|
|
110
|
-
<state relative-caret-position="
|
|
111
|
-
<caret line="
|
|
110
|
+
<state relative-caret-position="973">
|
|
111
|
+
<caret line="58" column="56" lean-forward="false" selection-start-line="58" selection-start-column="56" selection-end-line="58" selection-end-column="56" />
|
|
112
112
|
<folding />
|
|
113
113
|
</state>
|
|
114
114
|
</provider>
|
|
@@ -120,24 +120,25 @@
|
|
|
120
120
|
<findStrings>
|
|
121
121
|
<find>fleetAkashiConv</find>
|
|
122
122
|
<find>Not ready</find>
|
|
123
|
-
<find>poi-util-transpile</find>
|
|
124
123
|
<find>canRepair</find>
|
|
125
124
|
<find>HP</find>
|
|
126
|
-
<find>repairId</find>
|
|
127
125
|
<find>inRepair</find>
|
|
128
126
|
<find>timeElapsed</find>
|
|
127
|
+
<find>repairId</find>
|
|
129
128
|
<find>49</find>
|
|
130
129
|
<find>49a</find>
|
|
130
|
+
<find>poi-util-transpile</find>
|
|
131
131
|
</findStrings>
|
|
132
132
|
</component>
|
|
133
133
|
<component name="IdeDocumentHistory">
|
|
134
134
|
<option name="CHANGED_PATHS">
|
|
135
135
|
<list>
|
|
136
136
|
<option value="$PROJECT_DIR$/i18n/zh-CN.json" />
|
|
137
|
-
<option value="$PROJECT_DIR$/
|
|
137
|
+
<option value="$PROJECT_DIR$/parts/functions.js" />
|
|
138
138
|
<option value="$PROJECT_DIR$/parts/fleet-list.js" />
|
|
139
139
|
<option value="$PROJECT_DIR$/parts/ship-row.js" />
|
|
140
140
|
<option value="$PROJECT_DIR$/package.json" />
|
|
141
|
+
<option value="$PROJECT_DIR$/index.js" />
|
|
141
142
|
</list>
|
|
142
143
|
</option>
|
|
143
144
|
</component>
|
|
@@ -261,12 +262,12 @@
|
|
|
261
262
|
<option name="presentableId" value="Default" />
|
|
262
263
|
<updated>1764751942683</updated>
|
|
263
264
|
<workItem from="1764751943836" duration="336000" />
|
|
264
|
-
<workItem from="1764814660477" duration="
|
|
265
|
+
<workItem from="1764814660477" duration="9152000" />
|
|
265
266
|
</task>
|
|
266
267
|
<servers />
|
|
267
268
|
</component>
|
|
268
269
|
<component name="TimeTrackingManager">
|
|
269
|
-
<option name="totallyTimeSpent" value="
|
|
270
|
+
<option name="totallyTimeSpent" value="9488000" />
|
|
270
271
|
</component>
|
|
271
272
|
<component name="ToolWindowManager">
|
|
272
273
|
<frame x="140" y="22" width="3700" height="2138" extended-state="0" />
|
|
@@ -361,14 +362,6 @@
|
|
|
361
362
|
</state>
|
|
362
363
|
</provider>
|
|
363
364
|
</entry>
|
|
364
|
-
<entry file="file://$PROJECT_DIR$/i18n/zh-CN.json">
|
|
365
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
366
|
-
<state relative-caret-position="287">
|
|
367
|
-
<caret line="7" column="5" lean-forward="false" selection-start-line="7" selection-start-column="3" selection-end-line="7" selection-end-column="5" />
|
|
368
|
-
<folding />
|
|
369
|
-
</state>
|
|
370
|
-
</provider>
|
|
371
|
-
</entry>
|
|
372
365
|
<entry file="file://$PROJECT_DIR$/parts/factor.js">
|
|
373
366
|
<provider selected="true" editor-type-id="text-editor">
|
|
374
367
|
<state relative-caret-position="0">
|
|
@@ -377,34 +370,34 @@
|
|
|
377
370
|
</state>
|
|
378
371
|
</provider>
|
|
379
372
|
</entry>
|
|
380
|
-
<entry file="file://$PROJECT_DIR$/
|
|
373
|
+
<entry file="file://$PROJECT_DIR$/parts/functions.js">
|
|
381
374
|
<provider selected="true" editor-type-id="text-editor">
|
|
382
|
-
<state relative-caret-position="
|
|
383
|
-
<caret line="
|
|
375
|
+
<state relative-caret-position="973">
|
|
376
|
+
<caret line="58" column="56" lean-forward="false" selection-start-line="58" selection-start-column="56" selection-end-line="58" selection-end-column="56" />
|
|
384
377
|
<folding />
|
|
385
378
|
</state>
|
|
386
379
|
</provider>
|
|
387
380
|
</entry>
|
|
388
|
-
<entry file="file://$PROJECT_DIR$/
|
|
381
|
+
<entry file="file://$PROJECT_DIR$/i18n/zh-CN.json">
|
|
389
382
|
<provider selected="true" editor-type-id="text-editor">
|
|
390
|
-
<state relative-caret-position="
|
|
391
|
-
<caret line="
|
|
383
|
+
<state relative-caret-position="287">
|
|
384
|
+
<caret line="7" column="5" lean-forward="false" selection-start-line="7" selection-start-column="3" selection-end-line="7" selection-end-column="5" />
|
|
392
385
|
<folding />
|
|
393
386
|
</state>
|
|
394
387
|
</provider>
|
|
395
388
|
</entry>
|
|
396
389
|
<entry file="file://$PROJECT_DIR$/parts/fleet-list.js">
|
|
397
390
|
<provider selected="true" editor-type-id="text-editor">
|
|
398
|
-
<state relative-caret-position="
|
|
399
|
-
<caret line="
|
|
391
|
+
<state relative-caret-position="-5995">
|
|
392
|
+
<caret line="124" column="51" lean-forward="false" selection-start-line="124" selection-start-column="51" selection-end-line="124" selection-end-column="51" />
|
|
400
393
|
<folding />
|
|
401
394
|
</state>
|
|
402
395
|
</provider>
|
|
403
396
|
</entry>
|
|
404
397
|
<entry file="file://$PROJECT_DIR$/parts/ship-row.js">
|
|
405
398
|
<provider selected="true" editor-type-id="text-editor">
|
|
406
|
-
<state relative-caret-position="
|
|
407
|
-
<caret line="
|
|
399
|
+
<state relative-caret-position="893">
|
|
400
|
+
<caret line="65" column="42" lean-forward="false" selection-start-line="65" selection-start-column="42" selection-end-line="65" selection-end-column="42" />
|
|
408
401
|
<folding />
|
|
409
402
|
</state>
|
|
410
403
|
</provider>
|
|
@@ -417,5 +410,13 @@
|
|
|
417
410
|
</state>
|
|
418
411
|
</provider>
|
|
419
412
|
</entry>
|
|
413
|
+
<entry file="file://$PROJECT_DIR$/index.js">
|
|
414
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
415
|
+
<state relative-caret-position="1016">
|
|
416
|
+
<caret line="102" column="6" lean-forward="false" selection-start-line="102" selection-start-column="6" selection-end-line="102" selection-end-column="6" />
|
|
417
|
+
<folding />
|
|
418
|
+
</state>
|
|
419
|
+
</provider>
|
|
420
|
+
</entry>
|
|
420
421
|
</component>
|
|
421
422
|
</project>
|
package/index.js
CHANGED
|
@@ -83,16 +83,24 @@ const fleetAkashiConv = (fleet, $ships, ships, equips, repairId) => {
|
|
|
83
83
|
});
|
|
84
84
|
|
|
85
85
|
var repairStatus = 0
|
|
86
|
+
var flagshipa = _lodash2.default.get(fleet, 'api_ship.0', -1)
|
|
87
|
+
var secondshipa = _lodash2.default.get(fleet, 'api_ship.1', -1)
|
|
88
|
+
var flagshipid = ships[flagshipa]?ships[flagshipa].api_ship_id:-1;
|
|
89
|
+
var secondshipid = ships[secondshipa]?ships[secondshipa].api_ship_id:-1;
|
|
86
90
|
if(canRepair){
|
|
87
91
|
repairStatus = 1;
|
|
92
|
+
if(secondshipid==996
|
|
93
|
+
// ||secondshipid==357 //没有野崎，用初月改测试
|
|
94
|
+
){
|
|
95
|
+
repairStatus = 4;
|
|
96
|
+
}
|
|
97
|
+
if(secondshipid==1002
|
|
98
|
+
){
|
|
99
|
+
repairStatus = 5;
|
|
100
|
+
}
|
|
88
101
|
}else{
|
|
89
|
-
var flagshipa = _lodash2.default.get(fleet, 'api_ship.0', -1)
|
|
90
|
-
var secondshipa = _lodash2.default.get(fleet, 'api_ship.1', -1)
|
|
91
|
-
var flagshipid = ships[flagshipa]?ships[flagshipa].api_ship_id:-1;
|
|
92
|
-
var secondshipid = ships[secondshipa]?ships[secondshipa].api_ship_id:-1;
|
|
93
|
-
|
|
94
102
|
if(flagshipid==996||secondshipid==996
|
|
95
|
-
|
|
103
|
+
//||flagshipid==357||secondshipid==357 //没有野崎，用初月改测试
|
|
96
104
|
){
|
|
97
105
|
repairStatus = 2;
|
|
98
106
|
}
|
|
@@ -103,7 +111,7 @@ const fleetAkashiConv = (fleet, $ships, ships, equips, repairId) => {
|
|
|
103
111
|
}
|
|
104
112
|
//console.log("cc:"+flagshipid)
|
|
105
113
|
canRepair = repairStatus;
|
|
106
|
-
|
|
114
|
+
console.log("cc2:"+canRepair)
|
|
107
115
|
return {
|
|
108
116
|
api_id: fleet.api_id || -1,
|
|
109
117
|
shipId: fleet.api_ship || [],
|
package/package.json
CHANGED
package/parts/fleet-list.js
CHANGED
|
@@ -122,6 +122,8 @@ class FleetList extends _react.Component {
|
|
|
122
122
|
s1 = __('Repairing')
|
|
123
123
|
}else if(fleet.canRepair==2||fleet.canRepair==3){
|
|
124
124
|
s1 = '正在喂奶';
|
|
125
|
+
}else if(fleet.canRepair==4||fleet.canRepair==5){
|
|
126
|
+
s1 = '正在修理和喂奶';
|
|
125
127
|
}
|
|
126
128
|
|
|
127
129
|
return _react2.default.createElement(
|
package/parts/ship-row.js
CHANGED
|
@@ -61,13 +61,12 @@ const ShipRow = (0, _reactRedux.connect)(state => {
|
|
|
61
61
|
api_id, api_lv, inRepair, api_name ,api_cond} = ship;
|
|
62
62
|
//console.log(ship)
|
|
63
63
|
const completeTime = lastRefresh + estimate;
|
|
64
|
-
console.log('lsr')
|
|
65
|
-
console.log(lastRefresh);
|
|
66
|
-
console.log(canRepair);
|
|
67
|
-
console.log(timeElapsed);
|
|
68
64
|
var milkadd = 0;
|
|
69
|
-
if(canRepair==2||canRepair==
|
|
70
|
-
milkadd = Math.floor(timeElapsed/
|
|
65
|
+
if(canRepair==2||canRepair==4){
|
|
66
|
+
milkadd = Math.floor(timeElapsed/900)*2;
|
|
67
|
+
}
|
|
68
|
+
if(canRepair==3||canRepair==5){
|
|
69
|
+
milkadd = Math.floor(timeElapsed/900)*3;
|
|
71
70
|
}
|
|
72
71
|
var milks = Math.max(api_cond,Math.min(api_cond + milkadd,54))
|
|
73
72
|
|
|
@@ -127,9 +126,9 @@ const ShipRow = (0, _reactRedux.connect)(state => {
|
|
|
127
126
|
_react2.default.createElement(
|
|
128
127
|
'td',
|
|
129
128
|
null,
|
|
130
|
-
'❤️',
|
|
131
|
-
canRepair && api_nowhp !== api_maxhp && !inRepair && (0, _functions.repairEstimate)(ship, timeElapsed, availableSRF),
|
|
132
|
-
(canRepair==2||canRepair==3)?
|
|
129
|
+
(canRepair==1||canRepair==4||canRepair==5)?'❤️':null,
|
|
130
|
+
(canRepair==1||canRepair==4||canRepair==5) && api_nowhp !== api_maxhp && !inRepair && (0, _functions.repairEstimate)(ship, timeElapsed, availableSRF),
|
|
131
|
+
(canRepair==2||canRepair==3||canRepair==4||canRepair==5)?
|
|
133
132
|
_react2.default.createElement(
|
|
134
133
|
'td',
|
|
135
134
|
null,
|