poi-plugin-milk 1.0.3 → 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 +29 -29
- package/index.js +15 -7
- package/package.json +1 -1
- package/parts/fleet-list.js +2 -0
- package/parts/ship-row.js +8 -5
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">
|
|
@@ -122,23 +122,23 @@
|
|
|
122
122
|
<find>Not ready</find>
|
|
123
123
|
<find>canRepair</find>
|
|
124
124
|
<find>HP</find>
|
|
125
|
-
<find>repairId</find>
|
|
126
125
|
<find>inRepair</find>
|
|
127
126
|
<find>timeElapsed</find>
|
|
127
|
+
<find>repairId</find>
|
|
128
128
|
<find>49</find>
|
|
129
|
-
<find>poi-util-transpile</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$/index.js" />
|
|
138
|
-
<option value="$PROJECT_DIR$/parts/fleet-list.js" />
|
|
139
137
|
<option value="$PROJECT_DIR$/parts/functions.js" />
|
|
138
|
+
<option value="$PROJECT_DIR$/parts/fleet-list.js" />
|
|
140
139
|
<option value="$PROJECT_DIR$/parts/ship-row.js" />
|
|
141
140
|
<option value="$PROJECT_DIR$/package.json" />
|
|
141
|
+
<option value="$PROJECT_DIR$/index.js" />
|
|
142
142
|
</list>
|
|
143
143
|
</option>
|
|
144
144
|
</component>
|
|
@@ -262,12 +262,12 @@
|
|
|
262
262
|
<option name="presentableId" value="Default" />
|
|
263
263
|
<updated>1764751942683</updated>
|
|
264
264
|
<workItem from="1764751943836" duration="336000" />
|
|
265
|
-
<workItem from="1764814660477" duration="
|
|
265
|
+
<workItem from="1764814660477" duration="9152000" />
|
|
266
266
|
</task>
|
|
267
267
|
<servers />
|
|
268
268
|
</component>
|
|
269
269
|
<component name="TimeTrackingManager">
|
|
270
|
-
<option name="totallyTimeSpent" value="
|
|
270
|
+
<option name="totallyTimeSpent" value="9488000" />
|
|
271
271
|
</component>
|
|
272
272
|
<component name="ToolWindowManager">
|
|
273
273
|
<frame x="140" y="22" width="3700" height="2138" extended-state="0" />
|
|
@@ -362,14 +362,6 @@
|
|
|
362
362
|
</state>
|
|
363
363
|
</provider>
|
|
364
364
|
</entry>
|
|
365
|
-
<entry file="file://$PROJECT_DIR$/i18n/zh-CN.json">
|
|
366
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
367
|
-
<state relative-caret-position="287">
|
|
368
|
-
<caret line="7" column="5" lean-forward="false" selection-start-line="7" selection-start-column="3" selection-end-line="7" selection-end-column="5" />
|
|
369
|
-
<folding />
|
|
370
|
-
</state>
|
|
371
|
-
</provider>
|
|
372
|
-
</entry>
|
|
373
365
|
<entry file="file://$PROJECT_DIR$/parts/factor.js">
|
|
374
366
|
<provider selected="true" editor-type-id="text-editor">
|
|
375
367
|
<state relative-caret-position="0">
|
|
@@ -378,26 +370,26 @@
|
|
|
378
370
|
</state>
|
|
379
371
|
</provider>
|
|
380
372
|
</entry>
|
|
381
|
-
<entry file="file://$PROJECT_DIR$/
|
|
373
|
+
<entry file="file://$PROJECT_DIR$/parts/functions.js">
|
|
382
374
|
<provider selected="true" editor-type-id="text-editor">
|
|
383
|
-
<state relative-caret-position="
|
|
384
|
-
<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" />
|
|
385
377
|
<folding />
|
|
386
378
|
</state>
|
|
387
379
|
</provider>
|
|
388
380
|
</entry>
|
|
389
|
-
<entry file="file://$PROJECT_DIR$/
|
|
381
|
+
<entry file="file://$PROJECT_DIR$/i18n/zh-CN.json">
|
|
390
382
|
<provider selected="true" editor-type-id="text-editor">
|
|
391
|
-
<state relative-caret-position="
|
|
392
|
-
<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" />
|
|
393
385
|
<folding />
|
|
394
386
|
</state>
|
|
395
387
|
</provider>
|
|
396
388
|
</entry>
|
|
397
|
-
<entry file="file://$PROJECT_DIR$/parts/
|
|
389
|
+
<entry file="file://$PROJECT_DIR$/parts/fleet-list.js">
|
|
398
390
|
<provider selected="true" editor-type-id="text-editor">
|
|
399
|
-
<state relative-caret-position="
|
|
400
|
-
<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" />
|
|
401
393
|
<folding />
|
|
402
394
|
</state>
|
|
403
395
|
</provider>
|
|
@@ -418,5 +410,13 @@
|
|
|
418
410
|
</state>
|
|
419
411
|
</provider>
|
|
420
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>
|
|
421
421
|
</component>
|
|
422
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
|
@@ -62,8 +62,11 @@ const ShipRow = (0, _reactRedux.connect)(state => {
|
|
|
62
62
|
//console.log(ship)
|
|
63
63
|
const completeTime = lastRefresh + estimate;
|
|
64
64
|
var milkadd = 0;
|
|
65
|
-
if(canRepair==2||canRepair==
|
|
66
|
-
milkadd = Math.floor(timeElapsed/900)*
|
|
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;
|
|
67
70
|
}
|
|
68
71
|
var milks = Math.max(api_cond,Math.min(api_cond + milkadd,54))
|
|
69
72
|
|
|
@@ -123,9 +126,9 @@ const ShipRow = (0, _reactRedux.connect)(state => {
|
|
|
123
126
|
_react2.default.createElement(
|
|
124
127
|
'td',
|
|
125
128
|
null,
|
|
126
|
-
(canRepair==1)?'❤️':null,
|
|
127
|
-
(canRepair==1) && api_nowhp !== api_maxhp && !inRepair && (0, _functions.repairEstimate)(ship, timeElapsed, availableSRF),
|
|
128
|
-
(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)?
|
|
129
132
|
_react2.default.createElement(
|
|
130
133
|
'td',
|
|
131
134
|
null,
|